diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 938acaf..bc66b16 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -70,6 +70,8 @@
     <skip />
     <!-- no translation found for account_settings_action (4494079183315085171) -->
     <skip />
+    <!-- no translation found for mailbox_settings_action (4810618229637583429) -->
+    <skip />
     <!-- no translation found for mark_as_unread_action (3766298115778767554) -->
     <skip />
     <string name="move_action" msgid="3059189775933985898">"Skuif"</string>
@@ -140,6 +142,10 @@
     <skip />
     <!-- no translation found for mailbox_list_recent_mailboxes (8922653040520361032) -->
     <skip />
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <!-- no translation found for message_list_load_more_messages_action (7428302707908825692) -->
     <skip />
   <plurals name="message_view_selected_message_count">
@@ -414,6 +420,8 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Twee weke"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Een maand"</string>
     <!-- outdated translation 5383858972681926166 -->     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle pos"</string>
+    <!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
+    <skip />
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Gebruikernaam of wagwoord verkeerd."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Gebruikernaam of wagwoord verkeerd."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan nie veilig aan bediener koppel nie."</string>
@@ -529,6 +537,16 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Die rekening \"<xliff:g id="ACCOUNT">%s</xliff:g>\" sal uit E-pos verwyder word."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Verwyder rekening"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Verwyder rekening"</string>
+    <!-- no translation found for mailbox_settings_activity_title (1508088285900401927) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_activity_title_with_mailbox (6375095212457431269) -->
+    <skip />
+    <!-- no translation found for mailbox_preferences_header (9077316556563252246) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_check_frequency_label (1246075442689328906) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_sync_window_label (4140114925837071430) -->
+    <skip />
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-posrekening"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Kies \'n rekening"</string>
     <!-- no translation found for mailbox_shortcut_picker_title (4152973927804882131) -->
@@ -569,6 +587,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">"Reusagtig"</string>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <!-- no translation found for waitinf_for_sync_message_1 (1393719303955128036) -->
     <skip />
diff --git a/res/values-af/uploader.xml b/res/values-af/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-af/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f1df8b6..57f662d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -70,6 +70,8 @@
     <skip />
     <!-- no translation found for account_settings_action (4494079183315085171) -->
     <skip />
+    <!-- no translation found for mailbox_settings_action (4810618229637583429) -->
+    <skip />
     <!-- no translation found for mark_as_unread_action (3766298115778767554) -->
     <skip />
     <string name="move_action" msgid="3059189775933985898">"አንቀሳቅስ"</string>
@@ -140,6 +142,10 @@
     <skip />
     <!-- no translation found for mailbox_list_recent_mailboxes (8922653040520361032) -->
     <skip />
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <!-- no translation found for message_list_load_more_messages_action (7428302707908825692) -->
     <skip />
   <plurals name="message_view_selected_message_count">
@@ -414,6 +420,8 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"ሁለት ሳምንቶች"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"አንድ ወር"</string>
     <!-- outdated translation 5383858972681926166 -->     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"ሁሉም ኢሜይል"</string>
+    <!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
+    <skip />
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ተጠቃሚ ስም ወይም ይለፍ ቃል ተሳስቷል።"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ተጠቃሚ ስም ወይም ይለፍ ቃል ተሳስቷል።"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"ወደ አገልጋዩበደህና ማገናኘት አልተቻልም።"</string>
@@ -529,6 +537,16 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"መለያው  \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ከኢሜይል ይወገዳል።"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"መለያ አስወግድ"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"መለያ አስወግድ"</string>
+    <!-- no translation found for mailbox_settings_activity_title (1508088285900401927) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_activity_title_with_mailbox (6375095212457431269) -->
+    <skip />
+    <!-- no translation found for mailbox_preferences_header (9077316556563252246) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_check_frequency_label (1246075442689328906) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_sync_window_label (4140114925837071430) -->
+    <skip />
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"የኢሜይል መለያ"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"መለያ ምረጥ"</string>
     <!-- no translation found for mailbox_shortcut_picker_title (4152973927804882131) -->
@@ -569,6 +587,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <!-- no translation found for waitinf_for_sync_message_1 (1393719303955128036) -->
     <skip />
