Import revised translations.

Change-Id: I6923154d77795bd51be4d62158c1ccaf23522fb8
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 13092f4..01e6c00 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/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="status_sending_messages" msgid="3971880826111264523">"جارٍ إرسال الرسائل..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"إرسال الرسائل الصادرة"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"إرسال الكل"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"جلب المرفق."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"جلب المرفق <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"قراءة مرفقات البريد الإلكتروني"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"التالي"</string>
     <string name="okay_action" msgid="8365197396795675617">"موافق"</string>
     <string name="cancel_action" msgid="6967435583794021865">"إلغاء"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"السابق"</string>
     <string name="send_action" msgid="1729766205562446418">"إرسال"</string>
     <string name="reply_action" msgid="4262472229221507619">"رد"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"رد على الكل"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"إعادة توجيه"</string>
     <string name="done_action" msgid="7497990549515580249">"تم"</string>
     <string name="discard_action" msgid="6532206074859505968">"إلغاء"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"حفظ كمسودة"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"حفظ المسودة"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"مقروءة/غير مقروءة"</string>
     <string name="read_action" msgid="4701484794504781686">"وضع علامة كـ \"مقروءة\""</string>
     <string name="unread_action" msgid="6280399049357552826">"وضع علامة كـ \"غير مقروءة\""</string>
@@ -58,21 +57,18 @@
     <string name="accounts_action" msgid="901105887272231493">"الحسابات"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"وضع علامة عليها كـ \"مقروءة\""</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"تعليمها بـ \"غير مقروءة\""</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"إضافة نسخة إلى/نسخة مخفية الوجهة"</string>
+    <string name="move_action" msgid="3059189775933985898">"نقل"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ نسخة إلى/نسخة مخفية الوجهة"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"إضافة مرفق"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"إعدادات التفريغ"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"اختيار مرفق"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"نقل إلى"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"جارٍ تحميل الرسائل..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"خطأ في الاتصال"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"رسالة إلكترونية جديدة"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"حدث خطأ غير متوقع أثناء تحميل نص الرسالة. ربما تكون الرسالة كبيرة جدًا بحيث لا يمكن عرضها."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"نقل <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> من الرسائل"</item>
+    <item quantity="one" msgid="1891601902988083907">"نقل رسالة <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="8792313600381332865">"نقل <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> من الرسائل"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"في عدد: <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> من الحسابات"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"إلى <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"حساب <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> من الحسابات"</item>
+  </plurals>
     <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>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"البريد الصادر"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"الرجاء الضغط لفترة طويلة على حساب لتحديثه"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"صندوق البريد"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"عرض مجمّع"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"تحميل المزيد من الرسائل"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"تم تحديد <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7901361399231876038">"تم تحديد <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"ليس هناك أي رسائل"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"إلى"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"نسخة إلى"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"نسخة مخفية الوجهة"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"الموضوع"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"من:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"إلى:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"نسخة إلى:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"نسخة مخفية الوجهة:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"الموضوع:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"إنشاء رسالة"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- الرسالة الأصلية --------"\n"الموضوع: <xliff:g id="SUBJECT">%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_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> كتَب:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"نص مقتبس"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"تضمين نص"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"يلزم إضافة مستلم واحد على الأقل."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"بعض عناوين البريد الإلكتروني غير صالحة"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"الملف كبير جدًا بحيث لا يمكن إرفاقه."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"نسخة إلى:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"فتح"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"تعذر حفظ المرفق في بطاقة SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"عرض"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"تحميل"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"حفظ"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"إيقاف"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"تم حفظ المرفق باسم <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"يتعذر حفظ المرفق."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"ملاحظة: هناك واحد أو أكثر من المرفقات في الرسالة المعاد توجيهها سيتم تنزيله قبل الإرسال."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"الرسالة"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"دعوة"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"مرفق <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"عدد المرفقات: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"إظهار الصور"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"عرض في التقويم »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"عرض في التقويم"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"دعوة التقويم"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"هل تنوي الذهاب؟"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" نعم"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"لقد كان ردك هو \"ربما\" على هذه الدعوة"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"لقد رفضت هذه الدعوة"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"عرض <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"إلغاء الرسالة"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"هل تريد إلغاء هذه الرسالة؟"</item>
+    <item quantity="other" msgid="5071164417794016228">"هل تريد إلغاء هذه الرسائل؟"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"تمّ حذف الرسالة."</item>
     <item quantity="other" msgid="6574961322865652255">"تم حذف الرسائل."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"تمّ إلغاء الرسالة."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"تمّ حفظ الرسالة كمسودة."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"لا يمكن عرض هذا المرفق."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"تعذر تحميل المرفق \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"جارٍ فتح الرسالة…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"تم نقل رسالة <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> إلى <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"تم نقل <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> من الرسائل إلى <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"تعذرت إعادة توجيه واحد أو أكثر من المرفقات"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"تعذر إعادة توجيه <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"أخفق تسجيل الدخول إلى <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"المس لتغيير إعدادات الحساب"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بايت"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بايت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> كيلوبايت"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> كيلوبايت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> ميغابايت"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> ميغابايت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> غيغابايت"</item>