diff --git a/res/values-am/uploader.xml b/res/values-am/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-am/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8bc4540..50e62ea 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"إنشاء"</string>
     <string name="search_action" msgid="6325101454876682308">"بحث"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"إعدادات الحساب"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"إعدادات المجلد"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"تعليمها بـ \"غير مقروءة\""</string>
     <string name="move_action" msgid="3059189775933985898">"نقل"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ نسخة إلى/نسخة مخفية الوجهة"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"المجلدات الحديثة (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"جميع المجلدات"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"المجلدات الحديثة"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"تحميل المزيد من الرسائل"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"تم تحديد <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"أسبوعان"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"شهر واحد"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"الكل"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"استخدام الإعدادات الافتراضية للحساب"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"اسم المستخدم أو كلمة المرور غير صحيحة."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"اسم المستخدم أو كلمة المرور غير صحيحة."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"لا يمكن الاتصال بالخادم بأمان."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"ستتم إزالة الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" من Email."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"إزالة الحساب"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"إزالة الحساب"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"إعدادات المجلد"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"إعدادات المجلد (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"إعدادات المزامنة"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"معدل الاطلاع"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"المقدار المراد مزامنته"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"حساب بريد"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"حدد حسابًا"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"تحديد مجلد"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"في انتظار المزامنة"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"سيظهر بريدك الإلكتروني بعد قليل."</string>
diff --git a/res/values-ar/uploader.xml b/res/values-ar/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-ar/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1a7f4e3..b1f2daa 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Ново съобщение"</string>
     <string name="search_action" msgid="6325101454876682308">"Търсене"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Настройки на профил"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Настройки на папката"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Непрочетено"</string>
     <string name="move_action" msgid="3059189775933985898">"Местене"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Як/Ск"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Скорошни папки (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Всички папки"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Скорошни папки"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Зареждане на още съобщения"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Избрани: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две седмици"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Един месец"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Всички"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Стандартното за профила"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Неправилно потребителско име или парола."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неправилно потребителско име или парола."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не може да се осъществи безопасна връзка със сървъра."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ ще бъде премахнат от имейла."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Премахване на профила"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Премахване на профила"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Настройки на папката"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Настройки на папката (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Настройки за синхронизиране"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Честота на проверяване"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Количество за синхронизиране"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Имейл"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Избор на профил"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Изберете папка"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Изчаква се синхронизиране"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Имейлът ви ще се покаже след малко."</string>
diff --git a/res/values-bg/uploader.xml b/res/values-bg/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-bg/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6fdc654..28dcbb5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Redacta"</string>
     <string name="search_action" msgid="6325101454876682308">"Cerca"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Configuració del compte"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Configuració de la carpeta"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marca com a no llegit"</string>
     <string name="move_action" msgid="3059189775933985898">"Mou"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Cco"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Carpetes recents (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Totes les carpetes"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Carpetes recents"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carrega més missatges"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionat"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dues setmanes"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tots"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utilitza l\'opció predeterminada del compte"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nom d\'usuari o contrasenya incorrectes."</string>
     <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>
@@ -386,6 +392,11 @@
     <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>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Configuració de la carpeta"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Configuració de la carpeta (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Configuració de sincronització"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Comprova la freqüència"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Quantitat per sincronitzar"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Selecció de carpeta"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"S\'està esperant per sincronitzar"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"El correu electrònic apareixerà d\'aquí a una estona."</string>
diff --git a/res/values-ca/uploader.xml b/res/values-ca/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-ca/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5b32039..72e2a3b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Napsat"</string>
     <string name="search_action" msgid="6325101454876682308">"Hledat"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavení účtu"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Nastavení složek"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označit jako nepřečtené"</string>
     <string name="move_action" msgid="3059189775933985898">"Přesunout"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kopie/Skrytá"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Nejnovější složky (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Všechny složky"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Poslední složky"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Načíst další zprávy"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Počet vybraných položek: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva týdny"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden měsíc"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vše"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Použít výchozí nastavení účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Uživatelské jméno nebo heslo není správné"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Uživatelské jméno nebo heslo není správné."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nelze se bezpečně připojit k serveru."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude z aplikace Email odebrán."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Odebrat účet"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Odebrat účet"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Nastavení složek"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Nastavení složek (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Natavení synchronizace"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Frekvence kontrol"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Množství k synchronizaci"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mailový účet"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Vybrat účet"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Vyberte složku"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čekání na synchronizaci"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Vaše e-maily se zobrazí za chvíli."</string>
diff --git a/res/values-cs/uploader.xml b/res/values-cs/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-cs/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index af08265..d3b226b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Skriv"</string>
     <string name="search_action" msgid="6325101454876682308">"Søg"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Indstillinger for konto"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Indstillinger for mapper"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marker som ulæst"</string>
     <string name="move_action" msgid="3059189775933985898">"Flyt"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Nylige mapper (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Alle mapper"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Seneste mapper"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Indlæs flere beskeder"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markeret"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"To uger"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En måned"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Anvend kontostandarden"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Brugernavn eller adgangskode er forkert."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Brugernavn eller adgangskode er forkert."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Der kan ikke oprettes en sikker forbindelse til serveren."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fjernes fra E-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Fjern konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Fjern konto"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Indstillinger for mapper"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Indstillinger for mapper (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Indstillinger for synkronisering"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Opdateringsfrekvens"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Dage, der skal synkroniseres"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mail-konto"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Vælg en konto"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Vælg en mappe"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Venter på synkronisering"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Din e-mail vises om et øjeblik."</string>
diff --git a/res/values-da/uploader.xml b/res/values-da/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-da/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b6400d5..ad06217 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Schreiben"</string>
     <string name="search_action" msgid="6325101454876682308">"Suche"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoeinstellungen"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Ordnereinstellungen"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Als ungelesen markieren"</string>
     <string name="move_action" msgid="3059189775933985898">"Verschieben"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Letzte Ordner (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Alle Ordner"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Letzte Ordner"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Weitere Nachrichten laden"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> ausgewählt"</item>
@@ -300,7 +305,7 @@
     <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"E-Mails dieses Kontos synchronisieren"</string>
     <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Anhänge bei WLAN-Verbindung automatisch herunterladen"</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Einrichtung konnte nicht abgeschlossen werden"</string>
-    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Umfang der Synchronisation"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Umfang der Synchronisierung"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisch"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Ein Tag"</string>
     <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Drei Tage"</string>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Zwei Wochen"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ein Monat"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Kontostandard verwenden"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nutzername oder Passwort falsch"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nutzername/Password falsch"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Keine sichere Verbindung zu Server möglich"</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" wird aus Email entfernt."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Konto entfernen"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Konto entfernen"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Ordnereinstellungen"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Ordnereinstellungen (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Synchronisierungseinstellungen"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Abrufhäufigkeit"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Umfang der Synchronisierung"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-Mail-Konto"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Konto auswählen"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Ordner auswählen"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Warten auf Synchronisierung"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Ihre E-Mails werden in Kürze angezeigt."</string>
diff --git a/res/values-de/uploader.xml b/res/values-de/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-de/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1b10af9..3618e1e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Σύνταξη"</string>
     <string name="search_action" msgid="6325101454876682308">"Αναζήτηση"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Ρυθμίσεις λογαριασμού"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Ρυθμίσεις φακέλου..."</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Επισήμανση ως μη αναγνωσμένα"</string>
     <string name="move_action" msgid="3059189775933985898">"Μετακίνηση"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"Κοιν./Κρυφή κοιν."</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Πρόσφατοι φάκελοι (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Όλοι οι φάκελοι"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Πρόσφατοι φάκελοι"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Φόρτωση περισσότερων μηνυμάτων"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Επιλέχθηκαν <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Δύο εβδομάδες"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Ένας μήνας"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Όλες"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Χρήση των προεπιλογών του λογαριασμού"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Ο λογαριασμός \"<xliff:g id="ACCOUNT">%s</xliff:g>\" θα καταργηθεί από το ηλεκτρονικό ταχυδρομείο."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Κατάργηση λογαριασμού"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Κατάργηση λογαριασμού"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Ρυθμίσεις φακέλου..."</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Ρυθμίσεις φακέλου (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Ρυθμίσεις συγχρονισμού"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Ελέγξτε τη συχνότητα"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Όγκος προς συγχρονισμό"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Λογαριασμός ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Επιλογή λογαριασμού"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Επιλέξτε φάκελο"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Αναμονή για συγχρονισμό"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Η αλληλογραφία σας θα εμφανιστεί σύντομα."</string>
diff --git a/res/values-el/uploader.xml b/res/values-el/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-el/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4ed3861..ad41f80 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Compose"</string>
     <string name="search_action" msgid="6325101454876682308">"Search"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Account settings"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Folder settings"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Mark as unread"</string>
     <string name="move_action" msgid="3059189775933985898">"Move"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Recent folders (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"All folders"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Recent folders"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Load more messages"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selected"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Two weeks"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"One month"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"All"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Use account\'s default"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Username or password incorrect."</string>
     <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>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"The account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" will be removed from email."</string>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Folder settings"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Folder settings (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Sync settings"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Check frequency"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Amount to synchronise"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Select a folder"</string>
@@ -424,6 +435,9 @@
     <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_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restore default for \"Show pictures\""</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restore default for all senders (don\'t show pictures automatically)"</string>
+    <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Show pictures\" cleared."</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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Waiting for sync"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Your email will appear shortly."</string>
diff --git a/res/values-en-rGB/uploader.xml b/res/values-en-rGB/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-en-rGB/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 9f484f6..d552845 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Redactar"</string>
     <string name="search_action" msgid="6325101454876682308">"Buscar"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Configuración de la cuenta"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Configuración de la carpeta"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leídos"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ CC/CCO"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Carpetas recientes (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Todas las carpetas"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Carpeta reciente"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionados"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dos semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todos"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utilizar la configuración predeterminada de la cuenta."</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nombre de usuario o contraseña incorrecta."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede conectar de forma segura al servidor."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" se eliminará de correo electrónico."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Eliminar cuenta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Eliminar cuenta"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Configuración de la carpeta"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Configuración de la carpeta (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Configuración de la sincronización"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Verifica la frecuencia"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Cantidad para sincronizar"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Cuenta de correo electrónico"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleccionar una cuenta"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Selecc. una carpeta"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Esperando para sincronizar"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Tu correo electrónico aparecerá en breve."</string>
diff --git a/res/values-es-rUS/uploader.xml b/res/values-es-rUS/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-es-rUS/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 97441a9..822604e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Redactar"</string>
     <string name="search_action" msgid="6325101454876682308">"Búsqueda"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Ajustes de la cuenta"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Ajustes de carpeta"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Cco"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Carpetas recientes (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Todas las carpetas"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Carpetas recientes"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionados"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dos semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todo"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Predeterminada de cuenta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nombre de usuario o contraseña incorrecta"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede establecer una conexión de forma segura con el servidor."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Se va a eliminar la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" de \"Correo electrónico\"."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Eliminar cuenta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Eliminar cuenta"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Ajustes de carpeta"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Ajustes de carpeta (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Ajustes de sincronización"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Frecuencia de comprobación"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Cantidad para sincronizar:"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Email"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleccionar cuenta"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Seleccionar carpeta"</string>
@@ -424,6 +435,9 @@
     <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>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Restaurar valores predeterminados para Mostrar imágenes"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Restaurar valores predeterminados para todos los destinatarios (no mostrar imágenes automáticamente)"</string>
+    <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se ha restaurado la opción Mostrar imágenes."</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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Esperando para sincronizar"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Tu correo electrónico aparecerá en breve."</string>
diff --git a/res/values-es/uploader.xml b/res/values-es/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-es/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 8b85fb0..c92f843 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"نگاشتن"</string>
     <string name="search_action" msgid="6325101454876682308">"جستجو"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"تنظیمات حساب"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"تنظیمات پوشه"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"علامت گذاری بعنوان خوانده نشده"</string>
     <string name="move_action" msgid="3059189775933985898">"انتقال"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"پوشه های جدید (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"همه پوشه ها"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"پوشه های اخیر"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"بارگیری پیام های بیشتر"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> انتخاب شد"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"دو هفته"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"یک ماه"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"همه"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"استفاده از پیش فرض حساب"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"نام کاربری یا رمز ورود نادرست است."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"نام کاربری یا رمز ورود نادرست است. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"اتصال امن به سرور امکان پذیر نیست."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" از ایمیل حذف می شود."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"حذف حساب"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"حذف حساب"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"تنظیمات پوشه"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"تنظیمات پوشه (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"تنظیمات همگام سازی"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"بررسی فرکانس"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"مقدار همگام سازی"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"حساب ایمیل"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"انتخاب یک حساب"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"انتخاب یک پوشه"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"در انتظار همگام سازی"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"ایمیل شما به زودی نمایش داده می شود."</string>
diff --git a/res/values-fa/uploader.xml b/res/values-fa/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-fa/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b6d0fac..3e7ba58 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Viestin kirjoitus"</string>
     <string name="search_action" msgid="6325101454876682308">"Haku"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Tilin asetukset"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Kansion asetukset"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merkitse lukemattomaksi"</string>
     <string name="move_action" msgid="3059189775933985898">"Siirrä"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kopio/piilok."</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Viimeaikaiset kansiot (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Kaikki kansiot"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Viimeaikaiset kansiot"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Lataa lisää viestejä"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> valittu"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Kaksi viikkoa"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Yksi kuukausi"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Kaikki"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Käytä tilin oletusta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Virheellinen käyttäjänimi tai salasana."</string>
     <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>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" poistetaan sähköpostista."</string>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Kansion asetukset..."</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Kansion asetukset (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Synkronointiasetukset"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Tarkista taajuus"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Synkronoitava määrä"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Valitse kansio"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Odotetaan synkronointia"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Sähköposti näytetään piakkoin."</string>
diff --git a/res/values-fi/uploader.xml b/res/values-fi/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-fi/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 57a5d0c..78ccee4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Composer"</string>
     <string name="search_action" msgid="6325101454876682308">"Rechercher"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Paramètres du compte"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Paramètres de dossier"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marquer comme non lu"</string>
     <string name="move_action" msgid="3059189775933985898">"Déplacer"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Cci"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Dossiers récents (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Tous les dossiers"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Dossiers récents"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Charger plus de messages"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> sélectionné(s)"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Deux semaines"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mois"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tous"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utiliser paramètres défaut"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nom d\'utilisateur ou mot de passe incorrect."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nom d\'utilisateur ou mot de passe incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossible d\'établir une connexion sécurisée avec le serveur."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" va être supprimé de votre messagerie."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Supprimer le compte"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Supprimer le compte"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Paramètres de dossier"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Paramètres de dossier (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Paramètres de synchronisation"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Fréquence de consultation"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Nombre de jours à synchroniser"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Compte"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Sélectionner un compte"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Sélectionner dossier"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"En attente de synchronisation"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Votre e-mail va bientôt s\'afficher."</string>
diff --git a/res/values-fr/uploader.xml b/res/values-fr/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-fr/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7da18c1..bce5b84 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Stvori novu poruku"</string>
     <string name="search_action" msgid="6325101454876682308">"Pretraži"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Postavke računa"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Postavke mape"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kao nepročitano"</string>
     <string name="move_action" msgid="3059189775933985898">"Premjesti"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kop/sk.kop"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Nedavne mape (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Sve mape"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Nedavne mape"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Učitaj više poruka"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Odabrano: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -155,7 +160,7 @@
   </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Prikaži slike"</string>
     <string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"Uvijek prikaži"</string>
-    <string name="message_view_always_show_pictures_prompt" msgid="3305231364331259741">"Uvijek prikazati slike od tog pošiljatelja?"</string>
+    <string name="message_view_always_show_pictures_prompt" msgid="3305231364331259741">"Želite li uvijek prikazati slike od tog pošiljatelja?"</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>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva tjedna"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jedan mjesec"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Sve"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Upotrijebi zadanu postavku računa"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Korisničko ime ili zaporka nisu točni."</string>
     <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>
@@ -386,6 +392,11 @@
     <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>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Postavke mape"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Postavke mape (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Postavke sinkronizacije"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Provjerite frekvenciju"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Količina za sinkronizaciju"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Odaberite mapu"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čekanje na sinkronizaciju"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Vaša će se e-pošta uskoro pojaviti."</string>
diff --git a/res/values-hr/uploader.xml b/res/values-hr/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-hr/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7619b39..9b1b8d2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Levélírás"</string>
     <string name="search_action" msgid="6325101454876682308">"Keresés"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Fiókbeállítások"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Mappabeállítások"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Megjelölés olvasatlanként"</string>
     <string name="move_action" msgid="3059189775933985898">"Áthelyezés"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Másolatok"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Legutóbbi mappák (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Összes mappa"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Legutóbbi mappák"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"További üzenetek betöltése"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> kiválasztva"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Két hét"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Egy hónap"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Összes"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Fiók alapért. használata"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Helytelen felhasználónév vagy jelszó."</string>
     <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>
@@ -386,6 +392,11 @@
     <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>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Mappabeállítások"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Mappabeállítások (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Szinkronizálási beállítások"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Ellenőrzés gyakorisága"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Szinkronizálandó mennyiség"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Mappa kiválasztása"</string>
@@ -424,6 +435,9 @@
     <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_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Alapértelmezett beállítások visszaállítása \"Képek megjelenítése\" esetén"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Alapértelmezett beállítások visszaállítása minden feladó esetén (ne mutassa automatikusan a képeket)"</string>
+    <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Képek megjelenítése\" törölve."</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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Várakozás a szinkronizálásra"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Az e-mail hamarosan megjelenik."</string>
diff --git a/res/values-hu/uploader.xml b/res/values-hu/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-hu/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 36db62e..34ba7ca 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Tulis"</string>
     <string name="search_action" msgid="6325101454876682308">"Telusuri"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Setelan akun"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Setelan map"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Tandai belum dibaca"</string>
     <string name="move_action" msgid="3059189775933985898">"Pindahkan"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Map terkini (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Semua map"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Map terkini"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Muat pesan lainnya"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> dipilih"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dua minggu"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Satu bulan"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Semua"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Gunakan bawaan akun"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nama pengguna atau sandi salah."</string>
     <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>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" akan dihapus dari Email."</string>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Setelan map"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Setelan map (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Setelan sinkronisasi"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Periksa frekuensi"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Jumlah untuk disinkronkan"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Pilih map"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Menunggu sinkronisasi"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Email Anda akan segera muncul."</string>
diff --git a/res/values-in/uploader.xml b/res/values-in/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-in/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5d32131..86bde7e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Scrivi"</string>
     <string name="search_action" msgid="6325101454876682308">"Ricerca"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Impostazioni account"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Impostazioni cartella"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Segna come da leggere"</string>
     <string name="move_action" msgid="3059189775933985898">"Sposta"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Ccn"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Cartelle recenti (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Tutte le cartelle"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Cartelle recenti"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carica ulteriori messaggi"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selezionato"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Due settimane"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mese"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tutto"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Usa imp. predefinite account"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome utente o password errata."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome utente o password errata."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossibile connettersi correttamente al server."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"L\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" verrà rimosso da Email."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Rimuovi account"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Rimuovi account"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Impostazioni cartella"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Impostazioni cartella (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Impostazioni di sincronizzazione"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Frequenza di controllo"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Quantità da sincronizzare"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Account email"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleziona un account"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Seleziona una cartella"</string>
@@ -424,6 +435,9 @@
     <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>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Ripristina impostazioni predefinite di \"Mostra immagini\""</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Ripristina impostazioni predefinite per tutti i mittenti (non visualizzare automaticamente le immagini)"</string>
+    <string name="trusted_senders_cleared" msgid="4762002183756251723">"Impostazioni di \"Mostra immagini\" cancellate."</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="waitinf_for_sync_message_1" msgid="1393719303955128036">"In attesa di sincronizzazione"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Le email verranno visualizzate tra poco."</string>
diff --git a/res/values-it/uploader.xml b/res/values-it/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-it/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 67a82b2..d474fc3 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"חבר"</string>
     <string name="search_action" msgid="6325101454876682308">"חיפוש"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"הגדרות חשבון"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"הגדרות תיקיה"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"סמן כלא נקרא"</string>
     <string name="move_action" msgid="3059189775933985898">"העבר"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ עותק/עותק מוסתר"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"תיקיות אחרונות (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"כל התיקיות"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"תיקיות אחרונות"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"טען הודעות נוספות"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> נבחרו"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"שבועיים"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"חודש אחד"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"הכל"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"השתמש בברירת המחדל של החשבון"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"שם המשתמש או הסיסמה שגויים."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"שם המשתמש או הסיסמה שגויים."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"אין אפשרות להתחבר לשרת באופן בטוח."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" יוסר מ\'דוא\"ל\'."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"הסר חשבון"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"הסר חשבון"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"הגדרות תיקיה"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"הגדרות תיקיה (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"הגדרות סינכרון"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"תדירות בדיקות"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"מספר ימים לסינכרון"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"חשבון דוא\"ל"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"בחר חשבון"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"בחר תיקיה"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"ממתין לסינכרון"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"הדוא\"ל שלך יופיע בעוד זמן קצר."</string>
diff --git a/res/values-iw/uploader.xml b/res/values-iw/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-iw/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b8892ec..86cc29f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"作成"</string>
     <string name="search_action" msgid="6325101454876682308">"検索"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"アカウントの設定"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"フォルダの設定"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"未読にする"</string>
     <string name="move_action" msgid="3059189775933985898">"移動"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"Cc/Bccを追加"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"最近開いたフォルダ（<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>）"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"すべてのフォルダ"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"最近開いたフォルダ"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"さらにメールを読み込む"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>件を選択済み"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2週間"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1か月"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"すべて"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"アカウントのデフォルトを使用"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ユーザー名かパスワードが間違っています。"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ユーザー名かパスワードが間違っています。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"サーバーへの安全な接続を確立できません。"</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"アカウント\"<xliff:g id="ACCOUNT">%s</xliff:g>\"をEメールから削除しますか。"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"アカウントの削除"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"アカウントを削除"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"フォルダの設定"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"フォルダの設定（<xliff:g id="MAILBOXX_NAME">%s</xliff:g>）"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"同期設定"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"確認頻度"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"同期する期間"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"メール"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"アカウントを選択"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"フォルダを選択"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"同期を待機中"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"まもなくメールが表示されます。"</string>
diff --git a/res/values-ja/uploader.xml b/res/values-ja/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-ja/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0ca834f..0189ec4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"메시지작성"</string>
     <string name="search_action" msgid="6325101454876682308">"검색"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"계정 설정"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"폴더 설정"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"읽지않음으로 표시"</string>
     <string name="move_action" msgid="3059189775933985898">"이동"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ 참조/숨은참조"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"최근 폴더(<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"모든 폴더"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"최근 폴더"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메시지 로드"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>개 선택됨"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2주"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1달"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"전체"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"계정 기본값 사용"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"사용자 이름 또는 비밀번호가 잘못되었습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"서버에 안전하게 연결할 수 없습니다."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"<xliff:g id="ACCOUNT">%s</xliff:g> 계정이 이메일에서 삭제됩니다."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"계정 삭제"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"계정 삭제"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"폴더 설정"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"폴더 설정(<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"동기화 설정"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"주파수 확인"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"동기화할 이메일 분량"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"이메일 계정"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"계정 선택"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"폴더 선택"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"동기화 대기 중"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"이메일이 곧 표시됩니다."</string>
diff --git a/res/values-ko/uploader.xml b/res/values-ko/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-ko/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2a3a441..b07d20b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Sukurti"</string>
     <string name="search_action" msgid="6325101454876682308">"Ieškoti"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Paskyros nustatymai"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Aplankų nustatymai"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Pažymėti kaip neskaitytą"</string>
     <string name="move_action" msgid="3059189775933985898">"Perkelti"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ cc (kop.) / bcc (nemat. kop.)"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Naujausi aplankai (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Visi aplankai"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Naujausi aplankai"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Įkelti daugiau pranešimų"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Pasirinkta: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dvi savaitės"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Vienas mėnuo"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Visas"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Naudoti num. pask. nust."</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Neteisingas naudotojo vardas ar slaptažodis."</string>
     <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>
@@ -386,6 +392,11 @@
     <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>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Aplankų nustatymai"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Aplankų nustatymai (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Sinchronizavimo nustatymai"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Tikrinti dažnumą"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Sinchronizuotinas kiekis"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Pasirinkite aplanką"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Laukiama sinchronizavimo"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Jūsų el. paštas netrukus bus rodomas."</string>
diff --git a/res/values-lt/uploader.xml b/res/values-lt/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-lt/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 048f9e6..560d2a2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Rakstīt"</string>
     <string name="search_action" msgid="6325101454876682308">"Meklēt"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Konta iestatījumi"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Mapes iestatījumi"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Atzīmēt kā nelasītu"</string>
     <string name="move_action" msgid="3059189775933985898">"Pārvietot"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ kop./d. kop."</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Jaunākās mapes (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Visas mapes"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Jaunākās mapes"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Ielādēt vairāk ziņojumu"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> atlasīts"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Divas nedēļas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Viens mēnesis"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Visi"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Izmantot konta noklusēj."</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Lietotājvārds vai parole nav pareiza."</string>
     <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>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Konts “<xliff:g id="ACCOUNT">%s</xliff:g>” tiks noņemts no e-pasta."</string>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Mapes iestatījumi"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Mapes iestatījumi (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Sinhronizācijas iestatījumi"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Pārbaudes biežums"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Sinhronizējamais apjoms"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Mapes atlase"</string>
@@ -424,6 +435,9 @@
     <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_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Atjaunot noklusējuma vērtību iestatījumam Rādīt attēlus"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Atjaunot noklusējuma iestatījumus visiem sūtītājiem (nerādīt attēlus automātiski)"</string>
+    <string name="trusted_senders_cleared" msgid="4762002183756251723">"Iestatījums Rādīt attēlus ir notīrīts."</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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Gaida sinhronizāciju"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"E-pasta saturs drīz tiks parādīts."</string>
diff --git a/res/values-lv/uploader.xml b/res/values-lv/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-lv/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index db400ec..8fd40d3 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -52,6 +52,8 @@
     <string name="compose_action" msgid="4045702519637388045">"Karang"</string>
     <string name="search_action" msgid="6325101454876682308">"Carian"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Tetapan akaun"</string>
+    <!-- no translation found for mailbox_settings_action (4810618229637583429) -->
+    <skip />
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Tandakan belum dibaca"</string>
     <string name="move_action" msgid="3059189775933985898">"Alih"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Sk/Skt"</string>
@@ -118,6 +120,10 @@
     <skip />
     <!-- no translation found for mailbox_list_recent_mailboxes (8922653040520361032) -->
     <skip />
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Muatkan lagi mesej"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> dipilih"</item>
@@ -328,6 +334,8 @@
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Satu bulan"</string>
     <!-- no translation found for account_setup_options_mail_window_all (5372861827683632364) -->
     <skip />
+    <!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
+    <skip />
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nama pengguna atau kata laluan salah."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nama pengguna atau kata laluan salah."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Tidak boleh bersambung ke pelayan dengan selamat."</string>
@@ -413,6 +421,16 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Akaun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" akan dialih keluar daripada E-mel."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Alih keluar akaun"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Alih keluar akaun"</string>
+    <!-- no translation found for mailbox_settings_activity_title (1508088285900401927) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_activity_title_with_mailbox (6375095212457431269) -->
+    <skip />
+    <!-- no translation found for mailbox_preferences_header (9077316556563252246) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_check_frequency_label (1246075442689328906) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_sync_window_label (4140114925837071430) -->
+    <skip />
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Akaun e-mel"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Pilih akaun"</string>
     <!-- no translation found for mailbox_shortcut_picker_title (4152973927804882131) -->
@@ -453,6 +471,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Biasa"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <!-- no translation found for waitinf_for_sync_message_1 (1393719303955128036) -->
     <skip />
diff --git a/res/values-ms/uploader.xml b/res/values-ms/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-ms/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c558f4a..a12f4be 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Skriv e-post"</string>
     <string name="search_action" msgid="6325101454876682308">"Søk"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoinnstillinger"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Mappeinnstillinger"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk som ulest"</string>
     <string name="move_action" msgid="3059189775933985898">"Flytt"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kopi/blindkopi"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Nylige mapper (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Alle mapper"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Nylige mapper"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hent flere meldinger"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> valgt"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"To uker"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Én måned"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alle"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Bruk kontostandard"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Feil brukernavn eller passord."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Feil brukernavn eller passord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan ikke åpne en sikker tilkobling til tjeneren."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» vil bli fjernet fra e-postapplikasjonen."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Fjern konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Fjern konto"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Mappeinnstillinger"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Mappeinnstillinger (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Synkroniseringsinnstillinger"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Hvor ofte postboksen skal kontrolleres"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Mengde som skal synkroniseres"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-postkonto"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Velg en konto"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Velg en mappe"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Venter på synkronisering"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"E-posten din vises snart."</string>
diff --git a/res/values-nb/uploader.xml b/res/values-nb/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-nb/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4515fdf..05d0c22 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Opstellen"</string>
     <string name="search_action" msgid="6325101454876682308">"Zoeken"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Accountinstellingen"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Mapinstellingen"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markeren als ongelezen"</string>
     <string name="move_action" msgid="3059189775933985898">"Verpl."</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Recente mappen (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Alle mappen"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Recente mappen"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Meer berichten laden"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> geselecteerd"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Twee weken"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Eén maand"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alles"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Accountstandaard gebruiken"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Gebruikersnaam of wachtwoord is onjuist."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Gebruikersnaam of wachtwoord is onjuist."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan geen veilige verbinding met de server tot stand brengen."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"De account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Account verwijderen"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Account verwijderen"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Mapinstellingen"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Mapinstellingen (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Synchronisatie-instellingen"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Frequentie controleren"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Hoeveelheid om te synchroniseren"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"E-mailaccount"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selecteer een account"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Een map selecteren"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Wachten op synchronisatie"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Uw e-mail wordt over enkele ogenblikken weergegeven."</string>
diff --git a/res/values-nl/uploader.xml b/res/values-nl/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-nl/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5080807..d05d85b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Utwórz"</string>
     <string name="search_action" msgid="6325101454876682308">"Szukaj"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Ustawienia konta"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Ustawienia folderu"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczyt."</string>
     <string name="move_action" msgid="3059189775933985898">"Przenieś"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ DW/UDW"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Ostatnie foldery (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Wszystkie foldery"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Ostatnie foldery"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Załaduj więcej wiadomości"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Wybrano: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dwa tygodnie"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden miesiąc"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Wszystkie"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Użyj wartości domyślnej konta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nieprawidłowa nazwa użytkownika lub hasło."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nieprawidłowa nazwa użytkownika lub hasło."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nie można nawiązać bezpiecznego połączenia z serwerem."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> zostanie usunięte z usługi poczty e-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Usuń konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Usuń konto"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Ustawienia folderu"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Ustawienia folderu (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Ustawienia synchronizacji"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Częstotliwość sprawdzania"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Synchronizowany okres"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Konto e-mail"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Wybierz konto"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Wybierz folder"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Oczekiwanie na synchronizację"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Poczta e-mail zostanie za chwilę wyświetlona."</string>
diff --git a/res/values-pl/uploader.xml b/res/values-pl/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-pl/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 21229f1..8bf80b4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Redigir"</string>
     <string name="search_action" msgid="6325101454876682308">"Pesquisar"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Definições da conta"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Definições da pasta"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Pastas recentes (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Todas as pastas"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Pastas recentes"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionada(s)"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todas"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Utilizar predef. da conta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome de utilizador ou palavra passe incorrectos."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de utilizador ou palavra-passe incorrectos."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível ligar ao servidor em segurança."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida do E-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Remover conta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Remover conta"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Definições da pasta"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Definições da pasta (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Definições de sincronização"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Verificar frequência"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Quantidade a sincronizar"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Conta de e-mail"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Seleccione uma conta"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Selecione uma pasta"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"A aguardar sincronização"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"O seu e-mail aparecerá em breve."</string>
diff --git a/res/values-pt-rPT/uploader.xml b/res/values-pt-rPT/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-pt-rPT/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 039ccae..530a309 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Escrever"</string>
     <string name="search_action" msgid="6325101454876682308">"Pesquisa"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Configurações da conta"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Configurações da pasta"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Cco"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Pastas recentes (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Todas as pastas"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Pastas recentes"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selecionada(s)"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas semanas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Um mês"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todos"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Usar padrão da conta"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nome de usuário ou senha incorretos."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de usuário ou senha incorretos. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível se conectar ao servidor com segurança."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida deste e-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Remover conta"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Remover conta"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Configurações da pasta"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Configurações da pasta (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Configurações de sincronização"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Verificar frequência"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Número a ser sincronizado"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Con e-mail"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Selecione uma conta"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Selecionar uma pasta"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Aguardando sincronização"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Seu e-mail será exibido em breve."</string>
diff --git a/res/values-pt/uploader.xml b/res/values-pt/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-pt/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index a07d4ad..9b4815f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -53,6 +53,8 @@
     <string name="compose_action" msgid="4045702519637388045">"Nov messadi"</string>
     <string name="search_action" msgid="6325101454876682308">"Tschertgar"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Parameters dal conto"</string>
+    <!-- no translation found for mailbox_settings_action (4810618229637583429) -->
+    <skip />
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar sco nunlegì"</string>
     <!-- no translation found for move_action (3059189775933985898) -->
     <skip />
@@ -124,6 +126,10 @@
     <skip />
     <!-- no translation found for mailbox_list_recent_mailboxes (8922653040520361032) -->
     <skip />
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Chargiar ulteriurs messadis"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selected"</item>
@@ -379,6 +385,8 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas emnas"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"In mais"</string>
     <!-- outdated translation 5383858972681926166 -->     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tut ils e-mails"</string>
+    <!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
+    <skip />
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Num d\'utilisader u pled-clav nuncorrect."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Num d\'utilisader u pled-clav nuncorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impussibel da stabilir ina connexiun segirada cun il server."</string>
@@ -488,6 +496,16 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Il conto «<xliff:g id="ACCOUNT">%s</xliff:g>» vegn stizzà da Voss e-mail."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Stizzar il conto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Stizzar il conto"</string>
+    <!-- no translation found for mailbox_settings_activity_title (1508088285900401927) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_activity_title_with_mailbox (6375095212457431269) -->
+    <skip />
+    <!-- no translation found for mailbox_preferences_header (9077316556563252246) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_check_frequency_label (1246075442689328906) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_sync_window_label (4140114925837071430) -->
+    <skip />
     <!-- no translation found for account_shortcut_picker_name (1994861845225243190) -->
     <skip />
     <!-- no translation found for account_shortcut_picker_title (8799411733165525683) -->
@@ -541,6 +559,12 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <!-- no translation found for position_of_count (7989353140376877792) -->
     <skip />
     <!-- no translation found for waitinf_for_sync_message_1 (1393719303955128036) -->
diff --git a/res/values-rm/uploader.xml b/res/values-rm/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-rm/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cb8ac7c..ca16955 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Scrieţi"</string>
     <string name="search_action" msgid="6325101454876682308">"Căutaţi"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Setările contului"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Setări pentru dosare"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
     <string name="move_action" msgid="3059189775933985898">"Mutaţi"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Dosare recente (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Toate dosarele"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Dosare recente"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Încărcaţi mai multe mesaje"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selectate"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Două săptămâni"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"O lună"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Toate"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Ut. set. prest. ale cont."</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nume de utilizator sau parolă incorectă."</string>
     <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>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” va fi eliminat din e-mail."</string>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Setări pentru dosare"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Setări pentru dosare (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Setări de sincronizare"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Verificaţi frecvenţa"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Volumul de date de sincronizat"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Selectaţi un dosar"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Se aşteaptă sincronizarea"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"E-mailul dvs. va apărea în curând."</string>
diff --git a/res/values-ro/uploader.xml b/res/values-ro/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-ro/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b191305..71a67f9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Новое сообщение"</string>
     <string name="search_action" msgid="6325101454876682308">"Поиск"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Настройки аккаунта"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Настройки папки"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
     <string name="move_action" msgid="3059189775933985898">"Переместить"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"Добавить копию"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Последние папки (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Все папки"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Недавние папки"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Загрузить еще сообщения"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Выбрано: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -155,7 +160,7 @@
   </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показать картинки"</string>
     <string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"Всегда показывать"</string>
-    <string name="message_view_always_show_pictures_prompt" msgid="3305231364331259741">"Всегда показывать картинки этого отправителя?"</string>
+    <string name="message_view_always_show_pictures_prompt" msgid="3305231364331259741">"Показывать ли всегда картинки этого отправителя?"</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>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две недели"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один месяц"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Все"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Параметры по умолчанию"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Неверное имя пользователя или пароль."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неверное имя пользователя или пароль."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не удается установить защищенное подключение к серверу."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" будет удален из Email."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Удалить аккаунт"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Удалить аккаунт"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Настройки папки"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Настройки папки <xliff:g id="MAILBOXX_NAME">%s</xliff:g>"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Настройки синхронизации"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Частота проверки"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Длительность синхронизации"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Аккаунт эл. почты"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Выберите аккаунт"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Выберите папку"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Ожидание синхронизации"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Ваши письма скоро загрузятся."</string>
diff --git a/res/values-ru/uploader.xml b/res/values-ru/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-ru/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ac07aee..f2c4151 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Napísať správu"</string>
     <string name="search_action" msgid="6325101454876682308">"Hľadať"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavenia účtu"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Nastavenia priečinka"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označiť ako neprečítané"</string>
     <string name="move_action" msgid="3059189775933985898">"Presunúť"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+Kópia/Skr.kópia"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Nedávne priečinky (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Všetky priečinky"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Nedávne priečinky"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Načítať ďalšie správy"</string>
   <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>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva týdny"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden mesiac"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Všetky"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Použiť predv. nast. účtu"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Používateľské meno alebo heslo nie je správne."</string>
     <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>
@@ -386,6 +392,11 @@
     <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>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Nastavenia priečinka"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Nastavenia priečinka (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Nastavenia synchronizácie"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Frekvencia kontrol"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Množstvo na synchronizovanie"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Výber priečinka"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Prebieha synchronizácia"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Váš e-mail sa zobrazí čoskoro."</string>
diff --git a/res/values-sk/uploader.xml b/res/values-sk/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-sk/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5e993a7..197e93b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Novo sporočilo"</string>
     <string name="search_action" msgid="6325101454876682308">"Iskanje"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Nastavitve računa"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Nastavitve mape"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kot neprebrano"</string>
     <string name="move_action" msgid="3059189775933985898">"Premakni"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kp/Skp"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Nedavne mape (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Vse mape"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Nedavne mape"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Naloži več sporočil"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> izbranih"</item>
@@ -155,7 +160,7 @@
   </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Pokaži slike"</string>
     <string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"Vedno pokaži"</string>
-    <string name="message_view_always_show_pictures_prompt" msgid="3305231364331259741">"Želite vedno pokazari slike tega pošiljatelja?"</string>
+    <string name="message_view_always_show_pictures_prompt" msgid="3305231364331259741">"Želite vedno pokazati slike tega pošiljatelja?"</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>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva tedna"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En mesec"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Vse"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Uporabi privzeto računa"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nepravilno uporabniško ime ali geslo."</string>
     <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>
@@ -386,6 +392,11 @@
     <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>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Nastavitve mape ..."</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Nastavitve mape (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Nastavitve sinhronizacije"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Preverite frekvenco"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Število dni za sinhroniziranje"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Izberite mapo"</string>
@@ -424,6 +435,12 @@
     <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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čakanje na sinhronizacijo"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Vaša e-pošta se bo pojavila kmalu."</string>
diff --git a/res/values-sl/uploader.xml b/res/values-sl/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-sl/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 3ceca67..f56d339 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Нова порука"</string>
     <string name="search_action" msgid="6325101454876682308">"Претрага"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Подешавања налога"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Подешавања директоријума"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Означи као непрочитано"</string>
     <string name="move_action" msgid="3059189775933985898">"Премести"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ копија/скривена копија"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Недавни директоријуми (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Сви директоријуми"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Недавни директоријуми"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Учитај још порука"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Изабраних: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две недеље"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Месец дана"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Све"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Користи подр. под. налога"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Корисничко име или лозинка нису тачни."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Корисничко име или лозинка нису тачни."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Безбедно повезивање са сервером није могуће."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Налог „<xliff:g id="ACCOUNT">%s</xliff:g>“ биће уклоњен из е-поште."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Уклони налог"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Уклони налог"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Подешавања директоријума"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Подешавања директоријума (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Подешавања сихронизације"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Провери фреквенцију"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Период за синхронизацију"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Е-пошта"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Избор налога"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Избор директоријума"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Чека се синхронизација"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Адреса е-поште ће се ускоро приказати."</string>
diff --git a/res/values-sr/uploader.xml b/res/values-sr/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-sr/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d84cc64..abd0538 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Skriv"</string>
     <string name="search_action" msgid="6325101454876682308">"Sök"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoinställningar"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Mappinställningar"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markera som oläst"</string>
     <string name="move_action" msgid="3059189775933985898">"Flytta"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Kopia/heml. k."</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Senaste mappar (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Alla mappar"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Senaste mapparna"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hämta fler meddelanden"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markerad"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Två veckor"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En månad"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alla"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Använd standardinställning"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Fel användarnamn eller lösenord."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Fel användarnamn eller lösenord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Det går inte att upprätta en säker anslutning till servern."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontot <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från E-post."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Ta bort konto"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Ta bort konto"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Mappinställningar"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Mappinställningar (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Synkroniseringsinställningar"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Intervall för kontroll"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Antal att synkronisera"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Epostkonto"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Välj ett konto"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Välj en mapp"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Väntar på synk"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Ditt e-postmeddelande visas snart."</string>
diff --git a/res/values-sv/uploader.xml b/res/values-sv/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-sv/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6cd0668..33d3f7a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -70,6 +70,8 @@
     <skip />
     <!-- no translation found for account_settings_action (4494079183315085171) -->
     <skip />
+    <!-- no translation found for mailbox_settings_action (4810618229637583429) -->
+    <skip />
     <!-- no translation found for mark_as_unread_action (3766298115778767554) -->
     <skip />
     <string name="move_action" msgid="3059189775933985898">"Hamisha"</string>
@@ -140,6 +142,10 @@
     <skip />
     <!-- no translation found for mailbox_list_recent_mailboxes (8922653040520361032) -->
     <skip />
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <!-- no translation found for message_list_load_more_messages_action (7428302707908825692) -->
     <skip />
   <plurals name="message_view_selected_message_count">
@@ -414,6 +420,8 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Wiki mbili"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Mwezi mmoja"</string>
     <!-- outdated translation 5383858972681926166 -->     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Barua zote"</string>
+    <!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
+    <skip />
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Jina la mtumiaji na nenosiri sio sahihi."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Jina la mtumiaji au nenosiri sio sahihi."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Haiwezi kuunganisha kwa seva kwa usalama."</string>
@@ -529,6 +537,16 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Akaunti \"<xliff:g id="ACCOUNT">%s</xliff:g>\" itaondolewa kutoka kwa Barua pepe."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Ondoa akaunti"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Ondoa akaunti"</string>
+    <!-- no translation found for mailbox_settings_activity_title (1508088285900401927) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_activity_title_with_mailbox (6375095212457431269) -->
+    <skip />
+    <!-- no translation found for mailbox_preferences_header (9077316556563252246) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_check_frequency_label (1246075442689328906) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_sync_window_label (4140114925837071430) -->
+    <skip />
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Akaunti ya barua pepe"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Chagua akaunti"</string>
     <!-- no translation found for mailbox_shortcut_picker_title (4152973927804882131) -->
@@ -569,6 +587,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Kawaida"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Kubwa"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kubwa mno"</string>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ya <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for waitinf_for_sync_message_1 (1393719303955128036) -->
     <skip />
diff --git a/res/values-sw/uploader.xml b/res/values-sw/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-sw/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 85bd0db..07edf17 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"เขียน"</string>
     <string name="search_action" msgid="6325101454876682308">"ค้นหา"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"การตั้งค่าบัญชี"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"การตั้งค่าโฟลเดอร์"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
     <string name="move_action" msgid="3059189775933985898">"ย้าย"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ สำเนา/สำเนาลับ"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"โฟลเดอร์ล่าสุด (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"โฟลเดอร์ทั้งหมด"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"โฟลเดอร์ล่าสุด"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"โหลดข้อความเพิ่มเติม"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> รายการที่เลือกไว้"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"สองสัปดาห์"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 เดือน"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"ทั้งหมด"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"ใช้ค่าเริ่มต้นของบัญชี"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" จะถูกลบจากอีเมล"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"นำบัญชีออก"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"นำบัญชีออก"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"การตั้งค่าโฟลเดอร์"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"การตั้งค่าโฟลเดอร์ (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"การตั้งค่าการซิงค์"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"ตรวจสอบความถี่"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"จำนวนวันที่จะซิงค์"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"บัญชีอีเมล"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"เลือกบัญชี"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"เลือกโฟลเดอร์"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"กำลังรอการซิงค์"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"อีเมลของคุณจะปรากฏในไม่ช้า"</string>
diff --git a/res/values-th/uploader.xml b/res/values-th/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-th/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e0045d4..2d4e861 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Bumuo"</string>
     <string name="search_action" msgid="6325101454876682308">"Paghahanap"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Mga setting ng account"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Mga setting ng folder"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markahan bilang hindi pa nababasa"</string>
     <string name="move_action" msgid="3059189775933985898">"Ilipat"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Mga kamakailang folder (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Lahat ng folder"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Mga kamakailang folder"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Mag-load nang marami pang mensahe"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> ang napili"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dalawang linggo"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Isang buwan"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Lahat"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Gamitin ang default ng account"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Mali ang username o password."</string>
     <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>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Aalisin ang account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" mula sa Email."</string>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Mga setting ng folder"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Mga setting ng folder (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Mga setting ng pag-sync"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Suriin ang dalas"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Halagang isi-synchronize"</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="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Pumili ng folder"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Naghihintay ng pag-sync"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Lilitaw ang iyong email sa ilang saglit."</string>
diff --git a/res/values-tl/uploader.xml b/res/values-tl/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-tl/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a194d7d..35cd225 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"E-Posta Yaz"</string>
     <string name="search_action" msgid="6325101454876682308">"Ara"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Hesap ayarları"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Klasör ayarları"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı olarak işaretle"</string>
     <string name="move_action" msgid="3059189775933985898">"Taşı"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Son klasörler (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Tüm klasörler"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Son klasörler"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Daha fazla ileti yükle"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seçildi"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"İki hafta"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Bir ay"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tümü"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Hesabın varsaylnnı kullan"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Kullanıcı adı veya şifre hatalı."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Kullanıcı adı veya şifre hatalı."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Sunucuya güvenli biçimde bağlanılamıyor."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı E-postadan kaldırılacak."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Hesabı kaldır"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Hesabı kaldır"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Klasör ayarları"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Klasör ayarları (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Senkronizasyon ayarları"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Kontrol sıklığı"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Senkronize edilecek miktar"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Eposta hes"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Bir hesap seçin"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Klasör seçin"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Senkronize etmek için bekleniyor"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"E-postanız kısa süre içinde görüntülenecek."</string>
diff --git a/res/values-tr/uploader.xml b/res/values-tr/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-tr/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 327a320..9cb0567 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Написати"</string>
     <string name="search_action" msgid="6325101454876682308">"Пошук"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Налашт-ня обл. зап."</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Налаштування папки"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
     <string name="move_action" msgid="3059189775933985898">"Переміст."</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Коп./Прих.коп."</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Останні папки (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Усі папки"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Останні папки"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Завант. інші повід."</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Вибрано <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2 тижні"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один місяць"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Усі"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Парам. обл.зап. за умовч."</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Ім\'я кор. або пароль неправильн."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Ім\'я корист. чи пароль неправильн."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Неможл. безпечно підкл. до сервера."</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Обліковий запис \"<xliff:g id="ACCOUNT">%s</xliff:g>\" буде видалено з Пошти."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Видалити обліковий запис"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Видалити обліковий запис"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"Налаштування папки"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Налаштування папки (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Налаштування синхронізації"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Частота перевірки"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Період для синхронізації"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Обл.зап.пошти"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Вибрати облік. запис"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Вибір папки"</string>
@@ -424,6 +435,9 @@
     <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_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Відновити налаштування за умовчанням \"Показати зображення\""</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Відновити налаштування за умовчанням для всіх відправників (не показувати зображення автоматично)"</string>
+    <string name="trusted_senders_cleared" msgid="4762002183756251723">"Налаштування \"Показати зображення\" очищено."</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="waitinf_for_sync_message_1" msgid="1393719303955128036">"Очікування на синхронізацію"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Ваша електронна пошта з’явиться незабаром."</string>
diff --git a/res/values-uk/uploader.xml b/res/values-uk/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-uk/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ccde7b4..93a1c84 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"Soạn"</string>
     <string name="search_action" msgid="6325101454876682308">"Tìm kiếm"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Cài đặt tài khoản"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"Cài đặt thư mục"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
     <string name="move_action" msgid="3059189775933985898">"Di chuyển"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Bcc"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Thư mục gần đây (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Tất cả thư mục"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Thư mục gần đây"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Tải tin nhắn khác"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> được chọn"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Hai tuần"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Một tháng"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tất cả"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Sử dụng mặc định của tài khoản"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Tên người dùng hoặc mật khẩu không chính xác."</string>
     <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>
@@ -386,6 +392,11 @@
     <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>
     <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="mailbox_settings_activity_title" msgid="1508088285900401927">"Cài đặt thư mục"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"Cài đặt thư mục (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"Cài đặt đồng bộ hóa"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Tần suất kiểm tra"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"Số lượng sẽ đồng bộ hóa"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Tài khoản email"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Chọn tài khoản"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Chọn thư mục"</string>
@@ -424,6 +435,12 @@
     <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>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Đang đợi đồng bộ hóa"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"Email của bạn sẽ xuất hiện trong chốc lát."</string>
diff --git a/res/values-vi/uploader.xml b/res/values-vi/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-vi/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fa55589..a885601 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"撰写"</string>
     <string name="search_action" msgid="6325101454876682308">"搜索"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"帐户设置"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"文件夹设置"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"标记为未读"</string>
     <string name="move_action" msgid="3059189775933985898">"移动"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"添加抄送/密送"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"最近访问的文件夹 (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"所有文件夹"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"近期文件夹"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"载入更多邮件"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"已选定 <xliff:g id="MESSAGE_COUNT">%d</xliff:g> 封"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"两周"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"一个月"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"全部"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"使用帐户的默认设置"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"用户名或密码不正确。"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"用户名或密码不正确。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"无法安全地连接到服务器。"</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"将会从电子邮件中删除“<xliff:g id="ACCOUNT">%s</xliff:g>”帐户。"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"删除帐户"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"删除帐户"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"文件夹设置"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"文件夹设置（<xliff:g id="MAILBOXX_NAME">%s</xliff:g>）"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"同步设置"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"检查频率"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"要同步的天数"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"电子邮件帐户"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"选择帐户"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"选择文件夹"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"稍后将显示您的电子邮件。"</string>
diff --git a/res/values-zh-rCN/uploader.xml b/res/values-zh-rCN/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-zh-rCN/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 720a5c7..d5ff946 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -47,6 +47,7 @@
     <string name="compose_action" msgid="4045702519637388045">"撰寫郵件"</string>
     <string name="search_action" msgid="6325101454876682308">"搜尋"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"帳戶設定"</string>
+    <string name="mailbox_settings_action" msgid="4810618229637583429">"資料夾設定"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"標示為未讀取"</string>
     <string name="move_action" msgid="3059189775933985898">"移動"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"新增副本/密件副本"</string>
@@ -105,6 +106,10 @@
     <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"最近使用的資料夾 (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
     <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"所有資料夾"</string>
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"最近使用的資料夾"</string>
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"載入更多郵件"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"已選取 <xliff:g id="MESSAGE_COUNT">%d</xliff:g> 封郵件"</item>
@@ -308,6 +313,7 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2 週"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 個月"</string>
     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"全部"</string>
+    <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"使用帳戶預設值"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"使用者名稱或密碼不正確。"</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"使用者名稱或密碼不正確。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"無法安全地連線至伺服器。"</string>
@@ -386,6 +392,11 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"系統將從 [電子郵件] 中移除帳戶「<xliff:g id="ACCOUNT">%s</xliff:g>」。"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"移除帳戶"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"移除帳戶"</string>
+    <string name="mailbox_settings_activity_title" msgid="1508088285900401927">"資料夾設定"</string>
+    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6375095212457431269">"資料夾設定 (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
+    <string name="mailbox_preferences_header" msgid="9077316556563252246">"同步處理設定"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"檢查頻率"</string>
+    <string name="mailbox_settings_mailbox_sync_window_label" msgid="4140114925837071430">"要同步處理的數量"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"電子郵件帳戶"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"選取帳戶"</string>
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"選取資料夾"</string>
@@ -424,6 +435,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_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <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="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步處理"</string>
     <string name="waitinf_for_sync_message_2" msgid="8850585407012152631">"您的電子郵件很快就會顯示。"</string>
diff --git a/res/values-zh-rTW/uploader.xml b/res/values-zh-rTW/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-zh-rTW/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d12d0d9..7f73261 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -70,6 +70,8 @@
     <skip />
     <!-- no translation found for account_settings_action (4494079183315085171) -->
     <skip />
+    <!-- no translation found for mailbox_settings_action (4810618229637583429) -->
+    <skip />
     <!-- no translation found for mark_as_unread_action (3766298115778767554) -->
     <skip />
     <string name="move_action" msgid="3059189775933985898">"Khipha"</string>
@@ -140,6 +142,10 @@
     <skip />
     <!-- no translation found for mailbox_list_recent_mailboxes (8922653040520361032) -->
     <skip />
+    <!-- no translation found for message_subject_description (3597047441062021199) -->
+    <skip />
+    <!-- no translation found for message_is_empty_description (4004644319382041459) -->
+    <skip />
     <!-- no translation found for message_list_load_more_messages_action (7428302707908825692) -->
     <skip />
   <plurals name="message_view_selected_message_count">
@@ -414,6 +420,8 @@
     <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Amaviki amabili"</string>
     <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Inyanga eyodwa"</string>
     <!-- outdated translation 5383858972681926166 -->     <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Yonke Imeyili"</string>
+    <!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
+    <skip />
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Igama lomsebenzisi noma iphasiwedi ayilungile."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Igama lomsebenzisi noma iphasiwedi ayilungile."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Ayikwazi ukuxhuma ngokuphephile kwiseva."</string>
@@ -529,6 +537,16 @@
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"I-akhawunti\"<xliff:g id="ACCOUNT">%s</xliff:g>\" izokhishwa kwi-Imeyili"</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Khipha i-akhawunti"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Susa i-akhawunti"</string>
+    <!-- no translation found for mailbox_settings_activity_title (1508088285900401927) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_activity_title_with_mailbox (6375095212457431269) -->
+    <skip />
+    <!-- no translation found for mailbox_preferences_header (9077316556563252246) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_check_frequency_label (1246075442689328906) -->
+    <skip />
+    <!-- no translation found for mailbox_settings_mailbox_sync_window_label (4140114925837071430) -->
+    <skip />
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"I-akhawunti ye-imeyli"</string>
     <string name="account_shortcut_picker_title" msgid="8799411733165525683">"Khetha i-akhawunti"</string>
     <!-- no translation found for mailbox_shortcut_picker_title (4152973927804882131) -->
@@ -569,6 +587,12 @@
     <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Kuvamile"</string>
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Okukhulu"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Khulu"</string>
+    <!-- no translation found for general_preferences_clear_trusted_senders_title (8540277615940620308) -->
+    <skip />
+    <!-- no translation found for general_preferences_clear_trusted_senders_summary (2018233140620247) -->
+    <skip />
+    <!-- no translation found for trusted_senders_cleared (4762002183756251723) -->
+    <skip />
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ku-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <!-- no translation found for waitinf_for_sync_message_1 (1393719303955128036) -->
     <skip />
diff --git a/res/values-zu/uploader.xml b/res/values-zu/uploader.xml
new file mode 100644
index 0000000..1faf9ef
--- /dev/null
+++ b/res/values-zu/uploader.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for application_name (7812006268714926951) -->
+    <skip />
+    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
+    <skip />
+    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
+    <skip />
+    <!-- no translation found for summary_title_finished (7775292294989807025) -->
+    <skip />
+    <!-- no translation found for summary_title_paused (8936561302881926595) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
+    <skip />
+    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
+    <skip />
+    <!-- no translation found for menu_view_online (6546633605818509942) -->
+    <skip />
+    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
+    <skip />
+    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
+    <skip />
+    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
+    <skip />
+    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
+    <skip />
+    <!-- no translation found for menu_settings (5088116127086866634) -->
+    <skip />
+    <!-- no translation found for format_date_uploaded (803752037646090928) -->
+    <skip />
+    <!-- no translation found for format_progress_percent (1420459750508777491) -->
+    <skip />
+    <!-- no translation found for account (5199161365824352613) -->
+    <skip />
+    <!-- no translation found for upload (2615541458361216022) -->
+    <skip />
+    <!-- no translation found for ok (2516349681897895312) -->
+    <skip />
+    <!-- no translation found for cancel (1207103189404543868) -->
+    <skip />
+    <!-- no translation found for uploading_to (3986362895940069510) -->
+    <skip />
+    <!-- no translation found for uploading_for (1735961974624867111) -->
+    <skip />
+    <!-- no translation found for destination_format (7472552212462849956) -->
+    <skip />
+    <!-- no translation found for toast_intent_error (6164928822619692280) -->
+    <skip />
+    <!-- no translation found for toast_file_error (1315722681020841350) -->
+    <skip />
+    <!-- no translation found for account_error (1904775271866104941) -->
+    <skip />
+    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
+    <skip />
+    <string name="upload_state_queued" msgid="3990598443227105526"></string>
+    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
+    <skip />
+    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
+    <skip />
+    <!-- no translation found for upload_state_uploading (82854465974176047) -->
+    <skip />
+    <!-- no translation found for upload_state_failed (3799932718800848294) -->
+    <skip />
+    <!-- no translation found for upload_state_completed (5638163990418071018) -->
+    <skip />
+    <!-- no translation found for pause_state_running (711411177620353982) -->
+    <skip />
+    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
+    <skip />
+    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
+    <skip />
+    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
+    <skip />
+    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
+    <skip />
+    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
+    <skip />
+    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
+    <skip />
+    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
+    <skip />
+    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
+    <skip />
+    <!-- no translation found for retry_in_1min (2242454935194420914) -->
+    <skip />
+    <!-- no translation found for retry_in_2min (5845688527405283031) -->
+    <skip />
+    <!-- no translation found for retry_in_5min (3153220715959570358) -->
+    <skip />
+    <!-- no translation found for retry_no_data (630347885498641534) -->
+    <skip />
+    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
+    <skip />
+    <!-- no translation found for completed_no_file (6719715000947601844) -->
+    <skip />
+    <!-- no translation found for failed_bad_response (8357723053952213242) -->
+    <skip />
+    <!-- no translation found for failed_network_error (2531660472217573602) -->
+    <skip />
+    <!-- no translation found for failed_server_auth (2428208784689362254) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
+    <skip />
+    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
+    <skip />
+    <!-- no translation found for manager_pause (7046645023617816964) -->
+    <skip />
+    <!-- no translation found for manager_resume (1608630525599824933) -->
+    <skip />
+    <!-- no translation found for manager_upload_now (2284408578936376342) -->
+    <skip />
+    <!-- no translation found for manager_upload_later (5453932124711705632) -->
+    <skip />
+    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
+    <skip />
+    <!-- no translation found for manager_view_media (3714544539986850549) -->
+    <skip />
+    <!-- no translation found for manager_retry (939534318469518843) -->
+    <skip />
+    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
+    <skip />
+    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
+    <skip />
+    <!-- no translation found for manager_sync_all (5207146576940014345) -->
+    <skip />
+    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
+    <skip />
+    <!-- no translation found for finished_empty (689924777356099393) -->
+    <skip />
+    <!-- no translation found for notify_uploads (8593982942665493037) -->
+    <skip />
+    <!-- no translation found for notify_resolved (8111194870485485674) -->
+    <skip />
+    <!-- no translation found for notify_paused (3999817913227671338) -->
+    <skip />
+    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
+    <skip />
+    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
+    <skip />
+    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
+    <skip />
+    <!-- no translation found for manager_view_completed (5119780300858727185) -->
+    <skip />
+    <!-- no translation found for manager_view_pending (4403346072556950609) -->
+    <skip />
+    <!-- no translation found for preference_category_title_general (330919434495694575) -->
+    <skip />
+    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
+    <skip />
+    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
+    <skip />
+    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
+    <skip />
+    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
+    <skip />
+    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
+    <skip />
+    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
+    <skip />
+    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
+    <skip />
+    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
+    <skip />
+    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
+    <skip />
+    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
+    <skip />
+    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
+    <skip />
+    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
+    <skip />
+    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
+    <skip />
+    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
+    <skip />
+    <!-- no translation found for preference_plus_title (8505499389432915393) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
+    <skip />
+    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
+    <skip />
+    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
+    <skip />
+    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
+    <skip />
+    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
+    <skip />
+    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
+    <skip />
+    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
+    <skip />
+    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
+    <skip />
+    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
+    <skip />
+    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
+    <skip />
+</resources>
diff --git a/res/values/uploader.xml b/res/values/uploader.xml
new file mode 100644
index 0000000..232b544
--- /dev/null
+++ b/res/values/uploader.xml
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2009 Google Inc. All Rights Reserved. -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!-- Application's title (for title bars, the application manager, etc.) [CHAR LIMIT=20] -->
+  <string name="application_name">Instant Upload</string>
+
+  <!-- Default Picasa upload destination: the CameraSync album  [CHAR LIMIT=NONE]-->
+  <string name="picasa_default_destination">Instant Upload Album</string>
+  
+  <!-- Summary screen: title when uploading -->
+  <string name="summary_title_uploading">Uploading</string>
+  
+  <!-- Summary screen: title when displaying finished uploads -->
+  <string name="summary_title_finished">Finished</string>
+  
+  <!-- Summary screen: title when displaying finished uploads -->
+  <string name="summary_title_paused">Paused</string>
+  
+  <!-- Summary screen: subtitle showing the # of photos and videos to be uploaded -->
+  <string name="summary_subtitle_uploading_format">%1$d%% • %2$d photos • %3$d videos</string>
+  
+  <!-- Summary screen: subtitle showing the # of photos and videos that have finished uploading -->
+  <string name="summary_subtitle_counts_format">%1$d photos • %2$d videos</string>
+  
+  <!-- Summary screen: subtitle for when the app is paused due to low battery -->
+  <string name="summary_subtitle_paused_low_battery">low battery</string>
+  
+  <!-- Summary screen: subtitle for when the app is paused due out of photos quota condition -->
+  <string name="summary_subtitle_paused_photos_quota">exceeded photos quota</string>
+  
+  <!-- Summary screen: subtitle for when the app is paused due to Data Roaming -->
+  <string name="summary_subtitle_paused_roaming">roaming</string>
+  
+  <!-- Summary screen: subtitle for when the app is paused due to needing WiFi for this item -->
+  <string name="summary_subtitle_paused_need_wifi">waiting for WiFi</string>
+  
+  <!-- Summary screen: subtitle for when the app is paused due to needing the charger -->
+  <string name="summary_subtitle_paused_need_charger">delayed until charging</string>
+  
+  <!-- Summary screen: subtitle for when the app is paused due to needing a data connection -->
+  <string name="summary_subtitle_paused_need_network">waiting for connection</string>
+  
+  <!-- Summary screen: subtitle for when the app is paused due to needing a data connection -->
+  <string name="summary_subtitle_paused_retry_format">retrying in %s</string>
+  
+  <!-- Summary screen menu: label button to switch to pending uploads view -->
+  <string name="summary_menu_show_pending">Show Pending Uploads</string>
+  
+  <!-- Summary screen menu: label button to switch to finished uploads view -->
+  <string name="summary_menu_show_finished">Show Finished Uploads</string>
+  
+  <!-- Menu label button to launch the browser to view Picasa Web Albums -->
+  <string name="menu_view_online">View Online</string>
+
+  <string name="menu_show_pending_items">Show Pending Uploads</string>
+  <string name="menu_hide_pending_items">Hide Pending Uploads</string>
+
+  <string name="menu_show_completed_items">Show Details</string>
+  <string name="menu_hide_completed_items">Hide Details</string>
+  
+  <!-- Settings menu item title -->
+  <string name="menu_settings">Settings</string>
+  
+  <!-- Finished uploads per-item upload date formatting -->
+  <string name="format_date_uploaded">Uploaded %s</string>
+  
+  <!-- Format a percentage value for use in a progress bar -->
+  <string name="format_progress_percent"><xliff:g id="number" example="50">%d</xliff:g><xliff:g id="percentsign" example="%">%%</xliff:g></string>
+
+  <!-- Label for the account selection spinner. -->
+  <string name="account">Account</string>
+
+  <!-- Button to start an upload (on the upload settings page) -->
+  <string name="upload">Upload</string>
+  <!-- Button to confirm the settings on the initial launch -->
+  <string name="ok">OK</string>
+  <!-- Button to cancel the starting of an upload (on the upload settings page) -->
+  <string name="cancel">Cancel</string>
+
+  <!-- First half of the dialog message shown while an upload is starting - 'Uploading to [destination]' -->
+  <string name="uploading_to">Uploading to <b>%s</b></string>
+  <!-- Second half of the dialog message shown while an upload is starting.
+       In some cases, this is omitted - ' for [username]' -->
+  <string name="uploading_for"> for <b>%s</b></string>
+  <!-- Format for the destination string of an upload - '[Picasa] "[Photo Title]"'. -->
+  <string name="destination_format">%1$s \"%2$s\"</string>
+
+  <!-- Toast shown when the application is started in an incorrect way (by another application). -->
+  <string name="toast_intent_error">Upload initialization failed.</string>
+  <!-- Toast shown when we fail to access a file to upload. -->
+  <string name="toast_file_error">File not available.</string>
+  <!-- Toast shown when we there's a problem retrieving the user account information. -->
+  <string name="account_error">Failed to retrieve account information.</string>
+  <!-- Dialog shown after we failed to log into the user's account -->
+  <string name="toast_failed_auth">There was a problem signing into your account.</string>
+
+  <!-- State of a file while its waiting for its turn to be uploaded: intentionally blank -->
+  <string name="upload_state_queued"></string>
+  <!-- State of an upload while it's waiting to retry after some kind of problem -->
+  <string name="upload_state_waiting_retry">Waiting to retry</string>
+  <!-- State of a large upload while it's waiting for a WiFi connection -->
+  <string name="upload_state_waiting_wifi">Waiting for WiFi</string>
+  <!-- State of a file while it's being uploaded -->
+  <string name="upload_state_uploading">Uploading</string>
+  <!-- State of a file after it failed to be uploaded -->
+  <string name="upload_state_failed">Failed</string>
+  <!-- State of a file after it was uploaded successfully -->
+  <string name="upload_state_completed">Completed</string>
+
+  <!-- Human-readable name of PAUSE_STATE_RUNNING -->
+  <string name="pause_state_running">uploading</string>
+  <!-- Human-readable name of PAUSE_STATE_MANUALLY_PAUSED -->
+  <string name="pause_state_manually_paused">manually paused</string>
+  <!-- Human-readable name of PAUSE_STATE_LOW_BATTERY -->
+  <string name="pause_state_low_battery">paused - low battery</string>
+  <!-- Human-readable name of PAUSE_STATE_NEED_CHARGER -->
+  <string name="pause_state_need_charger">paused - delayed until charging</string>
+  <!-- Human-readable name of PAUSE_STATE_NEED_CONNECTIVITY -->
+  <string name="pause_state_need_connectivity">paused - waiting for connection</string>
+  <!-- Human-readable name of pause_state_need_photos_quota -->
+  <string name="pause_state_need_photos_quota">paused - out of PWA quota</string>
+  <!-- Human-readable name of PAUSE_STATE_NEED_WIFI -->
+  <string name="pause_state_need_wifi">paused - waiting for wifi</string>
+  <!-- Human-readable name of PAUSE_STATE_ROAMING -->
+  <string name="pause_state_roaming">paused - roaming</string>
+  <!-- Human-readable name of PAUSE_STATE_RETRYING -->
+  <string name="pause_state_retrying">waiting to retry</string>
+
+  <!-- State detail for "Waiting to retry", when waiting to retry in 1 minute after a network failure -->
+  <string name="retry_in_1min">1 minute</string>
+  <!-- State detail for "Waiting to retry", when waiting to retry in 2 minutes after a network failure -->
+  <string name="retry_in_2min">2 minutes</string>
+  <!-- State detail for "Waiting to retry", when waiting to retry in 5 minutes after a network failure -->
+  <string name="retry_in_5min">5 minutes</string>
+  <!-- State detail for "Waiting to retry", when waiting for the data connection to come back -->
+  <string name="retry_no_data">No data connection</string>
+  <!-- Toast text for "Out of quota", when waiting for account server space to free up -->
+  <string name="account_out_of_quota">Account is out of disk quota</string>
+
+  <!-- State detail for "Failed", when we couldn't find the file to upload -->
+  <string name="completed_no_file">File not found</string>
+  <!-- State detail for "Failed", when the server responded in an unexpected way -->
+  <string name="failed_bad_response">Service error</string>
+  <!-- State detail for "Failed", when we bail out after several network failures -->
+  <string name="failed_network_error">Network error</string>
+  <!-- State detail for "Failed", when the server failed to authorize the user -->
+  <string name="failed_server_auth">Authentication failed</string>
+
+  <!-- Format for the list switcher button when the pending list is being displayed -->
+  <string name="manager_list_switcher_pending_format">Pending uploads [%d]</string>
+  <!-- Format for the list switcher button when the completed uploads list is being displayed -->
+  <string name="manager_list_switcher_completed_format">Completed uploads [%d]</string>
+
+  <!-- Label for the button to pause the upload service -->
+  <string name="manager_pause">Pause uploads</string>
+  <!-- Label for the button to resume the upload service -->
+  <string name="manager_resume">Resume uploads</string>
+  <!-- Label for the button to mark a photo for immediate upload -->
+  <string name="manager_upload_now">Upload now</string>
+  <!-- Label for the button to change when a photo is to be uploaded -->
+  <string name="manager_upload_later">Upload later</string>
+  <!-- Label for the button to mark a photo as do not upload -->
+  <string name="manager_do_not_upload">Do not upload</string>
+  <!-- Label for the button to view the photo or video -->
+  <string name="manager_view_media">View</string>
+  <!-- Label for the button to retry one failed upload -->
+  <string name="manager_retry">Retry</string>
+  <!-- Toast confirming the canceling of one pending upload -->
+  <string name="manager_toast_canceled">Upload canceled</string>
+  <!-- Toast shown when the user tries to cancel an already finished (completed or failed) upload -->
+  <string name="manager_toast_not_canceled">Upload already finished</string>
+  <!--  Label for the button to resync all photos with the server -->
+  <string name="manager_sync_all">Sync all</string>
+  <!-- Text shown when the uploads list is empty. 1=date; 2=time -->
+  <string name="manager_activity_last_sync_format">Last Sync:\n%1$s\n%2$s</string>
+
+  <!-- Text shown when the finished items list is empty -->
+  <string name="finished_empty">Finished items list is empty.</string>
+
+  <!-- Notification label used in all notifications [CHAR LIMIT=25] -->
+  <string name="notify_uploads">Instant Upload</string>
+  <!-- Notification when all uploads are finished (completed or failed, so this should be neutral) -->
+  <string name="notify_resolved">Uploads finished</string>
+  <!-- Notification when the upload service is paused -->
+  <string name="notify_paused">Uploads paused</string>
+  <!-- Notification when the upload application was not initialized -->
+  <string name="notify_activation_reminder">Instant Upload hasn\'t been activated yet</string>
+
+  <!-- Toast explaining that large files are only uploaded when there is an active WiFi connection (shown on first large upload) -->
+  <!-- TODO: Probably remove this, rename ID if not. -->
+  <string name="dialog_first_wifi">Large files will be uploaded over a WiFi connection only.</string>
+
+  <!-- Sync All progress dialog message when scanning locally and querying the server -->
+  <string name="dialog_sync_all_scanning">Scanning for files...</string>
+
+  <!-- Sync All progress dialog message when enqueueing requests -->
+  <string name="dialog_sync_all_preparing">Preparing <xliff:g id="photocount" example="5">%1$d</xliff:g> photos and <xliff:g id="videocount" example="4">%2$d</xliff:g> videos for upload...</string>
+
+  <!-- Toast displayed when Sync All found nothing to do -->
+  <string name="dialog_sync_all_found_none">No additional photos/videos need to be uploaded.</string>
+
+  <!-- Sync All dialog message when a server error occurs -->
+  <string name="dialog_sync_all_server_error">There was a problem communicating with the server. Please try again later.</string>
+
+  <!-- Sync All toast when the process canceled -->
+  <string name="dialog_sync_all_canceled">Sync all canceled</string>
+
+  <!-- Sync All dialog title for any errors -->
+  <string name="dialog_sync_all_error_title">Sync All</string>
+
+  <!-- ManagerActivity view completed uploads menu title -->
+  <string name="manager_view_completed">View Completed</string>
+
+  <!-- ManagerActivity view pending uploads menu title -->
+  <string name="manager_view_pending">View Pending</string>
+
+  <!-- Preferences category title: general category -->
+  <string name="preference_category_title_general">General</string>
+
+  <!-- Preference title: Pause all uploads -->
+  <string name="preference_title_pause_all_uploads">Pause all uploads</string>
+
+  <!-- Preference title: select if battery recharging is required before uploading -->
+  <string name="preference_title_need_power">Power</string>
+
+  <!-- Preference summary: checkbox to determine if battery recharging is required before uploading  -->
+  <string name="preference_summary_need_power">Upload only when the phone is being charged.</string>
+
+  <!-- Preference title: select if battery recharging is required before uploading -->
+  <string name="preference_title_need_wifi">Wi-Fi</string>
+
+  <!-- Preference summary: checkbox to determine if WiFi/WiMAX must be available  -->
+  <string name="preference_summary_need_wifi">Upload only when Wi-Fi is available.</string>
+
+  <!-- Preferences category title: photos -->
+  <string name="preference_category_title_photos">Photos</string>
+
+  <!-- Preference title: Photos Account -->
+  <string name="preference_title_photos_account">Account</string>
+
+  <!-- Preference title: select the networks to upload photos -->
+  <string name="preference_title_photos_upload_connectivity">Upload conditions</string>
+
+  <!-- Preference title: Photo size -->
+  <string name="preference_title_photo_size">Photo size</string>
+
+  <!-- Preferences category title: videos -->
+  <string name="preference_category_title_videos">Videos</string>
+
+  <!-- Preference title: Photos Account -->
+  <string name="preference_title_videos_account">Account</string>
+  
+  <!-- Preference title: Photos Account -->
+  <string name="preference_title_videos_account_summary">The photos account will be used video uploads.</string>
+
+  <!-- Preference title: select the networks to upload videos -->
+  <string name="preference_title_videos_upload_connectivity">Upload conditions</string>
+
+  <!-- Preference title: select the networks to upload videos -->
+  <string name="preference_title_videos_upload_connectivity_summary">Photos connectivity settings are used for now.</string>
+
+  <!-- Preference mobile data usage: for photos only -->
+  <string name="preference_mobile_data_usage_for_photos_only">Only photos via mobile networks</string>
+
+  <!-- Preference mobile data usage: for all media -->
+  <string name="preference_mobile_data_usage_for_all_media">Photos &amp; videos via mobile networks</string>
+
+  <!-- Preference mobile data usage: never -->
+  <string name="preference_mobile_data_usage_never">Photos &amp; videos via Wi-Fi only</string>
+
+  <!-- Preference category title: "About" -->
+  <string name="preference_category_title_about">About</string>
+
+  <!-- Preference title: CameraSync Version [CHAR LIMIT=20]-->
+  <string name="preference_title_camera_sync_version">Instant Upload Version</string>
+
+  <!-- Preference photos upload dimensions label: 1600px max -->
+  <string name="photos_upload_dimension_1600">Recommended: 1600 pixels (for sharing, prints and screensavers)</string>
+
+  <!-- Preference photos upload dimensions label: original size -->
+  <string name="photos_upload_dimension_original">Original size (slowest upload)</string>
+
+  <!-- Pause state text that shows the SD card is needed -->
+  <string name="pause_state_need_media">paused - SD card unavailable</string>
+
+  <!-- Subtitle text for the summary view, detailing why we are not uploading -->
+  <string name="summary_subtitle_paused_need_media">SD card unavailable</string>
+
+  <!-- Preference screen title: Instant Upload detailed settings button [CHAR LIMIT=20] -->
+  <string name="preference_plus_title">Instant Upload settings</string>
+
+  <!-- Preference title: Enable CameraSync checkbox description [CHAR LIMIT=19]-->
+  <string name="preference_plus_enable_cs">Instant Upload</string>
+
+  <!-- Preference title: description for Enable CameraSync-->
+  <string name="preference_plus_enable_cs_summary">Automatically upload new photos &amp; videos to a private web album</string>
+
+  <!-- Preference title: CameraSync Upload status-->
+  <string name="preference_plus_upload_status">Upload status</string>
+
+  <!-- Preference category: Advanced settings-->
+  <string name="preference_plus_category_advanced">Advanced</string>
+
+  <!-- Preference title: setting for Use mobile data connection-->
+  <string name="preference_plus_mobile_data_connection">Mobile uploads</string>
+
+  <!-- Preference title: Sync while roaming-->
+  <string name="preference_plus_sync_while_roaming">Roaming uploads</string>
+
+  <!-- Preference summary: Sync while roaming-->
+  <string name="preference_plus_sync_while_roaming_summary">Upload photos &amp; videos when roaming on data network</string>
+
+  <!-- Preference title: Delay Sync until charging phone-->
+  <string name="preference_plus_delay_sync_until_charging">Battery uploads</string>
+
+  <!-- Preference summary: Delay Sync until charging phone-->
+  <string name="preference_plus_delay_sync_until_charging_summary">Upload photos &amp; videos only when charging</string>
+
+  <!-- Preference title: Sync all photos and videos-->
+  <string name="preference_plus_sync_all">Upload existing photos</string>
+
+  <!-- Preference title: description for Sync all photos and videos-->
+  <string name="preference_plus_sync_all_description">Upload any existing photos &amp; videos from your phone now</string>
+
+  <!-- Summary screen: subtitle for when the app is disabled-->
+  <string name="summary_subtitle_disabled">Disabled</string>
+
+  <!-- Preference summary: Summary string header, example "paused: waiting for wifi"-->
+  <string name="preference_summary_header_format">%1$s: %2$s</string>
+
+  <!-- Preference summary: uploading format for Uploading and percent number "Uploading (50%)"-->
+  <string name="preference_summary_uploading_percent">Uploading (%1$d%%)</string>
+
+  <!-- Preference summary: format for uploading "3 of 5"-->
+  <string name="preference_summary_uploading_format">: %1$d of %2$d</string>
+
+  <!-- Preference summary: subtitle for when uploading is paused-->
+  <string name="preference_summary_uploading_paused">Paused: touch to resume uploading</string>
+
+  <!-- Preference summary: title for sync all confirm dialog -->
+  <string name="preference_plus_sync_all_prompt_title">Upload existing photos</string>
+
+  <!-- Preference summary: text for sync all confirm dialog -->
+  <string name="preference_plus_sync_all_prompt_text">Uploading photos and videos that have not already been uploaded from your phone to a private album on the web can take a while, but will be done in the background. Are you sure you want to continue?</string>
+
+  <!-- Preference summary: Yes button text for sync all confirm dialog -->
+  <string name="preference_plus_sync_all_prompt_yes">Yes</string>
+
+  <!-- Preference summary: No button text for sync all confirm dialog -->
+  <string name="preference_plus_sync_all_prompt_no">No</string>
+
+</resources>