+    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> غيغابايت"</item>
+  </plurals>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"أقدم"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"إعداد الحساب"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"إضافة حساب Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"إضافة حساب Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"حساب بريد إلكتروني"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"يمكنك تهيئة البريد الإلكتروني لمعظم الحسابات من خلال اتباع خطوات قليلة."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"يمكنك تهيئة حساب Exchange من خلال اتباع خطوات قليلة."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"يمكنك تهيئة حساب Exchange ActiveSync من خلال اتباع خطوات قليلة."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"جارٍ فحص إعدادات خادم البريد الوارد…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"جارٍ فحص إعدادات خادم البريد الصادر…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"إعداد الحساب"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"تمّ إعداد حسابك، وستصلك رسالة إلكترونية قريبًا!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"تسمية هذا الحساب (اختياري)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"الاسم (يظهر في الرسائل الصادرة)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"إعداد الحساب"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"نوع الحساب"</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>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"نطاق/اسم المستخدم"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"استخدام اتصال آمن (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"قبول جميع شهادات طبقة المقابس الآمنة"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"معرّف جهاز الجوال"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"إعدادات الحساب"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"معدل الاطلاع على البريد الإلكتروني"</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>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"تنبيهي عند استلام رسالة إلكترونية."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"مزامنة جهات الاتصال من هذا الحساب."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"مزامنة التقويم من هذا الحساب أيضًا."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"مزامنة البريد الإلكتروني من هذا الحساب"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"تعذر إنهاء الإعداد"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"المقدار المراد مزامنته"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"يوم واحد"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"اسم المستخدم أو كلمة المرور غير صحيحة."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"لا يمكن الاتصال بالخادم بأمان."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"لا يمكن الاتصال بالخادم بأمان."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"لقد استجاب الخادم بخطأ، الرجاء التحقق من اسم المستخدم وكلمة المرور وإعادة المحاولة."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"لا يمكن الاتصال بالخادم."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"لا يمكن الاتصال بالخادم."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"يلزم وجود TLS لكن لا يتيح الخادم استخدامه."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"لا يتيح الخادم استخدام أساليب المصادقة."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"يتعذر الاتصال بالخادم نظرًا لوقوع خطأ بالأمان."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"تعذر الاتصال بالخادم."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"لقد أدخلت عنوان خادم غير صحيح أو أن الخادم يتطلب إصدار بروتوكول لا يتوافق مع البريد الإلكتروني."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"التحكم عن بعد في إدارة الأمان"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"يتطلب الخادم <xliff:g id="SERVER">%s</xliff:g> أن تسمح له بالتحكم في بعض ميزات الأمان بهاتفك عن بعد. هل تريد إنهاء إعداد هذا الحساب؟"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"يتطلب هذا الخادم ميزات أمان غير معتمدة على هاتفك."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"تحذير: سيؤدي إلغاء تنشيط صلاحية تطبيق البريد الإلكتروني لإدارة الجهاز إلى حذف جميع حسابات البريد الإلكتروني التي تتطلب الصلاحية، وأيضًا حذف البريد الإلكتروني وجهات الاتصال وأحداث التقويم وغيرها من البيانات."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"يتطلب الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" تحديث إعدادات الأمان."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"تحديث إعدادات الأمان"</string>
     <string name="account_security_title" msgid="4441470647344315196">"أمان الجهاز"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"انتهت صلاحية رمز إلغاء تأمين الشاشة."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"يلزم إلغاء تأمين شاشة جديد"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"انتهت صلاحية رمز إلغاء تأمين الشاشة. المس هنا لتحديثه."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"أتريد إلغاء أي تغييرات غير محفوظة؟"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"إعدادات عامة"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"الحساب الافتراضي"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"إرسال البريد الإلكتروني من هذا الحساب افتراضيًا"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"إشعارات البريد إلكتروني"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"معدل المزامنة والتنبيهات وما إلى ذلك"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"التنبيه في شريط الوضع عند استلام رسالة إلكترونية"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"معدل الاطلاع على البريد الإلكتروني"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"معدل الإطلاع على البريد الوارد"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"إعدادات البريد الوارد"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"إعدادات البريد الصادر"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"اسم الحساب"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"التوقيع"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"إلحاق نص بالرسائل التي يتم إرسالها"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"إعدادات التنبيه"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"مزامنة جهات الاتصال"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"مزامنة التقويم من هذا الحساب أيضًا"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"مزامنة التقويم"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"مزامنة التقويم من هذا الحساب أيضًا"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"مزامنة جهات الاتصال"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"مزامنة جهات الاتصال لهذا الحساب"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"مزامنة التقويم"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"مزامنة التقويم لهذا الحساب"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"مزامنة البريد الإلكتروني"</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_vibrate_when_summary" msgid="3991584445166247189">"الاهتزاز أيضًا عند استلام بريد إلكتروني"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"دومًا"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"إعدادات الخادم"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"إزالة الحساب"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"ستتم إزالة الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" من Email."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"إزالة الحساب"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"إزالة الحساب"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"حساب بريد"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"حدد حسابًا"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"ترقية الحسابات"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> من النتائج من <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"أول <xliff:g id="RESULTS">%1$d</xliff:g> من النتائج من <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"انقر على رمز البريد الإلكتروني لطرق العرض الأخرى"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"كل البريد"</string>
-    <string name="widget_unread" msgid="488582205091831168">"غير المقروءة كلها"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"كل المميزة بنجمة"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"تفضيلات البريد الإلكتروني"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"تفضيلات التطبيقات"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"التقدم التلقائي"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"تحديد الشاشة التي تظهر بعد حذف رسالة"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"التوجه إلى"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"رسالة أحدث"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"رسائل أقدم"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"قائمة الرسائل"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"حجم نص الرسالة"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"عرض محتوى الرسائل في نص حجمه صغير جدًا"</item>
+    <item msgid="8239633518447359057">"عرض محتوى الرسائل في نص حجمه صغير"</item>
+    <item msgid="55959821477704302">"عرض محتوى الرسائل في نص حجمه عادي"</item>
+    <item msgid="446236334663020508">"عرض محتوى الرسائل في نص حجمه كبير"</item>
+    <item msgid="235926149071179467">"عرض محتوى الرسائل في نص حجمه ضخم"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"حجم نص الرسالة"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"صغير جدًا"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"صغير"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"عادي"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"كبير"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ضخم"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"جلب المرفقات تلقائيًا"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"تحميل المرفقات لرسائل البريد الوارد. (غير متوفر لحسابات POP3.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> من <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"انقر على رمز البريد الإلكتروني لطرق العرض الأخرى"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"كل البريد"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"غير المقروءة كلها"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"كل المميزة بنجمة"</string>
     <string name="widget_loading" msgid="2340962056927255554">"جارٍ التحميل…"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4c7655c..3f8c1d1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/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="status_sending_messages" msgid="3971880826111264523">"Съобщенията се изпращат"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Изпращане на изх. съобщения"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Изпр. на всички"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Извлича се прикачен файл."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Извлича се прикаченият файл<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Четене на прикачени файлове в имейла"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Напред"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Отказ"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Предишна"</string>
     <string name="send_action" msgid="1729766205562446418">"Изпращане"</string>
     <string name="reply_action" msgid="4262472229221507619">"Отговор"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Отговор до всички"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Препращане"</string>
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
     <string name="discard_action" msgid="6532206074859505968">"Отхвърляне"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Запазване като чернова"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Запазване на чернова"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Прочетени/Непрочетени"</string>
     <string name="read_action" msgid="4701484794504781686">"Означаване като прочетено"</string>
     <string name="unread_action" msgid="6280399049357552826">"Означаване като непрочетено"</string>
@@ -58,16 +57,13 @@
     <string name="accounts_action" msgid="901105887272231493">"Профили"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Прочетено"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Непрочетено"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Добавяне на Як:/Ск:"</string>
+    <string name="move_action" msgid="3059189775933985898">"Местене"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Як/Ск"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Добавяне на прикачен файл"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Настройки за отхвърляне"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Избор на прикачен файл"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Преместване във:"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Съобщенията се зареждат…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Грешка при свързване"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Нов имейл"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Неочаквана грешка при зареждане на текст. Съобщението може да е твърде голямо за преглед."</string>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> профила"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"до <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> профил"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> профила"</item>
+  </plurals>
     <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>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Изх. поща"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Моля, натиснете продължително профил, за да го опресните"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Пощенска кутия"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Комбиниран изглед"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Зареждане на още съобщения"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"Избрани: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7901361399231876038">"Избрани: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Няма съобщения"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"До"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Як"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Ск:"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Тема"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"От:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"До:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Як:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Ск:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Тема:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Ново съобщение"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Оригинално съобщение --------"\n"Тема: <xliff:g id="SUBJECT">%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_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> написа:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитиран текст"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Включване на текста"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Трябва да добавите поне един получател."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Някои имейл адреси са невалидни."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файлът е твърде голям за прикачване."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Як:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Отваряне"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Неуспешно запазване на прикачен файл на SD карта."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Преглед"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Зареждане"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Запазване"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Стоп"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Запазен прикачен файл: <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Прикаченият файл не се запази."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Забележка: Един или повече прикачени файла в препратеното ви съобщение ще бъдат изтеглени преди изпращане."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Съобщение"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Покана"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> прикачен файл"</item>
+    <item quantity="other" msgid="974463163535515223">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> прикачени файла"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показване на изображенията"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Преглед в Календар »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Преглед в Календар"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Покана в календар"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Ще присъствате ли?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Да"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Отговорихте на тази покана с „Може би“"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Отклонихте тази покана"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Преглед на <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Отхвърляне"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Да се отхвърли ли съобщението?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Да се отхвърлят ли съобщенията?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Съобщението е изтрито."</item>
     <item quantity="other" msgid="6574961322865652255">"Съобщенията са изтрити."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Съобщението е отхвърлено."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Съобщението е запазено като чернова."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Този прикачен файл не може да бъде показан."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Прикаченият файл „<xliff:g id="FILENAME">%s</xliff:g>“ не можа да бъде зареден."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Съобщението се отваря…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> съобщение е преместено в/ъв <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> съобщения са преместени в/ъв <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Един или повече прикачени файла не можаха да се препратят"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> не можа да се препрати"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Не влязохте: <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Докоснете, за да промените настройките на профила"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
+    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
+  </plurals>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"По-стари"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка на профила"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавяне на нов профил от Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавяне на нов профил от Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Имейл профил"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Можете да конфигурирате имейла за повечето профили само с няколко стъпки."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Можете да конфигурирате профил от Exchange само с няколко стъпки."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Можете да конфигурирате профил от Exchange ActiveSync само с няколко стъпки."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Настройките на вх. сървър се проверяват..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Настройките на изх. сървър се проверяват..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка на профила"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Профилът ви е настроен и имейлите са на път!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именуване на този профил (незадължително)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Името ви (показвано в изходящи съобщения)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Настройка на профила"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Тип профил"</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>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домейн/Потребителско име"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Използване на сигурна връзка (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Приемане на всички SSL сертификати"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Идент. № на мобилното у-во"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Настройки на профила"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Честота на проверяване за имейл"</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">"Автоматично („Push“)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"На всеки 5 мин"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Известие при пристигане на имейл."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизиране на контактите в този профил."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизиране на календара в този профил."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Синхрон на имейлите от този профил"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Настройването не можа да завърши"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Количество за синхронизиране"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Един ден"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неправилно потребителско име или парола."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не може да се осъществи безопасна връзка със сървъра."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Не може да се осъществи безопасна връзка със сървъра."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Сървърът отговори с грешка. Моля, проверете потребителското име и паролата си и опитайте отново."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Не може да се осъществи връзка със сървъра."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Не може да се осъществи връзка със сървъра."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Изисква се TLS, но не се поддържа от сървъра."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Сървърът не поддържа методи за удостоверяване."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Неуспешно свързване със сървър поради грешка със сигурността."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Неуспешно свързване със сървър."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Въвели сте неправилен адрес на сървъра или сървърът изисква версия на протокола, която приложението за електронна поща не поддържа."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Отдалечено администриране на сигурността"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Сървърът <xliff:g id="SERVER">%s</xliff:g> изисква отдалечен контрол над някои от защитните функции на телефона ви. Искате ли да завършите настройването на този профил?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Сървърът изисква защитни функции, които телефонът ви не поддържа."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ПРЕДУПРЕЖДЕНИЕ: Деактивирането на възможността приложението за електронна поща да администрира устройството ви ще изтрие всички имейл профили, които го изискват, заедно с имейлите, контактите, календарните събития и други данни в тях."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ изисква актуализация на защитните настройки."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Актуализиране на защитни настройки"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Сигурност на устройство"</string>
@@ -316,20 +298,18 @@
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Редактиране на подробностите"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="950001176659814912">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ изисква да актуализирате кода си за отключване на екрана."</string>
     <string name="password_expire_warning_content_title" msgid="4602564325906174785">"Изисква се ново отключване"</string>
-    <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ изисква да актуализарате кода си за отключване на екрана. За целта докоснете тук."</string>
+    <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ изисква да актуализирате кода си за отключване на екрана. За целта докоснете тук."</string>
     <string name="password_expired_ticker" msgid="5698508544187945595">"Кодът за отключване на екрана е изтекъл."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Изисква се ново отключване"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Кодът ви за отключване на екрана е изтекъл. Натиснете тук, за да го актуализирате."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Да се отхвърлят ли незапазените промени?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Общи настройки"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Основен профил"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Изпращане на имейл от този профил по подразбиране"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Известия за имейл"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Честота на синхронизиране, известия и т.н."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Известие в лентата на състоянието при пристигане на имейл"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Честота на проверяване за имейл"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Честота на проверяване за входяща поща"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Входящи настройки"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Изходящи настройки"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Име на профила"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Подпис"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Прибавяне на текст към изпращаните от вас съобщения"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Настройки за известия"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхронизиране на контакти"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизиране и на контактите в този профил"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизиране на календар"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизиране и на календара в този профил"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхр. на контактите"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхр. на контактите за този профил"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхрон на календара"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхрон на календара за този профил"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Синхрон на имейлите"</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_vibrate_when_summary" msgid="3991584445166247189">"Да вибрира и при нов имейл"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Винаги"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки на сървъра"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Премахване на профил"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ ще бъде премахнат от имейла."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Премахване на профила"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Премахване на профила"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Имейл"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Избор на профил"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Надстройка на профилите"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> резултата от <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Първите <xliff:g id="RESULTS">%1$d</xliff:g> резултата от <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Докоснете иконата за имейл за други изгледи"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Цялата поща"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Всички непрочетени"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Всички със звезда"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Предпочитания за имейл"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Предпочитания за приложението"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Автоматично преминаване"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Изберете екран, който да се показва след изтриване на съобщение"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Преминаване към"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"По-ново съобщение"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"По-старо съобщение"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Списък със съобщения"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Размер на текста на съобщенията"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Показване на съдържанието на съобщенията с миниатюрен шрифт"</item>
+    <item msgid="8239633518447359057">"Показване на съдържанието на съобщенията с малък шрифт"</item>
+    <item msgid="55959821477704302">"Показване на съдържанието на съобщенията с нормален шрифт"</item>
+    <item msgid="446236334663020508">"Показване на съдържанието на съобщенията с голям шрифт"</item>
+    <item msgid="235926149071179467">"Показване на съдържанието на съобщенията с огромен шрифт"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Размер на текста на съобщенията"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Миниатюрен"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Малък"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Нормален"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Голям"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромен"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Авт. извличане на прик. файлове"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Изтегляне на прикачени файлове във вх. поща. (Без POP3 профили.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> от <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Докоснете иконата за имейл за други изгледи"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Цялата поща"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Всички непрочетени"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Всички със звезда"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Зарежда се…"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a53329e..7a26fbb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/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="status_sending_messages" msgid="3971880826111264523">"S\'estan enviant els missatges..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Envia els missatges de sortida"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Envia-ho tot"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"S\'està obtenint el fitxer adjunt."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"S\'està obtenint el fitxer adjunt <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Llegeix els fitxers adjunts al correu electrònic"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Següent"</string>
     <string name="okay_action" msgid="8365197396795675617">"D\'acord"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancel·la"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Anterior"</string>
     <string name="send_action" msgid="1729766205562446418">"Envia"</string>
     <string name="reply_action" msgid="4262472229221507619">"Respon"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Respon a tots"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Reenvia"</string>
     <string name="done_action" msgid="7497990549515580249">"Fet"</string>
     <string name="discard_action" msgid="6532206074859505968">"Descarta"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Anomena i desa com a esborrany"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Desa l\'esborrany"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Llegit/No llegit"</string>
     <string name="read_action" msgid="4701484794504781686">"Marca\'l com a llegit"</string>
     <string name="unread_action" msgid="6280399049357552826">"Marca com a no llegit"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Comptes"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marca com a llegit"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marca com a no llegit"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Afegeix Cc/Cco"</string>
+    <string name="move_action" msgid="3059189775933985898">"Mou"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Cco"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Afegeix un fitxer adjunt"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Configuració d\'abocament"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Selecció d\'un fitxer adjunt"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Mou a"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"S\'estan carregant els missatges…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Error de connexió"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Correu electrònic nou"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"S\'ha produït un error inesperat en carregar el text del missatge. Pot ser que el missatge sigui massa gran per visualitzar-lo."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Moure <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatge"</item>
-    <item quantity="other" msgid="8792313600381332865">"Moure <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatges"</item>
+    <item quantity="one" msgid="1891601902988083907">"Mou <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatge"</item>
+    <item quantity="other" msgid="8792313600381332865">"Mou <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatges"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> no llegits (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"a <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"a <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> compte"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> comptes"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Safata d\'entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Bústia de sortida"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Esborranys"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bústia de sortida"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Premeu durant una estona un compte per actualitzar-lo"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Bústia de correu"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carrega més missatges"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionat"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionats"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"No hi ha missatges"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Per a"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cco"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Assumpte"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"De:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Per a:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Cco:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Assumpte:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Redacta un missatge"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Missatge original --------"\n"Assumpte: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Per a: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha escrit:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Text citat"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inclou text"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Heu d\'afegir com a mínim un destinatari."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunes adreces electròniques no són vàlides."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El fitxer és massa gran per adjuntar-lo."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Obre"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"No es pot desar el fitxer adjunt a la targeta SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Mostra"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Carrega"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Desa"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Atura"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Fitxer adjunt desat com a <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"No es pot desar el fitxer adjunt."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: Un o més fitxers adjunts del teu missatge reenviat es baixaran abans de l\'enviament."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Missatge"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitació"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Fitxer adjunt <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Fitxers adjunts <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostra les imatges"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Visualitza-ho al calendari »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Mostra-ho al calendari"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitació al calendari"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Hi anireu?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Sí"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Heu respost \"potser\" a aquesta invitació"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Heu rebutjat la invitació"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Es mostra <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Descarta el missatge"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Vols descartar aquest missatge?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Vols descartar aquests missatges?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Missatge suprimit."</item>
     <item quantity="other" msgid="6574961322865652255">"Missatges suprimits."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Missatge descartat."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Missatge desat com a esborrany."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Aquest fitxer adjunt no es pot visualitzar."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"El fitxer adjunt \"<xliff:g id="FILENAME">%s</xliff:g>\" no s\'ha pogut carregar."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"S\'està obrint el missatge..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatge mogut a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatges moguts a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"No s\'han pogut reenviar un o més fitxers adjunts"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"No s\'ha pogut reenviar <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"S\'ha produït un error a l\'inici de sessió de <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Toca per canviar la configuració del compte"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Més antics"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuració del compte"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Afegeix un compte d\'Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Afegeix un compte d\'Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Compte de correu electrònic"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Podeu configurar el correu electrònic per a la majoria dels comptes en uns quants passos."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Podeu configurar un compte d\'Exchange en uns quants passos."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Podeu configurar un compte d\'Exchange ActiveSync en uns quants passos."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"S\'està comprovant la configuració del servidor d\'entrada…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"S\'està comprovant la configuració del servidor de sortida…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuració del compte"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"El compte s\'ha configurat i aviat rebre un correu electrònic."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assigneu un nom al compte (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"El vostre nom (visualitzat als missatges de sortida)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuració del compte"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipus de compte"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quin tipus de compte es tracta?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuració del compte"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuració del servidor d\'entrada"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domini\\Nom d\'usuari"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilitza una connexió segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepta tots els certificats SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositiu mòbil"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Configuració del compte"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Freqüència de comprovació de correu electrònic"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Opcions del compte"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Freqüència de comprovació de la safata d\'entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automàtica (tramesa automàtica)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Cada 5 minuts"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notifica\'m quan arribi correu electrònic nou."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronitza els contactes d\'aquest compte."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronitza el calendari d\'aquest compte."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronitza el correu electrònic d\'aquest compte."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"La configuració no ha pogut finalitzar"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Quantitat per sincronitzar"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un dia"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nom d\'usuari o contrasenya incorrectes."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No es pot establir una connexió segura amb el servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"No es pot establir una connexió segura amb el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"El servidor ha contestat amb un error. Comprova el nom d\'usuari i la contrasenya, i torna-ho a provar."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No es pot establir la connexió amb el servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"No es pot establir la connexió amb el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <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="1676242821459638150">"Els mètodes d\'autenticació no són compatibles amb el servidor."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"No es pot obrir la connexió amb el servidor a causa d\'un error de seguretat."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"No es pot obrir la connexió amb el servidor."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"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_security_required_title" msgid="1850321535870447468">"Administració de seguretat remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"El servidor <xliff:g id="SERVER">%s</xliff:g> requereix que li permeteu controlar de manera remota algunes funcions de seguretat del telèfon. Voleu acabar de configurar aquest compte?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Aquest servidor requereix funcions de seguretat no compatibles amb el telèfon."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ADVERTIMENT: Desactivar l\'autoritat de l\'aplicació de correu electrònic per administrar el dispositiu suprimirà tots els comptes de correu electrònic que ho requereixin, juntament amb els correus electrònics, els contactes, els esdeveniments de calendari i altres dades."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Cal actualitzar la configuració de seguretat del compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Actualització de la configuració de seguretat"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Seguretat del dispositiu"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"El codi de desbloqueig de pantalla ha caducat."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Cal nou desbloq. de pantalla"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"El codi de desbloqueig de pantalla ha caducat. Toca aquí per actualitzar-lo."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vols descartar els canvis no desats?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Configuració general"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Compte predeterminat"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Envia correu electrònic des d\'aquest compte de manera predeterminada"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificacions de correu electrònic"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Freqüència de sincronització, notificacions, etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Quan arribi correu electrònic, notifica-ho a la barra d\'estat"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Freqüència de comprovació del correu electrònic"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Freqüència de comprovació de la safata d\'entrada"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuració d\'entrada"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuració de sortida"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nom del compte"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatura"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Annexa text als missatges que envieu"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configuració de notificacions"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincronitza els contactes"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronitza també els contactes d\'aquest compte"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronitza el calendari"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronitza també el calendari d\'aquest compte"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincr. contactes"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincr. contactes d\'aquest compte"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronitza el calendari"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincr. calendari p. aq. compte"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sincronitza el correu electrònic"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincr. miss. correu d\'aquest compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibra també quan arribi correu electrònic"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Elimina el compte"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"El compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" s\'eliminarà del correu electrònic."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Elimina el compte"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Elimina el compte"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Compte"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selecciona un compte"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualitza els comptes"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primers <xliff:g id="RESULTS">%1$d</xliff:g> resultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Toca la icona de correu per obtenir altres vistes."</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Tot el correu"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Tots els no llegits"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Tots els preferits"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Preferències de correu electrònic"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Preferències de l\'aplicació"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avança automàticament"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Selecciona quina pantalla s\'ha de mostrar després de suprimir un missatge"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Vés a"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Missatge més recent"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Missatge més antic"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Llista de missatges"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Mida del text del missatge"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Mostra el contingut dels missatges amb una lletra molt petita"</item>
+    <item msgid="8239633518447359057">"Mostra el contingut dels missatges amb una lletra petita"</item>
+    <item msgid="55959821477704302">"Mostra el contingut dels missatges amb una lletra normal"</item>
+    <item msgid="446236334663020508">"Mostra el contingut dels missatges amb una lletra gran"</item>
+    <item msgid="235926149071179467">"Mostra el contingut dels missatges amb una lletra enorme"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Mida del text del missatge"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Molt petita"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Petita"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Gran"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Obtén fitxers adjunts autom."</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Baixa fitxers adjunts per als missatges de la safata d\'entrada. (No està disponible per a comptes POP3.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Toca la icona de correu per obtenir altres vistes."</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Tot el correu"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Tots els no llegits"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Tots els preferits"</string>
     <string name="widget_loading" msgid="2340962056927255554">"S\'està carregant…"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6c46101..803ebb1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starší"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">"  – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavení účtu"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Přidat účet Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Přidat účet Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normální"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velký"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velmi velký"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Automaticky načítat přílohy"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Stahovat přílohy doručené pošty (není k dispozici pro účty POP3)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Pohled přepnete klepnutím na ikonu E-mail"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Všechny zprávy"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Všechny nepřečtené"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Vše s hvězdičkou"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Pohled přepnete klepnutím na ikonu E-mail"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Všechny zprávy"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Všechny nepřečtené"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Vše s hvězdičkou"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Načítání..."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2a0ada9..86cd4fc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ældre"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguration af konto"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tilføj en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tilføj en Exchange ActiveSync-konto"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kæmpestor"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Hent vedhæftede filer automatisk"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Download vedhæftede filer fra indbakken (ikke tilgængeligt for POP3-konti)."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> af <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Tryk på e-mail-ikonet for at se andre visninger"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Alle e-mails"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Alle ulæste"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Stjernemarkerede"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Tryk på e-mail-ikonet for at se andre visninger"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Alle e-mails"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Alle ulæste"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Stjernemarkerede"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Indlæser..."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5f55e3d..5568ee7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -68,7 +68,7 @@
     <string name="notification_new_title" msgid="2200257910380529139">"Neue E-Mail"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Unerwarteter Fehler beim Laden des Nachrichtentextes aufgetreten. Die Nachricht ist möglicherweise zu lang, um angezeigt zu werden."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachricht verschieben"</item>
+    <item quantity="one" msgid="1891601902988083907">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachrichten verschieben"</item>
     <item quantity="other" msgid="8792313600381332865">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachrichten verschieben"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
@@ -170,7 +170,7 @@
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachrichten verschoben in: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Mindestens ein Anhang wurde nicht weitergeleitet."</string>
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> nicht weitergeleitet"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> nicht weitergegeben"</string>
     <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> - Anmeldefehler"</string>
     <string name="login_failed_notification" msgid="2405086379065472222">"Berühren Sie diesen Bereich, um die Kontoeinstellungen zu ändern."</string>
   <plurals name="message_view_attachment_bytes">
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Älter"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoeinrichtung"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-Konto hinzufügen"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-Konto hinzufügen"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groß"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sehr groß"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Anhänge automatisch abrufen"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Download von Posteingang-E-Mail-Anhängen (nicht für POP3-Konten)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Für andere Ansichten auf E-Mail-Symbol tippen"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Alle Nachrichten"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Alle ungelesenen"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Alle markierten"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Für weitere Ansichten auf E-Mail-Symbol tippen"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Alle Nachrichten"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Alle ungelesenen"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Alle markierten"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Wird geladen…"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index de6c84a..2ca3f64 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Παλαιότερα"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Προσθήκη λογαριασμού Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Προσθήκη λογαριασμού Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Κανονικό"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Μεγάλο"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Πολύ μεγάλο"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Αυτόματη ανάκτηση συνημμένων"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Λήψη συνημμένων για Εισ. μηνύματα. (Μη διαθέσιμο για λογαριασμούς POP3.)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Πατήστε το εικονίδιο μην.ηλ.ταχ. για άλλες όψεις"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Όλα τα μηνύματα"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Όλα τα μη αναγν."</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Όλα με αστέρι"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Πατήστε το εικονίδιο μην.ηλ.ταχ. για άλλες όψεις"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Όλα τα μηνύματα"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Όλα τα μη αναγν."</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Όλα με αστέρι"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Φόρτωση…"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ad9eedb..491b8ec 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/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="status_sending_messages" msgid="3971880826111264523">"Sending messages…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Send outgoing messages"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Send all"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Fetching attachment."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Fetching attachment <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Read Email attachments"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Next"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancel"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Previous"</string>
     <string name="send_action" msgid="1729766205562446418">"Send"</string>
     <string name="reply_action" msgid="4262472229221507619">"Reply"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Reply all"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Forward"</string>
     <string name="done_action" msgid="7497990549515580249">"Done"</string>
     <string name="discard_action" msgid="6532206074859505968">"Discard"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Save as draft"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Save draft"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Read/Unread"</string>
     <string name="read_action" msgid="4701484794504781686">"Mark read"</string>
     <string name="unread_action" msgid="6280399049357552826">"Mark unread"</string>
@@ -58,16 +57,13 @@
     <string name="accounts_action" msgid="901105887272231493">"Accounts"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Mark as read"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Mark as unread"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Add Cc/Bcc"</string>
+    <string name="move_action" msgid="3059189775933985898">"Move"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Add attachment"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Dump settings"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choose attachment"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Move to"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Loading messages…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Connection error"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"New email"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Unexpected error while loading message text. Message may be too large to view."</string>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"to <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> account"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> accounts"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inbox"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Outbox"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Drafts"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Outbox"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Please long-press an account to refresh it"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Mailbox"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Combined view"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Load more messages"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selected"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selected"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"No messages"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"To"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Subject"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"From:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"To:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Subject:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Compose Mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Quoted text"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Include text"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"You must add at least one recipient."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Some email addresses are invalid."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"File too large to attach."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Open"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Unable to save attachment to SD card."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"View"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Load"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Save"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stop"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Attachment saved as <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Unable to save attachment."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Note: One or more attachments in your forwarded message will be downloaded prior to sending."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Message"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invite"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Attachment <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Attachments <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Show pictures"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"View in Calendar »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"View in Calendar"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Calendar Invite"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Going?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Yes"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"You have replied \"maybe\" to this invitation"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"You have declined this invitation"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Viewing <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Discard message"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Discard this message?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Discard these messages?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Message deleted."</item>
     <item quantity="other" msgid="6574961322865652255">"Messages deleted."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Message discarded."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Message saved as draft."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"This attachment cannot be displayed."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"The attachment \" <xliff:g id="FILENAME">%s</xliff:g>\" could not be loaded."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Opening message…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> message moved to <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> messages moved to <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Could not forward one or more attachments"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Could not forward <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> sign-in failed"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Touch to change account settings"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Older"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Account setup"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Add an Exchange account"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Add an Exchange ActiveSync account"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Email account"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"You can configure Email for most accounts in just a few steps."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"You can configure an Exchange account in just a few steps."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"You can configure an Exchange ActiveSync account in just a few steps."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Checking incoming server settings…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Checking outgoing server settings…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Account setup"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Your account is set up and email is on its way!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Give this account a name (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Your name (displayed on outgoing messages)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Account setup"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Account type"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"What type of account is this?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Account setup"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Incoming server settings"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Use secure connection (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accept all SSL certificates"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobile Device ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Account settings"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Email checking frequency"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Account options"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Inbox checking frequency"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Never"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatic (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Every 5 minutes"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notify me when email arrives."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sync contacts from this account."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sync calendar from this account."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sync email from this account."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Setup could not finish"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Amount to synchronise"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"One day"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Username or password incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Cannot safely connect to server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Cannot safely connect to server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"The server responded with an error. Please check your username and password and try again."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Cannot connect to server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Cannot connect to server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS required but not supported by server."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Authentication methods are not supported by server."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Unable to open connection to server due to security error."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Unable to open connection to server."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"You\'ve entered an incorrect server address or the server requires a protocol version that Email does not support."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Remote security administration"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"The server <xliff:g id="SERVER">%s</xliff:g> requires that you allow it to control some security features of your phone remotely. Do you wish to finish setting up this account?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"This server requires security features that your phone does not support."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"WARNING: Deactivating the Email application\'s authority to administer your device will delete all Email accounts that require it, along with their emails, contacts, calendar events and other data."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requires security settings update."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Update Security Settings"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Device Security"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Your screen unlock code has expired."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"New screen unlock required"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Your screen unlock code has expired. Touch here to update it."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Discard unsaved changes?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"General settings"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Default account"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Send email from this account by default"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Email notifications"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Sync frequency, notifications, etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notify in status bar when email arrives"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Email check frequency"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Inbox check frequency"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Incoming settings"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Outgoing settings"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Account name"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signature"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Append text to messages that you send"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Notification settings"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sync contacts"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Also sync contacts from this account"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sync calendar"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Also sync calendar from this account"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sync contacts"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sync contacts for this account"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sync Calendar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sync calendar for this account"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sync Email"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sync email for this account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrate"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Also vibrate when email arrives"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Always"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Server settings"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remove account"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"The account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" will be removed from email."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Remove account"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Remove account"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Email account"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Select an account"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgrade accounts"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> results from <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"First <xliff:g id="RESULTS">%1$d</xliff:g> results from <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Tap email icon for other views"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"All Mail"</string>
-    <string name="widget_unread" msgid="488582205091831168">"All Unread"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"All Starred"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Email Preferences"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Application Preferences"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Auto-advance"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Select which screen to show after you delete a message"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Advance to"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Newer message"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Older message"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Message list"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Message text size"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Display content of messages in tiny-sized text"</item>
+    <item msgid="8239633518447359057">"Display content of messages in small-sized text"</item>
+    <item msgid="55959821477704302">"Display content of messages in normal-sized text"</item>
+    <item msgid="446236334663020508">"Display content of messages in large-sized text"</item>
+    <item msgid="235926149071179467">"Display content of messages in huge-sized text"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Message text size"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Tiny"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Small"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Large"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Huge"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Automatically fetch attachments"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Download attachments for Inbox messages. (Not available for POP3 accounts.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Tap email icon for other views"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"All Mail"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"All Unread"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"All Starred"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Loading…"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 94e0766..ba7e9b6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Antiguos"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración de la cuenta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agregar una cuenta de Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agregar una cuenta de Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Recuperar adjuntos automáticamente"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Descargar adjuntos de Recibidos (no disponible en cuentas POP3)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Toca el icono de Email para obtener otras vistas."</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Todos"</string>
-    <string name="widget_unread" msgid="488582205091831168">"No leídos"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Todos los destacados"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Toca el icono de Email para obtener otras vistas."</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Todos"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Todos los destacados"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Cargando…"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a719e1e..127ca41 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Anterior"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" : "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración de cuenta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Añadir una cuenta de Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Añadir una cuenta de Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Recuperar adjuntos automáticamente"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Descargar adjuntos de Recibidos (no disponible en cuentas POP3)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Toca el icono de Email para obtener otras vistas."</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Todos"</string>
-    <string name="widget_unread" msgid="488582205091831168">"No leídos"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Destacados"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Toca el icono de Email para obtener otras vistas."</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Todos"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Cargando…"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 33d45f3..90ba560 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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="status_sending_messages" msgid="3971880826111264523">"در حال ارسال پیام ها..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"ارسال پیام های خروجی"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"ارسال همه"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"واکشی پیوست."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"واکشی پیوست <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"خواندن پیوست های ایمیل"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"بعدی"</string>
     <string name="okay_action" msgid="8365197396795675617">"تأیید"</string>
     <string name="cancel_action" msgid="6967435583794021865">"لغو"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"قبلی"</string>
     <string name="send_action" msgid="1729766205562446418">"ارسال"</string>
     <string name="reply_action" msgid="4262472229221507619">"پاسخ"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"پاسخ به همه"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"هدایت"</string>
     <string name="done_action" msgid="7497990549515580249">"انجام شد"</string>
     <string name="discard_action" msgid="6532206074859505968">"صرفنظر"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"ذخیره بعنوان پیش نویس"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"ذخیره پیش نویس"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"خوانده شده/خوانده نشده"</string>
     <string name="read_action" msgid="4701484794504781686">"علامت گذاری بعنوان خوانده شده"</string>
     <string name="unread_action" msgid="6280399049357552826">"علامت گذاری بعنوان خوانده نشده"</string>
@@ -58,16 +57,13 @@
     <string name="accounts_action" msgid="901105887272231493">"حساب ها"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"علامت گذاری بعنوان خوانده شده"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"علامت گذاری بعنوان خوانده نشده"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"افزودن گیرنده کپی/گیرنده کپی مخفی"</string>
+    <string name="move_action" msgid="3059189775933985898">"انتقال"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"افزودن پیوست"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"تنظیمات نسخه برداری"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"انتخاب پیوست"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"انتقال به"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"در حال بارگیری پیام ها..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"خطای اتصال"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"ایمیل جدید"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"خطای پیش بینی نشده در حین بارگیری متن پیام. پیام ممکن است خیلی بزرگ باشد و نشان داده نشود."</string>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"در <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> حساب"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"به <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> حساب"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> حساب"</item>
+  </plurals>
     <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>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"صندوق خروجی"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"لطفاً یک حساب را برای تازه کردن به صورت طولانی فشار دهید."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"صندوق پستی"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"نمای مرکب"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"بارگیری پیام های بیشتر"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> انتخاب شد"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> انتخاب شد"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"پیامی موجود نیست"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"گیرنده"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"گیرنده کپی"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"گیرنده کپی مخفی"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"موضوع"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"از:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"به:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"گیرنده کپی:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"موضوع:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"نگاشتن نامه"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- پیام اصلی --------"\n"موضوع: <xliff:g id="SUBJECT">%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_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> نوشت:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"متن نقل قول شده"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"شامل متن"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"باید حداقل یک گیرنده اضافه کنید."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"برخی از آدرس های ایمیل نامعتبر هستند."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"فایل خیلی بزرگ است و پیوست نمی شود"</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"گیرنده کپی:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"باز کردن"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"ذخیره پیوست در کارت SD امکان پذیر نیست."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"مشاهده"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"بارگیری"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"ذخیره"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"توقف"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"پیوست به عنوان <xliff:g id="FILENAME">%s</xliff:g> ذخیره شد."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"ذخیره پیوست ممکن نیست."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"توجه: یک یا چند پیوست در پیام هدایت شده شما قبل از ارسال دانلود می شود."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"پیام"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"دعوت کردن"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"پیوست <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"پیوست ها <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"نمایش تصاویر"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"مشاهده در تقویم »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"مشاهده در تقویم"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"دعوت تقویم"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"می روید؟"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" بله"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"شما پاسخ \"شاید\" به این دعوت نامه داده اید"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"شما این دعوتنامه را رد کرده اید"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"مشاهده <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"صرفنظر کردن از پیام"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"از این پیام صرفنظر شود؟"</item>
+    <item quantity="other" msgid="5071164417794016228">"از این پیامها صرفنظر شود؟"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"پیام حذف شد."</item>
     <item quantity="other" msgid="6574961322865652255">"پیام ها حذف شدند."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"پیام رد شد."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"پیام به عنوان پیش نویس ذخیره شد."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"این پیوست نمایش داده نمی شود."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"نمی توان <xliff:g id="FILENAME"> %s</xliff:g> را هدایت کرد"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"پیوست \"<xliff:g id="FILENAME">%s</xliff:g>\" را نمی توان بارگیری کرد."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"درحال بازکردن پیام..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> پیام به <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> انتقال یافت"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> پیام به <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> انتقال یافت"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"یک یا چند پیوست هدایت نشد"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> هدایت نشد"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> ورود به سیستم ناموفق بود"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"برای تغییر دادن تنظیمات حساب لمس کنید"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بایت"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> بایت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> کیلوبایت"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> کیلوبایت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> مگابایت"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> مگابایت"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> گیگابایت"</item>
+    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> گیگابایت"</item>
+  </plurals>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"قدیمی تر"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" -- "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"تنظیم حساب"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"افزودن یک حساب Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"افزودن یک حساب Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"حساب ایمیل"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"شما می توانید ایمیل را برای اکثر حساب ها فقط در چند مرحله پیکربندی کنید."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"شما می توانید یک حساب Exchange را فقط در چند مرحله پیکربندی کنید."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"شما می توانید حساب Exchange ActiveSync را فقط در چند مرحله پیکربندی کنید."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"در حال بررسی تنظیمات سرور ورودی..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"در حال بررسی تنظیمات سرور خروجی..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"تنظیم حساب"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"حساب شما تنظیم شد و ایمیل در راه است!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"نامی به این حساب اختصاص دهید (اختیاری)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"نام شما (در پیام های خروجی نمایش داده می شود)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"تنظیم حساب"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"نوع حساب"</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>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"دامنه/نام کاربری"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"از اتصال امن (SSL) استفاده شود"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"پذیرش همه گواهی های SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"شناسه تلفن همراه"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"تنظیمات حساب"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"دفعات بررسی ایمیل"</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>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"ورود ایمیل به من اعلان شود."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"همگام سازی مخاطبین از این حساب."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"همگام سازی تقویم از این حساب."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"ایمیل را از این حساب همگام سازی کنید."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"تنظیم پایان نیافت"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"مقدار همگام سازی"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"یک روز"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"نام کاربری یا رمز ورود نادرست است. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"اتصال امن به سرور امکان پذیر نیست."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"اتصال امن به سرور امکان پذیر نیست. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"سرور با یک خطا پاسخ داد؛ لطفاً نام کاربری و رمز ورود خود را بررسی کرده و دوباره امتحان کنید."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"اتصال به سرور امکان پذیر نیست."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"اتصال به سرور امکان پذیر نیست. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS لازم است اما توسط سرور پشتیبانی نمی شود."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"روش های تأیید اعتبار توسط سرور پشتیبانی نمی شوند."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"به دلیل خطای امنیتی، اتصال به سرور باز نمی شود."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"اتصال به سرور باز نمی شود."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"آدرس سرور را اشتباه وارد کرده اید یا سرور به نسخه پروتکلی احتیاج دارد که ایمیل پشتیبانی نمی کند."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"مدیریت امنیت راه دور"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"سرور <xliff:g id="SERVER">%s</xliff:g> از شما می خواهد که به آن اجازه دهید برخی از ویژگی های امنیتی گوشی شما را به صورت خودکار کنترل کند. آیا می خواهید تنظیم این حساب را به پایان برسانید؟"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"این سرور به ویژگی های امنیتی نیاز دارد که گوشی شما پشتیبانی نمی کند."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"اخطار: غیرفعال کردن قدرت برنامه ایمیل جهت مدیریت سیستم خود، همه حسابهای ایمیلی که به آن احتیاج دارند، به همراه ایمیل، مخاطبین، رویدادهای تقویم و سایر داده های آنها را حذف می کند."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"تنظیمات امنیتی حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" باید به روزرسانی شود."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"به روزرسانی تنظیمات امنیتی"</string>
     <string name="account_security_title" msgid="4441470647344315196">"امنیت دستگاه"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"کد باز کردن قفل صفحه نمایش شما منقضی شده است."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"کد جدید باز کردن قفل صفحه نمایش مورد نیاز است"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"کد باز کردن قفل صفحه نمایش شما منقضی شده است. برای به روز کردن این کد اینجا را لمس کنید."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"از تغییرات ذخیره نشده صرفنظر شود؟"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"تنظیمات عمومی"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"حساب پیش فرض"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ارسال ایمیل از این حساب به صورت پیش فرض"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"اعلان های ایمیل"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"تکرار همگام سازی، اعلان ها، موارد دیگر"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"ورود ایمیل در نوار وضعیت اعلان شود"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"دفعات بررسی ایمیل"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"دفعات بررسی صندوق دریافت"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"تنظیمات ورودی"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"تنظیمات خروجی"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"نام حساب"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"امضا"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"افزودن متن به پیام هایی که ارسال می کنید"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"تنظیمات اعلان"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"همگام سازی مخاطبین"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"همچنین همگام سازی مخاطبین از این حساب"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"همگام سازی تقویم"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"همچنین همگام سازی تقویم از این حساب"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"همگام سازی مخاطبین"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"همگام سازی مخاطبین برای این حساب"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"همگام سازی تقویم"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"همگام سازی تقویم برای این حساب"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"همگام سازی ایمیل"</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_vibrate_when_summary" msgid="3991584445166247189">"همچنین لرزش هنگام دریافت ایمیل"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"همیشه"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"تنظیمات سرور"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"حذف حساب"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" از ایمیل حذف می شود."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"حذف حساب"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"حذف حساب"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"حساب ایمیل"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"انتخاب یک حساب"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"ارتقا حساب ها"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه از <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه اول از <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"برای نماهای دیگر روی نماد ایمیل ضربه بزنید"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"همه ایمیل ها"</string>
-    <string name="widget_unread" msgid="488582205091831168">"همه خوانده نشده ها"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"همه ستاره دارها"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"موارد برگزیده ایمیل"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"موارد برگزیده برنامه کاربردی"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"پیشرفته خودکار"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"انتخاب کنید چه صفحه ای بعد از حذف یک پیام نشان داده شود"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"پیشروی به"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"پیام جدیدتر"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"پیام قدیمی تر"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"لیست پیام"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"اندازه متن پیام"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"نمایش محتوای پیامها در متن با اندازه بسیار کوچک"</item>
+    <item msgid="8239633518447359057">"نمایش محتوای پیامها در متن با اندازه کوچک"</item>
+    <item msgid="55959821477704302">"نمایش محتوای پیامها در متن با اندازه معمولی"</item>
+    <item msgid="446236334663020508">"نمایش محتوای پیامها در متن با اندازه بزرگ"</item>
+    <item msgid="235926149071179467">"نمایش محتوای پیامها در متن با اندازه بسیار بزرگ"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"اندازه متن پیام"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"خیلی کوچک"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"کوچک"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"معمولی"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"بزرگ"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"بسیار بزرگ"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"واکشی خودکار پیوست ها"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"دانلود کردن پیوست ها برای پیام های صندوق دریافت. (برای حساب های POP3 در دسترس نیست.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> از <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"برای نماهای دیگر روی نماد ایمیل ضربه بزنید"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"همه ایمیل ها"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"همه خوانده نشده ها"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"همه ستاره دارها"</string>
     <string name="widget_loading" msgid="2340962056927255554">"در حال بارگیری..."</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c186800..b109db4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/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="status_sending_messages" msgid="3971880826111264523">"Lähetetään viestejä…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Lähetä lähtevät viestit"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Lähetä kaikki"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Liitetiedostoa noudetaan."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Noudetaan liitetiedostoa <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Sähköpostin liitteiden luku"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Seuraava"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Peruuta"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Edellinen"</string>
     <string name="send_action" msgid="1729766205562446418">"Lähetä"</string>
     <string name="reply_action" msgid="4262472229221507619">"Vastaa"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Vastaa kaikille"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Seuraava"</string>
     <string name="done_action" msgid="7497990549515580249">"Valmis"</string>
     <string name="discard_action" msgid="6532206074859505968">"Hylkää"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Tallenna luonnokseksi"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Tallenna luonnos"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Luettu/lukematon"</string>
     <string name="read_action" msgid="4701484794504781686">"Merkitse luetuksi"</string>
     <string name="unread_action" msgid="6280399049357552826">"Merkitse lukemattomaksi"</string>
@@ -58,16 +57,13 @@
     <string name="accounts_action" msgid="901105887272231493">"Tilit"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Merkitse luetuksi"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merkitse lukemattomaksi"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Lisää (piilo)kopio"</string>
+    <string name="move_action" msgid="3059189775933985898">"Siirrä"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kopio/piilok."</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Lisää liitetiedosto"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Vedosasetukset"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Valitse liite"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Siirrä kansioon"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Ladataan viestejä..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Yhteysvirhe"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Uutta sähköpostia"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Viestin tekstiä ladattaessa tapahtui odottamaton virhe. Viesti voi olla liian suuri näytettäväksi."</string>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tilissä"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"vastaanottaja: <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> tili"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> tiliä"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Postilaatikko"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Lähtevät"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Luonnokset"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Lähtevät"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Voit päivittää tilin painamalla sitä pitkään"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postilaatikot"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Yhdistetty näkymä"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Lataa lisää viestejä"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> valittu"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> valittu"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Ei viestejä"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Vastaanottaja"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopio"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Piilokopio"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Aihe"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Lähettäjä:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Vastaanottaja:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Kopio:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Piilokopio:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Aihe:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Kirjoita viesti"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Alkuperäinen viesti --------"\n"Aihe: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Lähettäjä: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Vastaanottaja: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopio: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> kirjoitti:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Lainattu teksti"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Liitä teksti mukaan"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vähintään yksi vastaanottaja on lisättävä."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Kaikki sähköpostiosoitteet eivät kelpaa."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Tiedosto on liian suuri liitettäväksi."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopio:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Avaa"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Liitetiedostoa ei voi tallentaa SD-muistikortille."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Näytä"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Lataa"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Tallenna"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Lopeta"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Liite tallennettu nimellä <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Liitteen tallennus epäonnistui"</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Huomaa: vähintään yksi edelleen lähetettävän viestisi liitteistä ladataan ennen lähettämistä."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Viesti"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Kutsu"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Liite <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Liitteet <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Näytä kuvat"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Näytä kalenterissa »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Näytä Kalenterissa"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenterikutsu"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Osallistutko?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Kyllä"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Olet vastannut tähän kutsuun \"ehkä\""</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Hylkäsit tämän kutsun"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Avoinna <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Hylkää viesti"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Hylätäänkö tämä viesti?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Hylätäänkö nämä viestit?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Viesti poistettiin."</item>
     <item quantity="other" msgid="6574961322865652255">"Viestit poistettu."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Viesti hylätty."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Viesti tallennettiin luonnokseksi."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Tätä liitetiedostoa ei voi näyttää."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Tiedostoa <xliff:g id="FILENAME"> %s</xliff:g> ei toimitettu"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Liitettä <xliff:g id="FILENAME">%s</xliff:g> ei voi ladata."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Avataan viestiä..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> viesti siirretty kansioon <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> viestiä siirretty kansioon <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Vähintään yhden liitteen edelleenlähettäminen epäonnistui"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Tiedoston <xliff:g id="FILENAME"> %s</xliff:g> edelleenlähettäminen epäonnistui"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> epäonnistui"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Kosketa ja muuta tilin asetuksia"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kt"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kt"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mt"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mt"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gt"</item>
+    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gt"</item>
+  </plurals>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Vanhemmat"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Tilin asetukset"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lisää Exchange-tili"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lisää Exchange ActiveSync -tili"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Sähköpostitili"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Voit määrittää useimpien sähköpostitilien asetukset helposti."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Voit määrittää Exchange-tilin asetukset helposti."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Voit määrittää Exchange ActiveSync -tilin asetukset helposti."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tarkistetaan saapuvan postin palvelimen asetuksia…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tarkistetaan lähtevän postin palvelimen asetuksia…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Tilin asetukset"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Tili on määritetty ja sähköposteja noudetaan."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Anna tilille nimi (valinnainen)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Oma nimi (näytetään lähtevissä viesteissä)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Tilin asetukset"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tilin tyyppi"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Millainen tili tämä on?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Tilin asetukset"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Saapuvan postin palvelimen asetukset"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Toimialue\\käyttäjänimi"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Käytä suojattua yhteyttä (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Hyväksy kaikki SSL-varmenteet"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiililaitteen tunnus"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Tilin asetukset"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Sähköpostin tarkistustiheys"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Tiliasetukset"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Uusien viestien tarkistustiheys"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Ei koskaan"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaattinen (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"5 minuutin välein"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Ilmoita saapuvasta sähköpostista."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkronoi tämän tilin yhteystiedot."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkronoi tämän tilin kalenteri."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synkronoi tämän tilin lähetetyt sähköpostit."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Määrityksiä ei voitu suorittaa loppuun"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Synkronoitava määrä"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Yksi päivä"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Virheellinen käyttäjänimi tai salasana."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Palvelimeen ei voi muodostaa suojattua yhteyttä."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Palvelimeen ei voi muodostaa suojattua yhteyttä."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Palvelin lähetti virheilmoituksen. Tarkista käyttäjänimesi ja salasanasi ja yritä uudelleen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Palvelimeen ei voi muodostaa yhteyttä."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Palvelimeen ei voi muodostaa yhteyttä."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS vaaditaan, mutta palvelin ei tue sitä."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Palvelin ei tue todennustapoja."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Palvelimeen ei voi muodostaa yhteyttä suojausvirheen takia."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Palvelinyhteyttä ei voi muodostaa."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Annoit virheellisen palvelimen osoitteen tai palvelin edellyttää protokollaversiota, jota sähköposti ei tue."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Suojauksen etähallinta"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Palvelin <xliff:g id="SERVER">%s</xliff:g> vaatii, että sen sallitaan hallita joitakin puhelimen suojaustoiminnoista. Haluatko määrittää tämän tilin loppuun?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Palvelin vaatii suojausominaisuuksia, joita puhelimesi ei tue."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"VAROITUS: poistamalla sähköpostisovellukselta oikeuden hallinnoida laitettasi poistetaan kaikki sovellukseen liittyvät sähköpostitilit sekä niiden sähköpostit, yhteystiedot, kalenteritapahtumat ja muut tiedot."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" edellyttää, että suojausasetukset päivitetään."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Päivitä suojausasetukset"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Laitteen suojaus"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Ruudunlukituksen poistokoodi on vanhentunut."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Uusi ruudunlukit. poisto tarvitaan"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Ruudunlukituksen poistokoodi on vanhentunut. Kosketa tätä ja päivitä koodi."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Hylätäänkö tallentamattomat muutokset?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Yleiset asetukset"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Oletustili"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Lähetä sähköposti oletuksena tältä tililtä"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Sähköposti-ilmoitukset"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Synkronoinnin tiheys, ilmoitukset jne."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Ilmoita tilarivillä saapuneesta sähköpostista"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Sähköpostin tarkistustiheys"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Uusien viestien tarkistustiheys"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Saapuvan postin asetukset"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Lähtevän postin asetukset"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Tilin nimi"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Allekirjoitus"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Liitä lähettämiisi viesteihin teksti"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ilmoitusasetukset"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Synkronoi yhteystiedot"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkronoi myös tämän tilin yhteystiedot"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synkronoi kalenteri"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synkronoi myös tämän tilin kalenteri"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Synkronoi yhteystiedot"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkronoi tämän tilin yhteystiedot"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synkronoi Kalenteri"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synkronoi tämän tilin kalenteri"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Synkronoi sähköposti"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronoi tämän tilin sähköpostit"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Värinä"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Käytä värinää, kun sähköpostiviesti saapuu"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Aina"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Palvelinasetukset"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Poista tili"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" poistetaan sähköpostista."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Poista tili"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Poista tili"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Sähköpostitili"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Valitse tili"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Tilien päivitys"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> tulosta osoitteella <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Ensimmäiset <xliff:g id="RESULTS">%1$d</xliff:g> tulosta osoitteella <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Vaihda näkymää napauttamalla sähköpostikuvaketta"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Kaikki viestit"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Kaikki lukemattomat"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Kaikki tähdelliset"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Sähköpostiasetukset"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Sovellusasetukset"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automaattinen siirtyminen"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Valitse, mikä ruutu näytetään viestin poistamisen jälkeen"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Siirry ruutuun"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Uudempi viesti"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Vanhempi viesti"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Viestiluettelo"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Viestin tekstin koko"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Näytä viestien sisältö hyvin pienikokoisena tekstinä"</item>
+    <item msgid="8239633518447359057">"Näytä viestien sisältö pienikokoisena tekstinä"</item>
+    <item msgid="55959821477704302">"Näytä viestien sisältö normaalikokoisena tekstinä"</item>
+    <item msgid="446236334663020508">"Näytä viestien sisältö suurikokoisena tekstinä"</item>
+    <item msgid="235926149071179467">"Näytä viestien sisältö hyvin suurikokoisena tekstinä"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Viestin tekstin koko"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Hyvin pieni"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Pieni"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normaali"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Suuri"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Hyvin suuri"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Hae liitetiedostot autom."</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Lataa Saapuneet-kansion viestien liitetiedostot. (Ei POP3)."</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Vaihda näkymää napauttamalla sähköpostikuvaketta"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Kaikki viestit"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Kaikki lukemattomat"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Kaikki tähdelliset"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Ladataan…"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5dc199f..3d6d6df 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -106,7 +106,7 @@
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> sélectionné(s)"</item>
   </plurals>
     <string name="message_list_no_messages" msgid="7846910091922523867">"Aucun message"</string>
-    <string name="message_compose_to_hint" msgid="2891895306418177013">"Langue cible"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"À"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cci"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Objet"</string>
@@ -124,7 +124,7 @@
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Certaines adresses e-mail sont incorrectes."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Impossible de joindre le fichier, car il est trop volumineux."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> et <xliff:g id="NUMBER">%2$d</xliff:g> autres"</string>
-    <string name="message_view_to_label" msgid="6485191743265527381">"Langue cible:"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"À :"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc :"</string>
     <string name="message_view_bcc_label" msgid="7577479221285310198">"Cci :"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Afficher"</string>
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Précédents"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuration du compte"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ajouter un compte Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ajouter un compte Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normale"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Très grande"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Récupérer pièces jointes"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Télécharger pièces jointes messages reçus (non disponible pour comptes POP3)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> sur <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Appuyez icône enveloppe pour afficher autres vues."</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Tous les messages"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Messages non lus"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Tous les messages suivis"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Appuyez icône enveloppe pour afficher autres vues."</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Tous les messages"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Messages non lus"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Messages suivis"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Chargement…"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8eae725..82a6c8a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/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="status_sending_messages" msgid="3971880826111264523">"Slanje poruka……"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Slanje izlaznih poruka"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Pošalji sve"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Dohvaćanje privitka."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Dohvaćanje privitka <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Pročitaj privitke e-pošte"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Dalje"</string>
     <string name="okay_action" msgid="8365197396795675617">"U redu"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Odustani"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Prethodno"</string>
     <string name="send_action" msgid="1729766205562446418">"Pošalji"</string>
     <string name="reply_action" msgid="4262472229221507619">"Odgovor"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Odgovori svima"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Proslijedi"</string>
     <string name="done_action" msgid="7497990549515580249">"Gotovo"</string>
     <string name="discard_action" msgid="6532206074859505968">"Odbaci"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Spremi kao skicu"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Spremanje skice"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Pročitano/Nepročitano"</string>
     <string name="read_action" msgid="4701484794504781686">"Označi kao pročitano"</string>
     <string name="unread_action" msgid="6280399049357552826">"Označi kao nepročitano"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Računi"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Označi kao pročitano"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kao nepročitano"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Dodaj kopiju/skrivenu kopiju"</string>
+    <string name="move_action" msgid="3059189775933985898">"Premjesti"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kop/sk.kop"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Dodaj privitak"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Postavke odlaganja"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Odaberite privitak"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Premjesti u/na"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Učitavanje poruka…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Pogreška veze"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nova e-pošta"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Neočekivana pogreška tijekom učitavanja teksta poruke. Poruka je možda prevelika za prikazivanje."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Premjesti ovoliko poruka: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="8792313600381332865">"Premjesti ovoliko poruka: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
+    <item quantity="one" msgid="1891601902988083907">"Premještanje <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> poruka"</item>
+    <item quantity="other" msgid="8792313600381332865">"Premještanje ovoliko poruka: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> nepročitanih (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"u <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računa"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"za <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> račun"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> računa"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Pristigla pošta"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Izlazna pošta"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Skice"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Izlazna pošta"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Dulje pritisnite račun kako biste ga osvježili"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Poštanski sandučić"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinirani prikaz"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Učitaj više poruka"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"Odabrano: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7901361399231876038">"Odabrano: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Nema poruka"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Prima:"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopija"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrivena kopija"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Predmet"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"S jezika:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Na:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Kopija:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Skriv. kop:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Predmet:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Stvori novu poruku"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Izvorna poruka --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Šalje: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Prima: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopija: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisao:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citirani tekst"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Uključi tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Morate dodati barem jednog primatelja."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Neke adrese e-pošte nisu važeće."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Datoteka je prevelika za privitak."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopija:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Otvori"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Spremanje privitka na SD karticu nije moguće."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Prikaži"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Učitaj"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Spremi"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Zaustavi"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Privitak spremljen kao <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Privitak se ne može spremiti."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Bilješka: Jedan ili više privitaka u vašoj proslijeđenoj poruci preuzet će se prije slanja."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Poruka"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pozovi"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Privitak <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Prilozi <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Prikaži slike"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Prikaži u kalendaru »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Prikaži u Kalendaru"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Pozivnica kalendara"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Dolazite?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Da"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Na ovu ste pozivnicu odgovorili s \"možda\""</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Odbili ste ovu pozivnicu"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Prikaz <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Odbaci poruku"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Odbaci ovu poruku?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Odbaciti ove poruke?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Poruka je izbrisana."</item>
     <item quantity="other" msgid="6574961322865652255">"Poruke su izbrisane."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Poruka je odbačena."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Poruka je spremljena kao skica."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Ovaj se privitak ne može prikazati."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Ne može se proslijediti <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Privitak \"<xliff:g id="FILENAME">%s</xliff:g>\" nije bilo moguće učitati."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Otvaranje poruke…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> poruka premještena u <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> poruka premješteno u <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Jedan ili više privitaka nije bilo moguće proslijediti"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Nije bilo moguće proslijediti <xliff:g id="FILENAME"> %s</xliff:g>"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Neusp. prijava <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Dodirnite da biste promijenili postavke računa"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Starije"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Postavljanje računa"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj Exchange račun"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj Exchange ActiveSync račun"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Račun e-pošte"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"E-poštu možete konfigurirati za većinu računa u samo nekoliko koraka."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Exchange račun možete konfigurirati u samo nekoliko koraka."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Račun Exchange ActiveSync možete konfigurirati u samo nekoliko koraka."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Provjeravanje postavki dolaznog poslužitelja..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Provjeravanje postavki izlaznog poslužitelja..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Postavljanje računa"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Vaš je račun postavljen, a e-pošta stiže!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dodijelite ovom računu naziv (opcionalno)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano u izlaznim porukama)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Postavljanje računa"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Vrsta računa"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Koja je ovo vrsta računa?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Postavljanje računa"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Postavke dolaznog poslužitelja"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\Korisničko ime"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Koristi sigurnu vezu (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prihvati sve SSL certifikate"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilnog uređaja"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Postavke računa"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Učestalost provjeravanja e-pošte"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Mogućnosti računa"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Učestalost provjeravanja e-pošte"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikad"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatski (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Svakih 5 minuta"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Obavijesti me kad stigne e-pošta."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkroniziraj i kontakte s ovog računa."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkroniziraj kalendar s ovog računa"</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sink. e-poštu za ovaj račun."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Postavljanje se ne može dovršiti"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Količina za sinkronizaciju"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jedan dan"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Korisničko ime ili zaporka nisu točni."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Sigurno povezivanje s poslužiteljem nije moguće."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Sigurno povezivanje s poslužiteljem nije moguće."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Poslužitelj je odgovorio pogreškom; provjerite korisničko ime i zaporku i pokušajte ponovno."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Povezivanje s poslužiteljem nije moguće."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Povezivanje s poslužiteljem nije moguće."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS je obavezan, ali ga poslužitelj ne podržava."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Poslužitelj ne podržava načine provjere autentičnosti."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Otvaranje veze s poslužiteljem nije moguće zbog pogreške sigurnosti."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nije moguće otvoriti vezu s poslužiteljem."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Unijeli ste pogrešnu adresu poslužitelja ili poslužitelj traži verziju za pristiglu poštu protokola koju e-pošta ne podržava."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Sigurnosna administracija na daljinu"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Poslužitelj <xliff:g id="SERVER">%s</xliff:g> zahtijeva da mu omogućite daljinsko upravljanje nekim sigurnosnim značajkama vašeg telefona.. Želite li dovršiti postavljanje ovog računa?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ovaj poslužitelj zahtijeva sigurnosne značajke koje vaš telefon ne podržava."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"UPOZORENJE: Deaktivacijom ovlasti aplikacije e-pošte za upravljanje uređajem izbrisat će se svi računi e-pošte koji traže tu ovlast, kao i e-pošta, kontakti, događaji kalendara i drugi podaci."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" zahtijeva ažuriranje sigurnosnih postavki."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Ažuriranje sigurnosnih postavki"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Sigurnost uređaja"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Istekao je kôd za otključavanje."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Potrebno je novo otključavanje zaslona"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Istekao je kôd za otključavanje. Dodirnite ovdje za ažuriranje."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Odbaciti nespremljene promjene?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Opće postavke"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Zadani račun"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Šalji e-poštu s ovog računa prema zadanim postavkama"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Obavijesti e-pošte"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Učestalost sinkronizacije, obavijesti itd."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Obavijesti na traci stanja kad stigne e-pošta"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Učestalost provjeravanja e-pošte"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Učestalost provjeravanja e-pošte"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Dolazne postavke"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Odlazne postavke"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Naziv računa"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Potpis"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Dodajte tekst porukama koje šaljete"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Postavke obavijesti"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinkroniziraj kontakte"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinkroniziraj i kontakte s ovog računa"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinkroniziraj kalendar"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinkroniziraj i kalendar s ovog računa"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sink. kontakte"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sink. kontakata za ovaj račun"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sink. Kalendar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sink. kalendara za ovaj račun"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sink. e-pošte"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sink. e-pošte za ovaj račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibracija"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibracija i kad stigne e-pošta"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Uvijek"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Postavke poslužitelja"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ukloni račun"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" bit će uklonjen iz e-pošte."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Brisanje računa"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Brisanje računa"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"R. e-pošte"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Odaberite račun"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nadogradnja računa"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultata sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Prvih <xliff:g id="RESULTS">%1$d</xliff:g> rezultata iz domene <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Dodirnite ikonu e-pošte za druge prikaze"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Sva pošta"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Sve nepročitano"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Sve sa zvjezdicom"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Postavke e-pošte"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Postavke aplikacija"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatski prijeđi na sljedeće"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Odaberite zaslon za prikazivanje nakon brisanja poruke"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Prijeđi na"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Novije poruke"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Starije poruke"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Popis poruka"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Veličina teksta poruke"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Prikaz sadržaja poruke sitnim tekstom"</item>
+    <item msgid="8239633518447359057">"Prikaz sadržaja poruke malim tekstom"</item>
+    <item msgid="55959821477704302">"Prikaz sadržaja poruke normalnim tekstom"</item>
+    <item msgid="446236334663020508">"Prikaz sadržaja poruke velikim tekstom"</item>
+    <item msgid="235926149071179467">"Prikaz sadržaja poruke ogromnim tekstom"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Veličina teksta poruke"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Sitan"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Malen"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normalan"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velik"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Ogroman"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Automatski dohvati privitke"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Preuzmite priloge za Prist. poštu. (Nedostupno za račune POP3.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Dodirnite ikonu e-pošte za druge prikaze"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Sva pošta"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Sve nepročitano"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Sve sa zvjezdicom"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Učitavanje…"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index af815bb..fce2061 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/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="status_sending_messages" msgid="3971880826111264523">"Üzenetek küldése..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Kimenő üzenetek küldése"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Összes küldése"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Melléklet letöltése folyamatban."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Melléklet letöltése folyamatban.<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"E-mail mellékletek olvasása"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Tovább"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Mégse"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Előző"</string>
     <string name="send_action" msgid="1729766205562446418">"Küldés"</string>
     <string name="reply_action" msgid="4262472229221507619">"Válasz"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Válasz mindenkinek"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Továbbítás"</string>
     <string name="done_action" msgid="7497990549515580249">"Kész"</string>
     <string name="discard_action" msgid="6532206074859505968">"Elvetés"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Mentés piszkozatként"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Piszkozatmentés"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Olvasott/olvasatlan"</string>
     <string name="read_action" msgid="4701484794504781686">"Megjelölés olvasottként"</string>
     <string name="unread_action" msgid="6280399049357552826">"Megjelölés olvasatlanként"</string>
@@ -58,16 +57,13 @@
     <string name="accounts_action" msgid="901105887272231493">"Fiókok"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Megjelölés olvasottként"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Megjelölés olvasatlanként"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Másolatot kap és Titkos másolat mezők hozzáadása"</string>
+    <string name="move_action" msgid="3059189775933985898">"Áthelyezés"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Másolatok"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Melléklet hozzáadása"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Kiírási beállítások"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Melléklet kiválasztása"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Áthelyezés"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Üzenetek betöltése..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Kapcsolathiba"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Új e-mail"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Nem várt hiba történt az üzenet szövegének betöltése során. Lehet, hogy az üzenet túl nagy ahhoz, hogy meg lehessen nézni."</string>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> fiókban"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"címzett: <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> fiók"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> fiók"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Beérkezett üzenetek"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Kimenő levelek"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Piszkozatok"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Kimenő levelek"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Nyomja meg hosszan a fiók frissítéséhez"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postaláda"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinált nézet"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"További üzenetek betöltése"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> kiválasztva"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> kiválasztva"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Nincsenek üzenetek"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Címzett"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Másolatot kap"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Titkos másolat"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Tárgy"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Feladó:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Címzett:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Másolat:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Titkos más.:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Tárgy:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Levélírás"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Eredeti üzenet --------"\n"Tárgy: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Feladó: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Címzett: <xliff:g id="TO">%3$s</xliff:g>"\n"Másolatot kap: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a következőt írta:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Idézett szöveg"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Szöveggel együtt"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Legalább egy résztvevőt hozzá kell adnia."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Egyes e-mail címek érvénytelenek."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"A csatolni kívánt fájl túl nagy."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Másolatot kap:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Megnyitás"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"A mellékleteket nem sikerült az SD-kártyára menteni."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Megtekint"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Betöltés"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Mentés"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Leállítás"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Melléklet elmentve: <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"A melléklet mentése sikertelen"</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Megjegyzés: a továbbított üzenet egy vagy több melléklete letöltésre kerül a küldés előtt."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Üzenet"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Meghívás"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Melléklet - <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Mellékletek: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Képek megjelenítése"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Megtekintés a Naptárban »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Megtekintés a Naptárban"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Meghívás a naptárban"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Részt vesz?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Igen"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"\"Lehet\" választ adott erre a meghívásra"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Ön elutasította ezt a meghívást"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"<xliff:g id="FILENAME">%s</xliff:g> megtekintése"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Üzenet elvetése"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Elveti ezt az üzenetet?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Elveti ezeket az üzeneteket?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Üzenet törölve."</item>
     <item quantity="other" msgid="6574961322865652255">"Az üzenetek törölve."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Üzenet elvetve."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Az üzenet mentve piszkozatként."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"A mellékletet nem lehet megjeleníteni."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> nem továbbítható"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"A melléklet (\"<xliff:g id="FILENAME">%s</xliff:g>\") nem tölthető be."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Üzenet megnyitása..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> üzenet áthelyezve ide: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> üzenet áthelyezve ide: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Egy vagy több melléklet nem továbbítható"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> továbbítása nem sikerült"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Sikert. bejel.:<xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Érintse meg a fiókbeállítások módosításához"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Régebbiek"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Fiók beállítása"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-fiók hozzáadása"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-fiók hozzáadása"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mail fiók"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Néhány lépésben beállíthatja e-mailjeit a legtöbb fiókhoz."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Mindössze néhány lépésben beállíthat egy Exchange-fiókot."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Mindössze néhány lépésben beállíthat egy Exchange ActiveSync-fiókot."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Bejövő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kimenő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Fiók beállítása"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"A fiók beállítása befejeződött, a levelezőprogram készen áll az e-mailek fogadására."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Fiók elnevezése (opcionális)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Az Ön neve (a kimenő üzenetekben való megjelenítéshez)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Fiók beállítása"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Fiók típusa"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Milyen típusú ez a fiók?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Fiók beállítása"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Bejövő üzenetek szerverének beállításai"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\felhasználónév"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Biztonságos kapcsolat (SSL) használata"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Minden SSL-tanúsítvány elfogadása"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"A mobil eszköz azonosítója"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Fiókbeállítások"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"E-mailek ellenőrzésének gyakorisága"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Fiókbeállítások"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Beérkező levelek ellenőrzésének gyakorisága"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Soha"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatikus (push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"5 percenként"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Értesítés megjelenítése e-mail érkezésekor"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Névjegyek szinkronizálása ebben a fiókban."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Naptár szinkronizálása ebben a fiókban."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Az e-mailek szinkronizálása ebből a fiókból."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"A telepítés nem fejeződött be."</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Szinkronizálás gyakorisága"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Egy nap"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Helytelen felhasználónév vagy jelszó."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"A szerver hibaüzenettel válaszolt. Kérjük, ellenőrizze felhasználónevét és jelszavát, majd próbálja újra."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nem lehet kapcsolatot létesíteni a szerverrel."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nem lehet kapcsolódni a szerverhez."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS szükséges, de a szerver nem támogatja."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"A szerver nem támogatja a hitelesítési módokat."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Biztonsági hiba miatt nem lehet megnyitni a kapcsolatot a szerverhez."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nem lehet megnyitni a kapcsolatot a szerverhez."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Nem megfelelő szervercímet adott meg, vagy a szerver olyan protokollverziót követel, amelyet az E-mail nem támogat."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Távoli biztonságkezelés"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"A(z) <xliff:g id="SERVER">%s</xliff:g> szerver engedélyt kér arra, hogy távolról vezérelhesse a telefon egyes biztonsági funkcióit. Befejezi a fiók konfigurálását?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"A szerver olyan biztonsági funkciókat követel meg, amelyeket a telefon nem támogat."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"FIGYELMEZTETÉS: ha kikapcsolja az E-mail alkalmazás azon jogosultságát, hogy felügyelje az eszközt, akkor törli az összes olyan E-mail fiókot, amelyhez szükség van az alkalmazásra; a fiókokkal együtt pedig törli az e-maileket, a névjegyeket, a naptári eseményeket és más adatokat is."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Frissíteni kell a(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fiók biztonsági beállításait."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Biztonsági beállítások frissítése"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Eszközbiztonság"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Képernyőkioldó kódja lejárt."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Új képernyőkioldás szükséges"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"A képernyőkioldó kódja lejárt. Itt érintse meg a frissítéshez."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Elveti a nem mentett módosításokat?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Általános beállítások"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Alapértelmezett fiók"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail értesítések"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Szinkronizálási gyakoriság, értesítések stb."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Értesítés megjelenítése az állapotjelzőn e-mailek érkezése esetén"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"E-mailek ellenőrzésének gyakorisága"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Beérkező levelek ellenőrzésének gyakorisága"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Bejövő üzenetek beállításai"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Kimenő üzenetek beállításai"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Fióknév"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Aláírás"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Szöveg hozzáfűzése az elküldendő üzenetekhez"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Értesítési beállítások"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Névjegyek szinkronizálása"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Névjegyek szinkronizálása ebben a fiókban"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Naptár szinkronizálása"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Naptár szinkronizálása ebben a fiókban is"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Névjegyek szinkr."</string>
+    <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="3039820725699412208">"Naptár szinkr."</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"A fiók naptárának szinkronizálása"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"E-mail szinkr."</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_vibrate_when_summary" msgid="3991584445166247189">"Rezgés e-mail érkezésekor is"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Mindig"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Szerverbeállítások"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fiók eltávolítása"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fiók el lesz távolítva az e-mail szolgáltatásból."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Fiók törlése"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Fiók törlése"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mail fiók"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Fiók kiválasztása"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Fiókok frissítése"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> találat a(z) <xliff:g id="DOMAIN">%2$s</xliff:g> domainből"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Az első <xliff:g id="RESULTS">%1$d</xliff:g> találat a(z) <xliff:g id="DOMAIN">%2$s</xliff:g> domainből"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Más nézetekhez érintse meg az e-mail ikont"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Összes levél"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Minden olvasatlan"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Minden csillagozott"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"E-mail preferenciái"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Alkalmazáspreferenciák"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatikus lépegetés"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Válassza ki, melyik képernyő jelenjen meg üzenet törlése után"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Továbblépés ide:"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Újabb üzenet"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Régebbi üzenet"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Üzenetek listája"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Üzenet szövegének mérete"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Üzenetek tartalmának megjelenítése apró méretű szövegként"</item>
+    <item msgid="8239633518447359057">"Üzenetek tartalmának megjelenítése kicsi méretű szövegként"</item>
+    <item msgid="55959821477704302">"Üzenetek tartalmának megjelenítése normál méretű szövegként"</item>
+    <item msgid="446236334663020508">"Üzenetek tartalmának megjelenítése nagy méretű szövegként"</item>
+    <item msgid="235926149071179467">"Üzenetek tartalmának megjelenítése óriási méretű szövegként"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Üzenet szövegének mérete"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Apró"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Kicsi"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normál"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Nagy"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Óriási"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Mellékletek autom. letöltése"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Levelek mellékleteinek letöltése.(Nem használható POP3 fiókoknál.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_2">%2$s</xliff:g>/<xliff:g id="ID_1">%1$d</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Más nézetekhez érintse meg az e-mail ikont"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Összes levél"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Minden olvasatlan"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Minden csillagozott"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Betöltés…"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e79e3df..30d7ec4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/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="status_sending_messages" msgid="3971880826111264523">"Mengirim pesan…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Kirim pesan keluar"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Kirim semua"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Mengambil lampiran."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Mengambil lampiran <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Baca lampiran Email"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Berikutnya"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Batal"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Sebelumnya"</string>
     <string name="send_action" msgid="1729766205562446418">"Kirimkan"</string>
     <string name="reply_action" msgid="4262472229221507619">"Balas"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Balas ke semua"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Teruskan"</string>
     <string name="done_action" msgid="7497990549515580249">"Selesai"</string>
     <string name="discard_action" msgid="6532206074859505968">"Buang"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Simpan sebagai draf"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Simpan konsep"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Telah Dibaca/Belum Dibaca"</string>
     <string name="read_action" msgid="4701484794504781686">"Tandai sudah dibaca"</string>
     <string name="unread_action" msgid="6280399049357552826">"Tandai belum dibaca"</string>
@@ -58,16 +57,13 @@
     <string name="accounts_action" msgid="901105887272231493">"Akun"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Tandai sudah dibaca"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Tandai belum dibaca"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Tambahkan Cc/Bcc"</string>
+    <string name="move_action" msgid="3059189775933985898">"Pindahkan"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Tambahkan lampiran"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Buang setelan"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pilih lampiran"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Pindahkan ke"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Memuat pesan…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Galat sambungan"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Email baru"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Galat tak terduga saat memuat teks pesan. Pesan mungkin terlalu besar untuk ditampilkan."</string>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"dalam <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> akun"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"kepada <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> akun"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> akun"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Kotak Masuk"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Kotak Keluar"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Konsep"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Kotak Keluar"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Tekan lama pada akun untuk menyegarkannya"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Kotak surat"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Tampilan kombinasi"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Muat pesan lainnya"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> dipilih"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> dipilih"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Tidak ada pesan"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Kepada"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Hal"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Dari:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Kepada:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Subjek:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Tulis Surat"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pesan Asli --------"\n"Subjek: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Dari: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kepada: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n" <xliff:g id="SENDER">%s</xliff:g> menulis:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Kutipan teks"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Sertakan teks"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Anda harus menambahkan setidaknya satu penerima."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Beberapa alamat email tidak valid."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Berkas terlalu besar untuk dilampirkan."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Buka"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Tidak dapat menyimpan lampiran ke kartu SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Lihat"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Muat"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Simpan"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Hentikan"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Lampiran disimpan sebagai <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Tidak dapat menyimpan lampiran."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Catatan: Satu atau beberapa lampiran dalam pesan yang diteruskan akan diunduh sebelum dikirim."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Pesan"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Undang"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Lampiran <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Lampiran <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Tampilkan gambar"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Tampilkan di Kalender »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Lihat dalam Kalender"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Undangan Kalender"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Gabung?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Ya"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Anda telah menjawab \"mungkin\" pada undangan ini"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Anda telah menolak undangan ini"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Melihat <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Buang pesan"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Buang pesan ini?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Buang pesan ini?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Pesan yang dihapus."</item>
     <item quantity="other" msgid="6574961322865652255">"Pesan yang dihapus."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Pesan dibuang."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Pesan disimpan sebagai draf."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Lampiran ini tidak dapat ditampilkan."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Lampiran \" <xliff:g id="FILENAME">%s</xliff:g>\" tidak dapat dimuat."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Membuka pesan…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> pesan dipindahkan ke <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> pesan dipindahkan ke <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Tidak dapat meneruskan satu atau beberapa lampiran"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Tidak dapat meneruskan <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Gagal masuk <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Sentuh untuk mengubah setelan akun"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Lawas"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Penyiapan akun"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tambah akun Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tambahkan akun Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Akun email"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Anda dapat mengonfigurasi Email untuk kebanyakan akun hanya dalam beberapa langkah."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Anda dapat mengonfigurasi akun Exchange hanya dalam beberapa langkah."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Anda dapat mengonfigurasi akun Exchange Activesync hanya dalam beberapa langkah."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Memeriksa setelan server masuk…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Memeriksa setelan server keluar…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Penyiapan akun"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Akun Anda sudah siap, dan email akan segera tiba!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Beri nama akun ini (opsional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Nama (yang ditampilkan pada pesan keluar)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Penyiapan akun"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Jenis akun"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jenis akun apakah ini?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Penyiapan akun"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setelan server masuk"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Nama Pengguna"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gunakan sambungan aman (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Terima semua sertifikat SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Perangkat Seluler"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Setelan akun"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekuensi pemeriksaan email"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Opsi akun"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekuensi pemeriksaan kotak masuk"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Tidak pernah"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Otomatis (Tekan)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Setiap 5 menit"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Beri tahu saya ketika email tiba."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkronkan kenalan dari akun ini."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkronkan kalender dari akun ini."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinkronkan email dari akun ini."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Penyiapan tidak dapat diselesaikan"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Jumlah untuk disinkronkan"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Satu hari"</string>
@@ -294,42 +279,37 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nama pengguna atau sandi salah."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Tidak dapat terhubung ke server dengan aman."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Tidak dapat terhubung ke server dengan aman."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Server menanggapi dengan galat; periksa nama pengguna dan sandi, lalu coba lagi."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Tidak dapat terhubung ke server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Tidak dapat terhubung ke server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS diperlukan, tetapi tidak didukung oleh server."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Metode autentikasi tidak didukung oleh server."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Tidak dapat membuka sambungan ke server karena galat keamanan."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Tidak dapat membuka sambungan ke server."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Anda memasukkan alamat server yang salah atau server memerlukan versi protokol yang tidak didukung Email."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administrasi keamanan jarak jauh"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Server <xliff:g id="SERVER">%s</xliff:g> meminta Anda mengizinkannya mengontrol beberapa fitur keamanan ponsel dari jarak jauh. Apakah Anda ingin menyelesaikan penyiapan akun ini?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Server ini memerlukan fitur keamanan yang tidak didukung ponsel Anda."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"PERINGATAN: Menonaktifkan otoritas aplikasi Email untuk mengatur perangkat akan menghapus semua akun Email yang memerlukannya, beserta email, kenalan, acara kalender, dan data lainnya."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan pembaruan setelan keamanan."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Perbarui Keamanan Setelan"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Keamanan Perangkat"</string>
     <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"<xliff:g id="SERVER">%s</xliff:g> server meminta Anda mengizinkannya mengendalikan beberapa fitur keamanan ponsel dari jarak jauh."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edit detail"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="950001176659814912">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" mengharuskan Anda untuk memperbarui kode buka kunci layar Anda."</string>
-    <string name="password_expire_warning_content_title" msgid="4602564325906174785">"Buka kunci layar baru diperlukan"</string>
+    <string name="password_expire_warning_content_title" msgid="4602564325906174785">"Perlu pembuka kunci layar baru"</string>
     <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Akun \" <xliff:g id="ACCOUNT">%s</xliff:g> \" mengharuskan Anda memperbarui kode buka kunci layar. Sentuh di sini untuk memperbaruinya."</string>
     <string name="password_expired_ticker" msgid="5698508544187945595">"Kode buka kunci layar Anda telah kedaluwarsa."</string>
-    <string name="password_expired_content_title" msgid="8417027276177867305">"Buka kunci layar baru diperlukan"</string>
+    <string name="password_expired_content_title" msgid="8417027276177867305">"Perlu pembuka kunci layar baru"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Kode buka kunci layar Anda telah kedaluwarsa. Sentuh di sini untuk memperbaruinya."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Buang perubahan yang tidak tersimpan?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Setelan umum"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akun bawaan"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Kirim email dari akun ini secara bawaan"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan email"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Sinkronkan frekuensi, pemberitahuan, dll."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Beri tahu di bilah status ketika email tiba"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekuensi pemeriksaan email"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekuensi pemeriksaan kotak masuk"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Setelan masuk"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Setelan keluar"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Nama akun"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Tanda tangan"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Menambahkan teks ke pesan yang Anda kirim"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Setelan pemberitahuan"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinkronkan kenalan"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Juga sinkronkan kenalan dari akun ini"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinkronkan kalender"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Juga sinkronkan kalender dari akun ini"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinkronkan Kenalan"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinkronkan kenalan untuk akun ini"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinkronkan Kalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinkronkan kalender untuk akun ini"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sinkronkan Email"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkronkan email untuk akun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar ketika email tiba"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Selalu"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Setelan server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hapus akun"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" akan dihapus dari Email."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Hapus akun"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Hapus akun"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Akun email"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Pilih akun"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Meningkatkan versi akun"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> hasil dari <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> hasil pertama dari <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Ketuk ikon email untuk tampilan lain"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Semua Email"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Semua Belum Dibaca"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Semua yang Berkilau Bintangnya"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Preferensi Email"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Preferensi Aplikasi"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Maju otomatis"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Pilih layar mana yang akan ditampilkan setelah menghapus pesan"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Majukan ke"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Pesan lebih anyar"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Pesan lawas"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Daftar pesan"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Ukuran teks pesan"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Tampilkan konten pesan dalam teks berukuran mini"</item>
+    <item msgid="8239633518447359057">"Tampilkan konten pesan dalam teks berukuran kecil"</item>
+    <item msgid="55959821477704302">"Tampilkan konten pesan dalam teks berukuran normal"</item>
+    <item msgid="446236334663020508">"Tampilkan konten pesan dalam teks berukuran besar"</item>
+    <item msgid="235926149071179467">"Tampilkan konten pesan dalam teks berukuran raksasa"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Ukuran teks pesan"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Mini"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Kecil"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Ambil lampiran secara otomatis"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Unduh lampiran untuk pesan Kotak masuk. (Tidak tersedia untuk akun POP3.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Ketuk ikon email untuk tampilan lain"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Semua Email"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Semua Belum Dibaca"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Semua yang Berkilau Bintangnya"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Memuat…"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 405e038..83463f2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Meno recenti"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Impostazione account"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Aggiungi un account Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Aggiungi un account Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normali"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grandi"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Molto grandi"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Recupera automaticam. allegati"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Scarica allegati msg in arrivo (non disp. per account POP3)."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> di <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Tocca l\'icona email per altre visualizzazioni"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Tutti i messaggi"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Tutti i non letti"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Tutti gli speciali"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Tocca l\'icona email per altre visualizzazioni"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Tutti i messaggi"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Tutti i non letti"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Tutti gli speciali"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Caricamento..."</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a99113e..1af6043 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/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="status_sending_messages" msgid="3971880826111264523">"שולח הודעות…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"שלח הודעות יוצאות"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"שלח הכול"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"משיג קובץ מצורף."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"מוריד את הקובץ המצורף <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"קרא קבצים מצורפים לדוא\"ל"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"הבא"</string>
     <string name="okay_action" msgid="8365197396795675617">"אישור"</string>
     <string name="cancel_action" msgid="6967435583794021865">"ביטול"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"הקודם"</string>
     <string name="send_action" msgid="1729766205562446418">"שלח"</string>
     <string name="reply_action" msgid="4262472229221507619">"השב"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"השב לכולם"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"העבר"</string>
     <string name="done_action" msgid="7497990549515580249">"בוצע"</string>
     <string name="discard_action" msgid="6532206074859505968">"מחק"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"שמור כטיוטה"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"שמור טיוטה"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"נקראה/לא נקראה"</string>
     <string name="read_action" msgid="4701484794504781686">"סמן כנקרא"</string>
     <string name="unread_action" msgid="6280399049357552826">"סמן כלא נקרא"</string>
@@ -58,21 +57,18 @@
     <string name="accounts_action" msgid="901105887272231493">"חשבונות"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"סמן כפריט שנקרא"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"סמן כלא נקרא"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"הוסף עותק/עותק מוסתר"</string>
+    <string name="move_action" msgid="3059189775933985898">"העבר"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ עותק/עותק מוסתר"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"הוסף קובץ מצורף"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"הגדרות קובץ Dump"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"בחר קובץ מצורף"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"העבר אל"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"טוען הודעות..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"שגיאת התחברות"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"דוא\"ל חדש"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"שגיאה לא צפויה במהלך הורדה של הודעת טקסט. ייתכן שההודעה גדולה מדי לתצוגה."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"העבר <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> הודעות"</item>
+    <item quantity="one" msgid="1891601902988083907">"העבר <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> הודעה"</item>
     <item quantity="other" msgid="8792313600381332865">"העבר <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> הודעות"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"ב-<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> חשבונות"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"עבור <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> חשבון"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> חשבונות"</item>
+  </plurals>
     <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>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"תיבת דואר יוצא"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"לחץ לחיצה ארוכה על חשבון כדי לרענן אותו"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"תיבת דואר"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"תצוגה משולבת"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"טען הודעות נוספות"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> נבחרו"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> נבחרו"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"אין הודעות"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"אל"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"עותק"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"עותק מוסתר"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"נושא"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"מאת:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"אל:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"עותק:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"עותק מוסתר:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"נושא:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"חבר דוא\"ל"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- הודעה מקורית --------"\n"נושא: <xliff:g id="SUBJECT">%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_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> כתב:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"טקסט מצוטט"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"כלול טקסט"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"עליך להוסיף נמען אחד לפחות."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"חלק מכתובות הדוא\"ל אינן חוקיות."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"הקובץ גדול מדי לצירוף."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"עותק:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"פתח"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"אין אפשרות לשמור קובץ מצורף בכרטיס SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"הצג"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"טען"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"שמור"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"עצור"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"קובץ מצורף נשמר בשם <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"אין אפשרות לשמור את הקובץ המצורף."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"הערה: קובץ מצורף אחד או יותר בהודעה שהעברת יורדו לפני השליחה."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"הודעה"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"הזמן"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"קובץ מצורף <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"קבצים מצורפים <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"הצג תמונות"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"הצג בלוח השנה »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"הצג בלוח השנה"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"הזמנה של לוח שנה"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"משתתף?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" כן"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"השבת \"אולי\" להזמנה זו"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"דחית הזמנה זו"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"צופה ב-<xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"מחק הודעה"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"למחוק הודעה זו?"</item>
+    <item quantity="other" msgid="5071164417794016228">"למחוק הודעות אלה?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"ההודעה נמחקה."</item>
     <item quantity="other" msgid="6574961322865652255">"ההודעות נמחקו."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"ההודעה נמחקה."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"ההודעה נשמרה כטיוטה."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"לא ניתן להציג קובץ מצורף זה."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"לא היתה אפשרות לטעון את הקובץ המצורף \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"פותח הודעה…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> הודעה הועברה אל <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> הודעות הועברו אל <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"אין אפשרות להעביר קובץ מצורף אחד או יותר"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"אין אפשרות להעביר את <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"הכניסה לחשבון <xliff:g id="ACCOUNT_NAME">%s </xliff:g> נכשלה"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"גע כדי לשנות את הגדרות החשבון"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"‎<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="4613385949384337840">"‎<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"‎<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"‎<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"‎<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"‎<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"ישן יותר"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"הגדרת חשבון"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"הוספת חשבון Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"הוסף חשבון Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"חשבון דוא\"ל"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"תוכל להגדיר דוא\"ל לרוב החשבונות באמצעות פעולות ספורות בלבד."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"ניתן להגדיר חשבון Exchange באמצעות מספר פעולות."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"ניתן להגדיר חשבון Exchange ActiveSync באמצעות מספר פעולות."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"בודק הגדרות שרת דואר נכנס..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"בודק הגדרות שרת דואר יוצא..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"הגדרת חשבון"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"החשבון שלך הוגדר והדוא\"ל בדרך!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"תן שם לחשבון זה (אופציונלי)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"שמך (מוצג בהודעות יוצאות)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"הגדרת חשבון"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"סוג חשבון"</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>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"דומיין/שם משתמש"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"השתמש בחיבור מאובטח (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"קבל את כל אישורי SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"מזהה נייד"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"הגדרות חשבון"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"תדירות בדיקת דוא\"ל"</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>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"הודע לי כשמגיע דוא\"ל."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"סנכרן אנשי קשר מחשבון זה."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"סנכרן את לוח השנה מחשבון זה."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"סנכרן דוא\"ל מחשבון זה."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"ההתקנה לא הסתיימה כראוי"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"כמות לסנכרון"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"יום אחד"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"שם המשתמש או הסיסמה שגויים."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"אין אפשרות להתחבר לשרת באופן בטוח."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"אי אפשר להתחבר לשרת באופן בטוח."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"השרת הגיב עם שגיאה. בדוק את שם המשתמש והסיסמה ונסה שוב."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"אין אפשרות להתחבר לשרת."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"אין אפשרות להתחבר לשרת."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS נדרש אך אין לו תמיכה בשרת."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"השרת אינו תומך בשיטות האימות."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"אין אפשרות לפתוח חיבור לשרת בשל שגיאת אבטחה."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"אין אפשרות לפתוח חיבור לשרת."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"הזנת כתובת שרת שגויה, או שהשרת דרש גרסת פרוטוקול שהדוא\"ל לא תומך בה."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"ניהול אבטחה מרחוק"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"השרת <xliff:g id="SERVER">%s</xliff:g> דורש שתאפשר לו שליטה מרחוק על תכונות אבטחה מסוימות בטלפון שלך. האם ברצונך לסיים הגדרת חשבון זה?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"שרת זה דורש תכונות אבטחה שהטלפון שלך לא תומך בהן."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"אזהרה: השבתת ההרשאה של יישום הדוא\"ל לטפל בהתקן תגרום למחיקת כל חשבונות הדוא\"ל שדורשים אותה יחד עם הודעות הדוא\"ל, אנשי הקשר, אירועים בלוח השנה ונתונים אחרים."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" דורש עדכון של הגדרות אבטחה."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"עדכן הגדרות אבטחה"</string>
     <string name="account_security_title" msgid="4441470647344315196">"אבטחת המכשיר"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"פג תוקף קוד הסרת הנעילה של המסך."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"נדרשת הסרת נעילה חדשה של מסך"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"פג תוקף קוד הסרת הנעילה של המסך. גע כאן כדי לעדכן אותו."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"למחוק שינויים שלא נשמרו?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"הגדרות כלליות"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"חשבון ברירת מחדל"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"שלח דוא\"ל מחשבון זה כברירת מחדל"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"התראות דוא\"ל"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"סנכרן תדירות, התראות וכדומה"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"הצג הודעה בשורת המצב כאשר מגיע דוא\"ל"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"תדירות בדיקת דוא\"ל"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"תדירות בדיקה של תיבת דואר נכנס"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"הגדרות דואר נכנס"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"הגדרות דואר יוצא"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"שם חשבון"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"חתימה"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"הוסף טקסט להודעות שאתה שולח"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"הגדרות התראה"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"סנכרן אנשי קשר"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"סנכרן גם אנשי קשר מחשבון זה"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"סנכרן לוח שנה"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"סנכרן גם את לוח השנה מחשבון זה"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"סנכרון אנשי קשר"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"סנכרן אנשי קשר בחשבון זה"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"סנכרן לוח שנה"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"סנכרן לוח שנה בחשבון זה"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"סנכרן דוא\"ל"</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_vibrate_when_summary" msgid="3991584445166247189">"הוסף גם רטט כשמגיע דוא\"ל"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"תמיד"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"הגדרות שרת"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"הסרת חשבון"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" יוסר מ\'דוא\"ל\'."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"הסר חשבון"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"הסר חשבון"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"חשבון דוא\"ל"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"בחר חשבון"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"שדרוג חשבונות"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> תוצאות של <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> התוצאות הראשונות מ-<xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"הקש על סמל הדוא\"ל לתצוגות אחרות"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"כל הדואר"</string>
-    <string name="widget_unread" msgid="488582205091831168">"כל הדואר שלא נקרא"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"כל המסומנים בכוכב"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"העדפות דוא\"ל"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"העדפות יישום"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"התקדמות אוטומטית"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"בחר איזה מסך להציג לאחר מחיקת הודעה"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"התקדם אל"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"הודעה חדשה יותר"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"הודעה ישנה יותר"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"רשימת הודעות"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"גודל טקסט בהודעה"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"הצג תוכן של הודעות בטקסט בגודל זעיר"</item>
+    <item msgid="8239633518447359057">"הצג תוכן של הודעות בטקסט בגודל קטן"</item>
+    <item msgid="55959821477704302">"הצג תוכן של הודעות בטקסט בגודל רגיל"</item>
+    <item msgid="446236334663020508">"הצג תוכן של הודעות בטקסט בגודל גדול"</item>
+    <item msgid="235926149071179467">"הצג תוכן של הודעות בטקסט בגודל ענק"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"גודל טקסט בהודעה"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"זעיר"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"קטן"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"רגיל"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"גדול"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ענק"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"אחזר קבצים מצורפים באופן אוטומטי"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"הורד קבצים המצורפים להודעות דואר נכנס. (לא זמין עבור חש\' POP3)."</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> מתוך <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"הקש על סמל הדוא\"ל לתצוגות אחרות"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"כל הדואר"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"כל הדואר שלא נקרא"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"כל המסומנים בכוכב"</string>
     <string name="widget_loading" msgid="2340962056927255554">"טוען…"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ca76993..24603be 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"前"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"アカウント設定"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchangeアカウントを追加"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSyncアカウントを追加"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"標準"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"極大"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"添付ファイルを自動的に取得"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"受信トレイメッセージの添付をダウンロードする(POP3アカウントでは使用不可)。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"他のビューのメールアイコンをタップします"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"すべてのメール"</string>
-    <string name="widget_unread" msgid="488582205091831168">"すべての未読"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"すべてのスター付き"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"他のビューのメールアイコンをタップします"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"すべてのメール"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"すべての未読"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"すべてのスター付き"</string>
     <string name="widget_loading" msgid="2340962056927255554">"読み込み中..."</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 147b0ce..60c60f4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"이전"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"계정 설정"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange 계정 추가"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync 계정 추가"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"보통"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"크게"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"아주 크게"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"자동으로 첨부 파일 가져오기"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"받은편지함 메일의 첨부파일을 다운로드합니다(POP3 계정에서는 사용할 수 없음)."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"다른 뷰로 이동하려면 이메일 아이콘을 누르세요."</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"전체보관함"</string>
-    <string name="widget_unread" msgid="488582205091831168">"읽지 않은 모든 메일"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"모든 별표편지함"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"다른 뷰로 이동하려면 이메일 아이콘을 누르세요."</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"전체보관함"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"읽지 않은 모든 메일"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"모든 별표편지"</string>
     <string name="widget_loading" msgid="2340962056927255554">"로드 중..."</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 60f6823..9ba93d6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/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="status_sending_messages" msgid="3971880826111264523">"Siunčiami pranešimai..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Siųsti siunčiamus pranešimus"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Siųsti viską"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pateikiamas priedas."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Pateikiamas priedas <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Skaityti el. pašto priedus"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Kitas"</string>
     <string name="okay_action" msgid="8365197396795675617">"Gerai"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Atšaukti"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Ankstesnis"</string>
     <string name="send_action" msgid="1729766205562446418">"Siųsti"</string>
     <string name="reply_action" msgid="4262472229221507619">"Atsakyti"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Atsakyti į visus"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Persiųsti"</string>
     <string name="done_action" msgid="7497990549515580249">"Atlikta"</string>
     <string name="discard_action" msgid="6532206074859505968">"Atmesti"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Išsaugoti kaip juodraštį"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Išsaug. juodraš."</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Skaityti / neskaityti"</string>
     <string name="read_action" msgid="4701484794504781686">"Žymėti raudonai"</string>
     <string name="unread_action" msgid="6280399049357552826">"Pažymėti kaip neperskaitytą"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Paskyros"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Pažymėti kaip skaitytą"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Pažymėti kaip neskaitytą"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Pridėti Cc (kopiją) ir Bcc (nematomąją kopiją)"</string>
+    <string name="move_action" msgid="3059189775933985898">"Perkelti"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ cc (kop.) / bcc (nemat. kop.)"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Pridėti priedą"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Iškelties nustatymai"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pasirinkti priedą"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Perkelti į"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Įkeliami pranešimai…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Ryšio klaida"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Naujas el. laiškas"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Įkeliant pranešimo tekstą įvyko netikėta klaida. Galbūt pranešimas per ilgas, kad galėtumėte jį žiūrėti."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Perkelti <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> pranešim."</item>
-    <item quantity="other" msgid="8792313600381332865">"Perkelti <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> pranešim."</item>
+    <item quantity="one" msgid="1891601902988083907">"Perkelti pranešimus: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="8792313600381332865">"Perkelti pranešimus: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> neperskaityti (-ų) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> paskyrose (-ų)"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"<xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"Paskyrų: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="8548760449976444566">"Paskyrų: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Gautų laiškų aplankas"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Išsiųstieji"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Juodraščiai"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Išsiųstieji"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Paspauskite ir laikykite nuspaudę paskyrą, jei norite ją atnaujinti"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Pašto dėžutė"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Bendras rodinys"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Įkelti daugiau pranešimų"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"Pasirinkta: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7901361399231876038">"Pasirinkta: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Pranešimų nėra"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Kam"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc (kopija)"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc (nematomoji kopija):"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Tema"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Nuo:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Kam:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc (kopija):"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc (nemat. kop.):"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Tema:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Sukurti laišką"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pirminis pranešimas --------"\n"Tema: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Nuo: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kam: <xliff:g id="TO">%3$s</xliff:g>"\n"CC (kopija): <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rašė:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cituojamas tekstas"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Įtraukti tekstą"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Turite pridėti bent vieną gavėją."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Kai kurie el. pašto adresai neteisingi."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Failas per didelis, kad būtų pridėtas."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc (kopija):"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Atidaryti"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Neįmanoma išsaugoti priedo SD kortelėje."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Žiūrėti"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Įkelti"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Išsaugoti"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Sustabdyti"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Priedas išsaugotas kaip <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Neįmanoma išsaugoti priedo."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Pastaba: prieš siunčiant bus atsisiųstas mažiausiai vienas priedas persiųstame pranešime."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Pranešimas"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pakviesti"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> pried."</item>
+    <item quantity="other" msgid="974463163535515223">"Priedų: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Rodyti paveikslėlius"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Žiūrėti Kalendoriuje »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Žiūrėti Kalendoriuje"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalendoriaus kvietimas"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Dalyvausite?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Taip"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Į šį kvietimą atsakėte „galbūt“"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Atmetėte šį kvietimą"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Peržiūrimas <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Atmesti praneš."</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Atmesti šį pranešimą?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Atmesti šiuos pranešimus?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Pranešimas ištrintas."</item>
     <item quantity="other" msgid="6574961322865652255">"Pranešimai ištrinti."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Pranešimas atmestas."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Pranešimas išsaugotas kaip juodraštis."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Šio priedo pateikti negalima."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Nepavyko įkelti „<xliff:g id="FILENAME">%s</xliff:g>“ priedo."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Atidaromas pranešimas…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"Į <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> perkelti pranešimai: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"Į <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> perkelti pranešimai: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Nepavyko persiųsti mažiausiai vieno priedo"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Nepavyko persiųsti <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Nepavyko „<xliff:g id="ACCOUNT_NAME">%s </xliff:g>“ prisij."</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Jei norite pakeisti paskyros nustatymus, palieskite"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Senesnis"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Paskyros sąranka"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridėti „Exchange“ paskyrą"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridėti „Exchange ActiveSync“ paskyrą"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"El. pašto paskyra"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Daugelyje paskyrų galite konfigūruoti el. paštą, atlikę vos kelis veiksmus."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Galite konfigūruoti „Exchange“ paskyrą atlikę vos kelis veiksmus."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Galite konfigūruoti „Exchange ActiveSync“ paskyrą atlikę vos kelis veiksmus."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tikrinami gaunamų laiškų serverio nustatymai..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tikrinami siunčiamo serverio nustatymai..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Paskyros sąranka"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Paskyra nustatyta ir išsiųstas el. laiškas!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Suteikti šiai paskyrai pavadinimą (pasirenkama)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsų vardas ir pavardė (pateikiami siunčiamuose pranešimuose)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Paskyros sąranka"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Paskyros tipas"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kokio tipo tai paskyra?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Paskyros sąranka"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Gaunamų laiškų serverio nustatymai"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domenas / naudotojo vardas"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Naudoti saugų ryšį (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Priimti visus SSL sertifikatus"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiliojo įrenginio ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Paskyros nustatymai"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"El. pašto tikrinimo dažnumas"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Paskyros parinktys"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Gautųjų tikrinimo dažnumas"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Niekada"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatinis (spausti)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Kas 5 min."</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Pranešti man, kai gausiu el. laišką."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinchronizuoti šios paskyros adresatus."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinchronizuoti šios paskyros kalendorių."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinchronizuoti el. paštą iš šios paskyros."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Nepavyko pabaigti sąrankos"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Sinchronizuojamas kiekis"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Vieną dieną"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Neteisingas naudotojo vardas ar slaptažodis."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Negalima saugiai prisijungti prie serverio."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nepavyksta saugiai prisijungti prie serverio."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serveris atsakė pateikdamas klaidą; patikrinkite naudotojo vardą bei slaptažodį ir bandykite dar kartą."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Negali prisijungti prie serverio."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Negalima prisijungti prie serverio."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Reikalingas TLS, bet jo nepalaiko serveris."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Serveris nepalaiko tapatybės nustatymo būdų."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Neįmanoma užmegzti ryšio su serveriu dėl saugos klaidos."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Neįmanoma užmegzti ryšio su serveriu."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Įvedėte neteisingą serverio adresą arba serveriui reikalinga el. pašto nepalaikoma protokolo versija."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Nuotolinis saugos administravimas"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serveris <xliff:g id="SERVER">%s</xliff:g> reikalauja leisti jam per atstumą valdyti kai kurias jūsų telefono saugos funkcijas. Ar norite užbaigti šios paskyros nustatymą?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Šis serveris reikalauja saugos funkcijų, kurių jūsų telefonas nepalaiko."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ĮSPĖJIMAS: išaktyvinus el. pašto programos leidimą administruoti įrenginį, bus ištrintos visos el. pašto paskyros, kurioms jis reikalingas, įskaitant el. laiškus, kontaktus, kalendorių įvykius ir kitus duomenis."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Reikalingas paskyros „<xliff:g id="ACCOUNT">%s</xliff:g>“ saugos nustatymų atnaujinimas."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Atnaujinti saugos nustatymus"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Įrenginio sauga"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Ekrano atrakinimo kodo galiojimo laikas baigėsi."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Reikia naujo ekrano atrakinimo kodo"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Ekrano atrakinimo kodo galiojimo laikas baigėsi. Palieskite čia, kad jį atnaujintumėte."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Atmesti neišsaugotus pakeitimus?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Bendri nustatymai"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Numatytoji paskyra"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"El. pašto pranešimai"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Sinchronizavimo dažnumas, pranešimai ir kt."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Būsenos juostoje pranešti, kai gaunamas el. laiškas"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"El. pašto tikrinimo dažnumas"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Gautųjų tikrinimo dažnumas"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gaunamų laiškų nustatymai"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Siunčiamų laiškų nustatymai"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Paskyros pavadinimas"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Parašas"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Priskirti tekstą prie siunčiamų pranešimų"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Įspėjimų nustatymai"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinchronizuoti adresatus"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Taip pat sinchronizuoti šios paskyros adresatus"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinchronizuoti kalendorių"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Iš šios paskyros sinchronizuoti ir kalendorių"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinchr. kontaktus"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinchron. šios paskyros kontaktus"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinchron. Kalendorių"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinchron. šios paskyros kalendorių"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sinchr. el. paštą"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinchron. šios paskyros el. paštą"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibruoti"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Taip pat vibruoti, kai gaunamas el. laiškas"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Visada"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverio nustatymai"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Pašalinti paskyrą"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Paskyra „<xliff:g id="ACCOUNT">%s</xliff:g>“ bus pašalinta iš el. pašto."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Pašalinti paskyrą"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Pašalinti paskyrą"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"El. p. pask."</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Pasirinkti paskyrą"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Naujovinti paskyras"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultatai (-ų) iš <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Pirmieji <xliff:g id="RESULTS">%1$d</xliff:g> rezultatai (-ų) iš <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Jei norite matyti kitus rodinius, palieskite el. pašto piktogramą"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Visi laiškai"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Visi neperskaityti"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Visi pažymėti žvaigždute"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"El. pašto nuostatos"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Programos nuostatos"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatinis perėjimas"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Pasirinkite, kurį ekraną rodyti ištrynus pranešimą"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pereiti į"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Naujesnis pranešimas"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Senesnis pranešimas"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Pranešimų sąrašas"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Pranešimo teksto dydis"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Pateikti pranešimų turinį itin mažo dydžio tekstu"</item>
+    <item msgid="8239633518447359057">"Pateikti pranešimų turinį mažo dydžio tekstu"</item>
+    <item msgid="55959821477704302">"Pateikti pranešimų turinį įprasto dydžio tekstu"</item>
+    <item msgid="446236334663020508">"Pateikti pranešimų turinį didelio dydžio tekstu"</item>
+    <item msgid="235926149071179467">"Pateikti pranešimų turinį itin didelio dydžio tekstu"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Pranešimo teksto dydis"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Itin mažas"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Mažas"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Įprastas"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Didelis"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Itin didelis"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Automatiškai gauti priedus"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Atsisiųsti Gautųjų praneš. priedus. (Negalima su POP3 paskyromis.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> iš <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Jei norite matyti kitus rodinius, palieskite el. pašto piktogramą"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Visi laiškai"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Visi neperskaityti"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Visi pažymėti žvaigždute"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Įkeliama…"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 962a0b6..2652ccb 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/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="status_sending_messages" msgid="3971880826111264523">"Notiek ziņojumu sūtīšana..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Sūtīt izejošos ziņojumus"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Sūtīt visus"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pielikuma ienese."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Notiek pielikuma <xliff:g id="FILENAME">%s</xliff:g> ienese"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Lasīt e-pasta ziņojumu pielikumus"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Tālāk"</string>
     <string name="okay_action" msgid="8365197396795675617">"Labi"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Atcelt"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Iepriekšējais"</string>
     <string name="send_action" msgid="1729766205562446418">"Sūtīt"</string>
     <string name="reply_action" msgid="4262472229221507619">"Atbildēt"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Atbildēt visiem"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Pārsūtīt"</string>
     <string name="done_action" msgid="7497990549515580249">"Gatavs"</string>
     <string name="discard_action" msgid="6532206074859505968">"Atmest"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Saglabāt kā melnrakstu"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Saglabāt melnr."</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Izlasīts/nelasīts"</string>
     <string name="read_action" msgid="4701484794504781686">"Atzīmēt kā izlasītu"</string>
     <string name="unread_action" msgid="6280399049357552826">"Atzīmēt kā nelasītu"</string>
@@ -58,16 +57,13 @@
     <string name="accounts_action" msgid="901105887272231493">"Konti"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Atzīmēt kā izlasītu"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Atzīmēt kā nelasītu"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Pievienot kopiju/diskrēto kopiju"</string>
+    <string name="move_action" msgid="3059189775933985898">"Pārvietot"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ kop./d. kop."</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Pievienot pielikumu"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Izmetes iestatījumi"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pielikuma izvēle"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Pārvietot uz"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Notiek ziņojumu ielāde…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Savienojuma kļūda"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Jauns e-pasta ziņojums"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Ielādējot ziņojuma tekstu, radās neparedzēta kļūda. Iespējams, ziņojumu nevar skatīt, jo tas ir pārāk garš."</string>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontā(-os)"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"kam: <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konts"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konti"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Iesūtne"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Izsūtne"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Melnraksti"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Izsūtne"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Lai atsvaidzinātu kontu, lūdzu, nospiediet konta nosaukumu un turiet to."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Pastkaste"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinētais skatījums"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Ielādēt vairāk ziņojumu"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> atlasīts"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> atlasīti"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Nav ziņojumu"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Kam"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopija"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Diskrētā kopija"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Temats"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"No:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Kam:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Kopija:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Diskr. kop.:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Tēma:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Rakstīt vēstuli"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Sākotnējais ziņojums --------"\n"Temats: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"No: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kam: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopija: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rakstīja:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citēts teksts"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Iekļaut tekstu"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Jāpievieno vismaz viens adresāts."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Dažas e-pasta adreses nav derīgas."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Failu nevar pievienot, jo tas ir pārāk liels."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopija:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Atvērt"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Nevar saglabāt pielikumu SD kartē."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Skatīt"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Ielādēt"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Saglabāt"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Apturēt"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Pielikums saglabāts kā <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Nevar saglabāt pielikumu."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Piezīme. Viens vai vairāki pārsūtītā ziņojuma pielikumi pirms sūtīšanas tiks lejupielādēti."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Ziņojums"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Uzaicināt"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> pielikums"</item>
+    <item quantity="other" msgid="974463163535515223">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> pielikumi"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Rādīt attēlus"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Skatīt kalendārā »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Skatīt kalendārā"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalendāra ielūgums"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Vai apmeklēsiet?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Jā"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Jūs uz šo ielūgumu esat atbildējis \"Varbūt”"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Jūs esat noraidījis šo ielūgumu."</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Tiek skat.: <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Ziņoj. atmešana"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Vai atmest šo ziņojumu?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Vai atmest šos ziņojumus?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Ziņojums ir dzēsts."</item>
     <item quantity="other" msgid="6574961322865652255">"Ziņojumi ir dzēsti."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Ziņojums ir atmests."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Ziņojums ir saglabāts kā melnraksts."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Šo pielikumu nevar attēlot."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Nevarēja pārsūtīt: <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Nevarēja ielādēt pielikumu <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Notiek ziņojuma atvēršana…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ziņojums pārvietots uz <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ziņojumi pārvietoti uz <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Nevarēja pārsūtīt vienu vai vairākus pielikumus."</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Nevarēja pārsūtīt failu <xliff:g id="FILENAME"> %s</xliff:g>."</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Pierakst. kļ.: <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Pieskarieties, lai mainītu konta iestatījumus"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Vecāki"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konta iestatīšana"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange konta pievienošana"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pievienot Exchange ActiveSync kontu"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-pasta konts"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Vairumā kontu e-pastu var konfigurēt, veicot tikai dažas darbības."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Varat konfigurēt Exchange kontu, veicot tikai dažas darbības."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Varat konfigurēt Exchange ActiveSync kontu, veicot tikai dažas darbības."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Notiek servera ienākošo datu iestatījumu pārbaude..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Notiek servera izejošo datu iestatījumu pārbaude…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konta iestatīšana"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Jūsu konts ir iestatīts, un ir nosūtīts e-pasta ziņojums."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ievadiet konta nosaukumu (neobligāti)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsu vārds (attēlots izejošajos ziņojumos)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konta iestatīšana"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Konta veids"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kāds ir šī konta veids?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konta iestatīšana"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ienākošā servera iestatījumi"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domēns\\lietotājvārds"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Lietot drošu savienojumu (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Pieņemt visus SSL sertifikātus"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilās ierīces ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Konta iestatījumi"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"E-pasta pārbaudes biežums"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Konta iespējas"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Iesūtnes pārbaudes biežums"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nekad"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automātiski (piespiediet)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Ik pēc 5 minūtēm"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Paziņot man, kad tiek saņemts jauns e-pasta ziņojums."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhronizēt kontaktpersonas no šī konta."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhronizēt šī konta kalendāru."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Šī konta e-pasta sinhronizācija."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Iestatīšanu nevarēja pabeigt."</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Sinhronizējamais apjoms"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Viena diena"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Lietotājvārds vai parole nav pareiza."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nevar izveidot drošu savienojumu ar serveri."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nevar izveidot drošu savienojumu ar serveri."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serveris reaģēja ar kļūdu; lūdzu, pārbaudiet savu lietotājvārdu un paroli un mēģiniet vēlreiz."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nevar izveidot savienojumu ar serveri."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nevar izveidot savienojumu ar serveri."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Protokols TLS ir obligāts, taču serveris to neatbalsta."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Serveris neatbalsta autentifikācijas metodes."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Nevar izveidot savienojumu ar serveri drošības kļūdas dēļ."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nevar izveidot savienojumu ar serveri."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Ievadījāt nepareizu servera adresi vai serverim ir nepieciešama protokola tāda versija, kuru e-pasts neatbalsta."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Attālināta drošības administrācija"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serveris <xliff:g id="SERVER">%s</xliff:g> pieprasa, lai jūs tam atļautu attālināti vadīt dažas tālruņa drošības funkcijas. Vai vēlaties pabeigt konta iestatīšanu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Šis serveris pieprasa drošības funkcijas, ko jūsu tālrunis neatbalsta."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"BRĪDINĀJUMS: deaktivizējot e-pasta lietojumprogrammas tiesības administrēt jūsu ierīci, tiks dzēsti visi e-pasta konti, kuriem šī funkcionalitāte ir nepieciešama, kā arī šo kontu e-pasts, kontaktpersonas, kalendāra notikumi un citi dati."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontā “<xliff:g id="ACCOUNT">%s</xliff:g>” nepieciešams atjaunināt drošības iestatījumus."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Drošības iestatījumu atjaunināšana"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Ierīces drošība"</string>
@@ -316,20 +298,18 @@
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediģēt datus"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="950001176659814912">"Kontā \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ir jāatjaunina ekrāna atbloķēšanas kods."</string>
     <string name="password_expire_warning_content_title" msgid="4602564325906174785">"Nep. jauns ekr. atbl. kods"</string>
-    <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Kontā \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ir jāatjaunina ekrāna atbloķēšanas kods. Pieskatieties šeit, lai to atjauninātu."</string>
+    <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Kontā \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ir jāatjaunina ekrāna atbloķēšanas kods. Pieskarieties šeit, lai to atjauninātu."</string>
     <string name="password_expired_ticker" msgid="5698508544187945595">"Ekrāna atbloķēšanas koda derīgums ir beidzies."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Nep. jauns ekr. atbl. kods"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Ekrāna atbloķēšanas koda derīgums ir beidzies. Pieskarieties šeit, lai to atjauninātu."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vai atmest nesaglabātās izmaiņas?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Vispārīgi iestatījumi"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Noklusējuma konts"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Pēc noklusējuma sūtīt e-pasta ziņojumus no šī konta"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-pasta paziņojumi"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Sinhronizācijas biežums, paziņojumi u.c."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Rādīt paziņojumu statusa joslā, kad tiek saņemts e-pasta ziņojums"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"E-pasta pārbaudes biežums"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Iesūtnes pārbaudes biežums"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Ienākošo datu iestatījumi"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Izejošo datu iestatījumi"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Konta nosaukums"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Paraksts"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Pievienot tekstu nosūtītajiem ziņojumiem"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Paziņojumu iestatījumi"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinhronizēt kontaktpersonas"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhronizēt šī konta kontaktpersonas"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhronizēt kalendāru"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhronizēt šī konta kalendāru"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinhron. kontaktp."</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhron. kontaktpersonas šim kontam"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhron. kalendāru"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhronizēt kalendāru šim kontam"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sinhronizēt e-pastu"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhronizēt e-pastu šim kontam"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrozvans"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Izmantot vibrozvanu, kad tiek saņemts e-pasta ziņojums"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vienmēr"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Servera iestatījumi"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konta noņemšana"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Konts “<xliff:g id="ACCOUNT">%s</xliff:g>” tiks noņemts no e-pasta."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Noņemt kontu"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Noņemt kontu"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-pasta k."</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Atlasīt kontu"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Kontu jaunināšana"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultāti no domēna <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Pirmie <xliff:g id="RESULTS">%1$d</xliff:g> rezultāti no domēna <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Piesk. e-pasta ikonai, lai pārslēgtu uz citu skatu"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Visas vēstules"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Visi nelasītie"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Visi ar zv. atzīm."</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"E-pasta preferences"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Lietojumprogrammas preferences"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automātiski pāriet"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Pēc ziņojuma dzēšanas parādāmā ekrāna atlase"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pāriet uz"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Jauns ziņojums"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Vecāki ziņojumi"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Ziņojumu saraksts"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Ziņojuma teksta izmērs"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Parādīt ziņojumu saturu, izmantojot sīka izmēra tekstu"</item>
+    <item msgid="8239633518447359057">"Parādīt ziņojumu saturu, izmantojot maza izmēra tekstu"</item>
+    <item msgid="55959821477704302">"Parādīt ziņojumu saturu, izmantojot normāla izmēra tekstu"</item>
+    <item msgid="446236334663020508">"Parādīt ziņojumu saturu, izmantojot liela izmēra tekstu"</item>
+    <item msgid="235926149071179467">"Parādīt ziņojumu saturu, izmantojot milzīga izmēra tekstu"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Ziņojuma teksta izmērs"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Niecīgs"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Mazs"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Parasts"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Liels"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Milzīgs"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Automātiski ienest pielikumus"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Lejupiel. iesūt. esošo ziņ. pielikumus (nav pieej. POP3 kontos.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> no <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Piesk. e-pasta ikonai, lai pārslēgtu uz citu skatījumu"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Visas vēstules"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Visi nelasītie"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Visi ar zv. atzīm."</string>
     <string name="widget_loading" msgid="2340962056927255554">"Notiek ielāde..."</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ef80a05..baacec5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Eldre"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfigurering av konto"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Legg til en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Legg til en Exchange ActiveSync-konto"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kjempestor"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Hent vedlegg automatisk"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Last ned vedlegg for innboksmeldinger. (Ikke tilgj. for POP3-kontoer.)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Trykk på e-postikonet for andre visninger"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"All e-post"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Alle uleste"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Alle stjernemerkede"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Trykk på e-postikonet for andre visninger"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"All e-post"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Alle uleste"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Alle stjernemerkede"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Laster inn …"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c288dee..2fde75b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ouder"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Accountinstellingen"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Een Exchange-account toevoegen"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Een Exchange ActiveSync-account toevoegen"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normaal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorm"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Bijlagen automatisch ophalen"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Bijlagen downloaden voor Inbox-berichten. (Niet beschikbaar voor POP3-account.)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Tik op het e-mailpictogram voor andere weergaven"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Alle berichten"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Alle ongelezen ber."</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Alle met ster"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Tik op het e-mailpictogram voor andere weergaven"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Alle berichten"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Alle ongelezen ber."</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Alle met ster"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Laden..."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c9f75b7..b8b7bac 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Starsze"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguracja konta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj konto Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj konto Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normalny"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Duży"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Wielki"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Automatycznie pobieraj załączniki"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Pobierz załączniki odebranych wiadomości. (Opcja niedostępna dla kont POP3)."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Dotknij ikony wiadomości e-mail, aby zmienić widok"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Wszystkie"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Nieprzeczytane"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Oznaczone gwiazdką"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Dotknij ikony wiadomości e-mail, aby zmienić widok"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Wszystkie"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Nieprzeczytane"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Oznaczone gwiazdką"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Trwa wczytywanie…"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 41d5c74..9ef64ea 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mais antigas"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuração da conta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Muito grande"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Obter anexos automaticamente"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Transferir anexos de mensagens de caixa de entrada. (Não disponível para contas POP3)."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Toque no ícone de e-mail para outras vistas"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Todo o correio"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Todas não lidas"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Todas com estrela"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Toque no ícone de e-mail para outras vistas"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Todo o correio"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Todas não lidas"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Todas com estrela"</string>
     <string name="widget_loading" msgid="2340962056927255554">"A carregar…"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 487c785..2cb277d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Mais antigos"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuração da conta"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Buscar anexos automaticamente"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Fazer o download de anexos de mensagens da caixa de entrada. Não disponível para contas POP3."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Toque no ícone e-mail para outras exibições"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Todos os e-mails"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Todas não lidas"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Todos com estrela"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Toque no ícone e-mail para outras exibições"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Todos os e-mails"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Todas não lidas"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Todos com estrela"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Carregando…"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 3a263ed..7e8f9c3 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -432,13 +432,13 @@
     <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
-    <!-- no translation found for widget_other_views (2924270018204427009) -->
+    <!-- no translation found for widget_other_views (2265335608760083337) -->
     <skip />
-    <!-- no translation found for widget_all_mail (6436796211067834315) -->
+    <!-- no translation found for widget_all_mail (4352573990283094963) -->
     <skip />
-    <!-- no translation found for widget_unread (488582205091831168) -->
+    <!-- no translation found for widget_unread (4404711399009077833) -->
     <skip />
-    <!-- no translation found for widget_starred (7855645697293191958) -->
+    <!-- no translation found for widget_starred (8290352707134011791) -->
     <skip />
     <!-- no translation found for widget_loading (2340962056927255554) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ebe2201..5d90faa 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/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="status_sending_messages" msgid="3971880826111264523">"Se trimit mesajele..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Trimiteţi mesajele de trimitere"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Trimiteţi toate"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Se preia ataşamentul."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Se preia ataşamentul <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Citiţi ataşamentele mesajului de e-mail"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Înainte"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Anulaţi"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Înapoi"</string>
     <string name="send_action" msgid="1729766205562446418">"Trimiteţi"</string>
     <string name="reply_action" msgid="4262472229221507619">"Răspundeţi"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Răspundeţi tuturor"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Redirecţionaţi"</string>
     <string name="done_action" msgid="7497990549515580249">"Terminat"</string>
     <string name="discard_action" msgid="6532206074859505968">"Renunţaţi"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Salvaţi ca mesaj nefinalizat"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Salvaţi m. nef."</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Citit/Necitit"</string>
     <string name="read_action" msgid="4701484794504781686">"Marcaţi ca citit"</string>
     <string name="unread_action" msgid="6280399049357552826">"Marcaţi drept necitit"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Conturi"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcaţi conversaţia ca citită"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Adăugaţi Cc/Bcc"</string>
+    <string name="move_action" msgid="3059189775933985898">"Mutaţi"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Adăugaţi un ataşament"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Setări pentru imaginea de memorie"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Alegeţi fişierul de ataşat"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Mutaţi în"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Se încarcă mesajele..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Eroare de conexiune"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"E-mail nou"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"A apărut o eroare neaşteptată în timpul încărcării mesajului text. Este posibil ca mesajul să fie prea lung pentru a fi vizualizat."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="1891601902988083907">"Mutaţi <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mesaj"</item>
-    <item quantity="other" msgid="8792313600381332865">"Mutaţi <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (de) mesaje"</item>
+    <item quantity="other" msgid="8792313600381332865">"Mutaţi <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mesaje"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> necitit(e) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"în <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (de) conturi"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"către <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> cont"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> conturi"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Mesaje primite"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Mesaje de trimis"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Mesaje nefinalizate"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Mesaje de trimis"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Apăsaţi lung pe un cont pentru a-l actualiza"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Căsuţă de e-mail"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Afişare combinată"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Încărcaţi mai multe mesaje"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selectate"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selectate"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Niciun mesaj"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Pentru"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Subiect"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"De la:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Către:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Subiect:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Scrieţi un mesaj"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mesajul original --------"\n"Subiect: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De la: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Către: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a scris:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Mesaj citat"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Includeţi textul"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Trebuie să adăugaţi cel puţin un destinatar."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Unele adrese de e-mail sunt nevalide."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Fişierul este prea mare pentru a fi ataşat."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Deschideţi"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Imposibil de salvat ataşamentul pe cardul SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Afişaţi"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Încărcaţi"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Salvaţi"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Opriţi"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Ataşament salvat ca <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Ataşamentul nu se poate salva."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Notă: unul sau mai multe ataşamente din mesajul dvs. redirecţionat vor fi descărcate înainte de a fi trimise."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Mesaj"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitaţi"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Ataşament <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> ataşamente"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afişaţi fotografiile"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Vizualizaţi în Calendar »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Afişaţi în Calendar"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitaţie în Calendar"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Participaţi?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Da"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Aţi răspuns cu „poate” acestei invitaţii"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Aţi refuzat această invitaţie"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Vizualizaţi <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Renunţaţi"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Renunţaţi la acest mesaj?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Renunţaţi la aceste mesaje?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Mesaj şters."</item>
     <item quantity="other" msgid="6574961322865652255">"Mesaje şterse."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mesaj refuzat."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mesaj salvat ca mesaj nefinalizat."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Acest ataşament nu poate fi afişat."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Nu s-a putut redirecţiona <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Ataşamentul „<xliff:g id="FILENAME">%s</xliff:g>” nu s-a putut încărca."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Se deschide mesajul..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mesaj mutat în <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (de) mesaje mutate în <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Nu se pot redirecţiona unul sau mai multe ataşamente"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Nu se poate redirecţiona <xliff:g id="FILENAME"> %s</xliff:g>"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Con. eşuată la <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Atingeţi pentru a modifica setările contului"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KO"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KO"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MO"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MO"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GO"</item>
+    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GO"</item>
+  </plurals>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Mai vechi"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurare cont"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adăugaţi un cont Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adăugaţi un cont Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cont de e-mail"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Puteţi configura adresa de e-mail pentru cele mai multe conturi, urmând doar câţiva paşi."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puteţi configura un cont de Exchange ActiveSync urmând doar câţiva paşi."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puteţi configura un cont Exchange ActiveSync urmând doar câţiva paşi."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Se verifică setările pentru serverul mesajelor de intrare..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Se verifică setările serverului de mesaje de ieşire..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurare cont"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Contul este configurat, iar e-mailul funcţionează corect!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Daţi un nume acestui cont (opţional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Numele dvs. (afişat în mesajele de trimitere)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configurare cont"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipul contului"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Ce tip de cont este acesta?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configurare cont"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Setări pentru serverul de mesaje de intrare"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domeniu\\Nume de utilizator"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizaţi o conexiune securizată (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptaţi toate certificatele SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dispozitiv mobil"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Setări cont"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecvenţa de verificare a mesajelor de e-mail"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Opţiunile contului"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecvenţa verificării mesajelor primite"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Niciodată"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automat (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"La fiecare 5 minute"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Doresc să primesc notificare la primirea de e-mailuri."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Doresc sincronizarea agendei acestui cont."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizaţi calendarul acestui cont."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincron. e-mail din acest cont."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Configurarea nu poate fi terminată"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Volumul de date de sincronizat"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"O zi"</string>
@@ -294,42 +279,37 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nume de utilizator sau parolă incorectă."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nu este posibilă conectarea în siguranţă la server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nu este posibilă conectarea în siguranţă la server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serverul a răspuns cu o eroare. Verificaţi numele de utilizator şi parola şi încercaţi din nou."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nu se poate conecta la server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nu se poate conecta la server. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS solicitat, dar neacceptat de către server."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Metodele de autentificare nu sunt acceptate de server."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Nu poate fi deschisă conexiunea la server din cauza unei erori de securitate."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nu poate fi deschisă conexiunea la server."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Aţi introdus o adresă de server incorectă sau serverul necesită o versiune de protocol pe care funcţia de e-mail nu o acceptă."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administrarea securităţii de la distanţă"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serverul <xliff:g id="SERVER">%s</xliff:g> vă solicită permisiunea de a controla de la distanţă unele funcţii de securitate ale telefonului dvs. Doriţi să finalizaţi configurarea acestui cont?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Pentru acest server sunt necesare funcţii de securitate pe care telefonul dvs. nu le acceptă."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"AVERTISMENT: dezactivarea aplicaţiei de e-mail care administrează dispozitivul dvs. va şterge toate conturile de e-mail care au nevoie de aceasta, împreună cu e-mailurile, agenda, evenimentele din calendar şi alte date pe care aceste conturi le conţin."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” necesită actualizarea setărilor de securitate."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizaţi setările de securitate"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Securitatea dispozitivului"</string>
     <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Serverul <xliff:g id="SERVER">%s</xliff:g> vă solicită permisiunea de a controla de la distanţă unele caracteristici de securitate ale telefonului dvs."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modificaţi detaliile"</string>
     <string name="password_expire_warning_ticker_fmt" msgid="950001176659814912">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” vă solicită să actualizaţi codul de deblocare a ecranului."</string>
-    <string name="password_expire_warning_content_title" msgid="4602564325906174785">"Se solicită un nou ecran de deblocare"</string>
-    <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” vă solicită să actualizaţi codul ecranului de deblocare. Atingeţi aici pentru a-l actualiza."</string>
-    <string name="password_expired_ticker" msgid="5698508544187945595">"Codul ecranului de deblocare a expirat."</string>
-    <string name="password_expired_content_title" msgid="8417027276177867305">"Blocare ecran nou solicitată"</string>
-    <string name="password_expired_content_text" msgid="741999155767783375">"Codul ecranului de deblocare a expirat. Atingeţi aici pentru a-l actualiza."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="password_expire_warning_content_title" msgid="4602564325906174785">"Nec. cod nou debloc. ecran"</string>
+    <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” vă solicită să actualizaţi codul de deblocare a ecranului. Atingeţi aici pentru a-l actualiza."</string>
+    <string name="password_expired_ticker" msgid="5698508544187945595">"Codul de deblocare a ecranului a expirat."</string>
+    <string name="password_expired_content_title" msgid="8417027276177867305">"Nec. cod nou debloc. ecran"</string>
+    <string name="password_expired_content_text" msgid="741999155767783375">"Codul de deblocare a ecranului a expirat. Atingeţi aici pentru a-l actualiza."</string>
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Renunţaţi la modificările nesalvate?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Setări generale"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cont prestabilit"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Trimiteţi e-mailuri de pe acest cont în mod prestabilit"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificările de e-mail"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Frecvenţa sincronizării, notificări etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Doresc notificare în bara de stare la primirea de e-mailuri"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frecvenţa de verificare a e-mailului"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frecvenţa verificării mesajelor primite"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Setări pentru mesajele primite"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Setări pentru mesajele de trimitere"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Numele contului"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Semnătura"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Adăugaţi text la mesajele trimise"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Setări pentru notificări"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincronizaţi persoanele din agendă"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Doresc şi sincronizarea agendei din acest cont"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizaţi calendarul"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Doresc şi sincronizarea calendarului din acest cont"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincronizaţi agenda"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincron. agenda pt. acest cont"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincron. Calendar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincron. calendarul pt. acest cont"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sincronizaţi e-mail"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincron. e-mail pt. acest cont"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrare"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrare şi la sosirea mesajelor de e-mail"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Întotdeauna"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Setări server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminaţi contul"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” va fi eliminat din e-mail."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Eliminaţi contul"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Eliminaţi contul"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mail"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selectaţi un cont"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Treceţi conturile la o versiune superioară"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> (de) rezultate din <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primele <xliff:g id="RESULTS">%1$d</xliff:g> (de) rezultate din <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Atingeţi pictograma de e-mail pentru alte afişări"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Toate mesajele"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Toate necitite"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Toate cu stea"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Preferinţe de e-mail"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Preferinţe pentru aplicaţie"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Înaintare automată"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Selectaţi ce ecran se afişează după ştergerea unui mesaj"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Înaintaţi la"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mesaje mai noi"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mesaj mai vechi"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Lista de mesaje"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Dimensiune text mesaj"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Afişaţi conţinutul mesajelor cu text de dimensiune foarte mică"</item>
+    <item msgid="8239633518447359057">"Afişaţi conţinutul mesajelor cu text de dimensiune mică"</item>
+    <item msgid="55959821477704302">"Afişaţi conţinutul mesajelor cu text de dimensiune normală"</item>
+    <item msgid="446236334663020508">"Afişaţi conţinutul mesajelor cu text de dimensiune mare"</item>
+    <item msgid="235926149071179467">"Afişaţi conţinutul mesajelor cu text de dimensiune foarte mare"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Dimensiune text mesaj"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Minusculă"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Mică"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normală"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Mare"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Foarte mare"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Preluaţi ataşamentele automat"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Descărcaţi ataş. pt. mes. primite. (Nedisp. pt. cont. POP3.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> din <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Atingeţi pictograma de e-mail pentru alte afişări"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Toate mesajele"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Toate necitite"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Toate cu stea"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Se încarcă..."</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d0d65fc..40775b4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"След."</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка аккаунта"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавить аккаунт Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавить аккаунт Exchange ActiveSync"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Обычный"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Крупный"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромный"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Загружать вложения автоматически"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Загрузка вложений для сообщений \"Входящие\" (не доступно для аккаунтов POP3)."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> из <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Нажмите на значок эл. почты, чтобы изменить вид"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Вся почта"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Все непрочитанные"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Все помеченные"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Нажмите на значок эл. почты, чтобы изменить вид"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Вся почта"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Все непрочитанные"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Все помеченные"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Идет загрузка..."</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 14fdb05..467c06b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/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="status_sending_messages" msgid="3971880826111264523">"Prebieha odosielanie správ…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Odoslať odchádzajúce správy"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Odoslať všetko"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Prebieha načítanie prílohy."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Prebieha načítanie prílohy <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Čítať prílohy e-mailov"</string>
@@ -30,8 +30,7 @@
     <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>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Predchádzajúce"</string>
     <string name="send_action" msgid="1729766205562446418">"Odoslať"</string>
     <string name="reply_action" msgid="4262472229221507619">"Odpovedať"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Odpovedať všetkým"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Poslať ďalej"</string>
     <string name="done_action" msgid="7497990549515580249">"Hotovo"</string>
     <string name="discard_action" msgid="6532206074859505968">"Zahodiť"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Uložiť ako koncept"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Uložiť koncept"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Prečítané/neprečítané"</string>
     <string name="read_action" msgid="4701484794504781686">"Označiť ako prečítané"</string>
     <string name="unread_action" msgid="6280399049357552826">"Označiť ako neprečítané"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Účty"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Označiť ako prečítané"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označiť ako neprečítané"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Pridať kópiu/skrytú kópiu"</string>
+    <string name="move_action" msgid="3059189775933985898">"Presunúť"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+Kópia/Skr.kópia"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Pridať prílohu"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Nastavenia výpisu"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Vyberte prílohu"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Presunúť do"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Prebieha načítavanie správ…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Chyba pripojenia"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nový e-mail"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Počas načítavania textu správy sa vyskytla neočakávaná chyba. Správa je možno príliš veľká a preto ju nie je možné zobraziť."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Presunúť správy (počet: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>)"</item>
-    <item quantity="other" msgid="8792313600381332865">"Presunúť správy (počet: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>)"</item>
+    <item quantity="one" msgid="1891601902988083907">"Presunúť <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> správu"</item>
+    <item quantity="other" msgid="8792313600381332865">"Presunúť odkazy (počet: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>)"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"Neprečítané správy: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g>(<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtoch"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"adresát: <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"Počet účtov: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="8548760449976444566">"Počet účtov: <xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Doručená pošta"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Pošta na odoslanie"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Koncepty"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Pošta na odoslanie"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Účet aktualizujete stlačením a podržaním"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"E-mailová schránka"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinované zobrazenie"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Načítať ďalšie správy"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"Počet vybratých správ: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7901361399231876038">"Počet vybratých správ: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Žiadne správy"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Komu"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kópia"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrytá kópia"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Predmet"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Od:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Komu:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Kópia:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Skr. kópia:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Predmet:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Napísať správu"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pôvodná správa --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Odosielateľ: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Komu: <xliff:g id="TO">%3$s</xliff:g>"\n"Kópia: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napísal/a:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citovaný text"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Zahrnúť text"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Musíte pridať aspoň jedného príjemcu."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Niektoré e-mailové adresy sú neplatné."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Súbor nie je možné priložiť, pretože je príliš veľký."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kópia:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Otvoriť"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Nie je možné uložiť prílohu na SD kartu."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Zobraziť"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Načítať"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Uložiť"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Zastaviť"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Príloha uložená ako <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Prílohu nie je možné uložiť."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Poznámka: Pred odoslaním sa prevezme jedna alebo viac príloh zo správy posielanej ďalej."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Správa"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pozvať"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Príloha <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Prílohy <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Zobraziť obrázky"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Zobraziť v Kalendári »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Zobraziť v Kalendári"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Pozvánka z kalendára"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Zúčastníte sa?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Áno"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Na túto pozvánku ste odpovedali „možno“"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Odmietli ste túto pozvánku"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Zobraz. súbor: <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Zahodiť správu"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Zahodiť túto správu?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Zahodiť tieto správy?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Správa bola odstránená."</item>
     <item quantity="other" msgid="6574961322865652255">"Správy boli odstránené."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Správa bola zahodená."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Správa bola uložená ako koncept."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Tuto prílohu nie je možné zobraziť."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Súbor <xliff:g id="FILENAME"> %s</xliff:g> sa nedá poslať ďalej"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Prílohu „ <xliff:g id="FILENAME">%s</xliff:g>“ sa nepodarilo načítať."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Prebieha otváranie správy..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> správa bola presunutá do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"Správy (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>) boli presunuté do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Nepodarilo sa poslať ďalej jednu alebo viac príloh"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Súbor <xliff:g id="FILENAME"> %s</xliff:g> sa nepodarilo poslať ďalej"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Prih. <xliff:g id="ACCOUNT_NAME">%s </xliff:g> zlyhalo"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Dotykom zmeníte nastavenia účtu"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Staršie"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavenie účtu"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridať účet Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridať účet Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailový účet"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Väčšinu e-mailových účtov môžete nakonfigurovať v niekoľkých jednoduchých krokoch."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Účet Exchange môžete nakonfigurovať v niekoľkých jednoduchých krokoch."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Účet služby Exchange ActiveSync môžete nakonfigurovať v niekoľkých jednoduchých krokoch."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení servera prichádzajúcej pošty…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení servera odchádzajúcej pošty…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavenie účtu"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Váš účet je nastavený, 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_user_name_label" msgid="8967410178488604770">"Vaše meno (zobrazované na odchádzajúcich správach)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nastavenie účtu"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Typ účtu"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O aký typ účtu ide?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavenie účtu"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavenia servera prichádzajúcej pošty"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Používateľské meno"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použiť zabezpečené pripojenie (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prijímať všetky certifikáty protokolu SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilného zariadenia"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavenia účtu"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Četnost kontrol e-mailů"</string>
+    <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_5min" msgid="6388939895878539307">"Každých 5 minút"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Upozorniť ma na príchod e-mailu"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizovať kontakty z tohto účtu."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizovať kalendár z tohto účtu."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Synchronizovať e-mail z tohto účtu."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Nastavenie nie je možné dokončiť"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Množstvo na synchronizovanie"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jeden deň"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Používateľské meno alebo heslo nie je správne."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nepodarilo sa bezpečne pripojiť k serveru."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nepodarilo sa bezpečne pripojiť k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Server odpovedal s chybou. Skontrolujte používateľské meno a heslo a skúste to znova."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nepodarilo sa pripojiť k serveru."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nepodarilo sa pripojiť k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Vyžaduje sa služba TLS, ale server ju nepodporuje."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Metódy overovania nie sú na tomto serveri podporované."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Pripojenie k serveru sa nepodarilo otvoriť kvôli chybe zabezpečenia."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nepodarilo sa otvoriť pripojenie k serveru."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Zadali ste nesprávni adresu servera alebo server vyžaduje verziu protokolu, ktorú aplikácia E-mail nepodporuje."</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="8146309611870795951">"Server <xliff:g id="SERVER">%s</xliff:g> žiada o povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho telefónu. Chcete dokončiť nastavenia tohto účtu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Tento server vyžaduje funkcie zabezpečenia, ktoré váš telefón nepodporuje."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"UPOZORNENIE: Ak deaktivujete oprávnenia 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>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizáciu nastavení zabezpečenia."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Aktualizácia nastavení zabezpečenia"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Zabezpečenie zariadenia"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Vypršala platnosť kódu na uzamknutie obrazovky"</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Vyžad. odomk. novej obraz."</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Platnosť kódu na uzamknutie obrazovky vypršala. Ak ho chcete aktualizovať, dotknite sa tu."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Zahodiť neuložené zmeny?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Všeobecné nastavenia"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Predvolený účet"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"V predvolenom nastavení odosielať e-maily z tohto účtu"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailové upozornenia"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Frekvencia synchronizácie, oznámení atď."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Zobraziť upozornenie na príchod e-mailu v stavovom riadku"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekvencia kontroly e-mailov"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekvencia kontroly doručenej pošty"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavenia prichádzajúcej pošty"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavenia odchádzajúcej pošty"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Názov účtu"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Text pripojiť k odosielaným správam"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavenia upozornení"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Synchronizovať kontakty"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchronizovať kontakty aj z tohto účtu"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synchronizovať kalendár"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synchronizovať kalendár aj z tohto účtu"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"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="3039820725699412208">"Synchr. kalendár"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synchr. kalendár pre tento účet"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Synchr. e-mail"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrovať aj pri príchode e-mailu"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrániť účet"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude odstránený z aplikácie E-mail."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Odstrániť účet"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Odstrániť účet"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mail. účet"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Výber účtu"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Inovovať účty"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"Počet výsledkov z webu <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Prvých <xliff:g id="RESULTS">%1$d</xliff:g> výsledkov z webu <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Na iné zobr. prepnete klepnutím na ikonu e-mailu"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Všetky správy"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Všetky neprečítané"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Všetky s hviezdičkou"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Predvoľby e-mailu"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Predvoľby aplikácie"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatický prechod"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Vyberte obrazovku, ktorá bude zobrazená po odstránení správy."</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pokračovať do"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Novšia správa"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Staršia správa"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Zoznam správ"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Veľkosť písma správy"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Zobraziť obsah správ veľmi malým písmom"</item>
+    <item msgid="8239633518447359057">"Zobraziť obsah správ malým písmom"</item>
+    <item msgid="55959821477704302">"Zobraziť obsah správ písmom normálnej veľkosti"</item>
+    <item msgid="446236334663020508">"Zobraziť obsah správ veľkým písmom"</item>
+    <item msgid="235926149071179467">"Zobraziť obsah správ veľmi veľkým písmom"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Veľkosť písma správy"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Veľmi malé"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Malé"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normálne"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Veľké"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Veľmi veľké"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Automaticky predbežne načítať prílohy"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Prevziať prílohy správ priečinka Doručená pošta. (Nie je k dispozícii pre účty POP3.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Na iné zobr. prepnete klepnutím na ikonu e-mailu"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Všetky správy"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Všetky neprečítané"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Všetky s hviezdičkou"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Prebieha načítav."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a298445..7851094 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/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="status_sending_messages" msgid="3971880826111264523">"Pošiljanje sporočil ..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Pošlji odhodna sporočila"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Pošlji vse"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pridobivanje priloge."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Pridobivanje priloge <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Preberi e-poštne priloge"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Naslednji"</string>
     <string name="okay_action" msgid="8365197396795675617">"V redu"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Prekliči"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Nazaj"</string>
     <string name="send_action" msgid="1729766205562446418">"Pošlji"</string>
     <string name="reply_action" msgid="4262472229221507619">"Odgovori"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Odgovori vsem"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Posreduj"</string>
     <string name="done_action" msgid="7497990549515580249">"Dokončano"</string>
     <string name="discard_action" msgid="6532206074859505968">"Zavrzi"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Shrani kot osnutek"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Shrani osnutek"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Prebrano/neprebrano"</string>
     <string name="read_action" msgid="4701484794504781686">"Označi kot prebrano"</string>
     <string name="unread_action" msgid="6280399049357552826">"Označi kot neprebrano"</string>
@@ -58,21 +57,18 @@
     <string name="accounts_action" msgid="901105887272231493">"Računi"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Označi kot prebrano"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kot neprebrano"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Dodaj »Kp«/»Skp«"</string>
+    <string name="move_action" msgid="3059189775933985898">"Premakni"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kp/Skp"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Dodaj prilogo"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Nastavitve izvoza ob zrušitvi"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Izberite prilogo"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Premakni v"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Nalaganje sporočil ..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"Napaka povezave"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nova e-pošta"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Nepričakovana napaka pri nalaganju sporočila. Sporočilo je morda predolgo za prikaz."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Premakni <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> sporočilo"</item>
+    <item quantity="one" msgid="1891601902988083907">"Premakni <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> sporočil"</item>
     <item quantity="other" msgid="8792313600381332865">"Premakni <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> sporočil"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računih"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"za <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> račun"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> računov"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Prejeto"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Odpošlji"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Osnutki"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Odpošlji"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Za osvežitev pritisnite in pridržite račun"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Nabiralnik"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombiniran pogled"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Naloži več sporočil"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> izbranih"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> izbranih"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Ni sporočil"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Za"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kp"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skp"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Zadeva"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Od:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Za:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Kp:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Skp:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Zadeva:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Novo sporočilo"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Izvirno sporočilo --------"\n"Zadeva: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Od: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Za: <xliff:g id="TO">%3$s</xliff:g>"\n"Kp: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisal:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citirano besedilo"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Vključi besedilo"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Dodati morate vsaj enega prejemnika."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nekateri e-poštni naslovi niso veljavni."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Datoteke ni mogoče pripeti, ker je prevelika."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kp:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Odpri"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Priloge ni bilo mogoče shraniti na kartico SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Prikaži"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Naloži"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Shrani"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Ustavi"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Priloga je shranjena kot <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Priloge ni mogoče shraniti."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Opomba: Ena ali več prilog v posredovanem sporočilu bo pred pošiljanjem prenesena iz strežnika."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Sporočilo"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Povabi"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Priloga <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Priloge <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Pokaži slike"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Prikaži v koledarju »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Prikaži v koledarju"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Povabilo koledarja"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Ali se boste udeležili?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Da"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Na to povabilo ste odgovorili z »morda«"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Zavrnili ste povabilo"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Ogledovanje <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Zavrzi sporočilo"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Želite zavreči sporočilo?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Želite zavreči sporočila?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Sporočilo izbrisano."</item>
     <item quantity="other" msgid="6574961322865652255">"Sporočila izbrisana."</item>
@@ -176,38 +164,41 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Sporočilo zavrženo."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Sporočilo shranjeno kot osnutek."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Te priloge ni mogoče prikazati."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Ni mogoče posredovati <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Priloge »<xliff:g id="FILENAME">%s</xliff:g>« ni mogoče naložiti."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Odpiranje sporočila ..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> sporočil premaknjenih v <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> sporočil premaknjenih v <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Ene ali več prilog ni bilo mogoče posredovati"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> ni mogoče posredovati"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> neuspela prijava"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Dotaknite se, če želite spremeniti nastavitve računa"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Starejše"</string>
     <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
     <skip />
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavitev računa"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj račun Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj račun Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-poštni račun"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"E-pošto lahko za večino računov nastavite le v nekaj korakih."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Račun Exchange lahko nastavite v nekaj korakih."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Račun Exchange ActiveSync lahko nastavite v nekaj korakih."</string>
@@ -224,13 +215,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Preverjanje nastavitev strežnika za dohodno pošto..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Preverjanje nastavitev strežnika za odhodno pošto..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavitev računa"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Vaš račun je nastavljen, e-pošta je na poti."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Poimenujte račun (neobvezno)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano v odhodnih sporočilih)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nastavitev računa"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Vrsta računa"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Katera vrsta računa je to?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavitev računa"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Nastavitve strežnika za dohodno pošto"</string>
@@ -264,12 +253,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena/uporabniško ime"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Uporabi varno povezavo (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Sprejmi vsa potrdila SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilne naprave"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Nastavitve računa"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Pogostost preverjanja e-pošte"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Možnosti računa"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Pogostost preverjanja mape »Prejeto«"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikoli"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Samodejno (potisno)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Vsakih 5 minut"</string>
@@ -281,8 +268,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Obvesti me, ko prispe e-pošta"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhroniziraj stike iz tega računa."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhroniziraj koledar iz tega računa"</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sinhroniziraj e-pošto iz tega računa"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Namestitve ni bilo mogoče končati"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Količina za sihnroniziranje"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dan"</string>
@@ -294,21 +280,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nepravilno uporabniško ime ali geslo."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Ni se mogoče varno povezati s strežnikom."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Ni se mogoče varno povezati s strežnikom."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Strežnik je odgovoril z napako; preverite uporabniško ime in geslo in poskusite znova."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Ni se mogoče povezati s strežnikom."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Ni se mogoče povezati s strežnikom."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Zahtevan je bil TLS, vendar ga strežnik ne podpira."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Strežnik ne podpira načinov preverjanja pristnosti."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Zaradi varnostne napake ni bilo mogoče vzpostaviti povezave s strežnikom."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Povezave s strežnikom ni bilo mogoče vzpostaviti."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Vnesli ste napačen naslov strežnika ali pa je za strežnik potrebna različico protokola, ki je program za e-pošto ne podpira."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Varnostno skrbništvo na daljavo"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Strežniku <xliff:g id="SERVER">%s</xliff:g> morate omogočiti, da na daljavo nadzira nekatere varnostne funkcije vašega telefona. Ali želite dokončati nastavitev tega računa?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ta strežnik zahteva varnostne funkcije, ki jih vaš telefon ne podpira."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"Opozorilo: Če onemogočite pravico e-poštnega programa za upravljanja naprave, boste izbrisali vse e-poštne račune, ki jo potrebujejo, skupaj z e-pošto, stiki, dogodki koledarja in drugimi podatki."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Varnostne nastavitve računa »<xliff:g id="ACCOUNT">%s</xliff:g>« je treba posodobiti."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Posodobitev varnostnih nastavitev"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Varnost naprave"</string>
@@ -320,16 +303,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Koda za odklepanje zaslona je potekla."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Potrebno je novo geslo za odklepanje zaslona"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Koda za odklepanje zaslona je potekla. Dotaknite se tukaj, da jo posodobite."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Želite zavreči neshranjene spremembe?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Splošne nastavitve"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Privzeti račun"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Privzeto pošiljaj e-pošto iz tega računa"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-poštna obvestila"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Pogostost sinhronizacije, obvestila itd."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Obvestilo v vrstici stanja, ko prispe e-pošta"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Pogostost preverjanja e-pošte"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Pogostost preverjanja mape »Prejeto«"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavitve dohodne pošte"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavitve odhodne pošte"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Ime računa"</string>
@@ -337,14 +318,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Pripni besedilo k poslanim sporočilom"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavitve obvestil"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinhroniziranje stikov"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhroniziraj tudi stike iz tega računa"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhroniziraj koledar"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhroniziraj tudi koledar tega računa"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinhroniziraj stike"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhroniziraj stike za ta račun"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhroniziraj koledar"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhroniziraj koledar za ta račun"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sinhr. e-pošto"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhroniziraj e-pošto za ta račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibriranje"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibriraj tudi, ko prejmem e-pošto"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vedno"</string>
@@ -355,10 +334,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavitve strežnika"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrani račun"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Račun »<xliff:g id="ACCOUNT">%s</xliff:g>« bo odstranjen iz e-pošte."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Odstrani račun"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Odstrani račun"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-pošti račun"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Izberite račun"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nadgradi račune"</string>
@@ -387,50 +364,36 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultatov iz <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Prvih <xliff:g id="RESULTS">%1$d</xliff:g> rezultatov z <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"E-poštne nastavitve"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Nastavitve programa"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Samodejno napredovanje"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Izberite, kateri zaslon naj se prikaže po brisanju sporočila"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Naprej do"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Novejša sporočila"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Starejše sporočilo"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Seznam sporočil"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Velikost besedila sporočila"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Prikaži vsebino sporočil v drobni pisavi"</item>
+    <item msgid="8239633518447359057">"Prikaži vsebino sporočil v mali pisavi"</item>
+    <item msgid="55959821477704302">"Prikaži vsebino sporočil v običajni pisavi"</item>
+    <item msgid="446236334663020508">"Prikaži vsebino sporočil v veliki pisavi"</item>
+    <item msgid="235926149071179467">"Prikaži vsebino sporočil v velikanski pisavi"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Velikost besedila sporočila"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Drobna"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Majhna"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Običajna"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velika"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velikanska"</string>
     <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
     <skip />
     <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
     <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Tapnite ikono e-pošte za druge poglede"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Vsa pošta"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Vsa neprebrana"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Vse z zvezdico"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Tapnite ikono e-pošte za druge poglede"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Vsa pošta"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Vsa neprebrana"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Vse z zvezdico"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Nalaganje ..."</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index efb3438..327707d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/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="status_sending_messages" msgid="3971880826111264523">"Слање порука је у току…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Пошаљи одлазне поруке"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Пошаљи све"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"У току је преузимање прилога."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"У току је преузимање прилога <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Читање прилога из е-порука"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Следеће"</string>
     <string name="okay_action" msgid="8365197396795675617">"Потврди"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Откажи"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Претходно"</string>
     <string name="send_action" msgid="1729766205562446418">"Пошаљи"</string>
     <string name="reply_action" msgid="4262472229221507619">"Одговори"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Одговори свима"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Проследи"</string>
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
     <string name="discard_action" msgid="6532206074859505968">"Одбаци"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Сачувај као недовршену поруку"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Сачувај недов. пор."</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Прочитано/непрочитано"</string>
     <string name="read_action" msgid="4701484794504781686">"Означи као прочитано"</string>
     <string name="unread_action" msgid="6280399049357552826">"Означи као непрочитано"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Налози"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Означи као прочитано"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Означи као непрочитано"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Додај Cc/Bcc"</string>
+    <string name="move_action" msgid="3059189775933985898">"Премести"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ копија/скривена копија"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Додај прилог"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Подешавања отклањања грешака"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Одаберите прилог"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Премести у"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Учитавање порука…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Грешка при повезивању"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Нова порука е-поште"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Дошло је до неочекиване грешке при учитавању текста поруке. Порука је можда превелика да би могла да се прикаже."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Премести поруке (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>)"</item>
-    <item quantity="other" msgid="8792313600381332865">"Премештање порука (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>)"</item>
+    <item quantity="one" msgid="1891601902988083907">"Премести <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> поруку"</item>
+    <item quantity="other" msgid="8792313600381332865">"Премести <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> порука"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"Непрочитане поруке: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"на <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> налога"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"коме: <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> налог"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> налога"</item>
+  </plurals>
     <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>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"За слање"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Притисните налог и сачекајте да се освежи"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Поштанско сандуче"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Комбиновани приказ"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Учитај још порука"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"Изабраних: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7901361399231876038">"Изабраних: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Нема порука"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Коме"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Копија"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Скривена копија"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Наслов"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Од:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Коме:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Копија:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Скривена копија:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Наслов:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Нова порука е-поште"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Изворна порука --------"\n"Наслов: <xliff:g id="SUBJECT">%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_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> је написао/ла:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Наведени текст"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Укључи текст"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Потребно је да додате бар једног примаоца."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Поједине адресе е-поште су неважеће."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Датотека је превелика за прилог."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Копија:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Отвори"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Није могуће сачувати прилог на SD картици."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Прикажи"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Учитај"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Сачувај"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Заустави"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Прилог је сачуван као <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Није могуће сачувати прилог."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Напомена: неки од прилога у прослеђеној поруци ће бити преузети пре слања."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Порука"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Позови"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Прилог <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Прилози <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Прикажи слике"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Прикажи у календару »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Прикажи у календару"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Позив у оквиру календара"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Идете ли?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Да"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"На ову позивницу сте одговорили са „можда“"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Одбили сте овај позив"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Преглед датотеке <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Одбаци поруку"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Одбацити поруку?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Одбацити ове поруке?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Порука је избрисана."</item>
     <item quantity="other" msgid="6574961322865652255">"Поруке су избрисане."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Порука је одбачена."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Порука је сачувана као недовршена."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Није могуће приказати овај прилог."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Није могуће проследити <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Прилог „<xliff:g id="FILENAME">%s</xliff:g>“ није учитан."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Отварање поруке…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> порука је премештено у <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> порука је премештено у <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Један или више прилога није прослеђено"</string>
+    <string name="forward_download_failed_notification" msgid="3122309797954781752">"Датотека <xliff:g id="FILENAME"> %s</xliff:g> није прослеђена"</string>
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Пријављивање на налог <xliff:g id="ACCOUNT_NAME">%s </xliff:g> није успело"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Додирните да бисте променили подешавања налога"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> kB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Старије"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Подешавање налога"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додавање Exchange налога"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додајте Exchange ActiveSync налог"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Налог е-поште"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"За већину налога е-пошту можете да конфигуришете у само неколико корака."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Exchange налог можете да конфигуришете у свега неколико корака."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Exchange ActiveSync налог можете да конфигуришете у свега неколико корака."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"У току је провера подешавања сервера за долазну пошту…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"У току је провера подешавања одлазног сервера…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Подешавање налога"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Налог је подешен и е-пошта стиже!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именујте овај налог (опционално)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше име (приказано у одлазним порукама)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Подешавање налога"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Тип налога"</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>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен/корисничко име"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Користите безбедну везу (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прихвати све SSL сертификате"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ИД мобилног уређаја"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Подешавања налога"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Учесталост провере е-поште"</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">"Аутоматски (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Сваких 5 минута"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Обавести ме о пријему поруке е-поште."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизуј контакте са овог налога."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизуј календар са овог налога."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Синхронизуј е-пошту са овог налога."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Није било могуће довршити поступак подешавања"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Налог за синхронизацију"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Један дан"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Корисничко име или лозинка нису тачни."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Безбедно повезивање са сервером није могуће."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Безбедно повезивање са сервером није могуће."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Сервер је као одговор дао грешку, проверите корисничко име и лозинку и покушајте поново."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Повезивање са сервером није могуће."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Повезивање са сервером није могуће."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS је захтеван, али га сервер не подржава."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Сервер не подржава методе потврде идентитета."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Услед безбедносне грешке није могуће успоставити везу са сервером."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Није било могуће успоставити везу са сервером."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Унели сте нетачну адресу сервера или сервер захтева верзију протокола коју е-пошта не подржава."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Удаљено безбедносно администрирање"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Сервер <xliff:g id="SERVER">%s</xliff:g> захтева да му омогућите удаљену контролу појединих безбедносних функција телефона. Желите ли да завршите поступак конфигурације овог налога?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Овај сервер захтева безбедносне функције које ваш телефон не подржава."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"УПОЗОРЕЊЕ: Деактивирањем овлашћења за апликацију е-поште да управља уређајем избрисаће налоге е-поште којима је то·потребно, заједно са е-адресом, контактима, догађајима календара и другим подацима."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Потребно је ажурирати безбедносна подешавања за налог „<xliff:g id="ACCOUNT">%s</xliff:g>“."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Безбедносна подешавања ажурирања"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Безбедност уређаја"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Кôд за откључавање екрана је истекао."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Потр. је ново откљ. екрана"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Кôд за откључавање екрана је истекао. Додирните овде да бисте га ажурирали."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Желите ли да одбаците несачуване промене?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Општа подешавања"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Подразумевани налог"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Подразумевано шаљи поруке е-поште са овог налога"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Обавештења е-поштом"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Синхронизација учесталости, обавештења итд."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Обавести ме у статусној траци када стигне порука е-поште"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Учесталост провере е-поште"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Учесталост провере пријемног сандучета"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Подешавања долазећих"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Подешавања одлазних"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Име налога"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Потпис"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Додајте текст порукама које шаљете"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Подешавања обавештења"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхронизација контаката"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизуј и контакте са овог налога"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизација календара"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизуј и календар са овог налога"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхронизација контаката"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизуј контакте за овај налог"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизуј календар"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизуј календар за овај налог"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Синхронизација е-поште"</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_vibrate_when_summary" msgid="3991584445166247189">"Вибрирај и када стигне порука е-поште"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Увек"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Подешавања сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Уклони налог"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Налог „<xliff:g id="ACCOUNT">%s</xliff:g>“ биће уклоњен из е-поште."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Уклони налог"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Уклони налог"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Е-пошта"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Избор налога"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Надоградња налога"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> резултата са домена <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Првих <xliff:g id="RESULTS">%1$d</xliff:g> резултата од <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Додирните икону за е-пошту за друге приказе"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Сва пошта"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Све непрочитане"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Све са звездицом"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Подешавања е-поште"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Подешавања апликације"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Аутоматски пређи"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Изаберите који екран желите да прикажете након брисања поруке"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Пређи на"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Новија порука"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Старија порука"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Листа порука"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Величина текста поруке"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Прикажи садржај порука текстом са веома малим словима"</item>
+    <item msgid="8239633518447359057">"Прикажи садржај порука текстом са малим словима"</item>
+    <item msgid="55959821477704302">"Прикажи садржај порука текстом нормалне величине"</item>
+    <item msgid="446236334663020508">"Прикажи садржај порука текстом са великим словима"</item>
+    <item msgid="235926149071179467">"Прикажи садржај порука текстом са огромним словима"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Величина текста поруке"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Мајушно"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Мало"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Нормалан"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Велика"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромно"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Аутоматски преузми прилоге"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Преузми прилоге за примљене поруке. (Не важи за POP3 налоге.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> од <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Додирните икону е-поште за друге приказе"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Сва пошта"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Све непрочитано"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Све са звездицом"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Учитавање…"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 1c1373d..590f1dd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Äldre"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoinställningar"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lägg till ett Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lägg till ett Exchange ActiveSync-konto"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Jättestor"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Hämta bilagor automatiskt"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Hämta bilagor till meddelanden (fungerar inte med POP3-konton)."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Knacka på e-postikonen om du vill välja andra vyer"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"All e-post"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Alla olästa"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Alla stjärnmärkta"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Knacka på e-postikonen om du vill välja andra vyer"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"All e-post"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Alla olästa"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Alla stjärnmärkta"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Läser in..."</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b51ba51..0c34d29 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/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="status_sending_messages" msgid="3971880826111264523">"กำลังส่งข้อความ..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"ส่งข้อความออก"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"ส่งทั้งหมด"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"กำลังเรียกไฟล์แนบ"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"กำลังเรียกไฟล์แนบ <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"อ่านไฟล์แนบของอีเมล"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"ถัดไป"</string>
     <string name="okay_action" msgid="8365197396795675617">"ตกลง"</string>
     <string name="cancel_action" msgid="6967435583794021865">"ยกเลิก"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"ก่อนหน้า"</string>
     <string name="send_action" msgid="1729766205562446418">"ส่ง"</string>
     <string name="reply_action" msgid="4262472229221507619">"ตอบกลับ"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"ตอบกลับทั้งหมด"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"ส่งต่อ"</string>
     <string name="done_action" msgid="7497990549515580249">"เสร็จสิ้น"</string>
     <string name="discard_action" msgid="6532206074859505968">"ยกเลิก"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"บันทึกเป็นร่างจดหมาย"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"บันทึกร่างจดหมาย"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"อ่านแล้ว/ยังไม่อ่าน"</string>
     <string name="read_action" msgid="4701484794504781686">"ทำเครื่องหมายว่าอ่านแล้ว"</string>
     <string name="unread_action" msgid="6280399049357552826">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"บัญชี"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"ทำเครื่องหมายว่าอ่านแล้ว"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"เพิ่ม สำเนา/สำเนาลับ"</string>
+    <string name="move_action" msgid="3059189775933985898">"ย้าย"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ สำเนา/สำเนาลับ"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"เพิ่มไฟล์แนบ"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"การตั้งค่าดัมพ์"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"เลือกไฟล์แนบ"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"ย้ายไปที่"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"กำลังโหลดข้อความ..."</string>
     <string name="status_network_error" msgid="6045933332005067021">"ข้อผิดพลาดของการเชื่อมต่อ"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"อีเมลใหม่"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"พบข้อผิดพลาดที่ไม่คาดคิดระหว่างโหลดข้อความตัวอักษร ข้อความอาจใหญ่เกินไปสำหรับการดู"</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"ย้ายข้อความ <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> รายการ"</item>
-    <item quantity="other" msgid="8792313600381332865">"ย้ายข้อความ <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> รายการ"</item>
+    <item quantity="one" msgid="1891601902988083907">"ย้าย <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ข้อความ"</item>
+    <item quantity="other" msgid="8792313600381332865">"ย้าย <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ข้อความ"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ฉบับที่ยังไม่ได้อ่าน (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"ในบัญชี <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> บัญชี"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"ถึง <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> บัญชี"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> บัญชี"</item>
+  </plurals>
     <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>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"กล่องจดหมายออก"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"กดบัญชีค้างไว้เพื่อรีเฟรช"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"กล่องจดหมาย"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"มุมมองแบบรวม"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"โหลดข้อความเพิ่มเติม"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> รายการที่เลือกไว้"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> รายการที่เลือกไว้"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"ไม่มีข้อความ"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"ถึง"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"สำเนา"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"สำเนาลับ"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"เรื่อง"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"จาก:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"ถึง:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"สำเนา:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"สำเนาลับ:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"หัวเรื่อง:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"เขียนจดหมาย"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- ข้อความต้นฉบับ --------"\n"เรื่อง: <xliff:g id="SUBJECT">%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_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> เขียนว่า:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"ข้อความที่ยกมา"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"รวมข้อความ"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"คุณต้องเพิ่มผู้รับอย่างน้อยหนึ่งราย"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"ที่อยู่อีเมลบางที่อยู่ไม่ถูกต้อง"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"ไฟล์ใหญ่เกินไปที่จะแนบ"</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"สำเนา:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"เปิด"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"ไม่สามารถบันทึกไฟล์แนบในการ์ด SD"</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"ดู"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"โหลด"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"บันทึก"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"หยุด"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"เอกสารแนบถูกบันทึกเป็น <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"บันทึกเอกสารแนบไม่ได้"</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"หมายเหตุ: เอกสารแนบอย่างน้อยหนึ่งรายการในข้อความที่ส่งต่อของคุณจะมีการดาวน์โหลดก่อนส่ง"</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"ข้อความ"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"เชิญ"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"เอกสารแนบ <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"เอกสารแนบ <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"แสดงรูปภาพ"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"ดูในปฏิทิน »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"ดูในปฏิทิน"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"ข้อความเชิญในปฏิทิน"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"เข้าร่วมหรือไม่"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" ใช่"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"คุณได้ตอบข้อความเชิญนี้ว่า \"อาจจะ\""</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"คุณได้ปฏิเสธข้อความเชิญนี้"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"กำลังดู <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"ยกเลิกข้อความ"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"ยกเลิกข้อความนี้หรือไม่"</item>
+    <item quantity="other" msgid="5071164417794016228">"ยกเลิกข้อความเหล่านี้หรือไม่"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"ลบข้อความแล้ว"</item>
     <item quantity="other" msgid="6574961322865652255">"ข้อความถูกลบแล้ว"</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"ยกเลิกข้อความแล้ว"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"บันทึกข้อความเป็นร่างจดหมาย"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"ไม่สามารถแสดงไฟล์แนบนี้"</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"ไม่สามารถโหลดเอกสารแนบ \" <xliff:g id="FILENAME">%s</xliff:g>\" ได้"</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"กำลังเปิดข้อความ..."</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ข้อความถูกย้ายไปที่ <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ข้อความถูกย้ายไปที่ <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"ไม่สามารถส่งต่อเอกสารแนบอย่างน้อยหนึ่งรายการ"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"ไม่สามารถส่งต่อ <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"การลงชื่อเข้าใช้ของ <xliff:g id="ACCOUNT_NAME">%s </xliff:g> ล้มเหลว"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"แตะเพื่อเปลี่ยนการตั้งค่าบัญชี"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ไบต์"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>ไบต์"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"เก่ากว่า"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"เพิ่มบัญชี Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"เพิ่มบัญชี Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"บัญชีอีเมล"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"คุณสามารถกำหนดค่าอีเมลสำหรับบัญชีส่วนใหญ่ได้ในไม่กี่ขั้นตอน"</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"คุณสามารถกำหนดค่าบัญชี Exchange ได้ในไม่กี่ขั้นตอน"</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"คุณสามารถกำหนดค่าบัญชี Exchange ActiveSync ได้ในไม่กี่ขั้นตอน"</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาเข้า..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาออก..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"การตั้งค่าบัญชี"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"ตั้งค่าบัญชีของคุณแล้ว และอีเมลกำลังมาถึง"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"ตั้งชื่อให้กับบัญชีนี้ (เป็นตัวเลือก)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"ชื่อของคุณ (แสดงในข้อความขาออก)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"การตั้งค่าบัญชี"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"ประเภทบัญชี"</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>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"โดเมน\\ชื่อผู้ใช้"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"ใช้การเชื่อมต่อที่ปลอดภัย (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"ยอมรับใบรับรอง SSL ทั้งหมด"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID โทรศัพท์มือถือ"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"การตั้งค่าบัญชี"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"ความถี่ในการเช็คอีเมล"</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">"อัตโนมัติ (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"ทุก 5 นาที"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"แจ้งให้ฉันทราบเมื่อมีอีเมลเข้า"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"ซิงค์รายชื่อจากบัญชีนี้"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"ซิงค์ปฏิทินจากบัญชีนี้"</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"ซิงค์อีเมลจากบัญชีนี้"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"การตั้งค่าไม่สมบูรณ์"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"จำนวนที่จะซิงค์"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"หนึ่งวัน"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"เซิร์ฟเวอร์ตอบสนองโดยมีข้อผิดพลาด โปรดตรวจสอบชื่อผู้ใช้และรหัสผ่านของคุณ แล้วลองอีกครั้ง"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"ต้องใช้ TLS แต่เซิร์ฟเวอร์ไม่สนับสนุน"</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"เซิร์ฟเวอร์ไม่สนับสนุนวิธีการตรวจสอบความถูกต้อง"</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"ไม่สามารถเปิดการเชื่อมต่อไปยังเซิร์ฟเวอร์ เนื่องจากข้อผิดพลาดด้านความปลอดภัย"</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"ไม่สามารถเปิดการเชื่อมต่อไปยังเซิร์ฟเวอร์"</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"คุณป้อนที่อยู่เซิร์ฟเวอร์ไม่ถูกต้อง หรือเซิร์ฟเวอร์ต้องการโปรโตคอลรุ่นที่อีเมลไม่สนับสนุน"</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"การจัดการด้านความปลอดภัยจากระยะไกล"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"เซิร์ฟเวอร์ <xliff:g id="SERVER">%s</xliff:g> ต้องการให้คุณอนุญาตให้ควบคุมคุณลักษณะด้านความปลอดภัยบางอย่างของโทรศัพท์คุณได้จากระยะไกล คุณต้องการตั้งค่าบัญชีนี้ให้เสร็จหรือไม่"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"เซิร์ฟเวอร์นี้ต้องการคุณลักษณะด้านความปลอดภัยที่โทรศัพท์คุณไม่สนับสนุน"</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"คำเตือน: การปิดการใช้งานสิทธิ์ของแอปพลิเคชันอีเมลในการดูแลอุปกรณ์ของคุณจะเป็นการลบบัญชีอีเมลทั้งหมดที่จำเป็นต้องใช้สิทธิ์นั้น พร้อมทั้งอีเมล สมุดโทรศัพท์ กิจกรรมในปฏิทิน และข้อมูลอื่นๆ"</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ต้องการการอัปเดตการตั้งค่าความปลอดภัย"</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"อัปเดตการตั้งค่าความปลอดภัย"</string>
     <string name="account_security_title" msgid="4441470647344315196">"ความปลอดภัยอุปกรณ์"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"รหัสปลดล็อกหน้าจอของคุณหมดอายุแล้ว"</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"ต้องกำหนดรหัสปลดล็อกหน้าจอใหม่"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"รหัสปลดล็อกหน้าจอของคุณหมดอายุแล้ว แตะที่นี่เพื่ออัปเดต"</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"ยกเลิกการเปลี่ยนแปลงที่ยังไม่ได้บันทึกหรือไม่"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"การตั้งค่าทั่วไป"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"บัญชีเริ่มต้น"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"การแจ้งเตือนทางอีเมล"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"ความถี่ในการซิงค์ การแจ้งเตือน ฯลฯ"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"แจ้งในแถบสถานะเมื่อมีอีเมลเข้า"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"ความถี่ในการเช็คอีเมล"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"ความถี่ในการตรวจสอบกล่องจดหมาย"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"การตั้งค่าข้อความขาเข้า"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"การตั้งค่าข้อความขาออก"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"ชื่อบัญชี"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"ลายเซ็น"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"เพิ่มข้อความต่อท้ายจดหมายที่คุณส่ง"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"การตั้งค่าการแจ้งเตือน"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"ซิงค์รายชื่อในสมุดโทรศัพท์"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ซิงค์รายชื่อในสมุดโทรศัพท์จากบัญชีนี้"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"ซิงค์ปฏิทิน"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"ซิงค์ปฏิทินจากบัญชีนี้"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"ซิงค์สมุดโทรศัพท์"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ซิงค์สมุดโทรศัพท์สำหรับบัญชีนี้"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"ซิงค์ปฏิทิน"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"ซิงค์ปฏิทินสำหรับบัญชีนี้"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"ซิงค์อีเมล"</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_vibrate_when_summary" msgid="3991584445166247189">"สั่นเมื่อมีอีเมลเข้า"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ทุกครั้ง"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"การตั้งค่าเซิร์ฟเวอร์"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"ลบบัญชี"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" จะถูกลบจากอีเมล"</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"นำบัญชีออก"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"นำบัญชีออก"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"บัญชีอีเมล"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"เลือกบัญชี"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"อัปเกรดบัญชี"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"ผลลัพธ์ <xliff:g id="RESULTS">%1$d</xliff:g> รายการจาก <xliff:g id="DOMAIN">%2$s</xliff:g> รายการ"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"ผลลัพธ์ <xliff:g id="RESULTS">%1$d</xliff:g> รายการแรกจาก <xliff:g id="DOMAIN">%2$s</xliff:g> รายการ"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"แตะที่ไอคอนอีเมลสำหรับมุมมองอื่นๆ"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"จดหมายทั้งหมด"</string>
-    <string name="widget_unread" msgid="488582205091831168">"ยังไม่ได้อ่านทั้งหมด"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"ที่ติดดาวทั้งหมด"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"ค่ากำหนดของอีเมล"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"ค่ากำหนดของแอปพลิเคชัน"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"เลื่อนไปข้างหน้าโดยอัตโนมัติ"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"เลือกหน้าจอที่จะแสดงขึ้นหลังจากที่คุณลบข้อความ"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"เลื่อนไปที่"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"ข้อความที่ใหม่กว่า"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"ข้อความที่เก่ากว่า"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"รายการข้อความ"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"ขนาดตัวอักษรข้อความ"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"แสดงเนื้อหาของข้อความเป็นตัวอักษรขนาดเล็กมาก"</item>
+    <item msgid="8239633518447359057">"แสดงเนื้อหาของข้อความเป็นตัวอักษรขนาดเล็ก"</item>
+    <item msgid="55959821477704302">"แสดงเนื้อหาของข้อความเป็นตัวอักษรขนาดปกติ"</item>
+    <item msgid="446236334663020508">"แสดงเนื้อหาของข้อความเป็นตัวอักษรขนาดใหญ่"</item>
+    <item msgid="235926149071179467">"แสดงเนื้อหาของข้อความเป็นตัวอักษรขนาดใหญ่มาก"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"ขนาดตัวอักษรข้อความ"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"เล็กมาก"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"เล็ก"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"ปกติ"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"ใหญ่"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ใหญ่มาก"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"ดึงข้อมูลเอกสารแนบโดยอัตโนมัติ"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"ดาวน์โหลดเอกสารแนบของข้อความในกล่องจดหมาย (ไม่สามารถใช้กับบัญชีแบบ POP3 ได้)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> จาก <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"แตะที่ไอคอนอีเมลสำหรับมุมมองอื่นๆ"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"จดหมายทั้งหมด"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"ยังไม่ได้อ่านทั้งหมด"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"ที่ติดดาวทั้งหมด"</string>
     <string name="widget_loading" msgid="2340962056927255554">"กำลังโหลด…"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c25ba7f..c8e59e4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/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="status_sending_messages" msgid="3971880826111264523">"Nagpapadala ng mga mensahe…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Magpadala ng mga papalabas na mensahe"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Ipadala lahat"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Kinukuha ang attachment."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Kinukuha ang attachment <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Basahin ang mga attachment ng Email"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Susunod"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Kanselahin"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Nakaraan"</string>
     <string name="send_action" msgid="1729766205562446418">"Ipadala"</string>
     <string name="reply_action" msgid="4262472229221507619">"Tumugon"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Tumugon sa lahat"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Ipasa"</string>
     <string name="done_action" msgid="7497990549515580249">"Tapos na"</string>
     <string name="discard_action" msgid="6532206074859505968">"Itapon"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"I-save bilang draft"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"I-save ang draft"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Nabasa na/Hindi pa nababasa"</string>
     <string name="read_action" msgid="4701484794504781686">"Markahan ng nabasa na"</string>
     <string name="unread_action" msgid="6280399049357552826">"Markahan bilang hindi pa nabasa"</string>
@@ -58,21 +57,18 @@
     <string name="accounts_action" msgid="901105887272231493">"Mga Account"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Markahan bilang nabasa na"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markahan bilang hindi pa nababasa"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Magdagdag ng Cc/Bcc"</string>
+    <string name="move_action" msgid="3059189775933985898">"Ilipat"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Magdagdag ng attachment"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Mga setting sa pagtapon"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pumili ng attachment"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Ilipat sa"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Naglo-load ng mga mensahe…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Error sa koneksyon"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Bagong email"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Hindi inaasahang error habang naglo-load ng teksto ng mensahe. Maaaring masyadong malaki ang mensahe upang tingnan."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Ilipat ang <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>(na) mensahe"</item>
+    <item quantity="one" msgid="1891601902988083907">"Ilipat ang <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (na) mensahe"</item>
     <item quantity="other" msgid="8792313600381332865">"Ilipat ang <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (na) mensahe"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"sa <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (na) account"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"sa <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> account"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> account"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inbox"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Outbox"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Mga Draft"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Outbox"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mangyaring pindutin nang matagal ang account upang i-refresh ito"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Mailbox"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Pinagsamang pagtingin"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Mag-load nang marami pang mensahe"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> ang napili"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> ang napili"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Walang mga mensahe"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para kay"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Paksa"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Mula:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Para Kay:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Paksa:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Bumuo ng Mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Orihinal na Mensahe --------"\n"Paksa: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Mula kay: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para kay: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">"Si "\n\n"<xliff:g id="SENDER">%s</xliff:g> ay sumulat:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Naka-quote na teksto"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Isama ang teksto"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Dapat kang magdagdag ng hindi bababa sa isang recipient."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Di-wasto ang ilang email address."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Masyadong malaki ang file upang i-attach."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Buksan"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Hindi magawang mag-save ng attachment sa SD card."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Tingnan"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"I-load"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"I-save"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Huminto"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Na-save attachment na <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Hindi na-save ang bookmark."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Paalala: Ida-download bago ang pagpapadala ang isa o higit pang mga attachment sa iyong ipinasang mensahe."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensahe"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Imbitahan"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Attachment <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Attachment <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Ipakita ang mga larawan"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Tingnan sa Kalendaryo »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Tingnan sa Kalendaryo"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Imbitasyon sa Kalendaryo"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Pupunta?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Oo"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Tumugon ka ng \"maaari\" sa imbitasyong ito"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Tinanggihan mo ang imbitasyong ito"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Tinitingnan <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Itapon mensahe"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Itapon ang mensaheng ito?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Itapon ang mga mensaheng ito?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Tinanggal ang mensahe."</item>
     <item quantity="other" msgid="6574961322865652255">"Tinanggal ang mga mensahe."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Itinapon ang mensahe."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Na-save ang mensahe bilang draft."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Hindi maipapakita ang attachment na ito."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Hindi ma-load ang attachment na \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Binubuksan ang mensahe…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (na) mensahe ang nailipat sa <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (na) mensahe ang nailipat sa <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Hindi maipasa ang isa o higit pang mga attachment"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Hindi maipasa ang <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Bigo sign-in <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Pindutin upang baguhin ang mga setting ng account"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Mas luma"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Setup ng account"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Magdagdag ng Exchange account"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Magdagdag ng Exchange ActiveSync account"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Email account"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Maaari kang mag-configure ng Email para sa karamihang account sa ilang hakbang lang."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Maaari kang mag-configure ng Exchange account sa ilang hakbang lang."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Maaari kang mag-configure ng Exchange ActiveSync account sa ilang hakbang lang."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sinusuri ang mga setting ng papasok na server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sinusuri ang mga setting ng papalabas na server…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Setup ng account"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Naka-set up ang iyong account, at paparating na ang email!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bigyan ng pangalan ang account na ito (opsyonal)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Iyong pangalan (na ipinapakita sa mga papalabas na mensahe)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Setup ng account"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Uri ng account"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Anong uri ng account ito?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Setup ng account"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Mga setting ng papasok na server"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gumamit ng secure na koneksyon (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tanggapin ang lahat ng mga SSL certificate"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobile Device ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Mga setting ng account"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Dalas ng pagsusuri ng email"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Mga pagpipilian sa account"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Dalas ng pagtingin sa inbox"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Hindi kailanman"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Awtomatiko (Itulak)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Tuwing 5 minuto"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"I-notify ako kapag dumating ang email."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"I-sync ang mga contact mula sa account na ito."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"I-sync ang kalendaryo mula sa account na ito"</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"I-sync ang email mula sa account na ito."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Hindi matapos ang pag-setup"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Halagang isi-synchronize"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Isang araw"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Mali ang username o password."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Hindi ligtas na makakonekta sa server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Hindi ligtas na makakonekta sa server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Tumugon ang server nang may error; pakitingnan ang iyong username at password at subukang muli."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Hindi makakontekta sa server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Hindi makakonekta sa server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Kinakailangan ang TLS ngunit hindi suportado ng server."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Hindi suportado ng server ng mga pamamaraan sa pagpapatotoo."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Hindi magawang buksan ang koneksyon sa server dahil sa error sa seguridad."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Hindi magawang buksan ang koneksyon sa server."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Nagpasok ka ng maling address ng server o nangangailangan ang server ng bersyon ng protocol na hindi sinusuportahan ng Email."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Pangangasiwa ng remote na seguridad"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Kinakailangan ng server na <xliff:g id="SERVER">%s</xliff:g> na payagan mo itong kontrolin ang ilang tampok sa seguridad ng iyong telepono. Nais mo bang tapusin ang pag-set up ng account na ito?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Nangangailangan ang server na ito ng mga tampok sa seguridad na hindi sinusuportahan ng iyong telepono."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"BABALA: Tatanggalin ng pag-deactivate ng awtoridad ng Email application na pangasiwaan ang iyong device ang lahat ng mga Email account na ngangailangan nito, kasama ang mga email, contact, kaganapan sa kalendaryo, at iba pang data ng mga ito."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Nangangailangan ang account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ng pag-update ng mga setting ng seguridad."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"I-update ang Mga Setting ng Seguridad"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Seguridad ng Device"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Nag-expire na ang iyong screen unlock code."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Kailangan bago screen unlock"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Nag-expire na ang iyong screen unlock code. Pumindot dito upang ma-update ito."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Itapon ang hindi naka-save na mga pagbabago?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Mga pangkalahatang setting"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Default na account"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Magpadala ng email mula sa account na ito bilang default"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Mga notification sa email"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Dalas ng pag-sync, mga notification, atbp."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"I-notify sa status bar kapag dumating ang email"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Dalas ng pagsusuri ng email"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Dalas ng pagtingin sa inbox"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Mga setting ng papasok"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mga setting ng papalabas"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Pangalan ng account"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Lagda"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Magsama ng teksto sa mga mensaheng iyong ipinapadala"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Mga setting ng notification"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"I-sync ang mga contact"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"I-sync rin ang mga contact mula sa account na ito"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"I-sync ang kalendaryo"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Mag-sync rin ng kalendaryo mula sa account na ito"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"I-sync Mga Contact"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sync ang contact sa account na ito"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sync ang Kalendaryo"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"I-sync kalendaryo sa account na ito"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"I-sync ang Email"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"I-sync ang email sa account na ito"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"I-vibrate"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"I-vibrate rin kapag dumating ang email"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Palagi"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Mga setting ng server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alisin ang account"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Aalisin ang account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" mula sa Email."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Alisin ang account"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Alisin ang account"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Email account"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Pumili ng account"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"I-upgrade ang mga account"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> (na) resulta mula sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Unang <xliff:g id="RESULTS">%1$d</xliff:g> (na) resulta mula sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Tapikin ang icon ng email para sa ibang pagtingin"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Lahat ng Mail"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Lahat Hindi pa Basa"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Lahat ng Naka-star"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Mga Kagustuhan sa Email"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Mga Kagustuhan sa Application"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Auto-advance"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Piliin ang screen na ipapakita matapos kang magtanggal ng mensahe"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Mag-advance sa"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mas bagong mga mensahe"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mas lumang mensahe"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Listahan ng mensahe"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Laki ng teksto ng mensahe"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Ipakita ang nilalaman ng mga mensahe sa napakaliit na teksto"</item>
+    <item msgid="8239633518447359057">"Ipakita ang nilalaman ng mga mensahe sa maliit na teksto"</item>
+    <item msgid="55959821477704302">"Ipakita ang nilalaman ng mga mensahe sa karaniwang laking teksto"</item>
+    <item msgid="446236334663020508">"Ipakita ang nilalaman ng mga mensahe sa napakalaking teksto"</item>
+    <item msgid="235926149071179467">"Ipakita ang nilalaman ng mga mensahe sa napakalaking teksto"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Laki ng teksto ng mensahe"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Napakaliit"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Maliit"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Malaki"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Malaki"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Awtomatikong kumuha ng mga attachment"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Mag-download ng mga attachment para sa mga mensaheng Inbox. (Hindi available para sa mga POP3 account.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ng <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Tapikin ang icon ng email para sa ibang pagtingin"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Lahat ng Mail"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Lahat Hindi pa Basa"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Lahat ng Naka-star"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Naglo-load..."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 736d685..44f6168 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Daha eski"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Hesap kurulumu"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Bir Exchange hesabı ekleyin"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Bir Exchange ActiveSync hesabı ekleyin"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Büyük"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Çok büyük"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Ekleri otomatik getir"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Gelen kts için iletlrn eklrn indir. (POP3 hesplr için kullnlmz.)"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"Diğer görünümler için e-posta simgesine dokunun"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Tüm Postalar"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Okunmayanların tümü"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Tüm Yıldızlılar"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Diğer görnmler için e-posta simgesne hafifçe vurun"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Tüm Postalar"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Okunmayanların tümü"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Tüm Yıldızlılar"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Yükleniyor…"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 86d4918..14b5748 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/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="status_sending_messages" msgid="3971880826111264523">"Надсил-ня листів…"</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Надісл. вихідні повідомл."</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Надіслати всі"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Отримання вклад. файлу."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Отримання вклад. файлу <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Читати вклад. файли пошти"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Далі"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Скасувати"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Назад"</string>
     <string name="send_action" msgid="1729766205562446418">"Надісл."</string>
     <string name="reply_action" msgid="4262472229221507619">"Відпов."</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Відпов. всім"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Переслати"</string>
     <string name="done_action" msgid="7497990549515580249">"Готово"</string>
     <string name="discard_action" msgid="6532206074859505968">"Відхилити"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Збер. як чернетку"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Зберег. чернетку"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Прочит./непроч."</string>
     <string name="read_action" msgid="4701484794504781686">"Позн. як проч."</string>
     <string name="unread_action" msgid="6280399049357552826">"Позн. як непроч."</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Обл. записи"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Позн. як прочит."</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Дод. копію/прих.копію"</string>
+    <string name="move_action" msgid="3059189775933985898">"Переміст."</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Коп./Прих.коп."</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Дод. вклад. файл"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Налашт-ня дампу"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Виберіть вклад. файл"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Перемістити до"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Завантаження повідомлень…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Помилка з\'єднання"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Новий лист"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Неочік. помилка під час завант. тексту повід. Воно може бути завелике для перегл."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Перемістити повідомлень: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="8792313600381332865">"Перемістити повідомлень: <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>"</item>
+    <item quantity="one" msgid="1891601902988083907">"Переміщ. <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> повід."</item>
+    <item quantity="other" msgid="8792313600381332865">"Переміщ. <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> повід."</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> непрочит. (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"у <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> обл. записах"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"кому: <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> обл. запис"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> обл. зап."</item>
+  </plurals>
     <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>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Вихідні"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Натисн. і утрим. обл. запис, щоб його онов."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Пошт. скр."</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Об\'єднаний перегляд"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Завант. інші повід."</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"Вибрано <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7901361399231876038">"Вибрано <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Немає повідомлень"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Кому"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Копія"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Прих. копія"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Тема"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Від:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Кому:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Копія:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Прих. копія:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Тема:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Напишіть лист"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Оригінал. повід. --------"\n"Тема: <xliff:g id="SUBJECT">%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_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> напис.:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитований текст"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Включити текст"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Потрібно додати принаймні 1 отримувача."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Деякі електронні адреси недійсні."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл завеликий для вклад."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Копія:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Відкр."</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Немож. зберегти вклад. файл на карті SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Переглян."</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Завантаж."</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Зберегти"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Зупинити"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Вклад. файл збереж. як <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Неможл. зберегти вклад. файл."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Примітка. Перед надсиланням буде завантажено один або кілька вкладених файлів із повідомлення, яке ви пересилаєте."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Повідомлення"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Запрошення"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Вклад.файл <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Вкладення: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показати зображ."</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Див. в Календарі »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Переглянути в Календарі"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Запрош. календаря"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Підете?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Так"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Ваша відповідь на це запрошення: \"Можливо\""</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Ви відхилили це запрошення"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Перегляд <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Відхилити повід."</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Відхилити це повідомлення?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Відхилити ці повідомлення?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Повідом. видалено."</item>
     <item quantity="other" msgid="6574961322865652255">"Повідомл. видалено."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Повідомл. відхилено."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Лист збереж. як чернетку."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Цей вкладений файл неможливо показати."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Неможливо завантажити вкладений файл \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Відкривання повідомлення…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"До <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> переміщено <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> повідомлення"</item>
+    <item quantity="other" msgid="2286739630865943494">"До <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> переміщено <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> повідомл."</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Неможливо переслати один або кілька вкладених файлів"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Неможливо переслати <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Помилка входу <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Торкніться, щоб змінити налаштування облікового запису"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Кб"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> Кб"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Мб"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Мб"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Гб"</item>
+    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Гб"</item>
+  </plurals>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Старіші"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Налаштування облікового запису"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додати обл. запис Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додати обл. запис Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Обліковий запис електронної пошти"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Можна налашт. пошту для більшості обл. зап. через ряд дій."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Можна налашт-ти облік. запис Exchange за допом. ряду дій."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Можна налашт-ти облік. запис Exchange ActiveSync за допом. ряду дій."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Перевірка налашт-нь вихід. сервера…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Перевірка налашт-нь вихід. сервера…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Налаштування облікового запису"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Ваш обліковий запис налаштовано. Скоро надійдуть листи!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Назвіть цей обл. запис. (додатково)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше ім\'я (відображено у вихідних повідомл.)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Налаштування облікового запису"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Тип облікового запису"</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>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\ім\'я корист."</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Викор. безпеч. з\'єднання (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прийняти всі сертифікати SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Ідентифікатор мобіл. пристрою"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Параметри облікового запису"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота перевірки ел. пошти"</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>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Сповіщ. мене, коли надійде лист"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхрон. контакти з цього обл. зап."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхроніз. календ. з обл. запису."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Синхр. ел. пошту з обл. запису."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Налаштування не заверш."</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"К-сть для синхронізації"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Один день"</string>
@@ -294,42 +279,37 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Ім\'я корист. чи пароль неправильн."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Неможл. безпечно підкл. до сервера."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Неможл. безпечно підключ. до серв."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Сервер повідомив про помилку. Перевірте своє ім\'я користувача та пароль і спробуйте ще."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Неможл. підключ. до сервера."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Неможл. підключ. до сервера."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS обов\'язк., але не підтрм. цим сервером."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Методи автентифікації не підтримуються сервером."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Неможл. відкрити підключ. до сервера через помилку безпеки."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Неможл. відкрити підключ. до сервера."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Введено неправильну адресу сервера чи сервер потребує версію протоколу, яка не підтримується електронною поштою."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Віддалене керування безпекою"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Сервер <xliff:g id="SERVER">%s</xliff:g> потребує вашого дозволу віддалено контролювати деякі функції безпеки вашого телефону. Завершити налаштування цього облікового запису?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Цей сервер потребує функцій захисту, які не підтрим. вашим телефоном."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ЗАСТЕРЕЖЕННЯ. Дезактивація повноважень програми електронної пошти на адміністрування вашого пристрою призведе до видалення всіх облікових записів електронної пошти, що вимагають адміністрування, разом із їхніми електронними листами, контактами, подіями календаря й іншими даними."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Облік. запис \"<xliff:g id="ACCOUNT">%s</xliff:g>\" потреб. оновл. налашт-нь безпеки"</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Оновл. налашт-нь безпеки"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Безпека пристрою"</string>
     <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Сервер <xliff:g id="SERVER">%s</xliff:g> потребує вашого дозволу віддалено контролювати деякі функції безпеки вашого телефону."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Редаг. деталі"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="950001176659814912">"Для облікового запису \"<xliff:g id="ACCOUNT">%s</xliff:g>\" потрібно оновити ваш код розблокування екрана."</string>
+    <string name="password_expire_warning_ticker_fmt" msgid="950001176659814912">"Для облікового запису \"<xliff:g id="ACCOUNT">%s</xliff:g>\" потрібно оновити код розблокування екрана."</string>
     <string name="password_expire_warning_content_title" msgid="4602564325906174785">"Потр. нов. код розблок. екр."</string>
     <string name="password_expire_warning_content_text_fmt" msgid="4302557343790365263">"Для облікового запису \"<xliff:g id="ACCOUNT">%s</xliff:g>\" потрібно оновити ваш код розблокування екрана. Торкніться тут, щоб оновити його."</string>
     <string name="password_expired_ticker" msgid="5698508544187945595">"Термін дії коду розблокування екрана завершився."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Потр. нов. код розблок. екр."</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Термін дії коду розблокування екрана завершився. Торкніться тут, щоб оновити його."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Відхилити незбережені зміни?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Загальні налашт-ня"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Обл. зап. за умовч."</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Надіс. ел.листи з цього обл. зап. за умовч."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Сповіщення ел. пошти"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Синхронізуйте частоту, сповіщення тощо"</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Сповіщ. в рядку стану, коли надійде лист"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Частота перевірки пошти"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Частота перевірки вхідн."</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Налашт. вхід. повід."</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Налашт-ня вихідних"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Назва обл. зап."</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Підпис"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Додав. текст у надісл. повідомл."</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Налаштування сповіщень"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхрон. контакти"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Також синхроніз. контакти з обл. запису"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхрон. календ."</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Також синхроніз. календ. з обл. запису"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхроніз. контакти"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхрон. контакти для облік. запису"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхроніз. Календар"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхроніз. календар для обл. запису"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Синхроніз. ел. пошту"</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_vibrate_when_summary" msgid="3991584445166247189">"Також вібрув., коли надійде лист"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Завжди"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Налашт-ня сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Видал. обл. зап."</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Обліковий запис \"<xliff:g id="ACCOUNT">%s</xliff:g>\" буде видалено з Пошти."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Видалити обліковий запис"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Видалити обліковий запис"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Обл.зап.пошти"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Вибрати облік. запис"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Онов. облік. записи"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"Результатів з <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Перші <xliff:g id="RESULTS">%1$d</xliff:g> результ. з <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Натисніть значок ел. пошти для інших переглядів"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Уся пошта"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Усі непрочитані"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Усі із зірочкою"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Налашт-ня ел. пошти"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Налаштування програми"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Автоматичний перехід"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Виберіть, що відображати після видалення повідомлення"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Перейти до"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Новішого повідомлення"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Старішого повідомлення"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Списку повідомлень"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Розмір тексту повідомлення"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Відображати вміст повідомлень текстом дуже малого розміру"</item>
+    <item msgid="8239633518447359057">"Відображати вміст повідомлень текстом малого розміру"</item>
+    <item msgid="55959821477704302">"Відображати вміст повідомлень текстом звичайного розміру"</item>
+    <item msgid="446236334663020508">"Відображати вміст повідомлень текстом великого розміру"</item>
+    <item msgid="235926149071179467">"Відображати вміст повідомлень текстом дуже великого розміру"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Розмір тексту повідомлення"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Дуже малий"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Малий"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Звичайний"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Великий"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Дуже великий"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Автомат. отримувати вклад. файли"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Завантаж. вклад. файлів для вхідних повід. (Недоступ. для обл. зап. POP3)."</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> з <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Натисніть значок ел. пошти для інших переглядів"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Уся пошта"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Усі непрочитані"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Усі із зірочкою"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Завантаження…"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9ae0183..376bf2b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/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="status_sending_messages" msgid="3971880826111264523">"Đang gửi tin nhắn..."</string>
-    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Gửi tin nhắn đi"</string>
+    <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Gửi tất cả"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Đang tìm nạp tệp đính kèm."</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Đang tìm nạp tệp đính kèm <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Đọc tệp đính kèm trong Email"</string>
@@ -30,8 +30,7 @@
     <string name="next_action" msgid="3931301986364184415">"Tiếp theo"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Huỷ"</string>
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
+    <string name="previous_action" msgid="5181616311579820981">"Trước"</string>
     <string name="send_action" msgid="1729766205562446418">"Gửi"</string>
     <string name="reply_action" msgid="4262472229221507619">"Trả lời"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Trả lời tất cả"</string>
@@ -39,7 +38,7 @@
     <string name="forward_action" msgid="669174181042344116">"Chuyển tiếp"</string>
     <string name="done_action" msgid="7497990549515580249">"Xong"</string>
     <string name="discard_action" msgid="6532206074859505968">"Huỷ"</string>
-    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Lưu dưới dạng tin nháp"</string>
+    <string name="save_draft_action" msgid="6413714270991417223">"Lưu thư nháp"</string>
     <string name="read_unread_action" msgid="4721446664849165077">"Đã đọc/Chưa đọc"</string>
     <string name="read_action" msgid="4701484794504781686">"Đánh dấu là đã đọc"</string>
     <string name="unread_action" msgid="6280399049357552826">"Đánh dấu là chưa đọc"</string>
@@ -58,22 +57,19 @@
     <string name="accounts_action" msgid="901105887272231493">"Tài khoản"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Đánh dấu là đã đọc"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
-    <!-- no translation found for move_action (3059189775933985898) -->
-    <skip />
-    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Thêm Cc/Bcc"</string>
+    <string name="move_action" msgid="3059189775933985898">"Di chuyển"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Thêm tệp đính kèm"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Cài đặt kết xuất"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Chọn tệp đính kèm"</string>
-    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
-    <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Di chuyển tới"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Đang tải thư…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Lỗi kết nối"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Email mới"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Lỗi không mong muốn khi tải nội dung tin nhắn. Tin nhắn có thể quá lớn để có thể xem."</string>
   <plurals name="move_messages">
-    <item quantity="one" msgid="1891601902988083907">"Chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> tin nhắn"</item>
-    <item quantity="other" msgid="8792313600381332865">"Chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> tin nhắn"</item>
+    <item quantity="one" msgid="1891601902988083907">"Di chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> thư"</item>
+    <item quantity="other" msgid="8792313600381332865">"Di chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> thư"</item>
   </plurals>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> chưa đọc (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -85,8 +81,10 @@
     <item quantity="other" msgid="2723797835410343458">"trong <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tài khoản"</item>
   </plurals>
     <string name="notification_to_account" msgid="2078557719010667913">"tới <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
-    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+  <plurals name="number_of_accounts">
+    <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> tài khoản"</item>
+    <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> tài khoản"</item>
+  </plurals>
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Hộp thư đến"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Hộp thư đi"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Tin nháp"</string>
@@ -101,33 +99,27 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Hộp thư đi"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Vui lòng nhấn và giữ tài khoản để làm mới tài khoản"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Hộp thư"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Chế độ xem tổng hợp"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Tải tin nhắn khác"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> được chọn"</item>
+    <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> được chọn"</item>
+  </plurals>
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Không có thư"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Tới"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Chủ đề"</string>
-    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
-    <skip />
-    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
-    <skip />
-    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
-    <skip />
-    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
-    <skip />
-    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
-    <skip />
+    <string name="message_compose_from_label" msgid="4084843296548498041">"Từ:"</string>
+    <string name="message_compose_to_label" msgid="6806045787441348009">"Tới:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
+    <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
+    <string name="message_compose_subject_label" msgid="1592314202889683309">"Chủ đề:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Soạn Thư"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Tin nhắn gốc --------"\n"Chủ đề: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Từ: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Tới: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> đã viết:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Văn bản được trích dẫn"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Bao gồm văn bản"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Bạn phải thêm ít nhất một người nhận."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Một số địa chỉ email không hợp lệ."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Tệp quá lớn để có thể đính kèm."</string>
@@ -136,26 +128,21 @@
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
     <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
     <skip />
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Mở"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
-    <!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
-    <skip />
-    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Không thể lưu tệp đính kèm vào thẻ SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Xem"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Tải"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Lưu"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Dừng"</string>
+    <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Đã lưu tệp đính kèm với tên <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Không thể lưu tệp đính kèm."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Lưu ý: Một hoặc nhiều tệp đính kèm trong thư chuyển tiếp của bạn sẽ được tải xuống trước khi gửi."</string>
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Thư"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Mời"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Tệp đính kèm <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Phần đính kèm:<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Hiển thị ảnh"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Xem trong Lịch »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Xem trong Lịch"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Thư mời Lịch"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Bạn có tham gia không?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Có"</string>
@@ -165,10 +152,11 @@
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Bạn đã trả lời \"có thể\" cho thư mời này"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Bạn đã từ chối thư mời này"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Đang xem <xliff:g id="FILENAME">%s</xliff:g>"</string>
-    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
-    <skip />
-    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
-    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+    <string name="message_delete_dialog_title" msgid="7189172554183139772">"Hủy thư"</string>
+  <plurals name="message_delete_confirm">
+    <item quantity="one" msgid="8452608582303152000">"Hủy tin nhắn này?"</item>
+    <item quantity="other" msgid="5071164417794016228">"Hủy những thư này?"</item>
+  </plurals>
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Tin nhắn đã bị xoá."</item>
     <item quantity="other" msgid="6574961322865652255">"Tin nhắn đã bị xoá."</item>
@@ -176,38 +164,40 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Tin nhắn đã bị huỷ."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Không thể hiển thị tệp đính kèm này."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
-    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
-    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Không thể tải tệp đính kèm \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Đang mở thư…"</string>
+  <plurals name="message_moved_toast">
+    <item quantity="one" msgid="3098493230185412871">"Đã di chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> thư tới <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="2286739630865943494">"Đã di chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> thư tới <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Không thể chuyển tiếp một hoặc nhiều tệp đính kèm"</string>
     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Không thể chuyển tiếp <xliff:g id="FILENAME"> %s</xliff:g>"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Đăng nhập vào <xliff:g id="ACCOUNT_NAME">%s </xliff:g> lỗi"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Chạm để thay đổi cài đặt tài khoản"</string>
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <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>
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
-    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
-    <skip />
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_view_move_to_older" msgid="4993043091356700890">"Cũ hơn"</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"Thiết lập tài khoản"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Thêm tài khoản Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Thêm tài khoản Exchange ActiveSync"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
+    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Tài khoản email"</string>
     <string name="accounts_welcome" msgid="5901437782383439370">"Bạn có thể định cấu hình Email cho hầu hết các tài khoản chỉ trong vài bước."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Bạn có thể định cấu hình tài khoản Exchange chỉ trong vài bước."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Bạn có thể định cấu hình tài khoản Exchange ActiveSync chỉ trong vài bước."</string>
@@ -224,13 +214,11 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Đang kiểm tra cài đặt máy chủ thư đến..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Đang kiểm tra cài đặt máy chủ thư đi..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Thiết lập tài khoản"</string>
-    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
-    <skip />
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Tài khoản của bạn đã được thiết lập và email đang được gửi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Đặt tên cho tài khoản này (tuỳ chọn)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tên bạn (được hiển thị trong tin nhắn đi)"</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Thiết lập tài khoản"</string>
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
+    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Loại tài khoản"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Đây loại tài khoản gì?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Thiết lập tài khoản"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Cài đặt máy chủ thư đến"</string>
@@ -264,12 +252,10 @@
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Tên miền\\Tên người dùng"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sử dụng kết nối bảo mật (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Chấp nhận tất cả chứng chỉ SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
-    <skip />
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID Thiết bị di động"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Cài đặt tài khoản"</string>
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Tần suất kiểm tra email"</string>
+    <string name="account_setup_options_headline" msgid="4181274232835368085">"Tùy chọn tài khoản"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Tần suất kiểm tra hộp thư đến"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Chưa bao giờ"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Tự động (Đẩy)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"5 phút một lần"</string>
@@ -281,8 +267,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Thông báo cho tôi khi email đến."</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Đồng bộ hoá danh bạ từ tài khoản này."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Đồng bộ hoá lịch từ tài khoản này."</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Đồng bộ hóa email từ tài khoản này."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Không thể hoàn tất thiết lập"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Số lượng sẽ đồng bộ hoá"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Một ngày"</string>
@@ -294,21 +279,18 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Tên người dùng hoặc mật khẩu không chính xác."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Không thể kết nối an toàn với máy chủ."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Không thể kết nối an toàn với máy chủ."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Máy chủ trả về lỗi; vui lòng kiểm tra tên người dùng và mật khẩu và thử lại."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Không thể kết nối với máy chủ."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Không thể kết nối với máy chủ."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS được yêu cầu nhưng không được máy chủ hỗ trợ."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Phương thức xác thực không được máy chủ hỗ trợ."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Không thể mở kết nối tới máy chủ do lỗi bảo mật."</string>
     <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Không thể mở kết nối tới máy chủ."</string>
-    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
-    <skip />
+    <string name="account_setup_failed_protocol_unsupported" msgid="5476633232659376833">"Bạn đã nhập địa chỉ máy chủ không chính xác hoặc máy chủ yêu cầu phiên bản giao thức mà Email không hỗ trợ."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Quản lý bảo mật từ xa"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Máy chủ <xliff:g id="SERVER">%s</xliff:g> yêu cầu bạn cho phép kiểm soát từ xa một số tính năng bảo mật của điện thoại của bạn. Bạn có muốn hoàn tất việc thiết lập tài khoản này không?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Máy chủ này yêu cầu tính năng bảo mật mà điện thoại của bạn không hỗ trợ."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"CẢNH BÁO: Vô hiệu hóa quyền quản lý điện thoại của bạn của ứng dụng Email sẽ xóa tất cả tài khoản Email yêu cầu quyền đó, cùng với email, địa chỉ liên hệ, sự kiện lịch và các dữ liệu khác."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" yêu cầu cập nhật cài đặt bảo mật."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Cập nhật Cài đặt Bảo mật"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Bảo mật của Thiết bị"</string>
@@ -320,16 +302,14 @@
     <string name="password_expired_ticker" msgid="5698508544187945595">"Mã mở khóa màn hình của bạn đã hết hạn."</string>
     <string name="password_expired_content_title" msgid="8417027276177867305">"Yêu cầu mã mở khóa màn hình mới"</string>
     <string name="password_expired_content_text" msgid="741999155767783375">"Mã mở khóa màn hình của bạn đã hết hạn. Chạm vào đây để cập nhật mã."</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
+    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Hủy những thay đổi chưa lưu?"</string>
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Cài đặt chung"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Tài khoản mặc định"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Gửi email từ tài khoản này theo mặc định"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Thông báo qua email"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"Đồng bộ hóa tần suất, thông báo, v.v."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Thông báo trên thanh trạng thái khi email đến"</string>
-    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Tần suất kiểm tra email"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Tần suất kiểm tra hộp thư đến"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Cài đặt thư đến"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Cài đặt thư đi"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Tên tài khoản"</string>
@@ -337,14 +317,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Chữ ký"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Thêm văn bản vào tin nhắn bạn gửi"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Cài đặt thông báo"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Đồng bộ hoá danh bạ"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Cũng đồng bộ hoá danh bạ từ tài khoản này"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Đồng bộ hoá lịch"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Cũng đồng bộ hoá lịch từ tài khoản này"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Đồng bộ hóa Danh bạ"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Đồng bộ hóa danh bạ cho tài khoản này"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Đồng bộ hóa lịch"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Đồng bộ hóa lịch cho tài khoản này"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Đồng bộ hóa email"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Đồng bộ hóa email cho tài khoản này"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rung"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Cũng rung khi email đến"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Luôn luôn"</string>
@@ -355,10 +333,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Cài đặt máy chủ"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Xoá tài khoản"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" sẽ bị xoá khỏi Email."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Xóa tài khoản"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Xóa tài khoản"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Tài khoản email"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Chọn tài khoản"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nâng cấp tài khoản"</string>
@@ -387,50 +363,34 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> kết quả từ <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> kết quả đầu tiên từ <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
-    <skip />
-    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
-    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
-    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
-    <skip />
-    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
-    <!-- no translation found for position_of_count (7989353140376877792) -->
-    <skip />
-    <string name="widget_other_views" msgid="2924270018204427009">"Bấm vào biểu tượng email để chuyển sang chế độ xem khác"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"Tất cả thư"</string>
-    <string name="widget_unread" msgid="488582205091831168">"Tất cả thư chưa đọc"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"Tất cả thư gắn dấu sao"</string>
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Tùy chọn email"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Tùy chọn ứng dụng"</string>
+    <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Tự động tiến"</string>
+    <string name="general_preference_auto_advance_summary" msgid="4540091103768602710">"Chọn màn hình nào để hiển thị sau khi bạn xóa tin nhắn"</string>
+    <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Chuyển sang"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Thư mới hơn"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Thư cũ hơn"</string>
+    <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Danh sách thư"</string>
+    <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Kích thước nội dung tin nhắn"</string>
+  <string-array name="general_preference_text_zoom_summary_array">
+    <item msgid="1728778773460367725">"Hiển thị nội dung thư trong văn bản cỡ rất nhỏ"</item>
+    <item msgid="8239633518447359057">"Hiển thị nội dung thư trong văn bản cỡ nhỏ"</item>
+    <item msgid="55959821477704302">"Hiển thị nội dung thư trong văn bản cỡ thông thường"</item>
+    <item msgid="446236334663020508">"Hiển thị nội dung thư trong văn bản cỡ lớn"</item>
+    <item msgid="235926149071179467">"Hiển thị nội dung thư trong văn bản cỡ rất lớn"</item>
+  </string-array>
+    <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Kích thước nội dung tin nhắn"</string>
+    <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Rất nhỏ"</string>
+    <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Nhỏ"</string>
+    <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Thường"</string>
+    <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Lớn"</string>
+    <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Rất lớn"</string>
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"Tự động tìm nạp tệp đính kèm"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"Tải xuống tệp đính kèm cho tin nhắn trong Hộp thư đến. (Không có sẵn cho tài khoản POP3.)"</string>
+    <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> trong tổng số <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"Bấm vào biểu tượng email để chuyển sang chế độ xem khác"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"Tất cả thư"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"Tất cả thư chưa đọc"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"Tất cả thư gắn dấu sao"</string>
     <string name="widget_loading" msgid="2340962056927255554">"Đang tải…"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3a56c04..e6b40da 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"更早"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" - "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"帐户设置"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"添加 Exchange 帐户"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"添加 Exchange ActiveSync 帐户"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"正常"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"超大"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"自动抓取附件"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"下载收件箱中邮件的附件(POP3 帐户不可用)。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封,共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"点按电子邮件图标查看其他视图"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"所有邮件"</string>
-    <string name="widget_unread" msgid="488582205091831168">"所有未读邮件"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"所有已加星标的邮件"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"点按电子邮件图标查看其他视图"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"所有邮件"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"所有未读邮件"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"所有已加星标的邮件"</string>
     <string name="widget_loading" msgid="2340962056927255554">"正在载入..."</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 023cfb8..29380ac 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -192,8 +192,7 @@
     <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
     <skip />
     <string name="message_view_move_to_older" msgid="4993043091356700890">"較舊"</string>
-    <!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
-    <skip />
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"帳戶設定"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"新增 Exchange 帳戶"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"新增 Exchange ActiveSync 帳戶"</string>
@@ -385,14 +384,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"適中"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"最大"</string>
-    <!-- no translation found for general_preference_background_attachments_label (5740568133528931495) -->
-    <skip />
-    <!-- no translation found for general_preference_background_attachments_summary (2745557569280394897) -->
-    <skip />
+    <string name="general_preference_background_attachments_label" msgid="5740568133528931495">"自動擷取附件"</string>
+    <string name="general_preference_background_attachments_summary" msgid="2745557569280394897">"下載收信匣中郵件的附件 (不支援 POP3 帳戶)。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封,共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
-    <string name="widget_other_views" msgid="2924270018204427009">"輕按電子郵件圖示使用其他檢視方式"</string>
-    <string name="widget_all_mail" msgid="6436796211067834315">"所有郵件"</string>
-    <string name="widget_unread" msgid="488582205091831168">"所有未讀郵件"</string>
-    <string name="widget_starred" msgid="7855645697293191958">"所有已加星號的項目"</string>
+    <!-- outdated translation 2924270018204427009 -->     <string name="widget_other_views" msgid="2265335608760083337">"輕按電子郵件圖示使用其他檢視方式"</string>
+    <!-- outdated translation 6436796211067834315 -->     <string name="widget_all_mail" msgid="4352573990283094963">"所有郵件"</string>
+    <!-- outdated translation 488582205091831168 -->     <string name="widget_unread" msgid="4404711399009077833">"所有未讀郵件"</string>
+    <!-- outdated translation 7855645697293191958 -->     <string name="widget_starred" msgid="8290352707134011791">"所有已加星號的項目"</string>
     <string name="widget_loading" msgid="2340962056927255554">"載入中..."</string>
 </resources>