Merge "Revert "Revert "Fix hierarchical folders""" into jb-ub-mail-ur10

commit: 03f1239aec39f8e3e3ade0e8c78df5836d5f4fc2 [log] [tgz]
author: Alice Yang <alice@google.com> Wed Sep 04 07:26:28 2013 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Wed Sep 04 07:26:28 2013 +0000
tree: 478d16871ea656aea0dd28139c855b54f77033a5
parent: a797e4669ee2c1243438ea22197fd5cdf8e1038d [diff]
parent: ebeef1babe39de2c1d97429a93ea956c655cd377 [diff]
diff --git a/Android.mk b/Android.mk
index 4c1d85c..719f142 100644
--- a/Android.mk
+++ b/Android.mk

@@ -19,7 +19,8 @@
 
 #Include res dir from photoviewer
 photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res
-res_dirs := res $(chips_dir) $(photo_dir)
+gridlayout_dir := ../../../frameworks/support/v7/gridlayout/res
+res_dirs := res $(chips_dir) $(photo_dir) $(gridlayout_dir)
 
 
 ##################################################
@@ -34,6 +35,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES += guava
 LOCAL_STATIC_JAVA_LIBRARIES += android-common
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
 
 LOCAL_SDK_VERSION := current
@@ -42,7 +44,7 @@
         $(call all-logtags-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo
+LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo:android.support.v7.gridlayout
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 27482ee..c8f2c32 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -113,7 +113,7 @@
         <activity
                 android:name=".browse.EmlViewerActivity"
                 android:label="@string/app_name"
-                android:theme="@style/PlainUnifiedEmailTheme" >
+                android:theme="@style/UnifiedEmailTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/res/drawable-hdpi/ic_menu_send_holo_light.png b/res/drawable-hdpi/ic_menu_send_holo_light.png
index 95fc4fc..ebbbc03 100644
--- a/res/drawable-hdpi/ic_menu_send_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_send_holo_light.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_menu_send_holo_light.png b/res/drawable-mdpi/ic_menu_send_holo_light.png
index e90a8c1..c967e9d 100644
--- a/res/drawable-mdpi/ic_menu_send_holo_light.png
+++ b/res/drawable-mdpi/ic_menu_send_holo_light.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_menu_send_holo_light.png b/res/drawable-xhdpi/ic_menu_send_holo_light.png
index 9f4c797..f5d3f9f 100644
--- a/res/drawable-xhdpi/ic_menu_send_holo_light.png
+++ b/res/drawable-xhdpi/ic_menu_send_holo_light.png
Binary files differ

diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index 60477c1..204a82a 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml

@@ -178,12 +178,12 @@
         android:layout_marginBottom="12dp"
         android:visibility="gone" />
 
-    <!-- Folders should be ~7dp below the subject *baseline*, so we cancel out part of the 12dp bottom margin above -->
+    <!-- Folders should be ~5dp below the subject *baseline*, so we cancel out part of the 12dp bottom margin above -->
     <TextView
         android:id="@+id/folders"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-8dp"
+        android:layout_marginTop="-10dp"
         android:fontFamily="sans-serif-light"
         android:includeFontPadding="false"
         android:text="@string/long_string"

diff --git a/res/layout/conversation_item_view_normal_spacious.xml b/res/layout/conversation_item_view_normal_spacious.xml
index 602d4e6..b641759 100644
--- a/res/layout/conversation_item_view_normal_spacious.xml
+++ b/res/layout/conversation_item_view_normal_spacious.xml

@@ -181,12 +181,12 @@
         android:layout_marginBottom="16dp"
         android:visibility="gone" />
 
-    <!-- Labels should be ~7dp below the subject *baseline*, so we cancel out part of the 16dp bottom margin -->
+    <!-- Labels should be ~5dp below the subject *baseline*, so we cancel out part of the 16dp bottom margin -->
     <TextView
         android:id="@+id/folders"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-12dp"
+        android:layout_marginTop="-14dp"
         android:fontFamily="sans-serif-light"
         android:includeFontPadding="false"
         android:text="@string/long_string"

diff --git a/res/layout/conversation_message_details_header_expanded.xml b/res/layout/conversation_message_details_header_expanded.xml
index 126a605..f63cac6 100644
--- a/res/layout/conversation_message_details_header_expanded.xml
+++ b/res/layout/conversation_message_details_header_expanded.xml

@@ -15,7 +15,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/details_expanded_content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -24,8 +25,8 @@
     android:paddingEnd="@dimen/message_details_header_padding_end"
     android:paddingLeft="@dimen/message_details_header_padding_start_collapsed"
     android:paddingRight="@dimen/message_details_header_padding_end"
-    android:columnCount="3"
-    android:rowCount="5" >
+    app:columnCount="3"
+    app:rowCount="6" >
 
     <TextView
         android:id="@+id/from_heading"
@@ -33,8 +34,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/message_header_inner_side_padding"
         android:layout_marginRight="@dimen/message_header_inner_side_padding"
-        android:layout_column="0"
-        android:layout_row="0"
+        app:layout_column="0"
+        app:layout_row="0"
         android:text="@string/from_heading"
         android:visibility="gone"
         style="@style/MessageHeaderSmallStyle" />
@@ -42,10 +43,10 @@
         android:id="@+id/from_details"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal"
+        app:layout_gravity="fill_horizontal"
         android:layout_marginBottom="4dp"
-        android:layout_column="1"
-        android:layout_row="0"
+        app:layout_column="1"
+        app:layout_row="0"
         android:visibility="gone"
         style="@style/MessageDetailsValueStyle" />
     <ImageView
@@ -54,8 +55,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/message_header_inner_side_padding"
         android:layout_marginLeft="@dimen/message_header_inner_side_padding"
-        android:layout_column="2"
-        android:layout_row="0"
+        app:layout_column="2"
+        app:layout_row="0"
         android:contentDescription="@string/collapse_recipient_details"
         android:src="@drawable/ic_menu_expander_maximized_holo_light" />
     <TextView
@@ -64,8 +65,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/message_header_inner_side_padding"
         android:layout_marginRight="@dimen/message_header_inner_side_padding"
-        android:layout_column="0"
-        android:layout_row="1"
+        app:layout_column="0"
+        app:layout_row="1"
         android:text="@string/replyto_heading"
         android:visibility="gone"
         style="@style/MessageHeaderSmallStyle" />
@@ -73,10 +74,10 @@
         android:id="@+id/replyto_details"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal"
+        app:layout_gravity="fill_horizontal"
         android:layout_marginBottom="4dp"
-        android:layout_column="1"
-        android:layout_row="1"
+        app:layout_column="1"
+        app:layout_row="1"
         android:visibility="gone"
         style="@style/MessageDetailsValueStyle" />
     <TextView
@@ -85,8 +86,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/message_header_inner_side_padding"
         android:layout_marginRight="@dimen/message_header_inner_side_padding"
-        android:layout_column="0"
-        android:layout_row="2"
+        app:layout_column="0"
+        app:layout_row="2"
         android:text="@string/to_heading"
         android:visibility="gone"
         style="@style/MessageHeaderSmallStyle" />
@@ -94,10 +95,10 @@
         android:id="@+id/to_details"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal"
+        app:layout_gravity="fill_horizontal"
         android:layout_marginBottom="4dp"
-        android:layout_column="1"
-        android:layout_row="2"
+        app:layout_column="1"
+        app:layout_row="2"
         android:visibility="gone"
         style="@style/MessageDetailsValueStyle" />
     <TextView
@@ -106,8 +107,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/message_header_inner_side_padding"
         android:layout_marginRight="@dimen/message_header_inner_side_padding"
-        android:layout_column="0"
-        android:layout_row="3"
+        app:layout_column="0"
+        app:layout_row="3"
         android:text="@string/cc_heading"
         android:visibility="gone"
         style="@style/MessageHeaderSmallStyle" />
@@ -115,10 +116,10 @@
         android:id="@+id/cc_details"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal"
+        app:layout_gravity="fill_horizontal"
         android:layout_marginBottom="4dp"
-        android:layout_column="1"
-        android:layout_row="3"
+        app:layout_column="1"
+        app:layout_row="3"
         android:visibility="gone"
         style="@style/MessageDetailsValueStyle" />
     <TextView
@@ -127,8 +128,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/message_header_inner_side_padding"
         android:layout_marginRight="@dimen/message_header_inner_side_padding"
-        android:layout_column="0"
-        android:layout_row="4"
+        app:layout_column="0"
+        app:layout_row="4"
         android:text="@string/bcc_heading"
         android:visibility="gone"
         style="@style/MessageHeaderSmallStyle" />
@@ -136,11 +137,32 @@
         android:id="@+id/bcc_details"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal"
+        app:layout_gravity="fill_horizontal"
         android:layout_marginBottom="4dp"
-        android:layout_column="1"
-        android:layout_row="4"
+        app:layout_column="1"
+        app:layout_row="4"
+        android:visibility="gone"
+        style="@style/MessageDetailsValueStyle" />
+    <TextView
+        android:id="@+id/date_heading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/message_header_inner_side_padding"
+        android:layout_marginRight="@dimen/message_header_inner_side_padding"
+        app:layout_column="0"
+        app:layout_row="5"
+        android:text="@string/date_heading"
+        android:visibility="gone"
+        style="@style/MessageHeaderSmallStyle" />
+    <TextView
+        android:id="@+id/date_details"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_gravity="fill_horizontal"
+        android:layout_marginBottom="4dp"
+        app:layout_column="1"
+        app:layout_row="5"
         android:visibility="gone"
         style="@style/MessageDetailsValueStyle" />
 
-</GridLayout>
+</android.support.v7.widget.GridLayout>

diff --git a/res/layout/conversation_message_header.xml b/res/layout/conversation_message_header.xml
index 21c111c..b4a9cbf 100644
--- a/res/layout/conversation_message_header.xml
+++ b/res/layout/conversation_message_header.xml

@@ -27,8 +27,13 @@
     android:layout_marginRight="@dimen/conversation_view_margin_side" >
 
     <include layout="@layout/conversation_message_upper_header"
-        android:id="@+id/upper_header" />
+             android:id="@+id/upper_header" />
 
+    <LinearLayout android:id="@+id/header_extra_content"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:background="@color/message_header_background_color"
+                  android:orientation="vertical" />
     <View
         android:id="@+id/snap_header_bottom_border"
         android:layout_width="match_parent"

diff --git a/res/layout/secure_conversation_view.xml b/res/layout/secure_conversation_view.xml
index d21ac4b..2e391eb 100644
--- a/res/layout/secure_conversation_view.xml
+++ b/res/layout/secure_conversation_view.xml

@@ -75,7 +75,8 @@
                 <com.android.mail.browse.MessageWebView
                     android:id="@+id/webview"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"/>
                 <View
                     android:layout_width="1dp"
                     android:layout_height="match_parent"

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index abe3c19..24ba7a0 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-lêer"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Voorskou"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Stoor"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Inligting"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Kanselleer"</string>
     <string name="download_again" msgid="7418568915429156518">"Laai weer af"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Inligting"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultate"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Search word nie ondersteun op hierdie rekening nie."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Soek tans…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Onlangs"</string>
-    <string name="add_label" msgid="1638508840481944248">"Voeg etiket by"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Nuwer"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Ouer"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nuwe boodskap van <xliff:g id="SENDER">%s</xliff:g> af."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe"</string>
-    <string name="show" msgid="7114006150083237343">"Wys"</string>
+    <string name="add_label" msgid="6060201715848652940">"Voeg vouer by"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nuwe boodskap van <xliff:g id="SENDER">%s</xliff:g> af. Wys."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe. Wys."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Vou ontvanger se details uit"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Vou ontvanger se details in"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Wys kontakinligting vir <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Aan: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Wys prente"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Wys altyd prente vanaf hierdie sender"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Prente vanaf hierdie sender sal outomaties gewys word."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Kies rekening"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Kies vouer"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"E-posvouer"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sinkroniseer: Alles"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinkroniseer: Afgelope <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sinkroniseer: Afgelope <xliff:g id="COUNT">%1$d</xliff:g> dae"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sinkroniseer: Geen"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Verander vouers"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Skuif na"</string>
     <string name="search_hint" msgid="3625734263059221350">"Deursoek e-pos"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Gister <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Maak wenk toe"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Outo-sinkronisering is af."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Tik om outosinkroniseer aan te skakel."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Raak om aan te skakel."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Rekeningsinkronisering is af."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Vliegtuigmodus is aan"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Skakel aan in <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Rekeninginstellings"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> ongestuur in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Skakel outo-sinkroniseer aan?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Veranderinge wat jy aan alle programme en rekeninge maak, nie net in Gmail nie, sal tussen die web, jou ander toestelle en jou <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> gesinkroniseer word."</string>
+    <string name="phone" msgid="5171715391553213328">"foon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Skakel aan"</string>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f3f7c46..7d4f539 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ፋይል"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"ቅድመ-ዕይታ"</string>
     <string name="save_attachment" msgid="5360128849867863132">"አስቀምጥ"</string>
-    <string name="info_attachment" msgid="607849900865956536">"መረጃ"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"ሰርዝ"</string>
     <string name="download_again" msgid="7418568915429156518">"እንደገና አውርድ"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"መረጃ"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"ውጤቶች"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"ፍለጋ በዚህ መለያ አይደገፍም።"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"በመፈለግ ላይ…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"የቅርብ ጊዜ"</string>
-    <string name="add_label" msgid="1638508840481944248">"መለያ ስም አክል"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> ከ<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"ይበልጥ አዲስ"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"የቆየ"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"አዲስ መልዕክት ከ<xliff:g id="SENDER">%s</xliff:g>።"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች"</string>
-    <string name="show" msgid="7114006150083237343">"አሳይ"</string>
+    <string name="add_label" msgid="6060201715848652940">"አቃፊ አክል"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"አዲስ መልዕክት ከ<xliff:g id="SENDER">%s</xliff:g>። አሳይ።"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች። አሳይ።"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"የተቀባይ ዝርዝሮችን ዘርጋ"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"የተቀባይ ዝርዝሮች ሰብስብ"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"የ<xliff:g id="NAME">%1$s</xliff:g> የእውቂያ መረጃ አሳይ"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"ለ፦ "</string>
     <string name="cc_heading" msgid="52678613787360092">"ካርቦን ቅጂ፦ "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"ስውር ቅጂ፦ "</string>
+    <string name="date_heading" msgid="2086174555097691910">"ቀን፦ "</string>
     <string name="show_images" msgid="1875700481186331432">"ስዕሎች  አሳይ"</string>
     <string name="always_show_images" msgid="5966408990164581801">"ሁልጊዜ ከዚህ ላኪ ፎቶዎችን አሳይ"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"የዚህ ላኪ ፎቶዎች በራስ-ሰር ይታያሉ።"</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"መለያ ምረጥ"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"አቃፊ ምረጥ"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"የኢሜይል አቃፊ"</string>
-    <string name="sync_all" msgid="1057043212338233359">"አመሳስል፦ ሁሉንም"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"አመሳሰል፦ የመጨረሻ <xliff:g id="COUNT">%1$d</xliff:g> ቀናት"</item>
-    <item quantity="other" msgid="6856940335775567991">"አመሳስል፦ የመጨረሻ <xliff:g id="COUNT">%1$d</xliff:g> ቀናት"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"አመሳስል፦ ምንም"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"አቃፊዎችን ይቀይሩ"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"ውሰድ ወደ"</string>
     <string name="search_hint" msgid="3625734263059221350">"መልዕክት ፈልግ"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"ትላንት፣ <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"ጠቃሚ ምክሩን ያሰናብቱ"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"ራስ-አመሳስል ጠፍቷል።"</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"በራስ ሰር አመሳስልን ለማብራት ነካ ያድርጉ።"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"ለማብራት ይንኩ።"</string>
     <string name="account_sync_off" msgid="5699548271856775808">"የመለያ ማመሳሰል ጠፍቷል።"</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"የአውሮፕላን ሁነታ በርቷል"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"በ<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g> ውስጥ አብራ።"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"የመለያ ቅንብሮች"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> ያልተላከ በ<xliff:g id="OUTBOX">%2$s</xliff:g> ውስጥ"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"ራስ-አመሳስል ይብራ?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"በGmail ላይ ብቻ ሳይሆን በሁሉም መተግበሪያዎች እና መለያዎች ላይ የሚያደርጓቸው ለውጦች በድር፣ ሌሎች የእርስዎ መሣሪያዎች እና በእርስዎ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> መካከል ይመሳሰላሉ።"</string>
+    <string name="phone" msgid="5171715391553213328">"ስልክ"</string>
+    <string name="tablet" msgid="7956969657216748522">"ጡባዊ"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"አብራ"</string>
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 04fcde9..f66cca4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"ملف <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"معاينة"</string>
     <string name="save_attachment" msgid="5360128849867863132">"حفظ"</string>
-    <string name="info_attachment" msgid="607849900865956536">"معلومات"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"إلغاء"</string>
     <string name="download_again" msgid="7418568915429156518">"تنزيل مرة أخرى"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"معلومات"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"النتائج"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"لا يمكن استخدام البحث على هذا الحساب."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"جارٍ البحث…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"الأخيرة"</string>
-    <string name="add_label" msgid="1638508840481944248">"إضافة تصنيف"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"أحدث"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"أقدم"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"رسالة جديدة من <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> من الرسائل الجديدة"</string>
-    <string name="show" msgid="7114006150083237343">"عرض"</string>
+    <string name="add_label" msgid="6060201715848652940">"إضافة مجلد"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"رسالة جديدة من <xliff:g id="SENDER">%s</xliff:g>. عرض."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> من الرسائل الجديدة. عرض."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"توسيع تفاصيل المستلم"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"تصغير تفاصيل المستلم"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"عرض معلومات جهة الاتصال لـ <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"إلى: "</string>
     <string name="cc_heading" msgid="52678613787360092">"نسخة إلى: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"نسخة مخفية الوجهة: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"التاريخ: "</string>
     <string name="show_images" msgid="1875700481186331432">"إظهار الصور"</string>
     <string name="always_show_images" msgid="5966408990164581801">"عرض صور من هذا المرسل دومًا"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"سيتم عرض الصور من هذا المرسل تلقائيًا."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"اختيار حساب"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"اختيار مجلد"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"مجلد البريد الإلكتروني"</string>
-    <string name="sync_all" msgid="1057043212338233359">"المزامنة: الكل"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"المزامنة: آخر <xliff:g id="COUNT">%1$d</xliff:g> يوم"</item>
-    <item quantity="other" msgid="6856940335775567991">"المزامنة: آخر <xliff:g id="COUNT">%1$d</xliff:g> يوم"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"المزامنة: لا شيء"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"تغيير المجلدات"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"نقل إلى"</string>
     <string name="search_hint" msgid="3625734263059221350">"بحث في البريد"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"أمس، <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"تجاهل النصيحة"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"المزامنة التلقائية متوقفة."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"انقر لتشغيل المزامنة التلقائية."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"المس للتشغيل."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"مزامنة الحساب متوقفة."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"وضع الطائرة قيد التشغيل"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"تشغيل في <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"إعدادات الحساب"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> من الرسائل التي لم يتم إرسالها في <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"تشغيل المزامنة التلقائية؟"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"ستتم مزامنة التغييرات التي تجريها على جميع التطبيقات والحسابات، وليس Gmail فقط، بين الويب والأجهزة الأخرى و<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"هاتف"</string>
+    <string name="tablet" msgid="7956969657216748522">"جهاز لوحي"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"تشغيل"</string>
 </resources>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 4646523..3c536ca 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -103,7 +103,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> файла"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Папярэдні прагляд"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Захаваць"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Інфармацыя"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Адмена"</string>
     <string name="download_again" msgid="7418568915429156518">"Спампаваць яшчэ раз"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Інфармацыя"</string>
@@ -214,14 +213,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Вынікі"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"У гэтым уліковым запісе пошук не падтрымліваецца."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Пошук..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Апошнiя навіны"</string>
-    <string name="add_label" msgid="1638508840481944248">"Дадаць цэтлік"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Больш новыя"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Больш старыя"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Новае паведамленне ад адпраўніка <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Новых паведамленняў: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Паказаць"</string>
+    <!-- no translation found for add_label (6060201715848652940) -->
+    <skip />
+    <!-- no translation found for new_incoming_messages_one (164529476439626369) -->
+    <skip />
+    <!-- no translation found for new_incoming_messages_many:other (6028908826781946980) -->
     <string name="expand_recipient_details" msgid="2266544827446346880">"Разгарнуць звесткi пра атрымальніка"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Згарнуць дадзеныя пра атрымальніка"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Паказаць кантактную інфармацыю карыстальнiка <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -237,6 +233,8 @@
     <skip />
     <!-- no translation found for bcc_heading (4698055226318660420) -->
     <skip />
+    <!-- no translation found for date_heading (2086174555097691910) -->
+    <skip />
     <string name="show_images" msgid="1875700481186331432">"Паказаць выявы"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Заўсёды паказваць выявы ад гэтага адпраўніка"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Выявы ад гэтага адпраўніка будуць паказвацца аўтаматычна."</string>
@@ -280,12 +278,6 @@
     <string name="activity_folder_selection" msgid="5161845867397316052">"Выберыце тэчку"</string>
     <!-- no translation found for folder_shortcut_widget_label (6700454062559797794) -->
     <skip />
-    <string name="sync_all" msgid="1057043212338233359">"Сінхранізаваць: усе"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Сінхранізацыя за апошнія днi: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="6856940335775567991">"Сінхранізацыя за апошнія днi: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Не сінхранізаваць"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Змена папак"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Перанесці"</string>
     <string name="search_hint" msgid="3625734263059221350">"Пошук у пошце"</string>
@@ -414,16 +406,24 @@
     <skip />
     <!-- no translation found for auto_sync_off (7185342309138211107) -->
     <skip />
-    <!-- no translation found for tap_to_enable_sync (8332275909378339123) -->
+    <!-- no translation found for tap_to_enable_sync (3334767826332383085) -->
     <skip />
     <!-- no translation found for account_sync_off (5699548271856775808) -->
     <skip />
-    <!-- no translation found for airplane_mode_on (2206488373387145840) -->
-    <skip />
     <!-- no translation found for enable_sync_in_account_settings (7707227409018294927) -->
     <skip />
     <!-- no translation found for account_settings_param (5277032997773498476) -->
     <skip />
     <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
     <skip />
+    <!-- no translation found for turn_auto_sync_on_dialog_title (8981949974921704813) -->
+    <skip />
+    <!-- no translation found for turn_auto_sync_on_dialog_body (5070811094706347971) -->
+    <skip />
+    <!-- no translation found for phone (5171715391553213328) -->
+    <skip />
+    <!-- no translation found for tablet (7956969657216748522) -->
+    <skip />
+    <!-- no translation found for turn_auto_sync_on_dialog_confirm_btn (1445158420197688714) -->
+    <skip />
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f3ec1d9..a3b0573 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> файл"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Визуал."</string>
     <string name="save_attachment" msgid="5360128849867863132">"Запазване"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Информация"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Отказ"</string>
     <string name="download_again" msgid="7418568915429156518">"Изтегляне отново"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Информация"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Резултати"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Търсенето не се поддържа за този профил."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Търси се…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Скорошни"</string>
-    <string name="add_label" msgid="1638508840481944248">"Добавяне на етикет"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"По-нова"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"По-стара"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Ново съобщение от <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения"</string>
-    <string name="show" msgid="7114006150083237343">"Показване"</string>
+    <string name="add_label" msgid="6060201715848652940">"Добавяне на папка"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Ново съобщение от <xliff:g id="SENDER">%s</xliff:g>. Показване."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения. Показване."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Разгъване на подробностите за получателя"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Свиване на подробностите за получателя"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показване на информацията за връзка със: <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"До: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Як: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Ск: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Дата: "</string>
     <string name="show_images" msgid="1875700481186331432">"Показване на снимките"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Снимки от този подател: Показване винаги"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Снимките от този подател ще се показват автоматично."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Изберете профил"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Изберете папка"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Папка „Имейл“"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Синхронизиране: Всички"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Синхронизиране: Последният <xliff:g id="COUNT">%1$d</xliff:g> ден"</item>
-    <item quantity="other" msgid="6856940335775567991">"Синхронизиране: Последните <xliff:g id="COUNT">%1$d</xliff:g> дни"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Синхронизиране: Без"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Промяна на папките"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Преместване във:"</string>
     <string name="search_hint" msgid="3625734263059221350">"Търсене в пощата"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Вчера, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Отхвърляне на съвета"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Автоматичното синхронизиране е изключено."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Докоснете, за да включите автоматичното синхронизиране."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Докоснете, за да включите."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Синхронизирането на профила е изключено."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Самолетният режим е включен"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Включете от <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"настройките на профила"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> неизпратени от <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Да се включи ли автоматичното синхронизиране?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Промените, които правите във всички приложения и профили, а не само в Gmail, ще се синхронизират между мрежата, другите ви устройства и <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ви."</string>
+    <string name="phone" msgid="5171715391553213328">"телефона"</string>
+    <string name="tablet" msgid="7956969657216748522">"таблета"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Включване"</string>
 </resources>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 37d06b8..e97b820 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Fitxer <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Previsual."</string>
     <string name="save_attachment" msgid="5360128849867863132">"Desa"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informació"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Cancel·la"</string>
     <string name="download_again" msgid="7418568915429156518">"Torna-ho a baixar"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informació"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultats"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"La cerca no és compatible en aquest compte."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"S\'està cercant..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recents"</string>
-    <string name="add_label" msgid="1638508840481944248">"Afegeix una etiqueta"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Més recent"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Més antiga"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Missatge nou de: <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous"</string>
-    <string name="show" msgid="7114006150083237343">"Mostra"</string>
+    <string name="add_label" msgid="6060201715848652940">"Afegeix una carpeta"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Missatge nou de <xliff:g id="SENDER">%s</xliff:g>. Mostra\'l."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous. Mostra\'ls."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Amplia els detalls del destinatari"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Redueix les dades del destinatari"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostra la informació de contacte de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Per a: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Cco: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Data: "</string>
     <string name="show_images" msgid="1875700481186331432">"Mostra imatges"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Mostra sempre imatges d\'aquest remitent"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Les imatges d\'aquest remitent es mostraran automàticament."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Selecciona un compte"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Tria de carpeta"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Carpeta de correu electrònic"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sincronitza-ho tot"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronitza el darrer dia (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sincronitza els darrers <xliff:g id="COUNT">%1$d</xliff:g> dies"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sincronitza: cap"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Canvia les carpetes"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Mou a"</string>
     <string name="search_hint" msgid="3625734263059221350">"Cerca al correu"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ahir a les <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Omet el consell"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"La sincronització automàtica està desactivada."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Toca aquí per activar la sincronització automàtica."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Toca aquí per activar-ho."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"La sincronització del compte està desactivada."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"El mode d\'avió està activat."</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Activa-la a <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Configuració del compte"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> missatges no enviats a <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Vols activar la sincronització automàtica?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Els canvis que facis a les aplicacions i als comptes, i no només a Gmail, se sincronitzaran al web, a la resta de dispositius i a <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telèfon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tauleta"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Activa"</string>
 </resources>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1e6ed45..442f74e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Soubor <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Náhled"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Uložit"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informace"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Zrušit"</string>
     <string name="download_again" msgid="7418568915429156518">"Stáhnout znovu"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informace"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Výsledky"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Vyhledávání není v tomto účtu podporováno."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Vyhledávání..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Poslední"</string>
-    <string name="add_label" msgid="1638508840481944248">"Přidat štítek"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Novější"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Starší"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nová zpráva od <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Nové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Zobrazit"</string>
+    <string name="add_label" msgid="6060201715848652940">"Přidat složku"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nová zpráva od <xliff:g id="SENDER">%s</xliff:g>. Zobrazit."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Nové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>. Zobrazit."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozbalit podrobnosti o příjemci"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sbalit podrobnosti o příjemci"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Zobrazit kontaktní údaje uživatele <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Komu: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kopie: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Skrytá: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Zobrazit obrázky"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Obr. od tohoto odesílatele vždy zobrazit"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Obrázky od tohoto odesílatele se zobrazí automaticky."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Výběr účtu"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Výběr složky"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Složka aplikace E-mail"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synchronizovat: vše"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synchronizovat: <xliff:g id="COUNT">%1$d</xliff:g> den"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synchronizovat <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Synchronizovat: nic"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Změnit složky"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Přesunout"</string>
     <string name="search_hint" msgid="3625734263059221350">"Vyhledat v poště"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Včera v <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Zavřít tip"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatická synchronizace je vypnuta."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Automatickou synchronizaci zapnete klepnutím."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Zapnete ji klepnutím."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Synchronizace účtu je vypnuta."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Režim V letadle je zapnutý"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Zapněte ji v <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Nastavení účtu"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Neodeslané zprávy ve složce <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Zapnout automatickou synchronizaci?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Změny, které provedete ve všech aplikacích a účtech (nikoli jen v Gmailu), budou synchronizovány mezi webem, ostatními zařízeními a zařízením <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Zapnout"</string>
 </resources>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b25d445..e2d5191 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fil"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Vis eks."</string>
     <string name="save_attachment" msgid="5360128849867863132">"Gem"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Annuller"</string>
     <string name="download_again" msgid="7418568915429156518">"Download igen"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Oplysninger"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultater"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Søgningen understøttes ikke på denne konto."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Søger..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Seneste"</string>
-    <string name="add_label" msgid="1638508840481944248">"Tilføj etiket"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Nyere"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Ældre"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Ny besked fra <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> nye beskeder"</string>
-    <string name="show" msgid="7114006150083237343">"Vis"</string>
+    <string name="add_label" msgid="6060201715848652940">"Tilføj mappe"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Ny besked fra <xliff:g id="SENDER">%s</xliff:g>. Vis."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> nye beskeder. Vis."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Udvid modtageroplysninger"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Skjul modtageroplysninger"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Vis kontaktoplysninger for <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Til: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Dato: "</string>
     <string name="show_images" msgid="1875700481186331432">"Vis billeder"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Vis altid billeder fra denne afsender"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Billeder fra denne afsender vises automatisk."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Vælg konto"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Vælg mappe..."</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"E-mailmappe"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synkroniser: alle"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synkronisering: seneste <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synkronisering: seneste <xliff:g id="COUNT">%1$d</xliff:g> dage"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Synkroniser: ingen"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Skift mapper"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Flyt til"</string>
     <string name="search_hint" msgid="3625734263059221350">"Søg i mail"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"I går kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Afvis tip"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatisk synkronisering er slået fra."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Tryk for at aktivere automatisk synkronisering."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Tryk for at slå til."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Kontosynkronisering er slået fra."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Flytilstand er slået til"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Aktivér i <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Kontoindstillinger"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> usendte meddelelser i <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Vil du slå automatisk synkronisering til?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Ændringer, du foretager i alle apps og konti, ikke kun Gmail, synkroniseres mellem nettet, dine andre enheder og din <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Slå til"</string>
 </resources>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ab4b4a5..f7465fa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-Datei"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Vorschau"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Speichern"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Abbrechen"</string>
     <string name="download_again" msgid="7418568915429156518">"Erneut herunterladen"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Info"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Ergebnisse"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Die Suche wird für dieses Konto nicht unterstützt."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Wird gesucht..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Letzte"</string>
-    <string name="add_label" msgid="1638508840481944248">"Label hinzufügen"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Neuer"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Älter"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Neue Nachricht von <xliff:g id="SENDER">%s</xliff:g>"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten"</string>
-    <string name="show" msgid="7114006150083237343">"Ansehen"</string>
+    <string name="add_label" msgid="6060201715848652940">"Ordner hinzufügen"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Neue Nachricht von <xliff:g id="SENDER">%s</xliff:g>. Anzeigen"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten. Anzeigen"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Empfängerdetails maximieren"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Empfängerdetails minimieren"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Kontaktinformationen für <xliff:g id="NAME">%1$s</xliff:g> anzeigen"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"An: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Bilder anzeigen"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Bilder von diesem Absender immer anzeigen"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Bilder von diesem Absender werden automatisch angezeigt."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Konto auswählen"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Ordner auswählen"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"E-Mail-Ordner"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Alle synchronisieren"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synchronisieren: letzter (<xliff:g id="COUNT">%1$d</xliff:g>) Tag"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synchronisieren: letzte <xliff:g id="COUNT">%1$d</xliff:g> Tage"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Keine synchronisieren"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Ordner ändern"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Verschieben nach"</string>
     <string name="search_hint" msgid="3625734263059221350">"In E-Mails suchen"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Gestern um <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Tipp schließen"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatische Synchronisierung ist deaktiviert."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Zum Aktivieren der automatischen Synchronisierung hier tippen"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Zum Aktivieren berühren"</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Kontosynchronisierung ist deaktiviert."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Flugzeugmodus ist aktiviert."</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"In <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g> aktivieren"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Kontoeinstellungen"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> nicht gesendete Nachricht(en) in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Automatische Synchronisierung aktivieren?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Änderungen, die Sie nicht nur an Gmail, sondern an allen Apps und Konten vornehmen, werden zwischen dem Web, Ihren anderen Geräten und Ihrem <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> synchronisiert."</string>
+    <string name="phone" msgid="5171715391553213328">"Telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"Tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Aktivieren"</string>
 </resources>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f509f14..6725c09 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Αρχείο <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Προεπισκ."</string>
     <string name="save_attachment" msgid="5360128849867863132">"Αποθήκευση"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Πληροφ."</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Ακύρωση"</string>
     <string name="download_again" msgid="7418568915429156518">"Λήψη ξανά"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Πληροφορίες"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Αποτελέσματα"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Η αναζήτηση δεν υποστηρίζεται σε αυτόν τον λογαριασμό."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Αναζήτηση…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Πρόσφατοι"</string>
-    <string name="add_label" msgid="1638508840481944248">"Προσθήκη ετικέτας"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Νεότερη"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Παλαιότερη"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Νέο μήνυμα από τον χρήστη <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα"</string>
-    <string name="show" msgid="7114006150083237343">"Προβολή"</string>
+    <string name="add_label" msgid="6060201715848652940">"Προσθήκη φακέλου"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Νέο μήνυμα από <xliff:g id="SENDER">%s</xliff:g>. Εμφάνιση."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα. Εμφάνιση."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ανάπτυξη στοιχείων παραλήπτη"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Σύμπτυξη στοιχείων παραλήπτη"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Εμφάνιση στοιχείων επικοινωνίας για τον χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Προς: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Κοιν.: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Κρυφή κοιν.: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Ημερομηνία: "</string>
     <string name="show_images" msgid="1875700481186331432">"Εμφάνιση εικόνων"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Πάντα εμφ. εικ. από αυτόν τον αποστολέα"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Αυτ. εμφ. εικ. από αυτόν τον αποστολέα."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Επιλογή λογαριασμού"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Επιλογή φακέλου"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Φάκελος email"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Συγχρονισμός: Όλες"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Συγχρονισμός: Τελευταίας <xliff:g id="COUNT">%1$d</xliff:g> ημέρας"</item>
-    <item quantity="other" msgid="6856940335775567991">"Συγχρονισμός: Τελευταίων <xliff:g id="COUNT">%1$d</xliff:g> ημερών"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Συγχρονισμός: Καμία"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Αλλαγή φακέλων"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Μετακίνηση σε"</string>
     <string name="search_hint" msgid="3625734263059221350">"Αναζήτηση μηνυμάτων ηλ. ταχ."</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Χθες, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Παράβλεψη συμβουλής"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Ο αυτόματος συγχρονισμός είναι απενεργοποιημένος."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Πατήστε για να ενεργοποιήσετε τον αυτόματο συγχρονισμό."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Αγγίξτε για ενεργοποίηση."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Ο συγχρονισμός του λογαριασμού είναι απενεργοποιημένος."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Η λειτουργία πτήσης είναι ενεργοποιημένη."</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Ενεργοποιήστε τον στην ενότητα <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g> ."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Ρυθμίσεις λογαριασμού"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> μη απεσταλμένα σε <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Ενεργοποίηση αυτόματου συγχρονισμού;"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Θα γίνει συγχρονισμός όλων των αλλαγών που πραγματοποιείτε σε όλες τις εφαρμογές και τους λογαριασμούς, όχι μόνο στο Gmail, στον ιστό, σε άλλες συσκευές και στο <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> σας."</string>
+    <string name="phone" msgid="5171715391553213328">"τηλέφωνo"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Ενεργοποίηση"</string>
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9e371d0..2cd44be 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> File"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Preview"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Save"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Cancel"</string>
     <string name="download_again" msgid="7418568915429156518">"Download again"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Info"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Results"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Search is not supported on this account."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Searching…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recent"</string>
-    <string name="add_label" msgid="1638508840481944248">"Add label"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Newer"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Older"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"New message from <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</string>
-    <string name="show" msgid="7114006150083237343">"Show"</string>
+    <string name="add_label" msgid="6060201715848652940">"Add folder"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"New message from <xliff:g id="SENDER">%s</xliff:g>. Show."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> new messages. Show."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expand recipient details"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Collapse recipient details"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Show contact information for <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"To: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Date: "</string>
     <string name="show_images" msgid="1875700481186331432">"Show pictures"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Always show pictures from this sender"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Pictures from this sender will be shown automatically."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Choose account"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Choose folder"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Email folder"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sync: All"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sync: Last <xliff:g id="COUNT">%1$d</xliff:g> day"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sync: Last <xliff:g id="COUNT">%1$d</xliff:g> days"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sync: None"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Change folders"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Move to"</string>
     <string name="search_hint" msgid="3625734263059221350">"Search mail"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Yesterday, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Dismiss tip"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Auto-sync is off."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Tap to turn auto-sync on."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Touch to turn on."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Account sync is off."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Aeroplane mode is on"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Turn on in <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Account settings"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> unsent in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Turn auto-sync on?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Changes you make to all apps and accounts, not just Gmail, will be synchronised between the web, your other devices and your <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"phone"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Turn on"</string>
 </resources>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5aec3f5..5e21d9a 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Archivo <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Vista prev"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Guardar"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Cancelar"</string>
     <string name="download_again" msgid="7418568915429156518">"Volver a descargar"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Info"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Esta cuenta no admite la función de búsqueda."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recientes"</string>
-    <string name="add_label" msgid="1638508840481944248">"Agrega una etiqueta"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Más recientes"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Anteriores"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nuevo mensaje de <xliff:g id="SENDER">%s</xliff:g>"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
-    <string name="show" msgid="7114006150083237343">"Mostrar"</string>
+    <string name="add_label" msgid="6060201715848652940">"Agregar carpeta"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Mensaje nuevo de <xliff:g id="SENDER">%s</xliff:g> (mostrar)"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos (mostrar)"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalles del destinatario"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Contraer detalles del destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar la información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Para: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Cco: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Fecha: "</string>
     <string name="show_images" msgid="1875700481186331432">"Ver imágenes"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Mostrar siempre las imágenes de este remitente"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Las imágenes de este remitente se mostrarán automáticamente."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Seleccionar cuenta"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Seleccionar carpeta"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Carpeta de correo electrónico"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sincronizar: todas"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizar: las conversaciones del último día (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sincronizar: las conversaciones de los últimos <xliff:g id="COUNT">%1$d</xliff:g> días"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sincronizar: ninguna"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Cambiar carpetas"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Mover a"</string>
     <string name="search_hint" msgid="3625734263059221350">"Buscar correo"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ayer, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Descartar sugerencia"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"La sincronización automática está desactivada."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Presiona para activar la sincronización automática."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Toca para activar esta opción."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"La sincronización de la cuenta está desactivada."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"El modo de avión está activado."</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Actívala en la <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Configuración de la cuenta"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> sin enviar en <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"¿Activar la sincronización automática?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Los cambios que realices en todas las aplicaciones y cuentas, no solo en Gmail, se sincronizarán con la Web, con otros dispositivos que tengas y con tu <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"teléfono"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Activar"</string>
 </resources>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b0eab70..4805675 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Archivo <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Vista previa"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Guardar"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Información"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Cancelar"</string>
     <string name="download_again" msgid="7418568915429156518">"Volver a descargar"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Información"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Esta cuenta no admite la función de búsqueda."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recientes"</string>
-    <string name="add_label" msgid="1638508840481944248">"Añadir etiqueta"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Más reciente"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Anterior"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nuevo mensaje de <xliff:g id="SENDER">%s</xliff:g>"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
-    <string name="show" msgid="7114006150083237343">"Mostrar"</string>
+    <string name="add_label" msgid="6060201715848652940">"Añadir carpeta"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Mensaje nuevo de <xliff:g id="SENDER">%s</xliff:g>. Mostrar."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos. Mostrar."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ampliar información del destinatario"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Contraer información del destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Para: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Cco: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Fecha: "</string>
     <string name="show_images" msgid="1875700481186331432">"Mostrar imágenes"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Mostrar siempre imágenes de este remitente"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Las imágenes de este remitente se mostrarán automáticamente."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Seleccionar cuenta"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Seleccionar carpeta"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Carpeta de correo"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sincronizar todas"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronización: último día (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sincronización: últimos <xliff:g id="COUNT">%1$d</xliff:g> días"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"No sincronizar ninguna"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Cambiar carpetas"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Mover a"</string>
     <string name="search_hint" msgid="3625734263059221350">"Buscar mensaje"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ayer a las <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Ignorar sugerencia"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"La opción de sincronización automática está desactivada."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Toca esta opción para activar la sincronización automática."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Tocar para activar."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"La opción de sincronización de cuenta está desactivada."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Modo avión activado"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Activar en <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Configuración de la cuenta"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> sin enviar en <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"¿Quieres activar la sincronización automática?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Los cambios que realices en todas las aplicaciones y cuentas, no solo en Gmail, se sincronizarán en la Web, otros de tus dispositivos y tu <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"teléfono"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Activar"</string>
 </resources>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..ca1d57d
--- /dev/null
+++ b/res/values-et-rEE/strings.xml

@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2011 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="to" msgid="4392614766835725698">"Saaja"</string>
+    <string name="cc" msgid="7017720927911078193">"Koopia"</string>
+    <string name="bcc" msgid="3098643138241111579">"Pimekoopia"</string>
+    <string name="subject_hint" msgid="7253964583324677128">"Teema"</string>
+    <string name="body_hint" msgid="4279864165439577668">"Koostage meil"</string>
+    <string name="add_file_attachment" msgid="2203398371671979481">"Manusta fail"</string>
+    <string name="add_photo_attachment" msgid="3738882100645552858">"Manusta pilt"</string>
+    <string name="add_video_attachment" msgid="8916625983712820173">"Manusta video"</string>
+    <string name="save_draft" msgid="5555744208032445632">"Salvesta mustand"</string>
+    <string name="discard" msgid="1714960202994370243">"Loobu"</string>
+    <string name="compose" msgid="1473559896062432878">"Koosta"</string>
+  <string-array name="compose_modes">
+    <item msgid="8631190144210933782">"Vasta"</item>
+    <item msgid="4085029907540221568">"Vasta kõigile"</item>
+    <item msgid="857480048798815437">"Edasta"</item>
+  </string-array>
+    <string name="reply_attribution" msgid="717207316577386788">"<xliff:g id="PERSON">%s</xliff:g> kirjutas kuupäeval <xliff:g id="DATE">%s</xliff:g>:"</string>
+    <string name="forward_attribution" msgid="1498936339458535158">"---------- Edastatud sõnum ----------&lt;br&gt;Saatja: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Kuupäev: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Teema: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Saaja: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
+    <string name="forward_attribution_no_headers" msgid="3239825787227110752">"---------- Edastatud kiri ----------"</string>
+    <string name="cc_attribution" msgid="374493748526504562">"Koopia: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
+    <string name="select_attachment_type" msgid="4711524151968942082">"Valige manuse tüüp"</string>
+    <string name="too_large_to_attach_single" msgid="2996733972478212136">"Ei saa lisada faile, mis ületavad mahu <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Üht või mitut faili ei lisatud. Limiit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Faili ei lisatud. Saavutatud limiit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="generic_attachment_problem" msgid="8775959340559458709">"Faili ei saanud manustada."</string>
+    <string name="recipient_needed" msgid="999037027358925655">"Lisage vähemalt üks saaja."</string>
+    <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Saaja viga"</string>
+    <string name="confirm_send_title" msgid="5663602035452564062">"Kas soovite sõnumi saata?"</string>
+    <string name="confirm_send_message_with_no_subject" msgid="8900379985826988281">"Sõnumi teemas pole teksti."</string>
+    <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Sõnumi sisus pole teksti."</string>
+    <string name="confirm_send_message" msgid="3221546155385562874">"Kas soovite selle sõnumi saata?"</string>
+    <string name="message_discarded" msgid="5079975378884765445">"Sõnumist loobuti."</string>
+    <string name="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
+    <string name="custom_from_account_label" msgid="5069652141632649722">"Saada meil kui:"</string>
+    <string name="send" msgid="8242003661397555986">"Saada"</string>
+    <string name="mark_read" msgid="8438349154394313195">"Märgi loetuks"</string>
+    <string name="mark_unread" msgid="6231373939351125713">"Märgi mitteloetuks"</string>
+    <string name="mute" msgid="1995954983688603977">"Summuta"</string>
+    <string name="add_star" msgid="2866003744391266498">"Lisa tärn"</string>
+    <string name="remove_star" msgid="4372327933122106128">"Eemalda tärn"</string>
+    <string name="remove_folder" msgid="4906542720439865413">"Eemalda kaustast <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+    <string name="archive" msgid="847250094775910499">"Arhiiv"</string>
+    <string name="report_spam" msgid="6467567747975393907">"Teata rämpspostist"</string>
+    <string name="mark_not_spam" msgid="694891665407228160">"Teata, et pole rämpspost"</string>
+    <string name="report_phishing" msgid="5714205737453138338">"Teata andmepüügist"</string>
+    <string name="delete" msgid="844871204175957681">"Kustuta"</string>
+    <string name="discard_drafts" msgid="6862272443470085375">"Kustuta mustandid"</string>
+    <string name="refresh" msgid="490989798005710951">"Värskenda"</string>
+    <string name="reply" msgid="2032052598496088561">"Vasta"</string>
+    <string name="reply_all" msgid="7257248094625487557">"Vasta kõigile"</string>
+    <string name="resume_draft" msgid="6450150180834092146">"Muuda"</string>
+    <string name="forward" msgid="6822914459902983767">"Edasta"</string>
+    <string name="menu_compose" msgid="6274193058224230645">"Koosta"</string>
+    <string name="menu_change_folders" msgid="1542713666608888717">"Muuda kaustu"</string>
+    <string name="menu_move_to" msgid="9138296669516358542">"Teisalda asukohta"</string>
+    <string name="menu_move_to_inbox" msgid="3201472943201077389">"Teisalda postkasti"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Kausta seaded"</string>
+    <string name="menu_show_original" msgid="4227060689700765828">"Ennista automaatne suurus"</string>
+    <string name="menu_folder_options" msgid="8897520487430647932">"Kausta seaded"</string>
+    <string name="menu_settings" msgid="6007027046949837282">"Seaded"</string>
+    <string name="menu_search" msgid="5297197523031943248">"Otsing ..."</string>
+    <string name="mark_important" msgid="6904096897104265870">"Märgi oluliseks"</string>
+    <string name="mark_not_important" msgid="4550967327747977068">"Märgi ebaoluliseks"</string>
+    <string name="add_cc_label" msgid="504861315425773180">"Lisa koopia/pimekoopia"</string>
+    <string name="add_bcc_label" msgid="7432027645493843336">"Lisa pimekoopia"</string>
+    <string name="feedback" msgid="79365993169715049">"Tagasiside saatmine"</string>
+    <string name="help_and_info" msgid="7873089811705257882">"Abi"</string>
+    <string name="quoted_text" msgid="7250749398672037355">"Osundatud teksti lisamine"</string>
+    <string name="quoted_text_label" msgid="541007446961960617">"Osundatud tekst"</string>
+    <string name="respond_inline" msgid="6797117334768201180">"Vasta teksti sees"</string>
+    <string name="bytes" msgid="874874279846496468">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
+    <string name="kilobytes" msgid="9191949758901349712">"<xliff:g id="COUNT">%s</xliff:g> kB"</string>
+    <string name="megabytes" msgid="130431176022837380">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>
+    <string name="attachment_image" msgid="3832985223906528449">"Kujutis"</string>
+    <string name="attachment_video" msgid="7526134752988603154">"Video"</string>
+    <string name="attachment_audio" msgid="135527133955622936">"Heli"</string>
+    <string name="attachment_text" msgid="5544874374971562759">"Tekst"</string>
+    <string name="attachment_application_msword" msgid="2326909450865637910">"Dokument"</string>
+    <string name="attachment_application_vnd_ms_powerpoint" msgid="861348289167216897">"Esitlus"</string>
+    <string name="attachment_application_vnd_ms_excel" msgid="5861224590731578901">"Arvutustabel"</string>
+    <string name="attachment_application_pdf" msgid="6922990425001131901">"PDF"</string>
+    <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fail"</string>
+    <string name="preview_attachment" msgid="6934911143603455393">"Eelvaade"</string>
+    <string name="save_attachment" msgid="5360128849867863132">"Salvesta"</string>
+    <string name="cancel_attachment" msgid="4651201258272223650">"Tühista"</string>
+    <string name="download_again" msgid="7418568915429156518">"Laadi uuesti alla"</string>
+    <string name="more_info_attachment" msgid="717244337981816703">"Teave"</string>
+    <string name="attachment_type_blocked" msgid="7878184764428642891">"Kahjuks ei saa te seda tüüpi manust salvestada ega avada."</string>
+    <string name="no_application_found" msgid="1945184804521392093">"Ükski rakendus ei saa seda manust vaatamiseks avada."</string>
+    <string name="fetching_attachment" msgid="2599763030649526179">"Manuse toomine"</string>
+    <string name="please_wait" msgid="8797634225088247121">"Oodake …"</string>
+    <string name="saved" msgid="6660844285730790469">"Salvestatud, <xliff:g id="SIZE">%s</xliff:g>"</string>
+    <string name="download_failed" msgid="442019281547315527">"Allal. nurjus. Puudutage."</string>
+    <string name="attachments_header" msgid="6459475590011460229">"Manused"</string>
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Salv. kõik"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Jaga"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Jaga kõike"</string>
+    <string name="saving" msgid="925514721138014677">"Salvestamine..."</string>
+    <string name="choosertitle_sharevia" msgid="6142681649048665134">"Jagamine:"</string>
+    <string name="contextmenu_openlink" msgid="2176176524824953775">"Ava brauseris"</string>
+    <string name="contextmenu_copy" msgid="4604170699444153037">"Kopeeri"</string>
+    <string name="contextmenu_copylink" msgid="3580131515400610839">"Kopeeri lingi URL"</string>
+    <string name="contextmenu_dial_dot" msgid="9104426720103729453">"Vali ..."</string>
+    <string name="contextmenu_sms_dot" msgid="6481040539501081547">"SMS ..."</string>
+    <string name="contextmenu_add_contact" msgid="8395100913366045250">"Lisa kontakt"</string>
+    <string name="contextmenu_send_mail" msgid="8301941130009797208">"Saada meil"</string>
+    <string name="contextmenu_map" msgid="7721544518698532954">"Kaart"</string>
+    <string name="contextmenu_sharelink" msgid="6213520416250245200">"Jaga linki"</string>
+    <string name="contextmenu_help" msgid="4651718679842414097">"Abi"</string>
+    <string name="contextmenu_feedback" msgid="4429118420169571473">"Tagasiside saatmine"</string>
+    <!-- no translation found for num_selected (5723323585692387843) -->
+    <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="3657821200245019288">"Meilivestluse teisaldamine"</item>
+    <item quantity="other" msgid="1685896770174368261">"Teisalda <xliff:g id="ID_1">%1$d</xliff:g> meilivestlust"</item>
+  </plurals>
+    <string name="content_description" msgid="5191020413686786341">"<xliff:g id="SENDER">%1$s</xliff:g> teemal <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> kuupäeval <xliff:g id="DATE">%4$s</xliff:g>, <xliff:g id="READSTATE">%5$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="2303358176694038320">"<xliff:g id="SENDER">%1$s</xliff:g> teemal <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> kell <xliff:g id="TIME">%4$s</xliff:g>, <xliff:g id="READSTATE">%5$s</xliff:g>"</string>
+    <string name="read_string" msgid="219566857950091332">"loetud vestlus"</string>
+    <string name="unread_string" msgid="588180203444398297">"lugemata vestlus"</string>
+    <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>  –  <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
+  <plurals name="draft">
+    <item quantity="one" msgid="333591132893648383">"Mustand"</item>
+    <item quantity="other" msgid="6961049507579977505">"Mustandid"</item>
+  </plurals>
+    <string name="sending" msgid="8214361929125649771">"Saatmine ..."</string>
+    <string name="send_failed" msgid="750908595144529579">"Sõnumit ei saadetud."</string>
+    <string name="me_object_pronun" msgid="7668994569594901571">"mina"</string>
+    <string name="me_subject_pronun" msgid="1088657349831581116">"mina"</string>
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Postkast"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Kas kustutada see meilivestlus?"</item>
+    <item quantity="other" msgid="930334208937121234">"Kas kustutada need <xliff:g id="COUNT">%1$d</xliff:g> meilivestlust?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Kas arhiveerida see meilivestlus?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Kas arhiveerida need <xliff:g id="COUNT">%1$d</xliff:g> meilivestlust?"</item>
+  </plurals>
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="5974090449454432874">"Kas kustutada mustandid sellest vestlusest?"</item>
+    <item quantity="other" msgid="4173815457177336569">"Kas kustutada mustandid <xliff:g id="COUNT">%1$d</xliff:g> vestlusest?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Kas soovite sellest sõnumist loobuda?"</string>
+    <string name="loading_conversations" msgid="2649440958602369555">"Laadimine …"</string>
+    <string name="no_conversations" msgid="35400008890372241">"Meilivestlusi pole."</string>
+    <string name="undo" msgid="6070869718469782251">"Võta tagasi"</string>
+  <plurals name="conversation_unstarred">
+    <item quantity="one" msgid="8315328190288744398">"Tärnid eemaldatakse <xliff:g id="COUNT">%1$d</xliff:g> meilivestluselt."</item>
+    <item quantity="other" msgid="2222365088907519938">"Tärnid eemaldatakse <xliff:g id="COUNT">%1$d</xliff:g> meilivestluselt."</item>
+  </plurals>
+  <plurals name="conversation_muted">
+    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; summutati."</item>
+    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; summutati."</item>
+  </plurals>
+  <plurals name="conversation_spammed">
+    <item quantity="one" msgid="3060864972122279220">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestlusest teatatakse kui rämpspostist."</item>
+    <item quantity="other" msgid="5071459475389411227">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; meilivestlusest teatatakse kui rämpspostist."</item>
+  </plurals>
+  <plurals name="conversation_not_spam">
+    <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlus märgiti mitte-rämpspostiks."</item>
+    <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlust märgiti mitte-rämpspostiks."</item>
+  </plurals>
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; üksus märgiti ebaoluliseks."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; üksust märgiti ebaoluliseks."</item>
+  </plurals>
+  <plurals name="conversation_phished">
+    <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlus märgiti andmepüügiga seotuks."</item>
+    <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; vestlust märgiti andmepüügiga seotuks."</item>
+  </plurals>
+  <plurals name="conversation_archived">
+    <item quantity="one" msgid="5457612502965117672">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhiveeriti."</item>
+    <item quantity="other" msgid="3012054504370916482">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arhiveeriti."</item>
+  </plurals>
+  <plurals name="conversation_deleted">
+    <item quantity="one" msgid="4398693029405479323">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kustutati."</item>
+    <item quantity="other" msgid="8630099095360065837">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kustutati."</item>
+  </plurals>
+    <string name="deleted" msgid="2757349161107268029">"Kustutatud"</string>
+    <string name="archived" msgid="7533995360704366325">"Arhiveeritud"</string>
+    <string name="folder_removed" msgid="1047474677580149436">"Eemaldatud kaustast <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Muudetud kaust."</item>
+    <item quantity="other" msgid="8918589141287976985">"Muudetud kaustad."</item>
+  </plurals>
+    <string name="conversation_folder_moved" msgid="297469098857964678">"Teisaldati kausta <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+    <string name="search_results_header" msgid="4669917471897026269">"Tulemused"</string>
+    <string name="search_unsupported" msgid="4654227193354052607">"Sellel kontol ei toetata otsingut."</string>
+    <string name="search_results_searching_header" msgid="3821361153909466819">"Otsimine ..."</string>
+    <string name="add_label" msgid="6060201715848652940">"Lisa kaust"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Uus sõnum saatjalt <xliff:g id="SENDER">%s</xliff:g>. Kuva."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit. Kuva."</item>
+  </plurals>
+    <string name="expand_recipient_details" msgid="2266544827446346880">"Saaja üksikasjade laiendamine"</string>
+    <string name="collapse_recipient_details" msgid="3608892454869745927">"Ahenda saaja üksikasjad"</string>
+    <string name="contact_info_string" msgid="6911322458329265644">"Kuva saatja <xliff:g id="NAME">%1$s</xliff:g> kontaktandmed"</string>
+    <string name="contact_info_string_default" msgid="596531738469809159">"Kuva kontaktandmed"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> vanemat sõnumit"</item>
+  </plurals>
+    <string name="from_heading" msgid="2454519463223197231">"Saatja: "</string>
+    <string name="replyto_heading" msgid="8563992423173220512">"Vasta: "</string>
+    <string name="to_heading" msgid="1142876841308812954">"Saaja: "</string>
+    <string name="cc_heading" msgid="52678613787360092">"Koopia: "</string>
+    <string name="bcc_heading" msgid="4698055226318660420">"Pimekoopia: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Kuupäev: "</string>
+    <string name="show_images" msgid="1875700481186331432">"Kuva pildid"</string>
+    <string name="always_show_images" msgid="5966408990164581801">"Näita alati selle saatja pilte"</string>
+    <string name="always_show_images_toast" msgid="6218061921546973716">"Selle saatja pilte näidatakse automaatselt."</string>
+    <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
+    <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> dom. <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> kaudu"</string>
+    <string name="message_saved" msgid="7073947895562277576">"Sõnum salvestati mustandina."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Sõnumi saatmine ..."</string>
+    <string name="invalid_recipient" msgid="2161317422860961623">"Aadress <xliff:g id="WRONGEMAIL">%s</xliff:g> on kehtetu."</string>
+    <string name="show_elided" msgid="5255917904110437886">"▶ Kuva osundatud tekst"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Peida osundatud tekst"</string>
+    <string name="message_invite_title" msgid="6757287288611722175">"Kalendri kutse"</string>
+    <string name="message_invite_calendar_view" msgid="1898326841767645665">"Kuva kalendris"</string>
+    <string name="message_invite_label_attending" msgid="7378806613557157546">"Kas osalete?"</string>
+    <string name="message_invite_accept" msgid="869753811259793266">"Jah"</string>
+    <string name="message_invite_tentative" msgid="3898050756490962079">"Võib-olla"</string>
+    <string name="message_invite_decline" msgid="4524135969656266758">"Ei"</string>
+    <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
+    <string name="yes" msgid="7474216525286833848">"Jah"</string>
+    <string name="no" msgid="427548507197604096">"Ei"</string>
+    <string name="ok" msgid="8339355733816891026">"OK"</string>
+    <string name="done" msgid="3079981801778027540">"Valmis"</string>
+    <string name="cancel" msgid="8762981157252199115">"Tühista"</string>
+    <string name="clear" msgid="3184687982186479442">"Tühjenda"</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Õnnestus"</item>
+    <item msgid="7109065688039971961">"Ühendus puudub."</item>
+    <item msgid="8437496123716232060">"Sisselogimine ebaõnnestus."</item>
+    <item msgid="1651266301325684887">"Turvalisuse viga."</item>
+    <item msgid="1461520171154288533">"Ei saanud sünkroonida."</item>
+    <item msgid="4779810016424303449">"Sisemine viga"</item>
+  </string-array>
+    <string name="tap_to_configure" msgid="1181356242354390930">"Puudutage seadistamiseks"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Meilivestl. vaatamis. sünkr. kaust."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sünkrooni kaust"</string>
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+  <plurals name="actionbar_unread_messages">
+    <item quantity="other" msgid="6210217540181960613">"<xliff:g id="COUNT">%1$d</xliff:g> on lugemata"</item>
+  </plurals>
+    <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ lugemata"</string>
+    <string name="view_more_conversations" msgid="3151067626309674344">"Kuva rohkem meilivestlusi"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Laadimine …"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Konto valimine"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Kausta valimine"</string>
+    <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Meili kaust"</string>
+    <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Kaustade muutmine"</string>
+    <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Teisalda:"</string>
+    <string name="search_hint" msgid="3625734263059221350">"Otsi e-posti hulgast"</string>
+    <!-- no translation found for search_results_loaded (7840075360438913721) -->
+    <skip />
+    <string name="network_error" msgid="2125579009654728299">"Ühendus puudub"</string>
+    <string name="retry" msgid="4515885444824418022">"Proovi uuesti"</string>
+    <string name="load_more" msgid="420892447103014683">"Laadi rohkem"</string>
+    <string name="shortcut_name_title" msgid="8220482314700618391">"Kausta otseteele nime andmine"</string>
+    <string name="wait_for_sync_title" msgid="2767841242539238015">"Sünkroonimise ootel"</string>
+    <string name="wait_for_sync_body" msgid="7718316938173643688">"Teie meil ilmub peagi."</string>
+    <string name="not_synced_title" msgid="794279749170198599">"Konto ei ole sünkroonitud"</string>
+    <string name="wait_for_manual_sync_body" msgid="2003192935254244968">"See konto ei ole seadistatud automaatseks sünkroonimiseks.\nPuudutage käsku "<b>"Sünkrooni kohe"</b>", et meile üks kord sünkroonida, või käsku "<b>"Muuda sünkroonimisseadeid"</b>", et seadistada see konto meilide automaatseks sünkroonimiseks."</string>
+    <string name="manual_sync" msgid="6743983544685622800">"Sünkr. kohe"</string>
+    <string name="change_sync_settings" msgid="5514293926214426577">"Muuda sünkroonimisseadeid"</string>
+    <string name="photo_load_failed" msgid="8811324070219403896">"Kujutist ei õnnestunud laadida"</string>
+    <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Ei saa teisaldada, kuna valik sisaldab mitut kontot."</string>
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>\n<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
+    <string name="ignore_spam_warning" msgid="1554651881128904262">"Eira, usaldan seda sõnumit"</string>
+    <string name="via_domain" msgid="380109230928079350">"<xliff:g id="VIADOMAIN">%1$s</xliff:g> kaudu"</string>
+  <string-array name="moveto_folder_sections">
+    <item msgid="6984976603137892898">"Süsteem"</item>
+    <item msgid="6593672292311851204">"Tihti kasutatud"</item>
+    <item msgid="3584541772344786752">"Kõik kaustad"</item>
+  </string-array>
+    <string name="signin" msgid="8958889809095796177">"Logi sisse"</string>
+    <string name="info" msgid="6009817562073541204">"Teave"</string>
+    <string name="report" msgid="5417082746232614958">"Teavitamine"</string>
+    <string name="sync_error" msgid="7368819509040597851">"Ei saanud sünkroonida."</string>
+    <string name="sync_error_message" msgid="5367907194753034375">"Seadmes pole sünkroonimiseks piisavalt mäluruumi."</string>
+    <string name="storage" msgid="3262760336059073446">"Salvestamine"</string>
+    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
+    <string name="all_folders_heading" msgid="2506843494725730618">"Kõik kaustad"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Hiljutised kaustad"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Sõnumi üksikasjad"</string>
+    <string name="auto_advance_label" msgid="3192951873988392119">"Automaatne edasiminek"</string>
+    <string name="auto_advance_summary" msgid="573927628806250719">"Valige, millist ekraani pärast sõnumi kustutamist kuvada"</string>
+    <string name="auto_advance_help_title" msgid="8091541690538426090">"Automaatse edasimineku eelistuse määramine\n(pärast kustutamist jne)"</string>
+  <string-array name="prefEntries_autoAdvance">
+    <item msgid="3400401085256526376">"Uuemad"</item>
+    <item msgid="5562093094216840213">"Vanemad"</item>
+    <item msgid="3331655314944797957">"Vestlusloend"</item>
+  </string-array>
+  <string-array name="prefSummaries_autoAdvance">
+    <item msgid="6389534341359835440">"Uuema vestluse näitamine pärast kustutamist"</item>
+    <item msgid="732746454445519134">"Vanema vestluse näitamine pärast kustutamist"</item>
+    <item msgid="2189929276292165301">"Vestlusloendi näitamine pärast kustutamist"</item>
+  </string-array>
+    <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Pildilubade kustutamine"</string>
+    <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Kas kustutada pildiload?"</string>
+    <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Varasemalt lubatud saatjate tekstisiseste piltide kuvamise peatamine."</string>
+    <string name="sender_whitelist_cleared" msgid="917434007919176024">"Pilte ei kuvata automaatselt."</string>
+    <string name="preferences_signature_title" msgid="888167074398030574">"Allkiri"</string>
+    <string name="preferences_signature_dialog_title" msgid="5112192919923401319">"Allkiri"</string>
+    <string name="preferences_signature_summary_not_set" msgid="2830886980620445857">"Määramata"</string>
+    <string name="notification_action_reply" msgid="6015299134424685297">"Vasta"</string>
+    <string name="notification_action_reply_all" msgid="20020468410400912">"Vasta kõigile"</string>
+    <string name="notification_action_archive" msgid="81978513898440040">"Arhiveeri"</string>
+    <string name="notification_action_remove_label" msgid="5852730267411032291">"Eemalda silt"</string>
+    <string name="notification_action_delete" msgid="327773454111551791">"Kustuta"</string>
+    <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhiveeritud"</string>
+    <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Silt on eemaldatud"</string>
+    <string name="notification_action_undo_delete" msgid="3105611327110905438">"Kustutatud"</string>
+    <string name="veiled_address" msgid="1209670815434513191"></string>
+    <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
+    <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
+    <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
+    <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit"</string>
+    <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="silent_ringtone" msgid="5856834572357761687">"Hääletu"</string>
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arhiveerimise ja kustutamise toimingud"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Kuva ainult arhiveerimine"</item>
+    <item msgid="5737880287951287278">"Kuva ainult kustutamine"</item>
+    <item msgid="4279948809971752573">"Kuva arhiveerimine ja kustutamine"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Kuva ainult arhiveerimine"</item>
+    <item msgid="8350973578419775975">"Kuva ainult kustutamine"</item>
+    <item msgid="2967059853409454648">"Kuva arhiveerimine ja kustutamine"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arhiveerimise ja kustutamise toimingud"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Vasta kõigile"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Kasuta vaikeseadena sõnumitele vastamisel"</string>
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Arhiveerimine pühkides"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Kustutamine pühkides"</string>
+    <string name="preference_swipe_description" msgid="5132683510510041028">"Meilivestluste loendis"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Saatja pilt"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Kuvatakse vestluste loendis nime kõrval"</string>
+    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Manuste eelvaated"</string>
+    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Kuva vestluse loendis hiljutiste sõnumite manuste eelvaateid"</string>
+    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Värskendamiseks pühkige alla"</string>
+    <string name="checking_for_mail" msgid="2301797903350897130">"E-posti kontrollimine"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Tühjenda prügikast"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Tühjenda rämpspostikaust"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Kas tühjendada prügikast?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Kas tühjendada rämpspostikaust?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> sõnum kustutatakse jäädavalt."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> sõnumit kustutatakse jäädavalt."</item>
+  </plurals>
+    <string name="drawer_open" msgid="6074646853178471940">"Ava navigeerimissahtel"</string>
+    <string name="drawer_close" msgid="2764774620737876943">"Sule navigeerimissahtel"</string>
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Vestluse valimiseks puudutage saatja kujutist."</string>
+    <string name="long_press_to_select_tip" msgid="9205666839837250150">"Puudutage ja hoidke all ühe vestluse valimiseks, seejärel puudutage teiste valimiseks."</string>
+    <string name="folder_icon_desc" msgid="1500547397347480618">"Kausta ikoon"</string>
+    <string name="add_account" msgid="2162808366829269770">"Lisa konto"</string>
+    <string name="attached_message" msgid="4267189489654642035">"Lisatud sõnum"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Täna kell <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Eile kell <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Nõuandest loobumine"</string>
+    <string name="auto_sync_off" msgid="7185342309138211107">"Automaatne sünkroonimine on välja lülitatud."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Puudutage sisselülitamiseks."</string>
+    <string name="account_sync_off" msgid="5699548271856775808">"Konto sünkroonimine on välja lülitatud."</string>
+    <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Lülitage sisse jaotises <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
+    <string name="account_settings_param" msgid="5277032997773498476">"Konto seaded"</string>
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Jaotises <xliff:g id="OUTBOX">%2$s</xliff:g> on <xliff:g id="NUMBER">%1$s</xliff:g> saatmata sõnumit"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Kas lülitada automaatne sünkroonimine sisse?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Kõikides rakendustes ja kontodel (mitte ainult Gmailis) tehtud muudatused sünkroonitakse veebi, teiste seadmete ja seadmega <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tahvelarvuti"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Lülita sisse"</string>
+</resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c9a020a..03a68ae 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"فایل <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"پیش‌نمایش"</string>
     <string name="save_attachment" msgid="5360128849867863132">"ذخیره"</string>
-    <string name="info_attachment" msgid="607849900865956536">"اطلاعات"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"لغو"</string>
     <string name="download_again" msgid="7418568915429156518">"دانلود دوباره"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"اطلاعات"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"نتایج"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"جستجو در این حساب پشتیبانی نمی‌شود."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"در حال جستجو..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"اخیر"</string>
-    <string name="add_label" msgid="1638508840481944248">"افزودن برچسب"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"جدیدتر"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"قدیمی‌تر"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"پیام جدید از <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</string>
-    <string name="show" msgid="7114006150083237343">"نمایش"</string>
+    <string name="add_label" msgid="6060201715848652940">"افزودن پوشه"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"پیام جدید از <xliff:g id="SENDER">%s</xliff:g>. نمایش."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید. نمایش."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"گسترش جزئیات گیرنده"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"کوچک کردن جزئیات گیرنده"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"نمایش اطلاعات تماس برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"به: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"تاریخ: "</string>
     <string name="show_images" msgid="1875700481186331432">"نمایش تصاویر"</string>
     <string name="always_show_images" msgid="5966408990164581801">"همیشه تصاویر از طرف این فرستنده نشان داده شود"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"تصاویر از طرف این فرستنده به طور خودکار نشان داده خواهد شد."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"انتخاب حساب"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"انتخاب پوشه"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"پوشه ایمیل"</string>
-    <string name="sync_all" msgid="1057043212338233359">"همگام‌سازی: همه"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"همگام‌سازی: <xliff:g id="COUNT">%1$d</xliff:g> روز گذشته"</item>
-    <item quantity="other" msgid="6856940335775567991">"همگام‌سازی: <xliff:g id="COUNT">%1$d</xliff:g> روز گذشته"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"همگام‌سازی: هیچکدام"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"تغییر پوشه‌ها"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"انتقال به"</string>
     <string name="search_hint" msgid="3625734263059221350">"جستجوی نامه"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"دیروز، <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"رد کردن نکته راهنما"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"همگام‌سازی خودکار خاموش است."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"برای روشن کردن همگام‌سازی خودکار، ضربه بزنید."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"برای روشن کردن لمس کنید."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"همگام‌سازی حساب خاموش است."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"حالت هواپیما روشن است"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"همگام‌سازی را در <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g> روشن کنید."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"تنظیمات حساب"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> پیام ارسال نشده در <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"همگام‌سازی خودکار روشن شود؟"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"تغییراتی که در تمام برنامه‌ها و حساب‌ها ایجاد می‌کنید نه فقط Gmail، بین وب، سایر دستگاه‌هایتان و <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> شما همگام‌سازی می‌شود."</string>
+    <string name="phone" msgid="5171715391553213328">"تلفن"</string>
+    <string name="tablet" msgid="7956969657216748522">"رایانه لوحی"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"روشن کردن"</string>
 </resources>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 54c586c..175a8c9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-tiedosto"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Esikatselu"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Tallenna"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Tiedot"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Peruuta"</string>
     <string name="download_again" msgid="7418568915429156518">"Lataa uudelleen"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Tiedot"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Tulokset"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Hakua ei voi käyttää tällä tilillä."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Haetaan.."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Uusimmat"</string>
-    <string name="add_label" msgid="1638508840481944248">"Lisää tunniste"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Uudemmat"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Vanhemmat"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Uusi viesti lähettäjältä <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä"</string>
-    <string name="show" msgid="7114006150083237343">"Näytä"</string>
+    <string name="add_label" msgid="6060201715848652940">"Lisää kansio"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Uusi viesti lähett. <xliff:g id="SENDER">%s</xliff:g>. Näytä."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä. Näytä."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Laajenna vastaanottajan tiedot"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Tiivistä vastaanottajan tiedot"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Näytä henkilön <xliff:g id="NAME">%1$s</xliff:g> yhteystiedot"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Vast.ott.: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kopio: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Piilokopio: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Päiväys: "</string>
     <string name="show_images" msgid="1875700481186331432">"Näytä kuvat"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Näytä aina tämän lähettäjän kuvat"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Kuvat tältä lähettäjältä näytetään automaattisesti."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Valitse tili"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Valitse kansio"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Sähköpostikansio"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synkronoi kaikki"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synkronoi edellinen <xliff:g id="COUNT">%1$d</xliff:g> päivä"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synkronoi edelliset <xliff:g id="COUNT">%1$d</xliff:g> päivää"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Älä synkronoi mitään"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Vaihda kansiota"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Siirrä kohteeseen"</string>
     <string name="search_hint" msgid="3625734263059221350">"Haku viesteistä"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Eilen klo <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Hylkää vinkki"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automaattinen synkronointi ei ole käytössä."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Ota automaattinen synkronointi käyttöön napauttamalla."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Ota käyttöön koskettamalla."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Tilin synkronointi ei ole käytössä."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Lentokonetila on käytössä"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Ota käyttöön täällä: <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Tilin asetukset"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g> lähettämätöntä viestiä"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Otetaanko automaattinen synkronointi käyttöön?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Gmailiin ja kaikkiin muihin sovelluksiin ja tileihin tekemäsi muutokset synkronoidaan seuraavissa kohteissa: verkko, muut laitteet ja <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"puhelin"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet-laite"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Ota käyttöön"</string>
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a6511f4..3441b43 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Fichier <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Prévisualiser"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Enregistrer"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Infos"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Annuler"</string>
     <string name="download_again" msgid="7418568915429156518">"Retélécharger"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Infos"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Résultats"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"La fonctionnalité de recherche n\'est pas compatible avec ce compte."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Recherche en cours…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Dossiers récents"</string>
-    <string name="add_label" msgid="1638508840481944248">"Ajouter un libellé"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Plus récente"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Plus ancienne"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nouveau message de <xliff:g id="SENDER">%s</xliff:g>"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</string>
-    <string name="show" msgid="7114006150083237343">"Afficher"</string>
+    <string name="add_label" msgid="6060201715848652940">"Ajouter un dossier"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nouveau message de <xliff:g id="SENDER">%s</xliff:g>. Afficher."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages. Afficher"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Développer coordonnées du destinataire"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Réduire les coordonnées du destinataire"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Afficher les coordonnées de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"À : "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc : "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Cci : "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Date : "</string>
     <string name="show_images" msgid="1875700481186331432">"Afficher les images"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Touj. afficher images de cet expéditeur"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Les images provenant de cet expéditeur seront affichées automatiquement."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Sélectionner un compte"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Sélectionner un dossier…"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Dossier E-mail"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Tout synchroniser"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synchroniser les dernières 24 heures (<xliff:g id="COUNT">%1$d</xliff:g> jour)"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synchroniser les <xliff:g id="COUNT">%1$d</xliff:g> derniers jours"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Ne rien synchroniser"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Modifier les dossiers"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Déplacer vers"</string>
     <string name="search_hint" msgid="3625734263059221350">"Rechercher dans les messages"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Hier à <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Masquer le conseil"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"La synchronisation automatique est désactivée."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Appuyer pour activer la synchronisation automatique"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Appuyer ici pour activer la fonctionnalité"</string>
     <string name="account_sync_off" msgid="5699548271856775808">"La synchronisation de votre compte est désactivée."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Le mode Avion est activé."</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Activer dans <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Paramètres de compte"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> message(s) non envoyé(s) dans <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Activer la synchronisation automatique ?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Les modifications que vous apporterez dans l\'ensemble des applications et des comptes, pas seulement dans Gmail, seront synchronisées avec le Web, vos autres appareils et votre <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"téléphone"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablette"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Activer"</string>
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 30b17c7..815da7d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> फ़ाइल"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"पूर्वावलोकन"</string>
     <string name="save_attachment" msgid="5360128849867863132">"सहेजें"</string>
-    <string name="info_attachment" msgid="607849900865956536">"जानकारी"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"रद्द करें"</string>
     <string name="download_again" msgid="7418568915429156518">"पुनः डाउनलोड करें"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"जानकारी"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"परिणाम"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"इस खाते पर खोज समर्थित नहीं है."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"खोज रहा है…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"नवीनतम"</string>
-    <string name="add_label" msgid="1638508840481944248">"लेबल जोड़ें"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"नए"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"पुराने"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"<xliff:g id="SENDER">%s</xliff:g> की ओर से नया संदेश."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश"</string>
-    <string name="show" msgid="7114006150083237343">"दिखाएं"</string>
+    <string name="add_label" msgid="6060201715848652940">"फ़ोल्‍डर जोड़ें"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"<xliff:g id="SENDER">%s</xliff:g> की ओर से नया संदेश. दिखाएं."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश. दिखाएं."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"प्राप्तकर्ता जानकारी विस्तृत करें"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"प्राप्तकर्ता जानकारी संक्षिप्त करें"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> की संपर्क जानकारी दिखाएं"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"प्रति: "</string>
     <string name="cc_heading" msgid="52678613787360092">"प्रतिलिपि: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"गुप्त प्रति: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"दिनांक: "</string>
     <string name="show_images" msgid="1875700481186331432">"चित्र दिखाएं"</string>
     <string name="always_show_images" msgid="5966408990164581801">"इस प्रेषक के चित्र हमेशा दिखाएं"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"इस प्रेषक के चित्रों को अपने आप दिखाया जाएगा."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"खाता चुनें"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"फ़ोल्डर चुनें"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"ईमेल फ़ोल्डर"</string>
-    <string name="sync_all" msgid="1057043212338233359">"समन्वयित करें: सभी"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"समन्वयित करें: अंतिम <xliff:g id="COUNT">%1$d</xliff:g> दिन"</item>
-    <item quantity="other" msgid="6856940335775567991">"समन्‍वयित करें: अंतिम <xliff:g id="COUNT">%1$d</xliff:g> दिन"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"समन्‍वयित करें: कोई भी नहीं"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"फ़ोल्डर बदलें"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"इसमें ले जाएं"</string>
     <string name="search_hint" msgid="3625734263059221350">"मेल खोजें"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"कल, <xliff:g id="TIME">%1$s</xliff:g> बजे"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"युक्ति ख़ारिज करें"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"स्वत: समन्वयन बंद है."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"स्वत: समन्वयन को चालू करने के लिए टैप करें."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"चालू करने के लिए स्पर्श करें."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"खाता समन्वयन बंद है."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"हवाई जहाज़ मोड चालू है"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g> में चालू करें."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"खाता सेटिंग"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="OUTBOX">%2$s</xliff:g> में <xliff:g id="NUMBER">%1$s</xliff:g> अप्रेषित"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"स्वत:-समन्वयन चालू करें?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"आपके द्वारा न केवल Gmail में, बल्कि सभी एप्लिकेशन और खातों में किए जाने वाले बदलाव, वेब, आपके अन्य उपकरणों, और आपके <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> के बीच समन्वयित किए जाएंगे."</string>
+    <string name="phone" msgid="5171715391553213328">"फ़ोन"</string>
+    <string name="tablet" msgid="7956969657216748522">"टेबलेट"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"चालू करें"</string>
 </resources>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index eab3841..c9baba5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> datoteka"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Pregled"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Spremi"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Odustani"</string>
     <string name="download_again" msgid="7418568915429156518">"Preuzmi ponovo"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informacije"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Rezultati"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Pretraživanje nije podržano na ovom računu."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Traženje..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Nedavno"</string>
-    <string name="add_label" msgid="1638508840481944248">"Dodaj oznaku"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Novije"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Starije"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Novu poruku šalje <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Prikaži"</string>
+    <string name="add_label" msgid="6060201715848652940">"Dodaj mapu"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Novu poruku šalje <xliff:g id="SENDER">%s</xliff:g>. Prikaži."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Nove poruke: <xliff:g id="COUNT">%1$d</xliff:g>. Prikaži."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Proširi podatke o primatelju"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sažmi podatke o primatelju"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Prikaži podatke o kontaktu za <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Prima: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kopija: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Skr. kop.: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Prikaži slike"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Uvijek prikaži slike ovog pošiljatelja"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Slike ovog pošiljatelja automatski će se prikazati."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Odabir računa"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Odabir mape"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Mapa e-pošte"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sinkroniziraj: sve"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinkronizacija prethodnog dana: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sinkronizacija sljedećeg broja prethodnih dana: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sinkroniziraj: ništa"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Promjena mapa"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Premještanje"</string>
     <string name="search_hint" msgid="3625734263059221350">"Pretraži poštu"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Jučer u <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Odbacivanje savjeta"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatska sinkronizacija nije uključena."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Dodirnite da biste uključili automatsku sinkronizaciju."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Dodirnite za isključivanje."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Sinkronizacija računa nije uključena."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Uključen je način rada u zrakoplovu"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Uključite je u <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"postavkama računa"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Broj neposlanih poruka u mapi <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Želite li uključiti automatsku sinkronizaciju?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Promjene koje unesete na svim aplikacijama i računima, a ne samo na Gmailu, sinkronizirat će se na webu, vašim ostalim uređajima i vašem uređaju <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Uključi"</string>
 </resources>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index eee067a..af9bcae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> fájl"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Előnézet"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Mentés"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Információ"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Mégse"</string>
     <string name="download_again" msgid="7418568915429156518">"Letöltés újra"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Információ"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Találatok"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"A keresés nem támogatott ebben a fiókban."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Keresés..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Legújabbak"</string>
-    <string name="add_label" msgid="1638508840481944248">"Címke hozzáadása"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Újabb"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Régebbi"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"<xliff:g id="SENDER">%s</xliff:g> új üzenetet küldött."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</string>
-    <string name="show" msgid="7114006150083237343">"Megjelenítés"</string>
+    <string name="add_label" msgid="6060201715848652940">"Mappa hozzáadása"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"<xliff:g id="SENDER">%s</xliff:g> új üzenete – megtekintés"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet – megtekintés"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Címzett adatainak megjelenítése"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Címzett adatainak elrejtése"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> elérhetőségi adatainak megjelenítése"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Címzett: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Dátum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Képek megjelenítése"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Mindig jelenjenek meg képek a feladótól"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Az ettől a feladótól származó képek automatikusan megjelennek."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Fiók kiválasztása"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Mappa kiválasztása"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"E-mail mappa"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Szinkronizálás: mind"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Az utolsó <xliff:g id="COUNT">%1$d</xliff:g> nap szinkronizálása"</item>
-    <item quantity="other" msgid="6856940335775567991">"Az utolsó <xliff:g id="COUNT">%1$d</xliff:g> nap szinkronizálása"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Szinkronizálás: ne legyen"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Mappaváltás"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Áthelyezés ide:"</string>
     <string name="search_hint" msgid="3625734263059221350">"Keresés a levelek között"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Tegnap, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Tipp elvetése"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatikus szinkronizálás kikapcsolva."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Érintse meg az automatikus szinkronizáláshoz."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Érintse meg a bekapcsoláshoz."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Fiókszinkronizálás kikapcsolva."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Repülős üzemmód bekapcsolva"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Kapcsolja be itt: <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Fiókbeállítások"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> nem elküldött levél van itt: <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Bekapcsolja az automatikus szinkronizálást?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Az összes alkalmazásban és fiókban (nem csak a Gmailben) végrehajtott módosítások szinkronizálva lesznek az internet, az egyéb eszközök és a <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> között."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"táblagép"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Bekapcsolás"</string>
 </resources>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8cae245..f643128 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"File <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Pratinjau"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Simpan"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Batal"</string>
     <string name="download_again" msgid="7418568915429156518">"Unduh lagi"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Info"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Hasil"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Penelusuran tidak didukung pada akun ini."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Menelusuri…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Terkini"</string>
-    <string name="add_label" msgid="1638508840481944248">"Tambahkan label"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Lebih baru"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Lebih lama"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Pesan baru dari <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</string>
-    <string name="show" msgid="7114006150083237343">"Tampilkan"</string>
+    <string name="add_label" msgid="6060201715848652940">"Tambahkan folder"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Pesan baru dari <xliff:g id="SENDER">%s</xliff:g>. Tampilkan."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru. Tampilkan."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Bentangkan detail penerima"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ciutkan detail penerima"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Tampilkan informasi kontak untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Kepada: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Tanggal: "</string>
     <string name="show_images" msgid="1875700481186331432">"Tampilkan gambar"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Selalu tampilkan gambar dr pengirim ini"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Gambar dari pengirim ini akan ditampilkan secara otomatis."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pilih akun"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Pilih folder"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Folder email"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sinkronkan: Semua"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinkronkan: <xliff:g id="COUNT">%1$d</xliff:g> hari terakhir"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sinkronkan: <xliff:g id="COUNT">%1$d</xliff:g> hari terakhir"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sinkronkan: Tidak Satu Pun"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Ganti folder"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Pindahkan ke"</string>
     <string name="search_hint" msgid="3625734263059221350">"Telusuri email"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Kemarin, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Tutup kiat"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Sinkronisasi otomatis mati."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Ketuk untuk mengaktifkan sinkronisasi otomatis."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Sentuh untuk mengaktifkan."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Sinkronisasi akun mati."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Mode pesawat aktif"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Aktifkan di <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Setelan akun"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> tidak terkirim di <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Aktifkan sinkronisasi otomatis?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Perubahan yang Anda lakukan pada semua aplikasi dan akun, bukan hanya Gmail, akan disinkronkan antara web, perangkat Anda lainnya, dan <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"ponsel"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Aktifkan"</string>
 </resources>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5f931e1..7c790d2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"File <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Anteprima"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Salva"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Annulla"</string>
     <string name="download_again" msgid="7418568915429156518">"Scarica di nuovo"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informazioni"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Risultati"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"La ricerca non è supportata per l\'account in uso."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Ricerca…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recenti"</string>
-    <string name="add_label" msgid="1638508840481944248">"Aggiungi etichetta"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> di <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Successiva"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Precedente"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nuovo messaggio da <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi"</string>
-    <string name="show" msgid="7114006150083237343">"Mostra"</string>
+    <string name="add_label" msgid="6060201715848652940">"Aggiungi cartella"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nuovo messaggio da <xliff:g id="SENDER">%s</xliff:g>. Mostra."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi. Mostra."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Espandi i dettagli destinatario"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Comprimi i dettagli destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostra informazioni di contatto di <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"A: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Ccn: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Data: "</string>
     <string name="show_images" msgid="1875700481186331432">"Mostra immagini"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Mostra sempre immagini del mittente"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Le immagini da questo mittente verranno mostrate automaticamente."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Scegli account"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Scegli cartella"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Cartella Email"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sincronizza: tutto"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizza: ultimo giorno (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sincronizza: ultimi <xliff:g id="COUNT">%1$d</xliff:g> giorni"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sincronizza: nessuna"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Cambia cartelle"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Sposta in"</string>
     <string name="search_hint" msgid="3625734263059221350">"Cerca nella posta"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ieri alle <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Ignora suggerimento"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"La sincronizzazione automatica non è attiva."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Tocca per attivare la sincronizzazione automatica."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Tocca per attivare."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"La sincronizzazione dell\'account non è attiva."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Modalità in volo attiva"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Attiva in <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Impostazioni dell\'account"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> non inviati in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Attivare la sincronizzazione automatica?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Le modifiche apportate a tutti gli account (non solo Gmail) e le app verranno sincronizzate tra il Web, gli altri tuoi dispositivi e il tuo <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefono"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Attiva"</string>
 </resources>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2bd526c..fc66e9a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"קובץ <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"תצוגה מקדימה"</string>
     <string name="save_attachment" msgid="5360128849867863132">"שמור"</string>
-    <string name="info_attachment" msgid="607849900865956536">"מידע"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"בטל"</string>
     <string name="download_again" msgid="7418568915429156518">"הורד שוב"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"מידע"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"תוצאות"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"חיפוש אינו נתמך בחשבון זה."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"מחפש…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"אחרונות"</string>
-    <string name="add_label" msgid="1638508840481944248">"הוסף תווית"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"חדשה יותר"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"ישנה יותר"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"הודעה חדשה מ-<xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות"</string>
-    <string name="show" msgid="7114006150083237343">"הצג"</string>
+    <string name="add_label" msgid="6060201715848652940">"הוסף תיקיה"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"הודעה חדשה מאת <xliff:g id="SENDER">%s</xliff:g>. הצג."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות. הצג."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"הרחב פרטי נמען"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"כווץ את פרטי הנמען"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"הצג פרטי איש קשר של <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"אל: "</string>
     <string name="cc_heading" msgid="52678613787360092">"עותק: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"עותק מוסתר: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"תאריך: "</string>
     <string name="show_images" msgid="1875700481186331432">"הצג תמונות"</string>
     <string name="always_show_images" msgid="5966408990164581801">"הצג תמיד תמונות משולח זה"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"תמונות משולח זה יוצגו באופן אוטומטי."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"בחר חשבון"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"בחר תיקיה"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"תיקיית דוא\"ל"</string>
-    <string name="sync_all" msgid="1057043212338233359">"סינכרון: הכל"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"סינכרון: ביום <xliff:g id="COUNT">%1$d</xliff:g> האחרון"</item>
-    <item quantity="other" msgid="6856940335775567991">"סינכרון: ב-<xliff:g id="COUNT">%1$d</xliff:g> הימים האחרונים"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"סינכרון: כלום"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"שינוי תיקיות"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"העבר אל"</string>
     <string name="search_hint" msgid="3625734263059221350">"חפש בדואר"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"אתמול ב-<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"סגור את הטיפ"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"הסנכרון האוטומטי כבוי."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"הקש כדי להפעיל סנכרון אוטומטי."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"גע כדי להפעיל."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"סנכרון החשבון כבוי."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"מצב טיסה מופעל"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"הפעל ב<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"הגדרות חשבון"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> לא נשלחו ב<xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"האם להפעיל סנכרון אוטומטי?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"שינויים שתבצע בכל האפליקציות והחשבונות, ולא רק ב-Gmail, יסונכרנו בין האינטרנט, המכשירים האחרים שלך וה<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> שלך."</string>
+    <string name="phone" msgid="5171715391553213328">"טלפון"</string>
+    <string name="tablet" msgid="7956969657216748522">"טאבלט"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"הפעל"</string>
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 192118b..23088d0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>ファイル"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"プレビュー"</string>
     <string name="save_attachment" msgid="5360128849867863132">"保存"</string>
-    <string name="info_attachment" msgid="607849900865956536">"情報"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"キャンセル"</string>
     <string name="download_again" msgid="7418568915429156518">"再ダウンロード"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"情報"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"検索結果"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"このアカウントでは検索をご利用いただけません。"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"検索しています…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"最近開いたフォルダ"</string>
-    <string name="add_label" msgid="1638508840481944248">"ラベルを追加"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"前"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"次"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"<xliff:g id="SENDER">%s</xliff:g>さんから新着メールがあります。"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メール"</string>
-    <string name="show" msgid="7114006150083237343">"表示"</string>
+    <string name="add_label" msgid="6060201715848652940">"フォルダを追加"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"<xliff:g id="SENDER">%s</xliff:g>さんから新着メール。表示。"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g>通の新着メール。表示。"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"受信者の詳細を表示"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"受信者の詳細を隠す"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g>の連絡先情報を表示"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"To: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"日付: "</string>
     <string name="show_images" msgid="1875700481186331432">"画像を表示"</string>
     <string name="always_show_images" msgid="5966408990164581801">"この送信者からの画像を常に表示する"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"この送信者からの画像は自動的に表示されます。"</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"アカウントを選択"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"フォルダを選択"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"メールフォルダ"</string>
-    <string name="sync_all" msgid="1057043212338233359">"同期: すべて"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"同期: 過去<xliff:g id="COUNT">%1$d</xliff:g>日分"</item>
-    <item quantity="other" msgid="6856940335775567991">"同期: 過去<xliff:g id="COUNT">%1$d</xliff:g>日分"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"同期: なし"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"フォルダを変更"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"移動"</string>
     <string name="search_hint" msgid="3625734263059221350">"メールを検索"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"昨日、<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"ヒントを表示しない"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"自動同期はOFFです。"</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"自動同期をONにするにはタップします。"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"ONにするにはタップします。"</string>
     <string name="account_sync_off" msgid="5699548271856775808">"アカウントの同期はOFFです。"</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"機内モードはONです"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>でONにできます。"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"アカウント設定"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="OUTBOX">%2$s</xliff:g>内の未送信件数: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"自動同期をONにしますか？"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Gmailだけでなく、すべてのアプリとアカウントへの変更は、ウェブ、その他の端末、お使いの<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>の間で同期されます。"</string>
+    <string name="phone" msgid="5171715391553213328">"携帯電話"</string>
+    <string name="tablet" msgid="7956969657216748522">"タブレット"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"ONにする"</string>
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c1e4815..fd246e1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> 파일"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"미리보기"</string>
     <string name="save_attachment" msgid="5360128849867863132">"저장"</string>
-    <string name="info_attachment" msgid="607849900865956536">"정보"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"취소"</string>
     <string name="download_again" msgid="7418568915429156518">"다시 다운로드"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"정보"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"검색결과"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"이 계정에서는 검색이 지원되지 않습니다."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"검색 중…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"최근 항목"</string>
-    <string name="add_label" msgid="1638508840481944248">"라벨 추가"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="TOTAL">%2$s</xliff:g>개 중 <xliff:g id="COUNT">%1$s</xliff:g>개"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"다음"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"이전"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"<xliff:g id="SENDER">%s</xliff:g>님이 보낸 새 메일입니다."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"새 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</string>
-    <string name="show" msgid="7114006150083237343">"표시"</string>
+    <string name="add_label" msgid="6060201715848652940">"폴더 추가"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"<xliff:g id="SENDER">%s</xliff:g>님이 보낸 새 메일 보기"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"새 메일 <xliff:g id="COUNT">%1$d</xliff:g>개 보기"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"수신자 세부정보 펼치기"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"수신자 세부정보 접기"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g>님에 대한 연락처 정보 표시"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"받는사람: "</string>
     <string name="cc_heading" msgid="52678613787360092">"참조: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"숨은참조: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"날짜: "</string>
     <string name="show_images" msgid="1875700481186331432">"사진 표시"</string>
     <string name="always_show_images" msgid="5966408990164581801">"이 발신자가 보낸 사진을 항상 표시"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"이 발신자가 보낸 사진이 자동으로 표시됩니다."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"계정 선택"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"폴더 선택"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"이메일 폴더"</string>
-    <string name="sync_all" msgid="1057043212338233359">"동기화: 전체"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"동기화: 지난 <xliff:g id="COUNT">%1$d</xliff:g>일"</item>
-    <item quantity="other" msgid="6856940335775567991">"동기화: 지난 <xliff:g id="COUNT">%1$d</xliff:g>일"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"동기화: 안함"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"폴더 변경"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"이동"</string>
     <string name="search_hint" msgid="3625734263059221350">"메일 검색"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"어제 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"도움말 닫기"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"자동 동기화가 사용 중지되어 있습니다."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"탭하여 자동 동기화를 사용하도록 설정하세요."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"사용하려면 터치합니다."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"계정 동기화가 사용 중지되어 있습니다."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"비행기 모드를 사용 중입니다."</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>에서 동기화를 설정하세요."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"계정 설정"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="OUTBOX">%2$s</xliff:g>에 보내지 않은 메일 <xliff:g id="NUMBER">%1$s</xliff:g>개 있음"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"자동 동기화를 사용하시겠습니까?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Gmail뿐만 아니라 모든 앱 및 계정의 변경사항이 웹, 다른 기기, <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> 간에 동기화됩니다."</string>
+    <string name="phone" msgid="5171715391553213328">"휴대전화"</string>
+    <string name="tablet" msgid="7956969657216748522">"태블릿"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"사용"</string>
 </resources>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2365ae4..a00a614 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> failas"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Peržiūrėti"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Išsaugoti"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informac."</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Atšaukti"</string>
     <string name="download_again" msgid="7418568915429156518">"Atsisiųsti dar kartą"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informacija"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Rezultatai"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Šioje paskyroje paieška nepalaikoma."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Ieškoma…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Naujausias"</string>
-    <string name="add_label" msgid="1638508840481944248">"Pridėti etiketę"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Naujesnis"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Senesnis"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Naujas pranešimas nuo <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Rodyti"</string>
+    <string name="add_label" msgid="6060201715848652940">"Pridėti aplanką"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"<xliff:g id="SENDER">%s</xliff:g> atsiuntė naują pran. Rodyti."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>. Rodyti."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Išskleisti išsamią gavėjo informaciją"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sutraukti išsamią gavėjo informaciją"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Rodyti <xliff:g id="NAME">%1$s</xliff:g> kontaktinę informaciją"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Kam: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Data: "</string>
     <string name="show_images" msgid="1875700481186331432">"Rodyti paveiksl."</string>
     <string name="always_show_images" msgid="5966408990164581801">"Visada rodyti iš šio siunt. gaut. pav."</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Iš šio siuntėjo gauti paveikslėliai bus rodomi automatiškai."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pasirinkti paskyrą"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Pasirinkti aplanką"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"El. pašto aplankas"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sinchronizuoti: viską"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinchronizuoti: paskutin. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
-    <item quantity="other" msgid="6856940335775567991">"Sinchronizuoti: paskutin. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Nesinchronizuoti nieko"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Keisti aplankus"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Perkelti į"</string>
     <string name="search_hint" msgid="3625734263059221350">"Ieškoti el. pašte"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Vakar <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Atsisakyti patarimo"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatinis sinchronizavimas išjungtas."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Palieskite, kad įjungtumėte automatinį sinchronizavimą."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Įjungti palietus."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Automatinis sinchronizavimas išjungtas."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Įjungtas lėktuvo režimas"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Įjunkite <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Paskyros nustatymai"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"„<xliff:g id="OUTBOX">%2$s</xliff:g>“ esančių neišsiųstų elementų: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Įjungti automatinį sinchronizavimą?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Pakeitimai, atliekami visose programose ir paskyrose, o ne tik „Gmail“, bus sinchronizuojami žiniatinklyje, kituose įrenginiuose ir <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefone"</string>
+    <string name="tablet" msgid="7956969657216748522">"planšetiniame kompiuteryje"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Įjungti"</string>
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6934162..5cd94dc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> fails"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Priekšsk."</string>
     <string name="save_attachment" msgid="5360128849867863132">"Saglabāt"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Inform."</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Atcelt"</string>
     <string name="download_again" msgid="7418568915429156518">"Lejupielādēt vēlreiz"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informācija"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Rezultāti"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Šajā kontā netiek atbalstīta meklēšana."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Notiek meklēšana..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Pēdējās"</string>
-    <string name="add_label" msgid="1638508840481944248">"Pievienojiet iezīmi."</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g>. no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Jaunāka"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Vecāka"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Jauns ziņojums no: <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi"</string>
-    <string name="show" msgid="7114006150083237343">"Rādīt"</string>
+    <string name="add_label" msgid="6060201715848652940">"Pievienot mapi"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Jauns ziņojums no: <xliff:g id="SENDER">%s</xliff:g>. Rādīt."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi. Rādīt!"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Izvērst informāciju par adresātu"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sakļaut informāciju par adresātu"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Rādīt sūtītāja <xliff:g id="NAME">%1$s</xliff:g> kontaktinformāciju"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Kam: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kopija: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"D. kop.: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datums: "</string>
     <string name="show_images" msgid="1875700481186331432">"Rādīt attēlus"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Vienmēr rādīt attēlus no šī sūtītāja"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Attēli no šī sūtītāja tiks rādīti automātiski."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Izvēlēties kontu"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Izvēlēties mapi"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"mape “E-pasts”"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sinhronizēt: visas"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinhronizēt: pēdējo <xliff:g id="COUNT">%1$d</xliff:g> dienu"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sinhronizēt: pēdējās <xliff:g id="COUNT">%1$d</xliff:g> dienas"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Nesinhronizēt"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Mapju mainīšana"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Pārvietošana"</string>
     <string name="search_hint" msgid="3625734263059221350">"Meklēt vēstulēs"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Vakar plkst. <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Noraidīt padomu"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automātiskā sinhronizācija ir izslēgta."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Pieskarieties, lai ieslēgtu automātisko sinhronizāciju."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Pieskarieties, lai ieslēgtu."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Konta sinhronizācija ir izslēgta."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Lidojuma režīms ir ieslēgts."</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Ieslēdziet to sadaļā <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Konta iestatījumi"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> nenosūtīti ziņojumi sadaļā <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Vai ieslēgt automātisko sinhronizāciju?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Izmaiņas, ko veicāt visām lietotnēm un kontiem (ne tikai Gmail), tiks sinhronizētas tīmeklī, citās jūsu ierīcēs un šādā jūsu ierīcē: <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"tālrunis"</string>
+    <string name="tablet" msgid="7956969657216748522">"planšetdators"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Ieslēgt"</string>
 </resources>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..87a79ee
--- /dev/null
+++ b/res/values-ms-rMY/strings.xml

@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2011 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="to" msgid="4392614766835725698">"Kepada"</string>
+    <string name="cc" msgid="7017720927911078193">"Sk"</string>
+    <string name="bcc" msgid="3098643138241111579">"Skt"</string>
+    <string name="subject_hint" msgid="7253964583324677128">"Subjek"</string>
+    <string name="body_hint" msgid="4279864165439577668">"Karang e-mel"</string>
+    <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan fail"</string>
+    <string name="add_photo_attachment" msgid="3738882100645552858">"Lampirkan gambar"</string>
+    <string name="add_video_attachment" msgid="8916625983712820173">"Lampirkan video"</string>
+    <string name="save_draft" msgid="5555744208032445632">"Simpan draf"</string>
+    <string name="discard" msgid="1714960202994370243">"Buang"</string>
+    <string name="compose" msgid="1473559896062432878">"Karang"</string>
+  <string-array name="compose_modes">
+    <item msgid="8631190144210933782">"Balas"</item>
+    <item msgid="4085029907540221568">"Balas kepada semua"</item>
+    <item msgid="857480048798815437">"Kirim semula"</item>
+  </string-array>
+    <string name="reply_attribution" msgid="717207316577386788">"Pada <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> menulis:"</string>
+    <string name="forward_attribution" msgid="1498936339458535158">"---------- Mesej kiriman semula ----------&lt;br&gt;Daripada: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tarikh: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subjek: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kepada: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
+    <string name="forward_attribution_no_headers" msgid="3239825787227110752">"---------- Mesej yang dikirim semula ----------"</string>
+    <string name="cc_attribution" msgid="374493748526504562">"Sk: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
+    <string name="select_attachment_type" msgid="4711524151968942082">"Pilih jenis lampiran"</string>
+    <string name="too_large_to_attach_single" msgid="2996733972478212136">"Tidak boleh melampirkan fail melebihi <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Satu atau lebih fail tidak dilampirkan. Had <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Fail tidak dilampirkan. Had <xliff:g id="MAXSIZE">%1$s</xliff:g> telah dicapai."</string>
+    <string name="generic_attachment_problem" msgid="8775959340559458709">"Tidak dapat melampirkan fail."</string>
+    <string name="recipient_needed" msgid="999037027358925655">"Tambahkan sekurang-kurangnya satu penerima."</string>
+    <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Ralat penerima"</string>
+    <string name="confirm_send_title" msgid="5663602035452564062">"Hantar mesej?"</string>
+    <string name="confirm_send_message_with_no_subject" msgid="8900379985826988281">"Tiada teks dalam subjek mesej."</string>
+    <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Tiada teks dalam badan mesej."</string>
+    <string name="confirm_send_message" msgid="3221546155385562874">"Hantar mesej ini?"</string>
+    <string name="message_discarded" msgid="5079975378884765445">"Mesej dibuang."</string>
+    <string name="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
+    <string name="custom_from_account_label" msgid="5069652141632649722">"Hantar mel sbg:"</string>
+    <string name="send" msgid="8242003661397555986">"Hantar"</string>
+    <string name="mark_read" msgid="8438349154394313195">"Tandakan dibaca"</string>
+    <string name="mark_unread" msgid="6231373939351125713">"Tandakan tidak dibaca"</string>
+    <string name="mute" msgid="1995954983688603977">"Redam"</string>
+    <string name="add_star" msgid="2866003744391266498">"Tambah bintang"</string>
+    <string name="remove_star" msgid="4372327933122106128">"Alih keluar bintang"</string>
+    <string name="remove_folder" msgid="4906542720439865413">"Dialih keluar dari <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+    <string name="archive" msgid="847250094775910499">"Arkib"</string>
+    <string name="report_spam" msgid="6467567747975393907">"Laporkan spam"</string>
+    <string name="mark_not_spam" msgid="694891665407228160">"Laporkan bukan spam"</string>
+    <string name="report_phishing" msgid="5714205737453138338">"Laporkan pancingan data"</string>
+    <string name="delete" msgid="844871204175957681">"Padam"</string>
+    <string name="discard_drafts" msgid="6862272443470085375">"Buang draf"</string>
+    <string name="refresh" msgid="490989798005710951">"Muat semula"</string>
+    <string name="reply" msgid="2032052598496088561">"Balas"</string>
+    <string name="reply_all" msgid="7257248094625487557">"Balas kepada semua"</string>
+    <string name="resume_draft" msgid="6450150180834092146">"Edit"</string>
+    <string name="forward" msgid="6822914459902983767">"Kirim semula"</string>
+    <string name="menu_compose" msgid="6274193058224230645">"Karang"</string>
+    <string name="menu_change_folders" msgid="1542713666608888717">"Tukar folder"</string>
+    <string name="menu_move_to" msgid="9138296669516358542">"Alih ke"</string>
+    <string name="menu_move_to_inbox" msgid="3201472943201077389">"Alih ke Peti Masuk"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Tetapan folder"</string>
+    <string name="menu_show_original" msgid="4227060689700765828">"Kembalikan auto saiz"</string>
+    <string name="menu_folder_options" msgid="8897520487430647932">"Tetapan folder"</string>
+    <string name="menu_settings" msgid="6007027046949837282">"Tetapan"</string>
+    <string name="menu_search" msgid="5297197523031943248">"Carian"</string>
+    <string name="mark_important" msgid="6904096897104265870">"Tandakan penting"</string>
+    <string name="mark_not_important" msgid="4550967327747977068">"Tandakan tidak penting"</string>
+    <string name="add_cc_label" msgid="504861315425773180">"Tambah Sk/Skt"</string>
+    <string name="add_bcc_label" msgid="7432027645493843336">"Tambah Skt"</string>
+    <string name="feedback" msgid="79365993169715049">"Hantar maklum balas"</string>
+    <string name="help_and_info" msgid="7873089811705257882">"Bantuan"</string>
+    <string name="quoted_text" msgid="7250749398672037355">"Sertakan teks petikan"</string>
+    <string name="quoted_text_label" msgid="541007446961960617">"Petik teks"</string>
+    <string name="respond_inline" msgid="6797117334768201180">"Menjawab dalam baris"</string>
+    <string name="bytes" msgid="874874279846496468">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
+    <string name="kilobytes" msgid="9191949758901349712">"<xliff:g id="COUNT">%s</xliff:g> KB"</string>
+    <string name="megabytes" msgid="130431176022837380">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>
+    <string name="attachment_image" msgid="3832985223906528449">"Imej"</string>
+    <string name="attachment_video" msgid="7526134752988603154">"Video"</string>
+    <string name="attachment_audio" msgid="135527133955622936">"Audio"</string>
+    <string name="attachment_text" msgid="5544874374971562759">"Teks"</string>
+    <string name="attachment_application_msword" msgid="2326909450865637910">"Dokumen"</string>
+    <string name="attachment_application_vnd_ms_powerpoint" msgid="861348289167216897">"Pembentangan"</string>
+    <string name="attachment_application_vnd_ms_excel" msgid="5861224590731578901">"Hamparan"</string>
+    <string name="attachment_application_pdf" msgid="6922990425001131901">"PDF"</string>
+    <string name="attachment_unknown" msgid="6005445955982153931">"Fail <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
+    <string name="preview_attachment" msgid="6934911143603455393">"Pratonton"</string>
+    <string name="save_attachment" msgid="5360128849867863132">"Simpan"</string>
+    <string name="cancel_attachment" msgid="4651201258272223650">"Batal"</string>
+    <string name="download_again" msgid="7418568915429156518">"Muat turun lagi"</string>
+    <string name="more_info_attachment" msgid="717244337981816703">"Maklumat"</string>
+    <string name="attachment_type_blocked" msgid="7878184764428642891">"Malangnya, anda tidak boleh menyimpan atau membuka lampiran jenis ini."</string>
+    <string name="no_application_found" msgid="1945184804521392093">"Tiada apl boleh membuka lampiran ini untuk tontonan."</string>
+    <string name="fetching_attachment" msgid="2599763030649526179">"Mengambil lampiran"</string>
+    <string name="please_wait" msgid="8797634225088247121">"Sila tunggu..."</string>
+    <string name="saved" msgid="6660844285730790469">"Disimpan, <xliff:g id="SIZE">%s</xliff:g>"</string>
+    <string name="download_failed" msgid="442019281547315527">"Tidak dapat memuat turun. Sentuh untuk mencuba semula."</string>
+    <string name="attachments_header" msgid="6459475590011460229">"Lampiran"</string>
+    <string name="menu_photo_save_all" msgid="4295226099481995348">"Simpan semua"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"Kongsi"</string>
+    <string name="menu_photo_share_all" msgid="4577299400844129078">"Kongsi semua"</string>
+    <string name="saving" msgid="925514721138014677">"Menyimpan…"</string>
+    <string name="choosertitle_sharevia" msgid="6142681649048665134">"Kongsi melalui"</string>
+    <string name="contextmenu_openlink" msgid="2176176524824953775">"Buka dalam Penyemak Imbas"</string>
+    <string name="contextmenu_copy" msgid="4604170699444153037">"Salin"</string>
+    <string name="contextmenu_copylink" msgid="3580131515400610839">"Salin URL pautan"</string>
+    <string name="contextmenu_dial_dot" msgid="9104426720103729453">"Dail..."</string>
+    <string name="contextmenu_sms_dot" msgid="6481040539501081547">"SMS..."</string>
+    <string name="contextmenu_add_contact" msgid="8395100913366045250">"Tambah kenalan"</string>
+    <string name="contextmenu_send_mail" msgid="8301941130009797208">"Hantar e-mel"</string>
+    <string name="contextmenu_map" msgid="7721544518698532954">"Peta"</string>
+    <string name="contextmenu_sharelink" msgid="6213520416250245200">"Kongsi pautan"</string>
+    <string name="contextmenu_help" msgid="4651718679842414097">"Bantuan"</string>
+    <string name="contextmenu_feedback" msgid="4429118420169571473">"Hantar maklum balas"</string>
+    <!-- no translation found for num_selected (5723323585692387843) -->
+    <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="3657821200245019288">"Alih perbualan"</item>
+    <item quantity="other" msgid="1685896770174368261">"Alih <xliff:g id="ID_1">%1$d</xliff:g> perbualan"</item>
+  </plurals>
+    <string name="content_description" msgid="5191020413686786341">"<xliff:g id="SENDER">%1$s</xliff:g> tentang <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> pada <xliff:g id="DATE">%4$s</xliff:g>, <xliff:g id="READSTATE">%5$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="2303358176694038320">"<xliff:g id="SENDER">%1$s</xliff:g> tentang <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> pada <xliff:g id="TIME">%4$s</xliff:g>, <xliff:g id="READSTATE">%5$s</xliff:g>"</string>
+    <string name="read_string" msgid="219566857950091332">"perbualan telah dibaca"</string>
+    <string name="unread_string" msgid="588180203444398297">"perbualan belum dibaca"</string>
+    <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+    <string name="ap_overflow_format" msgid="2285438422049030145">"+<xliff:g id="ID_1">%d</xliff:g>"</string>
+  <plurals name="draft">
+    <item quantity="one" msgid="333591132893648383">"Draf"</item>
+    <item quantity="other" msgid="6961049507579977505">"Draf"</item>
+  </plurals>
+    <string name="sending" msgid="8214361929125649771">"Menghantar…"</string>
+    <string name="send_failed" msgid="750908595144529579">"Mesej tidak dihantar."</string>
+    <string name="me_object_pronun" msgid="7668994569594901571">"saya"</string>
+    <string name="me_subject_pronun" msgid="1088657349831581116">"saya"</string>
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Peti Masuk"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Padamkan perbualan ini?"</item>
+    <item quantity="other" msgid="930334208937121234">"Padamkan <xliff:g id="COUNT">%1$d</xliff:g> perbualan ini?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Arkibkan perbualan ini?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Arkibkan <xliff:g id="COUNT">%1$d</xliff:g> perbualan ini?"</item>
+  </plurals>
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="5974090449454432874">"Buang draf daripada perbualan ini?"</item>
+    <item quantity="other" msgid="4173815457177336569">"Buang draf daripada <xliff:g id="COUNT">%1$d</xliff:g> perbualan ini?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Buang mesej ini?"</string>
+    <string name="loading_conversations" msgid="2649440958602369555">"Memuatkan..."</string>
+    <string name="no_conversations" msgid="35400008890372241">"Tiada perbualan."</string>
+    <string name="undo" msgid="6070869718469782251">"Buat asal"</string>
+  <plurals name="conversation_unstarred">
+    <item quantity="one" msgid="8315328190288744398">"Membuang bintang <xliff:g id="COUNT">%1$d</xliff:g> perbualan."</item>
+    <item quantity="other" msgid="2222365088907519938">"Membuang bintang <xliff:g id="COUNT">%1$d</xliff:g> perbualan."</item>
+  </plurals>
+  <plurals name="conversation_muted">
+    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diredamkan."</item>
+    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diredamkan."</item>
+  </plurals>
+  <plurals name="conversation_spammed">
+    <item quantity="one" msgid="3060864972122279220">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam."</item>
+    <item quantity="other" msgid="5071459475389411227">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai spam."</item>
+  </plurals>
+  <plurals name="conversation_not_spam">
+    <item quantity="one" msgid="7361303622131552596">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
+    <item quantity="other" msgid="2250720080221922267">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai bukan spam."</item>
+  </plurals>
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="788387259924027833">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandakan tidak penting."</item>
+    <item quantity="other" msgid="6662213740575340397">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandakan tidak penting."</item>
+  </plurals>
+  <plurals name="conversation_phished">
+    <item quantity="one" msgid="5386916574432049235">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data."</item>
+    <item quantity="other" msgid="3678624994662639442">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dilaporkan sebagai pancingan data."</item>
+  </plurals>
+  <plurals name="conversation_archived">
+    <item quantity="one" msgid="5457612502965117672">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarkibkan."</item>
+    <item quantity="other" msgid="3012054504370916482">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; diarkibkan."</item>
+  </plurals>
+  <plurals name="conversation_deleted">
+    <item quantity="one" msgid="4398693029405479323">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dipadamkan."</item>
+    <item quantity="other" msgid="8630099095360065837">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; dipadamkan."</item>
+  </plurals>
+    <string name="deleted" msgid="2757349161107268029">"Dipadam"</string>
+    <string name="archived" msgid="7533995360704366325">"Diarkibkan"</string>
+    <string name="folder_removed" msgid="1047474677580149436">"Dialih keluar dari <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Folder yang diubah."</item>
+    <item quantity="other" msgid="8918589141287976985">"Folder yang diubah."</item>
+  </plurals>
+    <string name="conversation_folder_moved" msgid="297469098857964678">"Dialihkan ke <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+    <string name="search_results_header" msgid="4669917471897026269">"Hasil"</string>
+    <string name="search_unsupported" msgid="4654227193354052607">"Carian tidak disokong pada akaun ini."</string>
+    <string name="search_results_searching_header" msgid="3821361153909466819">"Mencari..."</string>
+    <string name="add_label" msgid="6060201715848652940">"Tambah folder"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Mesej baharu drp <xliff:g id="SENDER">%s</xliff:g>. Paparkan."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu. Paparkan."</item>
+  </plurals>
+    <string name="expand_recipient_details" msgid="2266544827446346880">"Kembangkan butiran penerima"</string>
+    <string name="collapse_recipient_details" msgid="3608892454869745927">"Runtuhkan butiran penerima"</string>
+    <string name="contact_info_string" msgid="6911322458329265644">"Papar maklumat kenalan untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="contact_info_string_default" msgid="596531738469809159">"Tunjukkan maklumat kenalan"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="7439716291751085801">"<xliff:g id="COUNT">%1$d</xliff:g> mesej lebih lama"</item>
+  </plurals>
+    <string name="from_heading" msgid="2454519463223197231">"Daripada: "</string>
+    <string name="replyto_heading" msgid="8563992423173220512">"Balas kepada: "</string>
+    <string name="to_heading" msgid="1142876841308812954">"Kepada: "</string>
+    <string name="cc_heading" msgid="52678613787360092">"Sk: "</string>
+    <string name="bcc_heading" msgid="4698055226318660420">"Skt: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Tarikh: "</string>
+    <string name="show_images" msgid="1875700481186331432">"Tunjukkan gambar"</string>
+    <string name="always_show_images" msgid="5966408990164581801">"Sentiasa tunjukkan gambar daripada pengirim ini"</string>
+    <string name="always_show_images_toast" msgid="6218061921546973716">"Gambar daripada pengirim ini akan ditunjukkan secara automatik."</string>
+    <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
+    <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> melalui <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+    <string name="message_saved" msgid="7073947895562277576">"Mesej disimpan sebagai draf."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Menghantar mesej..."</string>
+    <string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak sah."</string>
+    <string name="show_elided" msgid="5255917904110437886">"▶ Tunjukkan teks yang dipetik"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan teks yang dipetik"</string>
+    <string name="message_invite_title" msgid="6757287288611722175">"Jemputan Kalendar"</string>
+    <string name="message_invite_calendar_view" msgid="1898326841767645665">"Lihat dalam Kalendar"</string>
+    <string name="message_invite_label_attending" msgid="7378806613557157546">"Akan hadiri?"</string>
+    <string name="message_invite_accept" msgid="869753811259793266">"Ya"</string>
+    <string name="message_invite_tentative" msgid="3898050756490962079">"Mungkin"</string>
+    <string name="message_invite_decline" msgid="4524135969656266758">"Tidak"</string>
+    <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
+    <string name="yes" msgid="7474216525286833848">"Ya"</string>
+    <string name="no" msgid="427548507197604096">"Tiada"</string>
+    <string name="ok" msgid="8339355733816891026">"OK"</string>
+    <string name="done" msgid="3079981801778027540">"Selesai"</string>
+    <string name="cancel" msgid="8762981157252199115">"Batal"</string>
+    <string name="clear" msgid="3184687982186479442">"Padam bersih"</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Berjaya"</item>
+    <item msgid="7109065688039971961">"Tiada sambungan."</item>
+    <item msgid="8437496123716232060">"Tidak dapat melog masuk."</item>
+    <item msgid="1651266301325684887">"Ralat keselamatan."</item>
+    <item msgid="1461520171154288533">"Tidak dapat menyegerakkan."</item>
+    <item msgid="4779810016424303449">"Ralat Dalaman"</item>
+  </string-array>
+    <string name="tap_to_configure" msgid="1181356242354390930">"Sentuh untuk menyediakan"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat perbualan, segerakkan folder ini."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Segerak Folder"</string>
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+  <plurals name="actionbar_unread_messages">
+    <item quantity="other" msgid="6210217540181960613">"<xliff:g id="COUNT">%1$d</xliff:g> belum dibaca"</item>
+  </plurals>
+    <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ belum dibaca"</string>
+    <string name="view_more_conversations" msgid="3151067626309674344">"Lihat lagi perbualan"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Memuatkan…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pilih akaun"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Pilih folder"</string>
+    <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Folder e-mel"</string>
+    <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Tukar folder"</string>
+    <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Alih ke"</string>
+    <string name="search_hint" msgid="3625734263059221350">"Cari dalam mel"</string>
+    <!-- no translation found for search_results_loaded (7840075360438913721) -->
+    <skip />
+    <string name="network_error" msgid="2125579009654728299">"Tiada sambungan"</string>
+    <string name="retry" msgid="4515885444824418022">"Cuba semula"</string>
+    <string name="load_more" msgid="420892447103014683">"Muatkan lagi"</string>
+    <string name="shortcut_name_title" msgid="8220482314700618391">"Namakan pintasan folder"</string>
+    <string name="wait_for_sync_title" msgid="2767841242539238015">"Menunggu penyegerakan"</string>
+    <string name="wait_for_sync_body" msgid="7718316938173643688">"E-mel anda akan muncul tidak lama lagi."</string>
+    <string name="not_synced_title" msgid="794279749170198599">"Akaun tidak tersegerak"</string>
+    <string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akaun ini tidak ditetapkan untuk disegerakkan secara automatik.\nSentuh "<b>"Segerakkan Sekarang"</b>" untuk menyegerakkan e-mel sekali, atau "<b>"Tukar Tetapan Penyegerakan"</b>" untuk menyediakan akaun ini agar menyegerakkan e-mel secara automatik."</string>
+    <string name="manual_sync" msgid="6743983544685622800">"Segerakkan sekarang"</string>
+    <string name="change_sync_settings" msgid="5514293926214426577">"Tukar tetapan penyegerakan"</string>
+    <string name="photo_load_failed" msgid="8811324070219403896">"Tidak dapat memuatkan imej"</string>
+    <string name="cant_move_or_change_labels" msgid="7997792014816166601">"Tidak boleh dialihkan kerana pilihan mengandungi akaun berbilang."</string>
+    <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"   <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>\n<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
+    <string name="ignore_spam_warning" msgid="1554651881128904262">"Abaikan, saya mempercayai mesej ini"</string>
+    <string name="via_domain" msgid="380109230928079350">"melalui <xliff:g id="VIADOMAIN">%1$s</xliff:g>"</string>
+  <string-array name="moveto_folder_sections">
+    <item msgid="6984976603137892898">"Sistem"</item>
+    <item msgid="6593672292311851204">"Kerap Digunakan"</item>
+    <item msgid="3584541772344786752">"Semua Folder"</item>
+  </string-array>
+    <string name="signin" msgid="8958889809095796177">"Log masuk"</string>
+    <string name="info" msgid="6009817562073541204">"Maklumat"</string>
+    <string name="report" msgid="5417082746232614958">"Laporkan"</string>
+    <string name="sync_error" msgid="7368819509040597851">"Tidak dapat menyegerakkan."</string>
+    <string name="sync_error_message" msgid="5367907194753034375">"Peranti anda tidak mempunyai storan mencukupi untuk disegerakkan."</string>
+    <string name="storage" msgid="3262760336059073446">"Storan"</string>
+    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
+    <string name="all_folders_heading" msgid="2506843494725730618">"Semua folder"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Folder terbaru"</string>
+    <string name="message_details_title" msgid="2183394728494962332">"Butiran mesej"</string>
+    <string name="auto_advance_label" msgid="3192951873988392119">"Auto maju"</string>
+    <string name="auto_advance_summary" msgid="573927628806250719">"Pilih skrin mana mahu ditunjukkan selepas anda memadamkan mesej"</string>
+    <string name="auto_advance_help_title" msgid="8091541690538426090">"Tetapkan pilihan auto mara\n(selepas anda memadamkan, dsb.)"</string>
+  <string-array name="prefEntries_autoAdvance">
+    <item msgid="3400401085256526376">"Lebih baharu"</item>
+    <item msgid="5562093094216840213">"Lebih lama"</item>
+    <item msgid="3331655314944797957">"Senarai perbualan"</item>
+  </string-array>
+  <string-array name="prefSummaries_autoAdvance">
+    <item msgid="6389534341359835440">"Tunjukkan perbualan yang lebih baharu selepas memadamkan"</item>
+    <item msgid="732746454445519134">"Tunjukkan perbualan yang lebih lama selepas memadamkan"</item>
+    <item msgid="2189929276292165301">"Tunjukkan senarai perbualan selepas memadamkan"</item>
+  </string-array>
+    <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Padam bersih kebenaran gambar"</string>
+    <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Padam bersih kebenaran gambar?"</string>
+    <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Berhenti memaparkan imej sebaris daripada penghantar yang anda benarkan sebelum ini."</string>
+    <string name="sender_whitelist_cleared" msgid="917434007919176024">"Gambar tidak akan ditunjukkan secara automatik."</string>
+    <string name="preferences_signature_title" msgid="888167074398030574">"Tandatangan"</string>
+    <string name="preferences_signature_dialog_title" msgid="5112192919923401319">"Tandatangan"</string>
+    <string name="preferences_signature_summary_not_set" msgid="2830886980620445857">"Tidak ditetapkan"</string>
+    <string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
+    <string name="notification_action_reply_all" msgid="20020468410400912">"Balas kepada semua"</string>
+    <string name="notification_action_archive" msgid="81978513898440040">"Arkib"</string>
+    <string name="notification_action_remove_label" msgid="5852730267411032291">"Alih keluar label"</string>
+    <string name="notification_action_delete" msgid="327773454111551791">"Padam"</string>
+    <string name="notification_action_undo_archive" msgid="7280710366587361219">"Diarkibkan"</string>
+    <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label Dialih Keluar"</string>
+    <string name="notification_action_undo_delete" msgid="3105611327110905438">"Dipadamkan"</string>
+    <string name="veiled_address" msgid="1209670815434513191"></string>
+    <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
+    <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
+    <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
+    <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</string>
+    <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="silent_ringtone" msgid="5856834572357761687">"Senyap"</string>
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arkib &amp; padam tindakan"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Tunjukkan arkib sahaja"</item>
+    <item msgid="5737880287951287278">"Tunjukkan padam sahaja"</item>
+    <item msgid="4279948809971752573">"Tunjukkan arkib &amp; padam"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Tunjukkan arkib sahaja"</item>
+    <item msgid="8350973578419775975">"Tunjukkan padam sahaja"</item>
+    <item msgid="2967059853409454648">"Tunjukkan arkib &amp; padam"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arkib &amp; padam tindakan"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Balas kepada semua"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gunakan sebagai tetapan lalai untuk balasan mesej"</string>
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Leret untuk mengarkib"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Leret untuk memadam"</string>
+    <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam senarai perbualan"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Imej penghantar"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Tunjukkan di sebelah nama dalam senarai perbualan"</string>
+    <string name="preference_attachment_previews_title" msgid="778099230423462593">"Pratonton Lampiran"</string>
+    <string name="preference_attachment_previews_description" msgid="2468573302785576222">"Tunjukkan pratonton lampiran untuk mesej terbaharu dalam senarai perbualan"</string>
+    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Leret ke bawah untuk memuat semula"</string>
+    <string name="checking_for_mail" msgid="2301797903350897130">"Menyemak mel"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Kosongkan Sampah"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Kosongkan Spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Kosongkan Sampah?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Kosongkan Spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> mesej akan dipadam secara kekal."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> mesej akan dipadam secara kekal."</item>
+  </plurals>
+    <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
+    <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Sentuh imej penghantar untuk memilih perbualan itu."</string>
+    <string name="long_press_to_select_tip" msgid="9205666839837250150">"Sentuh &amp; tahan untuk memilih satu perbualan, kemudian sentuh untuk memilih lagi."</string>
+    <string name="folder_icon_desc" msgid="1500547397347480618">"Ikon folder"</string>
+    <string name="add_account" msgid="2162808366829269770">"Tambah akaun"</string>
+    <string name="attached_message" msgid="4267189489654642035">"Mesej lampiran"</string>
+    <string name="date_message_received" msgid="6302308934790266050">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="date_message_received_today" msgid="7923108495669251362">"Hari ini, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="date_message_received_yesterday" msgid="2240669381396206434">"Semalam, <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Ketepikan petua"</string>
+    <string name="auto_sync_off" msgid="7185342309138211107">"Auto penyegerakan dimatikan."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Sentuh untuk menghidupkan."</string>
+    <string name="account_sync_off" msgid="5699548271856775808">"Penyegerakan akaun dimatikan."</string>
+    <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Hidupkan dalam <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
+    <string name="account_settings_param" msgid="5277032997773498476">"Tetapan akaun"</string>
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> tidak dihantar dalam <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Hidupkan auto segerak?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Perubahan yang anda lakukan kepada semua apl dan akaun, bukan hanya Gmail, akan disegerakkan antara web, peranti anda yang lain dan <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> anda."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Hidupkan"</string>
+</resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 72682ec..1bfd140 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fil"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Forhåndsvisning"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Lagre"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informasjon"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Avbryt"</string>
     <string name="download_again" msgid="7418568915429156518">"Last ned på nytt"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informasjon"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultater"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Søk støttes ikke på denne kontoen."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Søker …"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Nylige"</string>
-    <string name="add_label" msgid="1638508840481944248">"Legg til etikett"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Nyere"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Eldre"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Ny e-post fra <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> nye e-poster"</string>
-    <string name="show" msgid="7114006150083237343">"Vis"</string>
+    <string name="add_label" msgid="6060201715848652940">"Legg til mappe"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Ny e-post fra <xliff:g id="SENDER">%s</xliff:g>. Vis."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> nye e-poster. Vis."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Utvid detaljer om mottaker"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Skjul detaljer om mottaker"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Vis kontaktinformasjon for <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Til: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kopi: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Blindkopi: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Dato: "</string>
     <string name="show_images" msgid="1875700481186331432">"Vis bilder"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Vis alltid bilder fra denne avsenderen"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Bilder fra denne avsenderen blir vist automatisk."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Velg konto"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Velg mappe"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"E-postmappe"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synkroniser: alle"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synkronisering: siste <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synkronisering: siste <xliff:g id="COUNT">%1$d</xliff:g> dager"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Synkroniser: ingen"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Endre mapper"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Flytt til"</string>
     <string name="search_hint" msgid="3625734263059221350">"Søk i e-post"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"I går kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Avslå tips"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatisk synkronisering er slått av."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Trykk for å slå på automatisk synkronisering."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Trykk for å slå på."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Kontosynkronisering er slått av."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Flymodus er på"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Slå på i <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Kontoinnstillinger"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> usendte i <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Vil du aktivere automatisk synkronisering?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Endringer du gjør i apper og kontoer, ikke bare i Gmail, blir synkronisert mellom nettet, de andre enhetene dine og <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefonen"</string>
+    <string name="tablet" msgid="7956969657216748522">"nettbrettet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Slå på"</string>
 </resources>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1dc71b0..84f5961 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-bestand"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Voorbeeld"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Opslaan"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Annuleren"</string>
     <string name="download_again" msgid="7418568915429156518">"Opnieuw downloaden"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Info"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultaten"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Zoeken wordt niet ondersteund in dit account."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Zoeken…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recent"</string>
-    <string name="add_label" msgid="1638508840481944248">"Label toevoegen"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Nieuwer"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Ouder"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nieuw bericht van <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten"</string>
-    <string name="show" msgid="7114006150083237343">"Weergeven"</string>
+    <string name="add_label" msgid="6060201715848652940">"Map toevoegen"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nieuw bericht van <xliff:g id="SENDER">%s</xliff:g>. Tonen."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten. Weergeven."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ontvangersdetails uitvouwen"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ontvangersdetails samenvouwen"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Contactgegevens weergeven voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Aan: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Afbeeldingen weergeven"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Afbeeldingen van deze afzender altijd tonen"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Foto\'s van deze afzender worden automatisch weergegeven."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Account kiezen"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Map selecteren"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"E-mailmap"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synchroniseren: alles"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synchroniseren: afgelopen <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synchroniseren: afgelopen <xliff:g id="COUNT">%1$d</xliff:g> dagen"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Synchroniseren: niets"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Mappen wijzigen"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Verplaatsen naar"</string>
     <string name="search_hint" msgid="3625734263059221350">"Berichten doorzoeken"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Gisteren, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Tip negeren"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatische synchronisatie is uitgeschakeld."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Tik om automatisch synchroniseren in te schakelen."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Raak aan om in te schakelen."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Accountsynchronisatie is uitgeschakeld."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Vliegmodus is ingeschakeld"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Inschakelen in <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Accountinstellingen"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> niet verzonden in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Automatisch synchroniseren inschakelen?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Wijzigingen die u aanbrengt in alle apps en accounts, niet alleen in Gmail, worden gesynchroniseerd tussen internet, uw andere apparaten en uw <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefoon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Inschakelen"</string>
 </resources>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fb59aad..94e3b51 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Plik <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Podgląd"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Zapisz"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informacje"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Anuluj"</string>
     <string name="download_again" msgid="7418568915429156518">"Pobierz ponownie"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informacje"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Wyniki"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Wyszukiwanie nie jest obsługiwane na tym koncie."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Wyszukiwanie…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Najnowsze"</string>
-    <string name="add_label" msgid="1638508840481944248">"Dodaj etykietę"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Nowszy"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Starszy"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nowa wiadomość od: <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Wyświetl"</string>
+    <string name="add_label" msgid="6060201715848652940">"Dodaj folder"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nowe wiadomości od <xliff:g id="SENDER">%s</xliff:g>. Pokaż."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>. Pokaż."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozwiń szczegóły odbiorcy"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Zwiń szczegóły odbiorcy"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Pokaż informacje kontaktowe: <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Do: "</string>
     <string name="cc_heading" msgid="52678613787360092">"DW: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"UDW: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Data: "</string>
     <string name="show_images" msgid="1875700481186331432">"Pokaż obrazy"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Zawsze pokazuj obrazy od tego nadawcy"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Obrazy od tego nadawcy będą pokazywane automatycznie."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Wybierz konto"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Wybierz folder"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Folder E-mail"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synchronizuj: wszystko"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synchronizuj: ostatni <xliff:g id="COUNT">%1$d</xliff:g> dzień"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synchronizuj: ostatnie <xliff:g id="COUNT">%1$d</xliff:g> dni"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Synchronizuj: nic"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Zmień foldery"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Przenieś do"</string>
     <string name="search_hint" msgid="3625734263059221350">"Przeszukaj pocztę"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Wczoraj, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Zamknij wskazówkę"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Autosynchronizacja jest wyłączona."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Dotknij, by włączyć automatyczną synchronizację."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Kliknij, by włączyć."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Synchronizacja konta jest wyłączona."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Tryb samolotowy jest włączony"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Włącz w sekcji <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Ustawienia konta"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Niewysłane wiadomości w folderze <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Włączyć autosynchronizację?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Synchronizacja zmian wprowadzonych przez Ciebie nie tylko w Gmailu, ale we wszystkich aplikacjach i na wszystkich kontach, obejmie internet, Twoje pozostałe urządzenia i Twój <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Włącz"</string>
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 662b58b..0cbe00e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Ficheiro <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Pré-vis."</string>
     <string name="save_attachment" msgid="5360128849867863132">"Guardar"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Inform."</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Cancelar"</string>
     <string name="download_again" msgid="7418568915429156518">"Transferir novamente"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informações"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"A pesquisa não é suportada nesta conta."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"A pesquisar..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recentes"</string>
-    <string name="add_label" msgid="1638508840481944248">"Adicionar etiqueta"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Mais recente"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Mais antigo"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nova mensagem de <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens novas"</string>
-    <string name="show" msgid="7114006150083237343">"Mostrar"</string>
+    <string name="add_label" msgid="6060201715848652940">"Adicionar pasta"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nova mensagem de <xliff:g id="SENDER">%s</xliff:g>. Mostrar."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens. Mostrar."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalhes do destinatário"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Fechar detalhes do destinatário"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar informações de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Para: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Data: "</string>
     <string name="show_images" msgid="1875700481186331432">"Mostrar imagens"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Mostrar sempre imagens deste remetente"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"As imagens deste remetente serão mostradas automaticamente."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Selecionar conta"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Escolher pasta"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Pasta de Emails"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sincronizar: Tudo"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizar: últimas 24 horas (<xliff:g id="COUNT">%1$d</xliff:g> dia)"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sincronizar: últimos <xliff:g id="COUNT">%1$d</xliff:g> dias"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sincronizar: Nenhuma"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Alterar pastas"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Mover para"</string>
     <string name="search_hint" msgid="3625734263059221350">"Pesquisar correio"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ontem às <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Ignorar sugestão"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"A sincronização automática está desativada."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Toque para ativar a sincronização automática."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Tocar para ativar."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"A sincronização de conta está desativada."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"O modo de voo está ativado"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Ative em <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Definições da conta"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> não enviada(s) na <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Ativar a sincronização automática?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"As alterações efetuadas a todas as aplicações e contas, e não apenas ao Gmail, serão sincronizadas entre a Web, os seus outros dispositivos e o <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telemóvel"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Ativar"</string>
 </resources>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 71334c6..0873bc6 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Arquivo <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Visualizar"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Salvar"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Inform."</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Cancelar"</string>
     <string name="download_again" msgid="7418568915429156518">"Fazer novo download"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informações"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Não há suporte para pesquisa nesta conta."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Pesquisando..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recente"</string>
-    <string name="add_label" msgid="1638508840481944248">"Adicionar marcador"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Mais recente"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Mais antiga"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nova mensagem de <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens"</string>
-    <string name="show" msgid="7114006150083237343">"Mostrar"</string>
+    <string name="add_label" msgid="6060201715848652940">"Adicionar pasta"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nova mensagem de <xliff:g id="SENDER">%s</xliff:g>. Mostrar."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens. Mostrar."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalhes do destinatário"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Recolher detalhes do destinatário"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar informações de contato de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Para: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Cco: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Data: "</string>
     <string name="show_images" msgid="1875700481186331432">"Mostrar imagens"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Sempre mostrar fotos desse remetente"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"As imagens desse remetente serão mostradas automaticamente."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Escolher conta"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Escolher pasta"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Pasta E-mail"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sincronizar: todas"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizar: último <xliff:g id="COUNT">%1$d</xliff:g> dia"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sincronizar: últimos <xliff:g id="COUNT">%1$d</xliff:g> dias"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sincronizar: nenhuma"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Alterar pastas"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Mover para"</string>
     <string name="search_hint" msgid="3625734263059221350">"Pesquisar e-mail"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ontem, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Dispensar dica"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"A sincronização automática está desativada."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Toque para ativar a sincronização automática."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Toque para ativar."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"A sincronização da conta está desativada."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Modo avião ativado"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Ative em <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Configurações da conta"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> não enviadas em <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Ativar sincronização automática?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"As alterações em todos os aplicativos e contas, e não apenas o Gmail, serão sincronizadas entre a Web, seus outros dispositivos e seu <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefone"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Ativar"</string>
 </resources>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 4aca36d..d4c06db 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml

@@ -179,8 +179,6 @@
     <skip />
     <!-- no translation found for save_attachment (5360128849867863132) -->
     <skip />
-    <!-- no translation found for info_attachment (607849900865956536) -->
-    <skip />
     <!-- no translation found for cancel_attachment (4651201258272223650) -->
     <skip />
     <!-- no translation found for download_again (7418568915429156518) -->
@@ -309,22 +307,11 @@
     <skip />
     <!-- no translation found for search_results_searching_header (3821361153909466819) -->
     <skip />
-    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <!-- no translation found for add_label (6060201715848652940) -->
     <skip />
-    <!-- no translation found for add_label (1638508840481944248) -->
+    <!-- no translation found for new_incoming_messages_one (164529476439626369) -->
     <skip />
-    <!-- no translation found for conversation_count (4459776616201694172) -->
-    <skip />
-    <!-- no translation found for conversation_newer (7381341099165809801) -->
-    <skip />
-    <!-- no translation found for conversation_older (6384287019562069353) -->
-    <skip />
-    <!-- no translation found for new_incoming_messages_one (3200934730744395520) -->
-    <skip />
-    <!-- no translation found for new_incoming_messages_many (1071412616544342913) -->
-    <skip />
-    <!-- no translation found for show (7114006150083237343) -->
-    <skip />
+    <!-- no translation found for new_incoming_messages_many:other (6028908826781946980) -->
     <!-- no translation found for expand_recipient_details (2266544827446346880) -->
     <skip />
     <!-- no translation found for collapse_recipient_details (3608892454869745927) -->
@@ -344,6 +331,8 @@
     <skip />
     <!-- no translation found for bcc_heading (4698055226318660420) -->
     <skip />
+    <!-- no translation found for date_heading (2086174555097691910) -->
+    <skip />
     <!-- no translation found for show_images (1875700481186331432) -->
     <skip />
     <!-- no translation found for always_show_images (5966408990164581801) -->
@@ -417,12 +406,6 @@
     <skip />
     <!-- no translation found for folder_shortcut_widget_label (6700454062559797794) -->
     <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
     <!-- no translation found for change_folders_selection_dialog_title (8640832109613405534) -->
     <skip />
     <!-- no translation found for move_to_selection_dialog_title (1230762892675507608) -->
@@ -608,16 +591,24 @@
     <skip />
     <!-- no translation found for auto_sync_off (7185342309138211107) -->
     <skip />
-    <!-- no translation found for tap_to_enable_sync (8332275909378339123) -->
+    <!-- no translation found for tap_to_enable_sync (3334767826332383085) -->
     <skip />
     <!-- no translation found for account_sync_off (5699548271856775808) -->
     <skip />
-    <!-- no translation found for airplane_mode_on (2206488373387145840) -->
-    <skip />
     <!-- no translation found for enable_sync_in_account_settings (7707227409018294927) -->
     <skip />
     <!-- no translation found for account_settings_param (5277032997773498476) -->
     <skip />
     <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
     <skip />
+    <!-- no translation found for turn_auto_sync_on_dialog_title (8981949974921704813) -->
+    <skip />
+    <!-- no translation found for turn_auto_sync_on_dialog_body (5070811094706347971) -->
+    <skip />
+    <!-- no translation found for phone (5171715391553213328) -->
+    <skip />
+    <!-- no translation found for tablet (7956969657216748522) -->
+    <skip />
+    <!-- no translation found for turn_auto_sync_on_dialog_confirm_btn (1445158420197688714) -->
+    <skip />
 </resources>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6ba7a2d..8bd9bdf 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Fişier <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Previzual."</string>
     <string name="save_attachment" msgid="5360128849867863132">"Salvaţi"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informaţii"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Anulaţi"</string>
     <string name="download_again" msgid="7418568915429156518">"Descărcaţi din nou"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informaţii"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Rezultate"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Căutarea nu este acceptată pentru acest cont."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Se caută..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Recente"</string>
-    <string name="add_label" msgid="1638508840481944248">"Adăugaţi o etichetă"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Mai nouă"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Mai veche"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Mesaj nou de la <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje noi"</string>
-    <string name="show" msgid="7114006150083237343">"Afişaţi"</string>
+    <string name="add_label" msgid="6060201715848652940">"Adăugați un dosar"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Mesaj nou de la <xliff:g id="SENDER">%s</xliff:g>. Afișați."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> de mesaje noi. Afișați."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Extindeţi detaliile destinatarului"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Restrângeţi detaliile destinatarului"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Afişaţi informaţiile de contact pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Către: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Data: "</string>
     <string name="show_images" msgid="1875700481186331432">"Afişaţi fotografiile"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Afişaţi întot. imag. de la acest exped."</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Imaginile de la acest expeditor vor fi afişate în mod automat."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Alegeţi un cont"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Alegeţi un dosar"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Dosar de e-mail"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sincronizare: toate"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizare: ultima zi (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sincronizare: ultimele <xliff:g id="COUNT">%1$d</xliff:g> (de) zile"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sincronizare: niciunul"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Schimbați dosarele"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Mutați în"</string>
     <string name="search_hint" msgid="3625734263059221350">"Căutaţi în e-mailuri"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Ieri, la <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Ignorați sugestia"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Sincronizarea automată este dezactivată."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Atingeți pentru a activa sincronizarea automată."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Atingeți pentru a activa."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Sincronizarea contului este dezactivată."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Modul Avion este activat"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Activați din <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Setările contului"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> netrimise în <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Activați sincronizarea automată?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Modificările pe care le efectuați în toate aplicațiile și conturile, nu doar în Gmail, vor fi sincronizate între web, alte dispozitive ale dvs. și <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tabletă"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Activați"</string>
 </resources>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index db81d15..2d37a2c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Файл <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Просмотр"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Сохранить"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Справка"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Отмена"</string>
     <string name="download_again" msgid="7418568915429156518">"Загрузить ещё раз"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Справка"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Результаты"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"В этом аккаунте не поддерживается поиск."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Поиск…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Недавние"</string>
-    <string name="add_label" msgid="1638508840481944248">"Добавить ярлык"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Предыдущее"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Следующее"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Сообщение от пользователя <xliff:g id="SENDER">%s</xliff:g>"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Показать"</string>
+    <string name="add_label" msgid="6060201715848652940">"Добавить папку"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"<xliff:g id="SENDER">%s</xliff:g> – новое сообщение. Показать..."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Новых: <xliff:g id="COUNT">%1$d</xliff:g>. Показать…"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Показать сведения о получателе"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Скрыть сведения о получателе"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показать контактные данные пользователя <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Кому: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Копия: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Скрытая: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Дата: "</string>
     <string name="show_images" msgid="1875700481186331432">"Показать картинки"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Всегда открывать картинки с этого адреса"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Картинки, отправленные с этого адреса, будут всегда показываться."</string>
@@ -266,7 +263,7 @@
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизировать папку"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
   <plurals name="actionbar_unread_messages">
-    <item quantity="other" msgid="6210217540181960613">"Непрочитанных сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="6210217540181960613">"Новых: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Новых: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Другие цепочки писем"</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Выбрать аккаунт"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Выбрать папку"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Папка Почты"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Синхронизировать все"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Синхронизировать за <xliff:g id="COUNT">%1$d</xliff:g> последний день"</item>
-    <item quantity="other" msgid="6856940335775567991">"Синхронизировать за <xliff:g id="COUNT">%1$d</xliff:g> посл. дн."</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Не синхронизировать"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Изменение папок"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Перемещение"</string>
     <string name="search_hint" msgid="3625734263059221350">"Поиск в почте"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Вчера, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Закрыть подсказку"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Автосинхронизация отключена"</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Нажмите, чтобы включить автосинхронизацию"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Нажмите, чтобы включить."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Синхронизация для этого аккаунта отключена"</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Режим полета включен"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Включите в <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"настройках аккаунта"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Неотправленных сообщений в папке \"<xliff:g id="OUTBOX">%2$s</xliff:g>\": <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Включить автосинхронизацию?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Изменения, которые вы вносите во все приложения и аккаунты (не только Gmail), будут синхронизироваться между Интернетом, другими вашими устройствами и вашим <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"телефоном"</string>
+    <string name="tablet" msgid="7956969657216748522">"планшетным ПК"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Включить"</string>
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f3a0134..3095494 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Súbor <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Ukážka"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Uložiť"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informácie"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Zrušiť"</string>
     <string name="download_again" msgid="7418568915429156518">"Prevziať znova"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informácie"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Výsledky"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Hľadanie nie je v tomto účte podporované."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Prebieha vyhľadávanie..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Nedávne"</string>
-    <string name="add_label" msgid="1638508840481944248">"Pridať menovku"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Novšie"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Staršie"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nová správa od odosielateľa <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Počet nových správ: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Zobraziť"</string>
+    <string name="add_label" msgid="6060201715848652940">"Pridať priečinok"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nová správa od <xliff:g id="SENDER">%s</xliff:g>. Zobraziť."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Nové správy: <xliff:g id="COUNT">%1$d</xliff:g>. Zobraziť."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozbaliť podrobnosti o príjemcovi"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Zbaliť podrobnosti o príjemcovi"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Zobraziť informácie kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Komu: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kópia: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Sk. kópia: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Dátum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Zobraziť obrázky"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Vždy zobrazovať obrázky od tohto odosielateľa"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Obrázky od tohto odosielateľa sa budú zobrazovať automaticky."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Vybrať účet"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Vybrať priečinok"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Priečinok aplikácie E-mail"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synchronizovať: všetko"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synchronizovať: posled. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
-    <item quantity="other" msgid="6856940335775567991">"Synchronizovať: posled. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Nesynchronizovať žiadnu konverzáciu"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Zmeniť priečinky"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Presunúť do"</string>
     <string name="search_hint" msgid="3625734263059221350">"Hľadať v pošte"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Včera o <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Zrušiť tip"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Automatická synchronizácia je vypnutá."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Automatickú synchronizáciu zapnete klepnutím."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Dotykom zapnete."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Synchronizácia účtu je vypnutá."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Režim V lietadle je zapnutý"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Zapnite ju v <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Nastaveniach účtu"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Počet neodoslaných správ v priečinku <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Zapnúť automatickú synchronizáciu?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Zmeny, ktoré vykonáte vo všetkých aplikáciách a účtoch (nie iba v službe Gmail), budú synchronizované medzi webom, ďalšími zariadeniami a zariadením <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefón"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Zapnúť"</string>
 </resources>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 4f8e444..5abbf92 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Datoteka <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Predogled"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Shrani"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Informacije"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Prekliči"</string>
     <string name="download_again" msgid="7418568915429156518">"Znova prenesi"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Informacije"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Rezultati"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Iskanje ni podprto za ta račun."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Iskanje ..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Nedavne"</string>
-    <string name="add_label" msgid="1638508840481944248">"Dodaj oznako"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> od  <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Novejše"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Starejše"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Novo sporočilo pošiljatelja <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Št. novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Pokaži"</string>
+    <string name="add_label" msgid="6060201715848652940">"Dodaj mapo"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Novo sporočilo od: <xliff:g id="SENDER">%s</xliff:g>. Prikaz."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Št. novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>. Prikaz."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Razširi podrobnosti prejemnika"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Strni podrobnosti prejemnika"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Prikaz podatkov za stik za <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Za: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kp: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Skp: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Pokaži slike"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Vedno pokaži slike tega pošiljatelja"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Slike tega pošiljatelja bodo samodejno prikazane."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Izberite račun"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Izberite mapo"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Mapa za e-pošto"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sinhroniziraj: vse"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinhronizacija zadnjih toliko dni: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sinhronizacija zadnjih toliko dni: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sinhroniziraj: nič"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Spreminjanje map"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Premakni v"</string>
     <string name="search_hint" msgid="3625734263059221350">"Iskanje po pošti"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Včeraj ob <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Opusti nasvet"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Samodejna sinhronizacija je izklopljena."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Dotaknite se, če želite vklopiti samodejno sinhroniziranje."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Dotaknite se za vklop."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Sinhronizacija računa je izklopljena."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Način za letalo je vklopljen"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Vklopite v: <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Nastavitve računa"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Št. neposlanih sporočil v <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Želite vklopiti samodejno sinhronizacijo?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Spremembe vseh aplikacij in računov, ne samo za Gmaila, bodo sinhronizirane med spletom, vašimi drugimi napravami in napravo <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablični računalnik"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Vklopi"</string>
 </resources>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8da385e..f2ca23d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> датотека"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Прикажи"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Сачувај"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Информације"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Откажи"</string>
     <string name="download_again" msgid="7418568915429156518">"Преузми поново"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Информације"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Резултати"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Претрага није подржана на овом налогу."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Претраживање..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Недавни"</string>
-    <string name="add_label" msgid="1638508840481944248">"Додај ознаку"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Новије"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Старије"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Нова порука од <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Нове поруке (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
-    <string name="show" msgid="7114006150083237343">"Прикажи"</string>
+    <string name="add_label" msgid="6060201715848652940">"Додај директоријум"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Нова порука од <xliff:g id="SENDER">%s</xliff:g>. Прикажи."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>. Прикажи."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Прошири детаље о примаоцу"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Скупи детаље о примаоцу"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Прикажи контакт информације корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Коме: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Копија: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Скр. коп: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Датум: "</string>
     <string name="show_images" msgid="1875700481186331432">"Прикажи слике"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Увек приказуј слике овог пошиљаоца"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Слике овог пошиљаоца биће аутоматски приказане."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Избор налога"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Избор директоријума"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Директоријум за Е-пошту"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Синхронизуј: све"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Синхронизуј: последњи <xliff:g id="COUNT">%1$d</xliff:g> дан"</item>
-    <item quantity="other" msgid="6856940335775567991">"Синхронизуј: последња(их) <xliff:g id="COUNT">%1$d</xliff:g> дана"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Синхронизуј: ништа"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Промена директоријума"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Премештање у"</string>
     <string name="search_hint" msgid="3625734263059221350">"Претражи пошту"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Јуче, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Одбацивање савета"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Аутоматска синхронизација је искључена."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Додирните да бисте укључили аутоматску синхронизацију."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Додирните да бисте укључили."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Синхронизација налога је искључена."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Режим рада у авиону је укључен"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Укључите у <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"подешавањима налога"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Непослате поруке (<xliff:g id="NUMBER">%1$s</xliff:g>) у директоријуму <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Желите ли да укључите аутоматску синхронизацију?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Промене које обављате у свим апликацијама и налозима, а не само у Gmail-у, биће синхронизоване између веба, других уређаја и <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"телефон"</string>
+    <string name="tablet" msgid="7956969657216748522">"таблет"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Укључи"</string>
 </resources>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 10e9217..d625d3a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fil"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Förhandsgranska"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Spara"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Info"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Avbryt"</string>
     <string name="download_again" msgid="7418568915429156518">"Hämta igen"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Info"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Resultat"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Det går inte att söka i det här kontot."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Söker …"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Senaste"</string>
-    <string name="add_label" msgid="1638508840481944248">"Lägg till etikett"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Nyare"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Äldre"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Nytt meddelande från <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</string>
-    <string name="show" msgid="7114006150083237343">"Visa"</string>
+    <string name="add_label" msgid="6060201715848652940">"Lägg till mapp"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Nytt meddelande från <xliff:g id="SENDER">%s</xliff:g>. Visa."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden. Visa."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandera mottagardetaljer"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Komprimera mottagardetaljer"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Visa kontaktuppgifter för <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Till: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Kopia: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Hemlig: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Datum: "</string>
     <string name="show_images" msgid="1875700481186331432">"Visa bilder"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Visa alltid bilder från denna avsändare"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Bilder från den här avsändaren visas automatiskt."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Välj konto"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Välj mapp"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Mapp för e-post"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Synkronisera: alla"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Synkronisera: <xliff:g id="COUNT">%1$d</xliff:g> dagar bakåt"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synkronisera: <xliff:g id="COUNT">%1$d</xliff:g> dagar bakåt"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Synkronisera: inga"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Byt mapp"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Flytta till"</string>
     <string name="search_hint" msgid="3625734263059221350">"Sök i e-post"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"I går kl. <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Ta bort tips"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Den automatiska synkroniseringen är inaktiverad."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Tryck här om du vill aktivera automatisk synkronisering."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Aktivera genom att trycka."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Kontosynkroniseringen är inaktiverad."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Flygplansläge är aktiverat"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Aktivera i <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Kontoinställningar"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> osända meddelanden i <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Vill du aktivera automatisk synkronisering?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Ändringar som du gör i alla appar och konton, inte bara i Gmail, synkroniseras mellan webben, dina andra enheter och din <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"mobil"</string>
+    <string name="tablet" msgid="7956969657216748522">"surfplatta"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Aktivera"</string>
 </resources>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0495857..a5f3e0b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Faili <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Hakiki"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Hifadhi"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Maelezo"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Ghairi"</string>
     <string name="download_again" msgid="7418568915429156518">"Pakua tena"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Maelezo"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Matokeo"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Utafutaji hauauniwi kwenye akaunti hii."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Inatafuta…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Hivi karibuni"</string>
-    <string name="add_label" msgid="1638508840481944248">"Ongeza lebo"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> ya <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Mpya zaidi"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Nzee zaidi"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Ujumbe mpya kutoka kwa <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</string>
-    <string name="show" msgid="7114006150083237343">"Onyesha"</string>
+    <string name="add_label" msgid="6060201715848652940">"Ongeza folda"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Ujumbe mpya kutoka <xliff:g id="SENDER">%s</xliff:g>. Onyesha."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya. Onyesha."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Panua maelezo ya mpokeaji"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Kunja maelezo ya wapokeaji"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Onyesha maelezo ya mawasiliano ya <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Kwa: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Nakala kwa: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Nakala fiche kwa: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Tarehe: "</string>
     <string name="show_images" msgid="1875700481186331432">"Onyesha picha"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Daima onyesha picha kutoka kwa mtumaji huyu"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Picha kutoka kwa mtumaji huyu zitaonyeshwa kiotomatiki."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Chagua akaunti"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Chagua folda"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Folda ya barua pepe"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sawazisha: Zote"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sawazisha: Siku <xliff:g id="COUNT">%1$d</xliff:g> zilizopita"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sawazisha: Siku <xliff:g id="COUNT">%1$d</xliff:g> zilizopita"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sawazisha: Hakuna"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Badilisha folda"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Hamisha hadi"</string>
     <string name="search_hint" msgid="3625734263059221350">"Tafuta barua pepe"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Jana, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Ondoa kidokezo"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Usawazishaji otomatiki umezimwa."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Gonga ili kuwasha usawazishaji otomatiki."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Gusa ili uwashe."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Usawazishaji wa akaunti umezimwa."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Hali ya ndege imewashwa"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Washa kwenye <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Mipangilio ya akaunti"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> ambazo hazijatumwa katika <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Unataka kuwasha usawazishaji kiotomatiki?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Mabadiliko unayofanyia programu na akaunti zote, sio tu Gmail, yatasawazishwa baina ya wavuti, vifaa vyako vingine na, <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> yako."</string>
+    <string name="phone" msgid="5171715391553213328">"simu"</string>
+    <string name="tablet" msgid="7956969657216748522">"kompyuta kibao"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Washa"</string>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8bad66d..9c680e5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"ไฟล์ <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"ดูตัวอย่าง"</string>
     <string name="save_attachment" msgid="5360128849867863132">"บันทึก"</string>
-    <string name="info_attachment" msgid="607849900865956536">"ข้อมูล"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"ยกเลิก"</string>
     <string name="download_again" msgid="7418568915429156518">"ดาวน์โหลดอีกครั้ง"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"ข้อมูล"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"ผลการค้นหา"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"บัญชีนี้ไม่สนับสนุนการค้นหา"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"กำลังค้นหา..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"ล่าสุด"</string>
-    <string name="add_label" msgid="1638508840481944248">"เพิ่มป้ายกำกับ"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"ใหม่กว่า"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"เก่ากว่า"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"ข้อความใหม่จาก <xliff:g id="SENDER">%s</xliff:g>"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</string>
-    <string name="show" msgid="7114006150083237343">"แสดง"</string>
+    <string name="add_label" msgid="6060201715848652940">"เพิ่มโฟลเดอร์"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"ข้อความใหม่จาก <xliff:g id="SENDER">%s</xliff:g> แสดง"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่ แสดง"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"ขยายรายละเอียดผู้รับ"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"ยุบรายละเอียดผู้รับ"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"แสดงข้อมูลติดต่อของ <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"ถึง: "</string>
     <string name="cc_heading" msgid="52678613787360092">"สำเนา: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"สำเนาลับ: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"วันที่: "</string>
     <string name="show_images" msgid="1875700481186331432">"แสดงรูปภาพ"</string>
     <string name="always_show_images" msgid="5966408990164581801">"แสดงรูปภาพจากผู้ส่งรายนี้เสมอ"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"แสดงรูปภาพจากผู้ส่งนี้โดยอัตโนมัติ"</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"เลือกบัญชี"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"เลือกโฟลเดอร์"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"โฟลเดอร์อีเมล"</string>
-    <string name="sync_all" msgid="1057043212338233359">"ซิงค์: ทั้งหมด"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"ซิงค์: เมื่อ <xliff:g id="COUNT">%1$d</xliff:g> วันที่แล้ว"</item>
-    <item quantity="other" msgid="6856940335775567991">"ซิงค์: เมื่อ <xliff:g id="COUNT">%1$d</xliff:g> วันที่แล้ว"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"ซิงค์: ไม่เลย"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"เปลี่ยนโฟลเดอร์"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"ย้ายไปที่"</string>
     <string name="search_hint" msgid="3625734263059221350">"ค้นหาจดหมาย"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"เมื่อวานนี้เวลา <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"ปิดเคล็ดลับ"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"การซิงค์อัตโนมัติปิดอยู่"</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"แตะเพื่อเปิดการซิงค์อัตโนมัติ"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"แตะเพื่อเปิด"</string>
     <string name="account_sync_off" msgid="5699548271856775808">"การซิงค์บัญชีปิดอยู่"</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"เปิดโหมดใช้งานบนเครื่องบิน"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"เปิดใน<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"การตั้งค่าบัญชี"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> ข้อความที่ยังไม่ได้ส่งใน <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"เปิดซิงค์อัตโนมัติไหม"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"การเปลี่ยนแปลงที่คุณทำกับแอปและบัญชีทั้งหมด ไม่ใช่เพียง Gmail จะมีการซิงค์กันระหว่างเว็บ อุปกรณ์อื่นๆ และ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ของคุณ"</string>
+    <string name="phone" msgid="5171715391553213328">"โทรศัพท์"</string>
+    <string name="tablet" msgid="7956969657216748522">"แท็บเล็ต"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"เปิด"</string>
 </resources>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 86a0210..f04b075 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> File"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"I-preview"</string>
     <string name="save_attachment" msgid="5360128849867863132">"I-save"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Impormasyon"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Kanselahin"</string>
     <string name="download_again" msgid="7418568915429156518">"I-download muli"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Impormasyon"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Mga resulta"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Hindi sinusuportahan ang paghahanap sa account na ito."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Naghahanap..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Kamakailan"</string>
-    <string name="add_label" msgid="1638508840481944248">"Magdagdag ng label"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> ng <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Mas Bago"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Mas Luma"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Bagong mensahe mula kay <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe"</string>
-    <string name="show" msgid="7114006150083237343">"Ipakita"</string>
+    <string name="add_label" msgid="6060201715848652940">"Magdagdag ng folder"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Bagong mensahe mula <xliff:g id="SENDER">%s</xliff:g>. Ipakita."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe. Ipakita."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Palawakin ang mga detalye ng recipient"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Tiklupin ang mga detalye ng recipient"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Ipakita ang impormasyon ng contact para kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Sa/Kay: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Petsa: "</string>
     <string name="show_images" msgid="1875700481186331432">"Ipakita ang mga larawan"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Lagi pakita larawan mula nagpadalang ito"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Awtomatikong ipapakita ang mga larawan mula sa nagpadalang ito."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pumili ng account"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Pumili ng folder"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Folder ng Email"</string>
-    <string name="sync_all" msgid="1057043212338233359">"I-sync: Lahat"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"I-sync: Huling <xliff:g id="COUNT">%1$d</xliff:g> araw"</item>
-    <item quantity="other" msgid="6856940335775567991">"I-sync: Huling <xliff:g id="COUNT">%1$d</xliff:g> (na) araw"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"I-sync: Wala"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Baguhin ang mga folder"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Ilipat sa"</string>
     <string name="search_hint" msgid="3625734263059221350">"Maghanap sa mail"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Kahapon, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"I-dismiss ang tip"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Naka-off ang auto-sync."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"I-tap upang i-on ang auto-sync."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Pindutin upang i-on."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Naka-off ang pag-sync sa account."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Naka-on ang airplane mode"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"I-on sa <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Mga setting ng account"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> ang hindi naipadala sa <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"I-on ang auto-sync?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Ang mga pagbabagong iyong ginawa sa lahat ng apps at account, hindi lang sa Gmail, ay masi-synchronize sa web, iba mo pang mga device, at iyong <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ."</string>
+    <string name="phone" msgid="5171715391553213328">"telepono"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"I-on"</string>
 </resources>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 616078c..b9cc853 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> Dosyası"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Önizle"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Kaydet"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Bilgi"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"İptal"</string>
     <string name="download_again" msgid="7418568915429156518">"Tekrar indir"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Bilgi"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Sonuçlar"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Bu hesapta arama desteklenmiyor"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Aranıyor…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Son"</string>
-    <string name="add_label" msgid="1638508840481944248">"Etiket ekle"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Daha yeni"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Daha eski"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"<xliff:g id="SENDER">%s</xliff:g> adlı kişiden yeni ileti."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</string>
-    <string name="show" msgid="7114006150083237343">"Göster"</string>
+    <string name="add_label" msgid="6060201715848652940">"Klasör ekle"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"<xliff:g id="SENDER">%s</xliff:g> adlı kişiden yeni iletiler. Göster."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti. Göster."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Alıcı ayrıntılarını genişlet"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Alıcı ayrıntılarını daralt"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> iletişim bilgilerini göster"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Alıcı: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Tarih: "</string>
     <string name="show_images" msgid="1875700481186331432">"Resimleri göster"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Bu gönderenden gelen resimleri her zaman göster"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Bu gönderenden gelen resimler otomatik olarak gösterilecek."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Hesap seç"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Klasör seç"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"E-posta klasörü"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Senkronizasyon: Tümü"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Senkronizasyon: Son <xliff:g id="COUNT">%1$d</xliff:g> gün"</item>
-    <item quantity="other" msgid="6856940335775567991">"Senkronizasyon: Son <xliff:g id="COUNT">%1$d</xliff:g> gün"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Senkronizasyon: Yok"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Klasörleri değiştir"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Taşı"</string>
     <string name="search_hint" msgid="3625734263059221350">"Postalarda ara"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Dün, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"İpucunu kapat"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Otomatik senkronizasyon kapalı."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Otomatik senk.u açmak için hafifçe vurun."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Açmak için dokun."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Hesap senkronizasyonu kapalı."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Uçak modu açık"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g> içinde açın."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Hesap ayarları"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="OUTBOX">%2$s</xliff:g> içinde gönderilmemiş <xliff:g id="NUMBER">%1$s</xliff:g> ileti var"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Otomatik senkronizasyon açılsın mı?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Yalnızca Gmail değil, tüm uygulamalarda ve hesaplarda yaptığınız değişiklikler web ile diğer cihazlarınız ve <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> arasında senkronize edilir."</string>
+    <string name="phone" msgid="5171715391553213328">"telefon"</string>
+    <string name="tablet" msgid="7956969657216748522">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Aç"</string>
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index dba9266..64717a6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Файл <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Перегляд"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Зберегти"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Інформація"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Скасувати"</string>
     <string name="download_again" msgid="7418568915429156518">"Завантажити знову"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Інформація"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Результати"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Функція пошуку в цьому обліковому записі не підтримується."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Пошук..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Останні"</string>
-    <string name="add_label" msgid="1638508840481944248">"Додати мітку"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Новіша"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Старіша"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Нове повідомлення від <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="show" msgid="7114006150083237343">"Показати"</string>
+    <string name="add_label" msgid="6060201715848652940">"Додати папку"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Повідомлення від <xliff:g id="SENDER">%s</xliff:g>. Показати."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>. Показати."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Розгорнути дані отримувача"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Згорнути дані отримувача"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показати контактну інформацію відправника <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Кому: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Копія: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Прихована: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Дата: "</string>
     <string name="show_images" msgid="1875700481186331432">"Показати зображення"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Завжди показ. зображ.від цього відправн."</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Зображення від цього відправника відображатимуться автоматично."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Вибрати обліковий запис"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Вибрати папку"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Папка \"Електронна пошта\""</string>
-    <string name="sync_all" msgid="1057043212338233359">"Синхронізувати: усе"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Синхронізувати: за останній <xliff:g id="COUNT">%1$d</xliff:g> день"</item>
-    <item quantity="other" msgid="6856940335775567991">"Синхронізувати: за останні <xliff:g id="COUNT">%1$d</xliff:g> дн."</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Не синхронізувати"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Змінити папки"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Перемістити в"</string>
     <string name="search_hint" msgid="3625734263059221350">"Пошук у пошті"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Учора, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Закрити пораду"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Автоматичну синхронізацію вимкнено."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Торкніться, щоб увімкнути автоматичну синхронізацію."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Торкніться, щоб увімкнути."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Синхронізацію облікового запису вимкнено."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Режим польоту ввімкнено"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Увімкніть у меню \"<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>\"."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Налаштування облікового запису"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"Ненадісланих листів у <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Увімкнути автоматичну синхронізацію?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Зміни, які ви вносите до всіх програм і облікових записів (не лише Gmail), синхронізуватимуться з веб-службами, іншими пристроями та вашим <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
+    <string name="phone" msgid="5171715391553213328">"телефоном"</string>
+    <string name="tablet" msgid="7956969657216748522">"планшетом"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Увімкнути"</string>
 </resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index cc109b3..d45a22e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Tệp <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Xem trước"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Lưu"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Thông tin"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Hủy"</string>
     <string name="download_again" msgid="7418568915429156518">"Tải xuống lại"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Thông tin"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Kết quả"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Không hỗ trợ tính năng tìm kiếm trên tài khoản này."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Đang tìm kiếm…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Gần đây"</string>
-    <string name="add_label" msgid="1638508840481944248">"Thêm nhãn"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Mới hơn"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Cũ hơn"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Thư mới từ <xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> thư mới"</string>
-    <string name="show" msgid="7114006150083237343">"Hiển thị"</string>
+    <string name="add_label" msgid="6060201715848652940">"Thêm thư mục"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Tin nhắn mới từ <xliff:g id="SENDER">%s</xliff:g>. Hiển thị."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> thư mới. Hiển thị."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Mở rộng chi tiết người nhận"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Thu gọn chi tiết người nhận"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Hiển thị thông tin liên hệ cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Tới: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Ngày: "</string>
     <string name="show_images" msgid="1875700481186331432">"Hiển thị ảnh"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Luôn hiển thị ảnh từ người gửi này"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Hình ảnh từ người gửi này sẽ được hiển thị tự động."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Chọn tài khoản"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Chọn thư mục"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Thư mục Email"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Đồng bộ hóa: Tất cả"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Đồng bộ hóa: <xliff:g id="COUNT">%1$d</xliff:g> ngày qua"</item>
-    <item quantity="other" msgid="6856940335775567991">"Đồng bộ hóa: <xliff:g id="COUNT">%1$d</xliff:g> ngày qua"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Đồng bộ hóa: Không có"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Thay đổi thư mục"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Di chuyển tới"</string>
     <string name="search_hint" msgid="3625734263059221350">"Tìm kiếm trong thư"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Hôm qua, <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Bỏ qua mẹo"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Tự động đồng bộ hóa bị tắt."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Nhấn để bật tự động đồng bộ hóa."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Chạm để bật."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Đồng bộ hóa tài khoản bị tắt."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Chế độ trên máy bay đang bật"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Bật trong <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Cài đặt tài khoản"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> thư chưa được gửi trong <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Bật tự động đồng bộ hóa?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Các thay đổi bạn thực hiện đối với tất cả các ứng dụng và tài khoản, không chỉ với Gmail, sẽ được đồng bộ hóa giữa web, các thiết bị khác của bạn và <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> của bạn."</string>
+    <string name="phone" msgid="5171715391553213328">"điện thoại"</string>
+    <string name="tablet" msgid="7956969657216748522">"máy tính bảng"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Bật"</string>
 </resources>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cbfdf4e..a7a2dbb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> 文件"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"预览"</string>
     <string name="save_attachment" msgid="5360128849867863132">"保存"</string>
-    <string name="info_attachment" msgid="607849900865956536">"信息"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"取消"</string>
     <string name="download_again" msgid="7418568915429156518">"再次下载"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"信息"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"结果"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"此帐户不支持搜索。"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"正在搜索..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"最近"</string>
-    <string name="add_label" msgid="1638508840481944248">"添加标签"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"第 <xliff:g id="COUNT">%1$s</xliff:g> 封，共 <xliff:g id="TOTAL">%2$s</xliff:g> 封"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"更晚"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"更早"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"来自<xliff:g id="SENDER">%s</xliff:g>的新邮件。"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> 封新邮件"</string>
-    <string name="show" msgid="7114006150083237343">"显示"</string>
+    <string name="add_label" msgid="6060201715848652940">"添加文件夹"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"有来自<xliff:g id="SENDER">%s</xliff:g>的新邮件。显示。"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"有<xliff:g id="COUNT">%1$d</xliff:g>封新邮件。显示"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"展开收件人详细信息"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"折叠收件人详细信息"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"显示<xliff:g id="NAME">%1$s</xliff:g>的联系人信息"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"收件人： "</string>
     <string name="cc_heading" msgid="52678613787360092">"抄送： "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"密送： "</string>
+    <string name="date_heading" msgid="2086174555097691910">"日期： "</string>
     <string name="show_images" msgid="1875700481186331432">"显示图片"</string>
     <string name="always_show_images" msgid="5966408990164581801">"总是显示来自此发件人的图片"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"系统会自动显示来自此发件人的图片。"</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"选择帐户"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"选择文件夹"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"电子邮件文件夹"</string>
-    <string name="sync_all" msgid="1057043212338233359">"同步：全部"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"同步：过去 <xliff:g id="COUNT">%1$d</xliff:g> 天的会话"</item>
-    <item quantity="other" msgid="6856940335775567991">"同步：过去 <xliff:g id="COUNT">%1$d</xliff:g> 天的会话"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"同步：否"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"更改文件夹"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"移至"</string>
     <string name="search_hint" msgid="3625734263059221350">"搜索邮件"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"昨天<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"忽略提示"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"自动同步功能已关闭。"</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"点按即可开启自动同步功能。"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"触摸即可开启。"</string>
     <string name="account_sync_off" msgid="5699548271856775808">"帐户同步功能已关闭。"</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"开启了飞行模式"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"在“<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>”中开启。"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"帐户设置"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="OUTBOX">%2$s</xliff:g>中有<xliff:g id="NUMBER">%1$s</xliff:g>封未发送的邮件"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"要开启自动同步功能吗？"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"您对所有应用和帐户（不只是 Gmail）所做的更改都会在网络、您的其他设备和您的<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>之间同步。"</string>
+    <string name="phone" msgid="5171715391553213328">"手机"</string>
+    <string name="tablet" msgid="7956969657216748522">"平板电脑"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"开启"</string>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1726926..9699371 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> 檔案"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"預覽"</string>
     <string name="save_attachment" msgid="5360128849867863132">"儲存"</string>
-    <string name="info_attachment" msgid="607849900865956536">"資訊"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"取消"</string>
     <string name="download_again" msgid="7418568915429156518">"重新下載"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"資訊"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"搜尋結果"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"這個帳戶不支援搜尋功能。"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"搜尋中…"</string>
-    <string name="recent_folders" msgid="8240081561436891330">"最近使用過的資料夾"</string>
-    <string name="add_label" msgid="1638508840481944248">"新增標籤"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"第 <xliff:g id="COUNT">%1$s</xliff:g> 封，共 <xliff:g id="TOTAL">%2$s</xliff:g> 封"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"較新"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"較舊"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"來自 <xliff:g id="SENDER">%s</xliff:g> 的新郵件。"</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</string>
-    <string name="show" msgid="7114006150083237343">"顯示"</string>
+    <string name="add_label" msgid="6060201715848652940">"新增資料夾"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"來自 <xliff:g id="SENDER">%s</xliff:g> 的新郵件。顯示"</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"有 <xliff:g id="COUNT">%1$d</xliff:g> 封新郵件。顯示。"</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"展開收件者詳細資料"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"收合收件者詳細資料"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"顯示 <xliff:g id="NAME">%1$s</xliff:g> 的聯絡人資訊"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"收件者： "</string>
     <string name="cc_heading" msgid="52678613787360092">"副本： "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"密件副本： "</string>
+    <string name="date_heading" msgid="2086174555097691910">"日期： "</string>
     <string name="show_images" msgid="1875700481186331432">"顯示圖片"</string>
     <string name="always_show_images" msgid="5966408990164581801">"一律顯示這位寄件者所傳送的圖片"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"系統會自動顯示這位寄件者所傳送的圖片。"</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"選擇帳戶"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"選擇資料夾"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"電子郵件資料夾"</string>
-    <string name="sync_all" msgid="1057043212338233359">"同步處理：全部"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"同步處理：最近 <xliff:g id="COUNT">%1$d</xliff:g> 天"</item>
-    <item quantity="other" msgid="6856940335775567991">"同步處理：最近 <xliff:g id="COUNT">%1$d</xliff:g> 天"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"同步處理：無"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"變更資料夾"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"移至"</string>
     <string name="search_hint" msgid="3625734263059221350">"搜尋郵件"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"昨天<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"關閉提示"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"自動同步處理功能已關閉。"</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"輕按即可開啟自動同步功能。"</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"輕觸即可開啟。"</string>
     <string name="account_sync_off" msgid="5699548271856775808">"帳戶同步處理功能已關閉。"</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"飛航模式已開啟"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"在 [<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>] 中開啟。"</string>
     <string name="account_settings_param" msgid="5277032997773498476">"帳戶設定"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="OUTBOX">%2$s</xliff:g>內有 <xliff:g id="NUMBER">%1$s</xliff:g> 封未傳送的郵件"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"開啟自動同步功能？"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"您對所有應用程式和帳戶 (不限於 Gmail) 所做的變更一律會在網路、您的其他裝置和您的<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>之間保持同步。"</string>
+    <string name="phone" msgid="5171715391553213328">"手機"</string>
+    <string name="tablet" msgid="7956969657216748522">"平板電腦"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"開啟"</string>
 </resources>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d456b0e..3140e1a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -102,7 +102,6 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"Ifayela <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"Buka kuqala"</string>
     <string name="save_attachment" msgid="5360128849867863132">"Londoloza"</string>
-    <string name="info_attachment" msgid="607849900865956536">"Imininingwane"</string>
     <string name="cancel_attachment" msgid="4651201258272223650">"Khansela"</string>
     <string name="download_again" msgid="7418568915429156518">"Landa futhi"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"Imininingwane"</string>
@@ -210,14 +209,11 @@
     <string name="search_results_header" msgid="4669917471897026269">"Imiphumela"</string>
     <string name="search_unsupported" msgid="4654227193354052607">"Usesho alusekelwe kule akhawunti."</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Iyasesha..."</string>
-    <string name="recent_folders" msgid="8240081561436891330">"Okwakamuva"</string>
-    <string name="add_label" msgid="1638508840481944248">"Yengeza ilebula"</string>
-    <string name="conversation_count" msgid="4459776616201694172">"<xliff:g id="COUNT">%1$s</xliff:g> koku-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="conversation_newer" msgid="7381341099165809801">"Okusha kakhulu"</string>
-    <string name="conversation_older" msgid="6384287019562069353">"Kudala kakhulu"</string>
-    <string name="new_incoming_messages_one" msgid="3200934730744395520">"Umlayezo omusha ovela ku-<xliff:g id="SENDER">%s</xliff:g>."</string>
-    <string name="new_incoming_messages_many" msgid="1071412616544342913">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha"</string>
-    <string name="show" msgid="7114006150083237343">"Bonisa"</string>
+    <string name="add_label" msgid="6060201715848652940">"Engeza ifolda"</string>
+    <string name="new_incoming_messages_one" msgid="164529476439626369">"Imilayezo emisha esuka ku-<xliff:g id="SENDER">%s</xliff:g>. Bonisa."</string>
+  <plurals name="new_incoming_messages_many">
+    <item quantity="other" msgid="6028908826781946980">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha. Bonisa."</item>
+  </plurals>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Nweba imininigwane yomtholi"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Goqa imininingwane yomtholi"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Khombisa imininingwane yokuxhumana ka-<xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -230,6 +226,7 @@
     <string name="to_heading" msgid="1142876841308812954">"Ku: "</string>
     <string name="cc_heading" msgid="52678613787360092">"Cc: "</string>
     <string name="bcc_heading" msgid="4698055226318660420">"Bcc: "</string>
+    <string name="date_heading" msgid="2086174555097691910">"Idethi: "</string>
     <string name="show_images" msgid="1875700481186331432">"Bonisa izithombe"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Njalo bonisa izithombe eziphuma kulo mthumeli"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Izithombe eziphuma kulo mthumeli zizoboniswa ngokuzenzakalelayo."</string>
@@ -274,12 +271,6 @@
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Khetha i-akhawunti"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Khetha ifolda"</string>
     <string name="folder_shortcut_widget_label" msgid="6700454062559797794">"Ifolda ye-imeyili"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Vumelanisa: Konke"</string>
-  <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Vumelanisa: Usuku olu-<xliff:g id="COUNT">%1$d</xliff:g> lokugcina"</item>
-    <item quantity="other" msgid="6856940335775567991">"Vumelanisa: Izinsuku ezingu-<xliff:g id="COUNT">%1$d</xliff:g> zokugcina"</item>
-  </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Ukuvumelanisa: Akukho"</string>
     <string name="change_folders_selection_dialog_title" msgid="8640832109613405534">"Shintsha amafolda"</string>
     <string name="move_to_selection_dialog_title" msgid="1230762892675507608">"Hambisa ku-"</string>
     <string name="search_hint" msgid="3625734263059221350">"Sesha imeyili"</string>
@@ -396,11 +387,14 @@
     <string name="date_message_received_yesterday" msgid="2240669381396206434">"Izolo, ngo-<xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="dismiss_tip_hover_text" msgid="1930345936314578166">"Cashisa ithiphu"</string>
     <string name="auto_sync_off" msgid="7185342309138211107">"Ukuvumelanisa okuzenzakalelayo kuvaliwe."</string>
-    <string name="tap_to_enable_sync" msgid="8332275909378339123">"Thepha ukuze uvule ukuvumelanisa ngokuzenzakalela."</string>
+    <string name="tap_to_enable_sync" msgid="3334767826332383085">"Thinta ukuze uvule."</string>
     <string name="account_sync_off" msgid="5699548271856775808">"Ukuvumelanisa kwe-akhawunti kuvaliwe."</string>
-    <string name="airplane_mode_on" msgid="2206488373387145840">"Imodi yendiza ivuliwe"</string>
     <string name="enable_sync_in_account_settings" msgid="7707227409018294927">"Yivule ku-<xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string>
     <string name="account_settings_param" msgid="5277032997773498476">"Izilungiselelo ze-akhawunti"</string>
-    <!-- no translation found for unsent_messages_in_outbox (8754987959475577698) -->
-    <skip />
+    <string name="unsent_messages_in_outbox" msgid="8754987959475577698">"<xliff:g id="NUMBER">%1$s</xliff:g> akuthunyelwanga ku-<xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="8981949974921704813">"Vula ukuvumelanisa okuzenzekalelalayo?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5070811094706347971">"Ushintsho olwenza kuzo zonke izinhlelo zokusebenza nama-akhawunti, hhayi nje ku-Gmail kuphela, luzovumelaniswa phakathi kwewebhu, amanye amadivayisi wakho ne-<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> yakho."</string>
+    <string name="phone" msgid="5171715391553213328">"ifoni"</string>
+    <string name="tablet" msgid="7956969657216748522">"ithebulethi"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Vula"</string>
 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d350098..d4106d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -440,9 +440,9 @@
           viewing it. [CHAR LIMIT=40] -->
     <string name="add_label">Add folder</string>
 
-    <!-- New Message notification text that appears over conversation view on incoming message. [CHAR LIMIT=30] -->
+    <!-- New Message notification text that appears over conversation view on incoming message. [CHAR LIMIT=40] -->
     <string name="new_incoming_messages_one">New message from <xliff:g id="sender">%s</xliff:g>. Show.</string>
-    <!-- New Message notification text that appears over conversation view on incoming messages. Will only be used if there is more than one new message. [CHAR LIMIT=30] -->
+    <!-- New Message notification text that appears over conversation view on incoming messages. Will only be used if there is more than one new message. [CHAR LIMIT=40] -->
     <plurals name="new_incoming_messages_many">
         <item quantity="other"><xliff:g id="count">%1$d</xliff:g> new messages. Show.</item>
     </plurals>
@@ -461,18 +461,18 @@
     <plurals name="show_messages_read">
         <item quantity="other"><xliff:g id="count" example="4">%1$d</xliff:g> older messages</item>
     </plurals>
-
+    <!-- Shown to display the from address of the message [CHAR LIMIT=10] -->
     <string name="from_heading">From:\u0020</string>
     <!-- Shown to display the reply to address of the message [CHAR LIMIT=20] -->
     <string name="replyto_heading">Reply-to:\u0020</string>
-    <!-- Shown to display the recipient(s) of the message [CHAR LIMIT=10] -->
-    <!-- Shown in HTML to display the recipient(s) of the message [CHAR LIMIT=10] -->
+    <!-- Shown to display the to recipient(s) of the message [CHAR LIMIT=10] -->
     <string name="to_heading">To:\u0020</string>
-    <!-- Shown in HTML to display the recipient(s) of the message [CHAR LIMIT=10] -->
+    <!-- Shown to display the cc recipient(s) of the message [CHAR LIMIT=10] -->
     <string name="cc_heading">Cc:\u0020</string>
-    <!-- Shown in HTML to display the recipient(s) of the message [CHAR LIMIT=10] -->
+    <!-- Shown to display the bcc recipient(s) of the message [CHAR LIMIT=10] -->
     <string name="bcc_heading">Bcc:\u0020</string>
-    <!-- Shown to display the from address of the message [CHAR LIMIT=10] -->
+    <!-- Shown to display the recipient(s) of the message [CHAR LIMIT=10] -->
+    <string name="date_heading">Date:\u0020</string>
     <!-- Displayed above an HTML message to show the images in that message [CHAR LIMIT=40] -->
     <string name="show_images">Show pictures</string>
     <!-- Displayed above an HTML message to always show images in messages from that sender [CHAR LIMIT=40] -->
@@ -901,11 +901,6 @@
         receiving any new mail. [CHAR LIMIT=250] -->
     <string name="account_sync_off">Account sync is off.</string>
 
-    <!-- Tip for letting user know that airplane mode is enabled on
-        their device, in case they are wondering why they are not
-        receiving any new mail. [CHAR LIMIT=250] -->
-    <string name="airplane_mode_on">Airplane mode is on</string>
-
     <!-- Hint text for user to enable sync in Gmail's account settings.
          The whole string should read "Turn on in Account settings.", but because we need
          "Account settings" to appear as blue link text, it's a parameter here.

diff --git a/src/com/android/mail/MailIntentService.java b/src/com/android/mail/MailIntentService.java
index daca7a7..ed555bb 100644
--- a/src/com/android/mail/MailIntentService.java
+++ b/src/com/android/mail/MailIntentService.java

@@ -23,6 +23,8 @@
 import android.content.Context;
 import android.content.Intent;
 
+import com.android.mail.analytics.Analytics;
+import com.android.mail.analytics.AnalyticsUtils;
 import com.android.mail.providers.Account;
 import com.android.mail.providers.Folder;
 import com.android.mail.utils.FolderUri;
@@ -69,6 +71,10 @@
             final Folder folder = intent.getParcelableExtra(Utils.EXTRA_FOLDER);
 
             NotificationUtils.clearFolderNotification(this, account, folder, true /* markSeen */);
+
+            Analytics.getInstance().sendEvent("notification_dismiss", folder.getTypeDescription(),
+                    null, 0);
+
         } else if (ACTION_RESEND_NOTIFICATIONS.equals(action)) {
             final Uri accountUri = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT_URI);
             final Uri folderUri = intent.getParcelableExtra(Utils.EXTRA_FOLDER_URI);

diff --git a/src/com/android/mail/analytics/AnalyticsUtils.java b/src/com/android/mail/analytics/AnalyticsUtils.java
index 038a4bf..03bc162 100644
--- a/src/com/android/mail/analytics/AnalyticsUtils.java
+++ b/src/com/android/mail/analytics/AnalyticsUtils.java

@@ -87,6 +87,10 @@
             s = "home";
         } else if (id == R.id.inside_conversation_unread) {
             s = "inside_conversation_unread";
+        } else if (id == R.id.read) {
+            s = "mark_read";
+        } else if (id == R.id.unread) {
+            s = "mark_unread";
         } else if (id == R.id.show_original) {
             s = "show_original";
         } else if (id == R.id.add_photo_attachment) {

diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index b316bf0..26c2241 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java

@@ -822,7 +822,11 @@
         mHeader.hasDraftMessage = mHeader.conversation.numDrafts() > 0;
 
         // Parse senders fragments.
-        if (mHeader.conversation.conversationInfo != null) {
+        if (mHeader.preserveSendersText) {
+            // This is a special view that doesn't need special sender formatting
+            mHeader.sendersDisplayText = new SpannableStringBuilder(mHeader.sendersText);
+            loadSenderImages();
+        } else if (mHeader.conversation.conversationInfo != null) {
             // This is Gmail
             Context context = getContext();
             mHeader.messageInfoString = SendersView
@@ -1694,8 +1698,13 @@
             Conversation conv = mHeader.conversation;
             // Set the list position of this item in the conversation
             SwipeableListView listView = getListView();
-            conv.position = mSelected && listView != null ? listView.getPositionForView(this)
-                    : Conversation.NO_POSITION;
+
+            try {
+                conv.position = mSelected && listView != null ? listView.getPositionForView(this)
+                        : Conversation.NO_POSITION;
+            } catch (final NullPointerException e) {
+                // TODO(skennedy) Remove this if we find the root cause b/9527863
+            }
 
             if (mSelectedConversationSet.isEmpty()) {
                 final String source = (sourceOpt != null) ? sourceOpt : "checkbox";

diff --git a/src/com/android/mail/browse/ConversationItemViewModel.java b/src/com/android/mail/browse/ConversationItemViewModel.java
index ea191a0..359f8f3 100644
--- a/src/com/android/mail/browse/ConversationItemViewModel.java
+++ b/src/com/android/mail/browse/ConversationItemViewModel.java

@@ -78,6 +78,9 @@
     // Paperclip
     Bitmap paperclip;
 
+    /** If <code>true</code>, we will not apply any formatting to {@link #sendersText}. */
+    public boolean preserveSendersText = false;
+
     // Senders
     public String sendersText;
 

diff --git a/src/com/android/mail/browse/ConversationViewAdapter.java b/src/com/android/mail/browse/ConversationViewAdapter.java
index e650c18..24966c6 100644
--- a/src/com/android/mail/browse/ConversationViewAdapter.java
+++ b/src/com/android/mail/browse/ConversationViewAdapter.java

@@ -73,12 +73,14 @@
     private final VeiledAddressMatcher mMatcher;
 
     public static final int VIEW_TYPE_CONVERSATION_HEADER = 0;
-    public static final int VIEW_TYPE_AD_HEADER = 1;
-    public static final int VIEW_TYPE_MESSAGE_HEADER = 2;
-    public static final int VIEW_TYPE_MESSAGE_FOOTER = 3;
-    public static final int VIEW_TYPE_SUPER_COLLAPSED_BLOCK = 4;
-    public static final int VIEW_TYPE_BORDER = 5;
-    public static final int VIEW_TYPE_COUNT = 6;
+    public static final int VIEW_TYPE_MESSAGE_HEADER = 1;
+    public static final int VIEW_TYPE_MESSAGE_FOOTER = 2;
+    public static final int VIEW_TYPE_SUPER_COLLAPSED_BLOCK = 3;
+    public static final int VIEW_TYPE_BORDER = 4;
+    public static final int VIEW_TYPE_AD_HEADER = 5;
+    public static final int VIEW_TYPE_AD_SENDER_HEADER = 6;
+    public static final int VIEW_TYPE_AD_BORDER = 7;
+    public static final int VIEW_TYPE_COUNT = 8;
 
     public class ConversationHeaderItem extends ConversationOverlayItem {
         public final Conversation mConversation;

diff --git a/src/com/android/mail/browse/MessageHeaderDetailsDialogFragment.java b/src/com/android/mail/browse/MessageHeaderDetailsDialogFragment.java
index b6e6603..92a4f3c 100644
--- a/src/com/android/mail/browse/MessageHeaderDetailsDialogFragment.java
+++ b/src/com/android/mail/browse/MessageHeaderDetailsDialogFragment.java

@@ -45,6 +45,7 @@
     private static final String ARG_TO = "to";
     private static final String ARG_CC = "cc";
     private static final String ARG_BCC = "bcc";
+    private static final String ARG_RECEIVED_TIME = "received-timestamp";
 
     // Public no-args constructor needed for fragment re-instantiation
     public MessageHeaderDetailsDialogFragment() {}
@@ -63,7 +64,7 @@
      */
     public static MessageHeaderDetailsDialogFragment newInstance(
             Map<String, Address> addressCache, Account account, String[] from, String[] replyTo,
-            String[] to, String[] cc, String[] bcc) {
+            String[] to, String[] cc, String[] bcc, CharSequence receivedTimestamp) {
         final MessageHeaderDetailsDialogFragment f = new MessageHeaderDetailsDialogFragment();
 
         // Supply needed items as arguments
@@ -83,6 +84,7 @@
         args.putStringArray(ARG_TO, to);
         args.putStringArray(ARG_CC, cc);
         args.putStringArray(ARG_BCC, bcc);
+        args.putCharSequence(ARG_RECEIVED_TIME, receivedTimestamp);
         f.setArguments(args);
 
         return f;
@@ -115,7 +117,7 @@
                 addressCache, (Account) args.getParcelable(ARG_ACCOUNT), null,
                 args.getStringArray(ARG_FROM), args.getStringArray(ARG_REPLY_TO),
                 args.getStringArray(ARG_TO), args.getStringArray(ARG_CC),
-                args.getStringArray(ARG_BCC));
+                args.getStringArray(ARG_BCC), args.getCharSequence(ARG_RECEIVED_TIME));
 
         expandedDetails.findViewById(R.id.details_expander)
                 .setVisibility(View.GONE);

diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index f12baa7..ed47bf5 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java

@@ -114,6 +114,7 @@
     private QuickContactBadge mPhotoView;
     private ImageView mStarView;
     private ViewGroup mTitleContainerView;
+    private ViewGroup mExtraContentView;
     private ViewGroup mCollapsedDetailsView;
     private ViewGroup mExpandedDetailsView;
     private SpamWarningView mSpamWarningView;
@@ -283,6 +284,7 @@
         mEditDraftButton = findViewById(R.id.edit_draft);
         mUpperDateView = (TextView) findViewById(R.id.upper_date);
         mAttachmentIcon = findViewById(R.id.attachment);
+        mExtraContentView = (ViewGroup) findViewById(R.id.header_extra_content);
 
         mCollapsedStarVisible = mStarView.getVisibility() == VISIBLE;
         final Resources resources = getResources();
@@ -1122,7 +1124,7 @@
         if (mInviteView == null) {
             mInviteView = (MessageInviteView) mInflater.inflate(
                     R.layout.conversation_message_invite, this, false);
-            addView(mInviteView);
+            mExtraContentView.addView(mInviteView);
         }
         mInviteView.bind(mMessage);
         mInviteView.setVisibility(VISIBLE);
@@ -1138,7 +1140,7 @@
         if (mImagePromptView == null) {
             mImagePromptView = (TextView) mInflater.inflate(
                     R.layout.conversation_message_show_pics, this, false);
-            addView(mImagePromptView);
+            mExtraContentView.addView(mImagePromptView);
             mImagePromptView.setOnClickListener(this);
         }
         mImagePromptView.setVisibility(VISIBLE);
@@ -1177,7 +1179,7 @@
         if (mSpamWarningView == null) {
             mSpamWarningView = (SpamWarningView)
                     mInflater.inflate(R.layout.conversation_message_spam_warning, this, false);
-            addView(mSpamWarningView);
+            mExtraContentView.addView(mSpamWarningView);
         }
 
         mSpamWarningView.showSpamWarning(mMessage, mSender);
@@ -1234,7 +1236,7 @@
         if (mCollapsedDetailsView == null) {
             mCollapsedDetailsView = (ViewGroup) mInflater.inflate(
                     R.layout.conversation_message_details_header, this, false);
-            addView(mCollapsedDetailsView, indexOfChild(mUpperHeaderView) + 1);
+            mExtraContentView.addView(mCollapsedDetailsView, 0);
             mCollapsedDetailsView.setOnClickListener(this);
         }
         if (!mCollapsedDetailsValid) {
@@ -1261,7 +1263,7 @@
         // lazily create expanded details view
         final boolean expandedViewCreated = ensureExpandedDetailsView();
         if (expandedViewCreated) {
-            addView(mExpandedDetailsView, indexOfChild(mUpperHeaderView) + 1);
+            mExtraContentView.addView(mExpandedDetailsView, 0);
         }
         mExpandedDetailsView.setVisibility(VISIBLE);
     }
@@ -1277,7 +1279,8 @@
         }
         if (!mExpandedDetailsValid) {
             renderExpandedDetails(getResources(), mExpandedDetailsView, mMessage.viaDomain,
-                    mAddressCache, getAccount(), mVeiledMatcher, mFrom, mReplyTo, mTo, mCc, mBcc);
+                    mAddressCache, getAccount(), mVeiledMatcher, mFrom, mReplyTo, mTo, mCc, mBcc,
+                    mMessageHeaderItem.getTimestampLong());
 
             mExpandedDetailsValid = true;
         }
@@ -1292,7 +1295,7 @@
     public static void renderExpandedDetails(Resources res, View detailsView,
             String viaDomain, Map<String, Address> addressCache, Account account,
             VeiledAddressMatcher veiledMatcher, String[] from, String[] replyTo,
-            String[] to, String[] cc, String[] bcc) {
+            String[] to, String[] cc, String[] bcc, CharSequence receivedTimestamp) {
         renderEmailList(res, R.id.from_heading, R.id.from_details, from, viaDomain,
                 detailsView, addressCache, account, veiledMatcher);
         renderEmailList(res, R.id.replyto_heading, R.id.replyto_details, replyTo, viaDomain,
@@ -1303,6 +1306,12 @@
                 detailsView, addressCache, account, veiledMatcher);
         renderEmailList(res, R.id.bcc_heading, R.id.bcc_details, bcc, viaDomain,
                 detailsView, addressCache, account, veiledMatcher);
+
+        // Render date
+        detailsView.findViewById(R.id.date_heading).setVisibility(VISIBLE);
+        final TextView date = (TextView) detailsView.findViewById(R.id.date_details);
+        date.setText(receivedTimestamp);
+        date.setVisibility(VISIBLE);
     }
 
     /**
@@ -1381,7 +1390,8 @@
         mDetailsPopup = (DialogFragment) manager.findFragmentByTag(DETAILS_DIALOG_TAG);
         if (mDetailsPopup == null) {
             mDetailsPopup = MessageHeaderDetailsDialogFragment.newInstance(
-                    mAddressCache, getAccount(), mFrom, mReplyTo, mTo, mCc, mBcc);
+                    mAddressCache, getAccount(), mFrom, mReplyTo, mTo, mCc, mBcc,
+                    mMessageHeaderItem.getTimestampLong());
             mDetailsPopup.show(manager, DETAILS_DIALOG_TAG);
         }
     }

diff --git a/src/com/android/mail/browse/MessageWebView.java b/src/com/android/mail/browse/MessageWebView.java
index 253a16b..9f66a8f 100644
--- a/src/com/android/mail/browse/MessageWebView.java
+++ b/src/com/android/mail/browse/MessageWebView.java

@@ -18,19 +18,45 @@
 package com.android.mail.browse;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.webkit.WebView;
 
+import com.android.mail.utils.Clock;
+import com.android.mail.utils.LogTag;
 import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Throttle;
 
 /**
  * A WebView designed to live within a {@link MessageScrollView}.
  */
 public class MessageWebView extends WebView implements MessageScrollView.Touchable {
 
+    private static final String LOG_TAG = LogTag.getLogTag();
+
+    private static Handler sMainThreadHandler;
+
     private boolean mTouched;
 
+    private static final int MIN_RESIZE_INTERVAL = 200;
+    private static final int MAX_RESIZE_INTERVAL = 300;
+    private final Clock mClock = Clock.INSTANCE;
+
+    private final Throttle mThrottle = new Throttle("MessageWebView",
+            new Runnable() {
+                @Override public void run() {
+                    performSizeChangeDelayed();
+                }
+            }, getMainThreadHandler(),
+            MIN_RESIZE_INTERVAL, MAX_RESIZE_INTERVAL);
+
+    private int mRealWidth;
+    private int mRealHeight;
+    private boolean mIgnoreNext;
+    private long mLastSizeChangeTime = -1;
+
     public MessageWebView(Context c) {
         this(c, null);
     }
@@ -58,4 +84,51 @@
         return handled;
     }
 
+    @Override
+    protected void onSizeChanged(int w, int h, int ow, int oh) {
+        mRealWidth = w;
+        mRealHeight = h;
+        final long now = mClock.getTime();
+        boolean recentlySized = (now - mLastSizeChangeTime < MIN_RESIZE_INTERVAL);
+
+        // It's known that the previous resize event may cause a resize event immediately. If
+        // this happens sufficiently close to the last resize event, drop it on the floor.
+        if (mIgnoreNext) {
+            mIgnoreNext = false;
+            if (recentlySized) {
+                    LogUtils.w(LOG_TAG, "Suppressing size change in MessageWebView");
+                return;
+            }
+        }
+
+        if (recentlySized) {
+            mThrottle.onEvent();
+        } else {
+            // It's been a sufficiently long time - just perform the resize as normal. This should
+            // be the normal code path.
+            performSizeChange(ow, oh);
+        }
+    }
+
+    private void performSizeChange(int ow, int oh) {
+        super.onSizeChanged(mRealWidth, mRealHeight, ow, oh);
+        mLastSizeChangeTime = mClock.getTime();
+    }
+
+    private void performSizeChangeDelayed() {
+        mIgnoreNext = true;
+        performSizeChange(getWidth(), getHeight());
+    }
+
+    /**
+     * @return a {@link Handler} tied to the main thread.
+     */
+    public static Handler getMainThreadHandler() {
+        if (sMainThreadHandler == null) {
+            // No need to synchronize -- it's okay to create an extra Handler, which will be used
+            // only once and then thrown away.
+            sMainThreadHandler = new Handler(Looper.getMainLooper());
+        }
+        return sMainThreadHandler;
+    }
 }

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 5b31253..f969938 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java

@@ -239,14 +239,14 @@
     private Button mCcBccButton;
     private CcBccView mCcBccView;
     private AttachmentsView mAttachmentsView;
-    private Account mAccount;
+    protected Account mAccount;
     protected ReplyFromAccount mReplyFromAccount;
     private Settings mCachedSettings;
     private Rfc822Validator mValidator;
     private TextView mSubject;
 
     private ComposeModeAdapter mComposeModeAdapter;
-    private int mComposeMode = -1;
+    protected int mComposeMode = -1;
     private boolean mForward;
     private QuotedTextView mQuotedTextView;
     protected EditText mBodyView;
@@ -279,7 +279,7 @@
     private RecipientTextWatcher mBccListener;
     private Uri mRefMessageUri;
     private boolean mShowQuotedText = false;
-    private Bundle mInnerSavedState;
+    protected Bundle mInnerSavedState;
     private ContentValues mExtraValues = null;
 
     // Array of the outstanding send or save tasks.  Access is synchronized
@@ -328,6 +328,14 @@
     /**
      * Can be called from a non-UI thread.
      */
+    public static void composeWithExtraValues(Context launcher, Account account,
+            String subject, final ContentValues extraValues) {
+        launch(launcher, account, null, COMPOSE, null, null, null, subject, extraValues);
+    }
+
+    /**
+     * Can be called from a non-UI thread.
+     */
     public static Intent createReplyIntent(final Context launcher, final Account account,
             final Uri messageUri, final boolean isReplyAll) {
         return createActionIntent(launcher, account, messageUri, isReplyAll ? REPLY_ALL : REPLY);
@@ -510,8 +518,13 @@
             mShowQuotedText = message.appendRefMessageContent;
             // if we should be showing quoted text but mRefMessage is null
             // and we have some quotedText, display that
-            if (mShowQuotedText && quotedText != null && mRefMessage == null) {
-                initQuotedText(quotedText, false /* shouldQuoteText */);
+            if (mShowQuotedText && mRefMessage == null) {
+                if (quotedText != null) {
+                    initQuotedText(quotedText, false /* shouldQuoteText */);
+                } else if (mExtraValues != null) {
+                    initExtraValues(mExtraValues);
+                    return;
+                }
             }
         } else if (action == EDIT_DRAFT) {
             initFromDraftMessage(message);
@@ -552,7 +565,9 @@
                 mShowQuotedText = true;
             }
         } else {
-            initFromExtras(intent);
+            if (initFromExtras(intent)) {
+                return;
+            }
         }
 
         mComposeMode = action;
@@ -640,7 +655,7 @@
         return account;
     }
 
-    private void finishSetup(int action, Intent intent, Bundle savedInstanceState) {
+    protected void finishSetup(int action, Intent intent, Bundle savedInstanceState) {
         setFocus(action);
         // Don't bother with the intent if we have procured a message from the
         // intent already.
@@ -1318,8 +1333,9 @@
      * all, or forward), the original attachments from the message will not be
      * re-instantiated. The user's changes will be respected. This follows the
      * web gmail interaction.
+     * @return {@code true} if the activity should not call {@link #finishSetup}.
      */
-    public void initFromExtras(Intent intent) {
+    public boolean initFromExtras(Intent intent) {
         // If we were invoked with a SENDTO intent, the value
         // should take precedence
         final Uri dataUri = intent.getData();
@@ -1355,11 +1371,6 @@
             mSubject.setText(extraString);
         }
 
-        mExtraValues = intent.getParcelableExtra(EXTRA_VALUES);
-        if (mExtraValues != null) {
-            LogUtils.d(LOG_TAG, "Launched with extra values: %s", mExtraValues.toString());
-        }
-
         for (String extra : ALL_EXTRAS) {
             if (intent.hasExtra(extra)) {
                 String value = intent.getStringExtra(extra);
@@ -1388,6 +1399,19 @@
 
             // TODO - support EXTRA_HTML_TEXT
         }
+
+        mExtraValues = intent.getParcelableExtra(EXTRA_VALUES);
+        if (mExtraValues != null) {
+            LogUtils.d(LOG_TAG, "Launched with extra values: %s", mExtraValues.toString());
+            initExtraValues(mExtraValues);
+            return true;
+        }
+
+        return false;
+    }
+
+    protected void initExtraValues(ContentValues extraValues) {
+        // DO NOTHING - Gmail will override
     }
 
 
@@ -1606,7 +1630,7 @@
         }
     }
 
-    private void initQuotedText(CharSequence quotedText, boolean shouldQuoteText) {
+    protected void initQuotedText(CharSequence quotedText, boolean shouldQuoteText) {
         mQuotedTextView.setQuotedTextFromHtml(quotedText, shouldQuoteText);
         mShowQuotedText = true;
     }

diff --git a/src/com/android/mail/photomanager/ContactPhotoManager.java b/src/com/android/mail/photomanager/ContactPhotoManager.java
index c612f31..06184b0 100644
--- a/src/com/android/mail/photomanager/ContactPhotoManager.java
+++ b/src/com/android/mail/photomanager/ContactPhotoManager.java

@@ -208,7 +208,7 @@
                 // Still need to set a null result for all addresses, otherwise we end
                 // up in the loop where photo manager attempts to load these again.
                 for (final String address: addresses) {
-                    photos.put(address, null);
+                    photos.put(address, new BitmapHolder(null, -1, -1));
                 }
             }
 

diff --git a/src/com/android/mail/preferences/MailPrefs.java b/src/com/android/mail/preferences/MailPrefs.java
index c186f5b..f13e298 100644
--- a/src/com/android/mail/preferences/MailPrefs.java
+++ b/src/com/android/mail/preferences/MailPrefs.java

@@ -40,7 +40,7 @@
  */
 public final class MailPrefs extends VersionedPrefs {
 
-    public static final boolean SHOW_EXPERIMENTAL_PREFS = true;
+    public static final boolean SHOW_EXPERIMENTAL_PREFS = false;
 
     private static final String PREFS_NAME = "UnifiedEmail";
 
@@ -451,22 +451,4 @@
                 PreferenceKeys.GLOBAL_SYNC_OFF_DISMISSES, 0);
         getEditor().putInt(PreferenceKeys.GLOBAL_SYNC_OFF_DISMISSES, value + 1).apply();
     }
-
-    public int getNumOfDismissesForAirplaneModeOn() {
-        return getSharedPreferences().getInt(PreferenceKeys.AIRPLANE_MODE_ON_DISMISSES, 0);
-    }
-
-    public void resetNumOfDismissesForAirplaneModeOn() {
-        final int value = getSharedPreferences().getInt(
-                PreferenceKeys.AIRPLANE_MODE_ON_DISMISSES, 0);
-        if (value != 0) {
-            getEditor().putInt(PreferenceKeys.AIRPLANE_MODE_ON_DISMISSES, 0).apply();
-        }
-    }
-
-    public void incNumOfDismissesForAirplaneModeOn() {
-        final int value = getSharedPreferences().getInt(
-                PreferenceKeys.AIRPLANE_MODE_ON_DISMISSES, 0);
-        getEditor().putInt(PreferenceKeys.AIRPLANE_MODE_ON_DISMISSES, value + 1).apply();
-    }
 }

diff --git a/src/com/android/mail/providers/Account.java b/src/com/android/mail/providers/Account.java
index 7610e6a..7f5deaa 100644
--- a/src/com/android/mail/providers/Account.java
+++ b/src/com/android/mail/providers/Account.java

@@ -278,43 +278,42 @@
     private Account(String name, String type, String jsonAccount) throws JSONException {
         super(name, type);
         final JSONObject json = new JSONObject(jsonAccount);
-        providerVersion = json.getInt(UIProvider.AccountColumns.PROVIDER_VERSION);
-        uri = Uri.parse(json.optString(UIProvider.AccountColumns.URI));
-        capabilities = json.getInt(UIProvider.AccountColumns.CAPABILITIES);
+        providerVersion = json.getInt(AccountColumns.PROVIDER_VERSION);
+        uri = Uri.parse(json.optString(AccountColumns.URI));
+        capabilities = json.getInt(AccountColumns.CAPABILITIES);
         folderListUri = Utils
-                .getValidUri(json.optString(UIProvider.AccountColumns.FOLDER_LIST_URI));
+                .getValidUri(json.optString(AccountColumns.FOLDER_LIST_URI));
         fullFolderListUri = Utils.getValidUri(json
-                .optString(UIProvider.AccountColumns.FULL_FOLDER_LIST_URI));
-        searchUri = Utils.getValidUri(json.optString(UIProvider.AccountColumns.SEARCH_URI));
-        accountFromAddresses = json.optString(UIProvider.AccountColumns.ACCOUNT_FROM_ADDRESSES,
+                .optString(AccountColumns.FULL_FOLDER_LIST_URI));
+        searchUri = Utils.getValidUri(json.optString(AccountColumns.SEARCH_URI));
+        accountFromAddresses = json.optString(AccountColumns.ACCOUNT_FROM_ADDRESSES,
                 "");
         expungeMessageUri = Utils.getValidUri(json
-                .optString(UIProvider.AccountColumns.EXPUNGE_MESSAGE_URI));
-        undoUri = Utils.getValidUri(json.optString(UIProvider.AccountColumns.UNDO_URI));
+                .optString(AccountColumns.EXPUNGE_MESSAGE_URI));
+        undoUri = Utils.getValidUri(json.optString(AccountColumns.UNDO_URI));
         settingsIntentUri = Utils.getValidUri(json
-                .optString(UIProvider.AccountColumns.SETTINGS_INTENT_URI));
-        helpIntentUri = Utils
-                .getValidUri(json.optString(UIProvider.AccountColumns.HELP_INTENT_URI));
+                .optString(AccountColumns.SETTINGS_INTENT_URI));
+        helpIntentUri = Utils.getValidUri(json.optString(AccountColumns.HELP_INTENT_URI));
         sendFeedbackIntentUri = Utils.getValidUri(json
-                .optString(UIProvider.AccountColumns.SEND_FEEDBACK_INTENT_URI));
+                .optString(AccountColumns.SEND_FEEDBACK_INTENT_URI));
         reauthenticationIntentUri = Utils.getValidUri(
-                json.optString(UIProvider.AccountColumns.REAUTHENTICATION_INTENT_URI));
-        syncStatus = json.optInt(UIProvider.AccountColumns.SYNC_STATUS);
-        composeIntentUri = Utils.getValidUri(json.optString(UIProvider.AccountColumns.COMPOSE_URI));
-        mimeType = json.optString(UIProvider.AccountColumns.MIME_TYPE);
+                json.optString(AccountColumns.REAUTHENTICATION_INTENT_URI));
+        syncStatus = json.optInt(AccountColumns.SYNC_STATUS);
+        composeIntentUri = Utils.getValidUri(json.optString(AccountColumns.COMPOSE_URI));
+        mimeType = json.optString(AccountColumns.MIME_TYPE);
         recentFolderListUri = Utils.getValidUri(json
-                .optString(UIProvider.AccountColumns.RECENT_FOLDER_LIST_URI));
-        color = json.optInt(UIProvider.AccountColumns.COLOR, 0);
+                .optString(AccountColumns.RECENT_FOLDER_LIST_URI));
+        color = json.optInt(AccountColumns.COLOR, 0);
         defaultRecentFolderListUri = Utils.getValidUri(json
-                .optString(UIProvider.AccountColumns.DEFAULT_RECENT_FOLDER_LIST_URI));
+                .optString(AccountColumns.DEFAULT_RECENT_FOLDER_LIST_URI));
         manualSyncUri = Utils
-                .getValidUri(json.optString(UIProvider.AccountColumns.MANUAL_SYNC_URI));
+                .getValidUri(json.optString(AccountColumns.MANUAL_SYNC_URI));
         viewIntentProxyUri = Utils
-                .getValidUri(json.optString(UIProvider.AccountColumns.VIEW_INTENT_PROXY_URI));
+                .getValidUri(json.optString(AccountColumns.VIEW_INTENT_PROXY_URI));
         accoutCookieQueryUri = Utils.getValidUri(
-                json.optString(UIProvider.AccountColumns.ACCOUNT_COOKIE_QUERY_URI));
+                json.optString(AccountColumns.ACCOUNT_COOKIE_QUERY_URI));
         updateSettingsUri = Utils.getValidUri(
-                json.optString(UIProvider.AccountColumns.UPDATE_SETTINGS_URI));
+                json.optString(AccountColumns.UPDATE_SETTINGS_URI));
         enableMessageTransforms = json.optInt(AccountColumns.ENABLE_MESSAGE_TRANSFORMS);
         syncAuthority = json.optString(AccountColumns.SYNC_AUTHORITY);
         quickResponseUri = Utils.getValidUri(json.optString(AccountColumns.QUICK_RESPONSE_URI));
@@ -329,43 +328,6 @@
         }
     }
 
-    public Account(Parcel in, ClassLoader loader) {
-        super(in);
-        providerVersion = in.readInt();
-        uri = in.readParcelable(null);
-        capabilities = in.readInt();
-        folderListUri = in.readParcelable(null);
-        fullFolderListUri = in.readParcelable(null);
-        searchUri = in.readParcelable(null);
-        accountFromAddresses = in.readString();
-        expungeMessageUri = in.readParcelable(null);
-        undoUri = in.readParcelable(null);
-        settingsIntentUri = in.readParcelable(null);
-        helpIntentUri = in.readParcelable(null);
-        sendFeedbackIntentUri = in.readParcelable(null);
-        reauthenticationIntentUri = in.readParcelable(null);
-        syncStatus = in.readInt();
-        composeIntentUri = in.readParcelable(null);
-        mimeType = in.readString();
-        recentFolderListUri = in.readParcelable(null);
-        color = in.readInt();
-        defaultRecentFolderListUri = in.readParcelable(null);
-        manualSyncUri = in.readParcelable(null);
-        viewIntentProxyUri = in.readParcelable(null);
-        accoutCookieQueryUri = in.readParcelable(null);
-        updateSettingsUri = in.readParcelable(null);
-        enableMessageTransforms = in.readInt();
-        syncAuthority = in.readString();
-        quickResponseUri = in.readParcelable(null);
-        final int hasSettings = in.readInt();
-        if (hasSettings == 0) {
-            LogUtils.e(LOG_TAG, new Throwable(), "Unexpected null settings in Account(Parcel)");
-            settings = Settings.EMPTY_SETTINGS;
-        } else {
-            settings = in.readParcelable(loader);
-        }
-    }
-
     public Account(Cursor cursor) {
         super(cursor.getString(cursor.getColumnIndex(UIProvider.AccountColumns.NAME)),
                 cursor.getString(cursor.getColumnIndex(UIProvider.AccountColumns.TYPE)));
@@ -422,6 +384,9 @@
                 cursor.getColumnIndex(AccountColumns.ENABLE_MESSAGE_TRANSFORMS));
         syncAuthority = cursor.getString(
                 cursor.getColumnIndex(AccountColumns.SYNC_AUTHORITY));
+        if (TextUtils.isEmpty(syncAuthority)) {
+            LogUtils.e(LOG_TAG, "Unexpected empty syncAuthority from cursor");
+        }
         quickResponseUri = Utils.getValidUri(cursor.getString(
                 cursor.getColumnIndex(AccountColumns.QUICK_RESPONSE_URI)));
         settings = new Settings(cursor);
@@ -471,6 +436,46 @@
         return !isAccountInitializationRequired() && !isAccountSyncRequired();
     }
 
+    public Account(Parcel in, ClassLoader loader) {
+        super(in);
+        providerVersion = in.readInt();
+        uri = in.readParcelable(null);
+        capabilities = in.readInt();
+        folderListUri = in.readParcelable(null);
+        fullFolderListUri = in.readParcelable(null);
+        searchUri = in.readParcelable(null);
+        accountFromAddresses = in.readString();
+        expungeMessageUri = in.readParcelable(null);
+        undoUri = in.readParcelable(null);
+        settingsIntentUri = in.readParcelable(null);
+        helpIntentUri = in.readParcelable(null);
+        sendFeedbackIntentUri = in.readParcelable(null);
+        reauthenticationIntentUri = in.readParcelable(null);
+        syncStatus = in.readInt();
+        composeIntentUri = in.readParcelable(null);
+        mimeType = in.readString();
+        recentFolderListUri = in.readParcelable(null);
+        color = in.readInt();
+        defaultRecentFolderListUri = in.readParcelable(null);
+        manualSyncUri = in.readParcelable(null);
+        viewIntentProxyUri = in.readParcelable(null);
+        accoutCookieQueryUri = in.readParcelable(null);
+        updateSettingsUri = in.readParcelable(null);
+        enableMessageTransforms = in.readInt();
+        syncAuthority = in.readString();
+        if (TextUtils.isEmpty(syncAuthority)) {
+            LogUtils.e(LOG_TAG, "Unexpected empty syncAuthority from Parcel");
+        }
+        quickResponseUri = in.readParcelable(null);
+        final int hasSettings = in.readInt();
+        if (hasSettings == 0) {
+            LogUtils.e(LOG_TAG, new Throwable(), "Unexpected null settings in Account(Parcel)");
+            settings = Settings.EMPTY_SETTINGS;
+        } else {
+            settings = in.readParcelable(loader);
+        }
+    }
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);

diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index df7bded..30d38c9 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java

@@ -734,7 +734,8 @@
     public static final class FolderCapabilities {
         public static final int SYNCABLE = 0x0001;
         public static final int PARENT = 0x0002;
-        public static final int CAN_HOLD_MAIL = 0x0004;
+        // FEEL FREE TO USE 0x0004 - was previous CAN_HOLD_MAIL but that was true for all
+        // folders so we removed that value
         public static final int CAN_ACCEPT_MOVED_MESSAGES = 0x0008;
          /**
          * For accounts that support archive, this will indicate that this folder supports
@@ -965,7 +966,7 @@
      * {@link UIProvider#CONVERSATION_PROJECTION} projection will fit in a single
      * {@link android.database.CursorWindow}
      */
-    public static final int CONVERSATION_PROJECTION_QUERY_CURSOR_WINDOW_LIMT = 2000;
+    public static final int CONVERSATION_PROJECTION_QUERY_CURSOR_WINDOW_LIMT = 1500;
 
     // These column indexes only work when the caller uses the
     // default CONVERSATION_PROJECTION defined above.

diff --git a/src/com/android/mail/providers/protos/mock/MockUiProvider.java b/src/com/android/mail/providers/protos/mock/MockUiProvider.java
index c4cd785..1b1a4f0 100644
--- a/src/com/android/mail/providers/protos/mock/MockUiProvider.java
+++ b/src/com/android/mail/providers/protos/mock/MockUiProvider.java

@@ -294,7 +294,6 @@
                 Long.valueOf(
                         FolderCapabilities.SYNCABLE |
                         FolderCapabilities.PARENT |
-                        FolderCapabilities.CAN_HOLD_MAIL |
                         FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES));
         folderMap.put(FolderColumns.UNREAD_COUNT, unread);
         folderMap.put(FolderColumns.TOTAL_COUNT, total);

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 89a26b4..61b7bf2 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java

@@ -1076,6 +1076,12 @@
     public void onConversationListVisibilityChanged(boolean visible) {
         informCursorVisiblity(visible);
         commitAutoAdvanceOperation();
+
+        // Notify special views
+        final ConversationListFragment convListFragment = getConversationListFragment();
+        if (convListFragment != null && convListFragment.getAnimatedAdapter() != null) {
+            convListFragment.getAnimatedAdapter().onConversationListVisibilityChanged(visible);
+        }
     }
 
     /**
@@ -3143,8 +3149,6 @@
                 && event.getClipDescription() != null
                 && folder.supportsCapability
                     (UIProvider.FolderCapabilities.CAN_ACCEPT_MOVED_MESSAGES)
-                && folder.supportsCapability
-                    (UIProvider.FolderCapabilities.CAN_HOLD_MAIL)
                 && !mFolder.equals(folder));
     }
 
@@ -4122,6 +4126,11 @@
             if (mHasNewAccountOrFolder) {
                 refreshDrawer();
             }
+
+            // When closed, we want to use either the burger, or up, based on where we are
+            final int mode = mViewMode.getMode();
+            final boolean isTopLevel = (mFolder == null) || (mFolder.parent == Uri.EMPTY);
+            mDrawerToggle.setDrawerIndicatorEnabled(getShouldShowDrawerIndicator(mode, isTopLevel));
         }
 
         /**
@@ -4178,6 +4187,9 @@
             }
 
             mOldSlideOffset = slideOffset;
+
+            // If we're sliding, we always want to show the burger
+            mDrawerToggle.setDrawerIndicatorEnabled(true /* enable */);
         }
 
         /**

diff --git a/src/com/android/mail/ui/AbstractMailActivity.java b/src/com/android/mail/ui/AbstractMailActivity.java
index 43f3b23..33a7da2 100644
--- a/src/com/android/mail/ui/AbstractMailActivity.java
+++ b/src/com/android/mail/ui/AbstractMailActivity.java

@@ -39,7 +39,7 @@
 
     private final UiHandler mUiHandler = new UiHandler();
 
-    private static final boolean STRICT_MODE = true;
+    private static final boolean STRICT_MODE = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 2a53f40..a3b65ea 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java

@@ -27,6 +27,7 @@
 import android.database.Cursor;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -58,7 +59,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -188,8 +188,9 @@
     private final AccountObserver mAccountListener = new AccountObserver() {
         @Override
         public void onChanged(Account newAccount) {
-            setAccount(newAccount);
-            notifyDataSetChanged();
+            if (setAccount(newAccount)) {
+                notifyDataSetChanged();
+            }
         }
     };
 
@@ -211,10 +212,25 @@
     /** List of all child folders for this folder. */
     private List<NestedFolderView> mFolderViews;
 
-    private final SparseArray<WeakReference<ConversationSetObserver>> mItemViewSetObservers =
-            new SparseArray<WeakReference<ConversationSetObserver>>();
+    /**
+     * @return <code>true</code> if a relevant part of the account has changed, <code>false</code>
+     *         otherwise
+     */
+    private boolean setAccount(Account newAccount) {
+        final boolean accountChanged;
+        if (mAccount != null && mAccount.uri.equals(newAccount.uri)
+                && mAccount.settings.priorityArrowsEnabled ==
+                        newAccount.settings.priorityArrowsEnabled
+                && mAccount.supportsCapability(UIProvider.AccountCapabilities.UNDO) ==
+                        newAccount.supportsCapability(UIProvider.AccountCapabilities.UNDO)
+                && mAccount.settings.convListIcon == newAccount.settings.convListIcon
+                && mAccount.settings.convListAttachmentPreviews ==
+                        newAccount.settings.convListAttachmentPreviews) {
+            accountChanged = false;
+        } else {
+            accountChanged = true;
+        }
 
-    private void setAccount(Account newAccount) {
         mAccount = newAccount;
         mPriorityMarkersEnabled = mAccount.settings.priorityArrowsEnabled;
         mSwipeEnabled = mAccount.supportsCapability(UIProvider.AccountCapabilities.UNDO);
@@ -227,6 +243,8 @@
                 (newAccount.settings.replyBehavior == UIProvider.DefaultReplyBehavior.REPLY)
                 ? "reply"
                 : "reply_all");
+
+        return accountChanged;
     }
 
     private static final String LOG_TAG = LogTag.getLogTag();
@@ -1063,6 +1081,12 @@
 
     @Override
     public void notifyDataSetChanged() {
+        // This may be a temporary catch for a problem, or we may leave it here.
+        // b/9527863
+        if (Looper.getMainLooper() != Looper.myLooper()) {
+            LogUtils.wtf(LOG_TAG, "notifyDataSetChanged() called off the main thread");
+        }
+
         updateSpecialViews();
         super.notifyDataSetChanged();
     }
@@ -1140,6 +1164,12 @@
         }
     }
 
+    public void onConversationListVisibilityChanged(final boolean visible) {
+        for (final ConversationSpecialItemView specialView : mFleetingViews) {
+            specialView.onConversationListVisibilityChanged(visible);
+        }
+    }
+
     public void onScrollStateChanged(final int scrollState) {
         final boolean scrolling = scrollState != OnScrollListener.SCROLL_STATE_IDLE;
         mBitmapCache.setBlocking(scrolling);
@@ -1153,4 +1183,10 @@
         // If we have conversation in our selected set, we're in CAB mode
         return !mBatchConversations.isEmpty();
     }
+
+    public void saveSpecialItemInstanceState(final Bundle outState) {
+        for (final ConversationSpecialItemView specialView : mFleetingViews) {
+            specialView.saveInstanceState(outState);
+        }
+    }
 }

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 3b8d314..4d8ecad 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java

@@ -346,7 +346,7 @@
         if (specialItemViews != null) {
             // Attach to the LoaderManager
             for (final ConversationSpecialItemView view : specialItemViews) {
-                view.bindLoaderManager(manager);
+                view.bindFragment(manager, savedState);
             }
         }
 
@@ -647,6 +647,10 @@
             outState.putParcelable(LIST_STATE_KEY, mListView.onSaveInstanceState());
             outState.putInt(CHOICE_MODE_KEY, mListView.getChoiceMode());
         }
+
+        if (mListAdapter != null) {
+            mListAdapter.saveSpecialItemInstanceState(outState);
+        }
     }
 
     @Override

diff --git a/src/com/android/mail/ui/ConversationListView.java b/src/com/android/mail/ui/ConversationListView.java
index 26e47d3..2a8fe20 100644
--- a/src/com/android/mail/ui/ConversationListView.java
+++ b/src/com/android/mail/ui/ConversationListView.java

@@ -346,14 +346,6 @@
                     mAccountPreferences.incNumOfDismissesForAccountSyncOff();
                 }
                 break;
-            case ReasonSyncOff.AIRPLANE_MODE_ON:
-                num = mMailPrefs.getNumOfDismissesForAirplaneModeOn();
-                if (num > 0 && num <= MAX_NUM_OF_SYNC_TOASTS) {
-                    Toast.makeText(getContext(), R.string.airplane_mode_on, Toast.LENGTH_SHORT)
-                            .show();
-                    mMailPrefs.incNumOfDismissesForAirplaneModeOn();
-                }
-                break;
         }
     }
 

diff --git a/src/com/android/mail/ui/ConversationLongPressTipView.java b/src/com/android/mail/ui/ConversationLongPressTipView.java
index fd36a16..9119125 100644
--- a/src/com/android/mail/ui/ConversationLongPressTipView.java
+++ b/src/com/android/mail/ui/ConversationLongPressTipView.java

@@ -23,12 +23,11 @@
 import com.android.mail.providers.Folder;
 import com.android.mail.utils.Utils;
 
-import android.animation.Animator;
 import android.animation.ObjectAnimator;
-import android.animation.Animator.AnimatorListener;
 import android.app.LoaderManager;
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
@@ -135,7 +134,7 @@
     }
 
     @Override
-    public void bindLoaderManager(LoaderManager loaderManager) {
+    public void bindFragment(final LoaderManager loaderManager, final Bundle savedInstanceState) {
     }
 
     @Override
@@ -149,7 +148,9 @@
 
     @Override
     public void onCabModeEntered() {
-        dismiss();
+        if (mShow) {
+            dismiss();
+        }
     }
 
     @Override
@@ -158,6 +159,16 @@
     }
 
     @Override
+    public void onConversationListVisibilityChanged(final boolean visible) {
+        // Do nothing
+    }
+
+    @Override
+    public void saveInstanceState(final Bundle outState) {
+        // Do nothing
+    }
+
+    @Override
     public boolean acceptsUserTaps() {
         // No, we don't allow user taps.
         return false;
@@ -204,29 +215,16 @@
                 ObjectAnimator.ofInt(this, "animatedHeight", start, end);
         heightAnimator.setInterpolator(new DecelerateInterpolator(2.0f));
         heightAnimator.setDuration(sShrinkAnimationDuration);
-        heightAnimator.addListener(new AnimatorListener() {
-            @Override
-            public void onAnimationStart(final Animator animation) {
-                // Do nothing
-            }
-
-            @Override
-            public void onAnimationRepeat(final Animator animation) {
-                // Do nothing
-            }
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                // We should no longer exist, so notify the adapter
-                mAdapter.notifyDataSetChanged();
-            }
-
-            @Override
-            public void onAnimationCancel(final Animator animation) {
-                // Do nothing
-            }
-        });
         heightAnimator.start();
+
+        /*
+         * Ideally, we would like to call mAdapter.notifyDataSetChanged() in a listener's
+         * onAnimationEnd(), but we are in the middle of a touch event, and this will cause all the
+         * views to get recycled, which will cause problems.
+         *
+         * Instead, we'll just leave the item in the list with a height of 0, and the next
+         * notifyDatasetChanged() will remove it from the adapter.
+         */
     }
 
     /**
@@ -255,5 +253,4 @@
             setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), mAnimatedHeight);
         }
     }
-
 }

diff --git a/src/com/android/mail/ui/ConversationPhotoTeaserView.java b/src/com/android/mail/ui/ConversationPhotoTeaserView.java
index 95c4c89..30ad0af 100644
--- a/src/com/android/mail/ui/ConversationPhotoTeaserView.java
+++ b/src/com/android/mail/ui/ConversationPhotoTeaserView.java

@@ -1,11 +1,10 @@
 package com.android.mail.ui;
 
-import android.animation.Animator;
 import android.animation.ObjectAnimator;
-import android.animation.Animator.AnimatorListener;
 import android.app.LoaderManager;
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
@@ -148,7 +147,7 @@
     }
 
     @Override
-    public void bindLoaderManager(LoaderManager loaderManager) {
+    public void bindFragment(final LoaderManager loaderManager, final Bundle savedInstanceState) {
     }
 
     @Override
@@ -162,7 +161,9 @@
 
     @Override
     public void onCabModeEntered() {
-        dismiss();
+        if (mShown) {
+            dismiss();
+        }
     }
 
     @Override
@@ -171,6 +172,16 @@
     }
 
     @Override
+    public void onConversationListVisibilityChanged(final boolean visible) {
+        // Do nothing
+    }
+
+    @Override
+    public void saveInstanceState(final Bundle outState) {
+        // Do nothing
+    }
+
+    @Override
     public boolean acceptsUserTaps() {
         // No, we don't allow user taps.
         return false;
@@ -217,29 +228,16 @@
                 ObjectAnimator.ofInt(this, "animatedHeight", start, end);
         heightAnimator.setInterpolator(new DecelerateInterpolator(2.0f));
         heightAnimator.setDuration(sShrinkAnimationDuration);
-        heightAnimator.addListener(new AnimatorListener() {
-            @Override
-            public void onAnimationStart(final Animator animation) {
-                // Do nothing
-            }
-
-            @Override
-            public void onAnimationRepeat(final Animator animation) {
-                // Do nothing
-            }
-
-            @Override
-            public void onAnimationEnd(final Animator animation) {
-                // We should no longer exist, so notify the adapter
-                mAdapter.notifyDataSetChanged();
-            }
-
-            @Override
-            public void onAnimationCancel(final Animator animation) {
-                // Do nothing
-            }
-        });
         heightAnimator.start();
+
+        /*
+         * Ideally, we would like to call mAdapter.notifyDataSetChanged() in a listener's
+         * onAnimationEnd(), but we are in the middle of a touch event, and this will cause all the
+         * views to get recycled, which will cause problems.
+         *
+         * Instead, we'll just leave the item in the list with a height of 0, and the next
+         * notifyDatasetChanged() will remove it from the adapter.
+         */
     }
 
     /**

diff --git a/src/com/android/mail/ui/ConversationSpecialItemView.java b/src/com/android/mail/ui/ConversationSpecialItemView.java
index 92fc7ac..85532ce 100644
--- a/src/com/android/mail/ui/ConversationSpecialItemView.java
+++ b/src/com/android/mail/ui/ConversationSpecialItemView.java

@@ -17,6 +17,7 @@
 package com.android.mail.ui;
 
 import android.app.LoaderManager;
+import android.os.Bundle;
 import android.widget.Adapter;
 
 import com.android.mail.browse.ConversationCursor;
@@ -55,7 +56,7 @@
 
     void setAdapter(AnimatedAdapter adapter);
 
-    void bindLoaderManager(LoaderManager loaderManager);
+    void bindFragment(LoaderManager loaderManager, Bundle savedInstanceState);
 
     /**
      * Called when the view is being destroyed.
@@ -79,4 +80,12 @@
 
     /** Returns whether this special view is enabled (= accepts user taps). */
     boolean acceptsUserTaps();
+
+    /** Called when the conversation list's visibility changes */
+    void onConversationListVisibilityChanged(boolean visible);
+
+    /**
+     * Saves any state for the view to the fragment so it will be restored on configuration change
+     */
+    void saveInstanceState(Bundle outState);
 }

diff --git a/src/com/android/mail/ui/ConversationSyncDisabledTipView.java b/src/com/android/mail/ui/ConversationSyncDisabledTipView.java
index 993c62b..9d37edf 100644
--- a/src/com/android/mail/ui/ConversationSyncDisabledTipView.java
+++ b/src/com/android/mail/ui/ConversationSyncDisabledTipView.java

@@ -25,8 +25,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.provider.Settings;
 import android.text.SpannableString;
+import android.text.TextUtils;
 import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
 import android.view.View;
@@ -89,8 +91,6 @@
         public static final int AUTO_SYNC_OFF = 1;
         // Global auto-sync is on, but Gmail app level sync is disabled for this particular account
         public static final int ACCOUNT_SYNC_OFF = 2;
-        // Auto-sync is enabled at both device and account level, but device is in airplane mode
-        public static final int AIRPLANE_MODE_ON = 3;
     }
 
     public ConversationSyncDisabledTipView(final Context context) {
@@ -205,8 +205,6 @@
                 return (mMailPrefs.getNumOfDismissesForAutoSyncOff() == 0);
             case ReasonSyncOff.ACCOUNT_SYNC_OFF:
                 return (mAccountPreferences.getNumOfDismissesForAccountSyncOff() == 0);
-            case ReasonSyncOff.AIRPLANE_MODE_ON:
-                return (mMailPrefs.getNumOfDismissesForAirplaneModeOn() == 0);
             default:
                 return false;
         }
@@ -217,7 +215,6 @@
         if (!ContentResolver.getMasterSyncAutomatically()) {
             // Global sync is turned off
             accountPreferences.resetNumOfDismissesForAccountSyncOff();
-            mailPrefs.resetNumOfDismissesForAirplaneModeOn();
             // Logging to track down bug where this tip is being showing when it shouldn't be.
             LogUtils.i(LOG_TAG, "getMasterSyncAutomatically() return false");
             return ReasonSyncOff.AUTO_SYNC_OFF;
@@ -230,25 +227,15 @@
             // Not sure why directly passing mAccount to ContentResolver doesn't just work.
             android.accounts.Account acct = new android.accounts.Account(
                     account.name, account.type);
-            if (!ContentResolver.getSyncAutomatically(acct, account.syncAuthority)) {
+            if (!TextUtils.isEmpty(account.syncAuthority) &&
+                    !ContentResolver.getSyncAutomatically(acct, account.syncAuthority)) {
                 // Account level sync is off
-                mailPrefs.resetNumOfDismissesForAirplaneModeOn();
-                // Logging to track down bug where this tip is showing when it shouldn't be.
-                LogUtils.i(LOG_TAG, "getSyncAutomatically() return false for %s %s %s",
-                        account.name, account.type, account.syncAuthority);
                 return ReasonSyncOff.ACCOUNT_SYNC_OFF;
             } else {
                 // Account sync is on, clear the number of times users has dismissed this
                 // warning so that next time sync is off, warning gets displayed again.
                 accountPreferences.resetNumOfDismissesForAccountSyncOff();
-
-                // Now check for whether airplane mode is on
-                if (Utils.isAirplaneModeOnAndDeviceOffline(context)) {
-                    return ReasonSyncOff.AIRPLANE_MODE_ON;
-                } else {
-                    mailPrefs.resetNumOfDismissesForAirplaneModeOn();
-                    return ReasonSyncOff.NONE;
-                }
+                return ReasonSyncOff.NONE;
             }
         }
     }
@@ -271,11 +258,6 @@
                     mTextArea.setClickable(true);
                     mTextArea.setOnClickListener(mAccountSyncOffTextClickedListener);
                     break;
-                case ReasonSyncOff.AIRPLANE_MODE_ON:
-                    mText1.setText(R.string.airplane_mode_on);
-                    mText2.setVisibility(View.GONE);
-                    mTextArea.setClickable(false);
-                    break;
                 default:
                     // Doesn't matter what mText is since this view is not displayed
             }
@@ -294,7 +276,7 @@
     }
 
     @Override
-    public void bindLoaderManager(LoaderManager loaderManager) {
+    public void bindFragment(LoaderManager loaderManager, final Bundle savedInstanceState) {
     }
 
     @Override
@@ -316,6 +298,16 @@
     }
 
     @Override
+    public void onConversationListVisibilityChanged(final boolean visible) {
+        // Do nothing
+    }
+
+    @Override
+    public void saveInstanceState(final Bundle outState) {
+        // Do nothing
+    }
+
+    @Override
     public boolean acceptsUserTaps() {
         return true;
     }
@@ -332,10 +324,6 @@
                 mAccountPreferences.incNumOfDismissesForAccountSyncOff();
                 reason = "account_sync_off";
                 break;
-            case ReasonSyncOff.AIRPLANE_MODE_ON:
-                mMailPrefs.incNumOfDismissesForAirplaneModeOn();
-                reason = "airplane_mode_on";
-                break;
             default:
                 reason = null;
                 break;

diff --git a/src/com/android/mail/ui/ConversationsInOutboxTipView.java b/src/com/android/mail/ui/ConversationsInOutboxTipView.java
index 359a79f..3664b83 100644
--- a/src/com/android/mail/ui/ConversationsInOutboxTipView.java
+++ b/src/com/android/mail/ui/ConversationsInOutboxTipView.java

@@ -232,7 +232,7 @@
     }
 
     @Override
-    public void bindLoaderManager(LoaderManager loaderManager) {
+    public void bindFragment(final LoaderManager loaderManager, final Bundle savedInstanceState) {
         mLoaderManager = loaderManager;
     }
 
@@ -254,6 +254,16 @@
     }
 
     @Override
+    public void onConversationListVisibilityChanged(final boolean visible) {
+        // Do nothing
+    }
+
+    @Override
+    public void saveInstanceState(final Bundle outState) {
+        // Do nothing
+    }
+
+    @Override
     public boolean acceptsUserTaps() {
         return true;
     }

diff --git a/src/com/android/mail/ui/DividedImageCanvas.java b/src/com/android/mail/ui/DividedImageCanvas.java
index b45e88b..274327e 100644
--- a/src/com/android/mail/ui/DividedImageCanvas.java
+++ b/src/com/android/mail/ui/DividedImageCanvas.java

@@ -418,10 +418,13 @@
         mWidth = width;
         mHeight = height;
 
-        // todo:ath this bitmap is creating a GC which is killing CIV.loadAttachmentPreviews()
         mDividedBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         mCanvas = new Canvas(mDividedBitmap);
-        mBitmapValid = true;
+
+        for (int i = 0; i < getDivisionCount(); i++) {
+            mDivisionImages.set(i, null);
+        }
+        mBitmapValid = false;
         Utils.traceEndSection();
     }
 

diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 631142d..ea1dcdc 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java

@@ -1115,8 +1115,10 @@
     public void updateScroll() {
         final int selectedPosition = mCursorAdapter.getSelectedPosition();
         if (selectedPosition >= 0) {
+            // TODO: setSelection() jumps the item to the top of the list "hiding" the accounts
+            // TODO: and smoothScrollToPosition() is too slow for lots of labels/folders
             // It's called "setSelection" but it's really more like "jumpScrollToPosition"
-            mListView.setSelection(selectedPosition);
+            // mListView.setSelection(selectedPosition);
         }
     }
 

diff --git a/src/com/android/mail/ui/NestedFolderView.java b/src/com/android/mail/ui/NestedFolderView.java
index 85c03f8..1ee049e 100644
--- a/src/com/android/mail/ui/NestedFolderView.java
+++ b/src/com/android/mail/ui/NestedFolderView.java

@@ -20,6 +20,7 @@
 import android.app.LoaderManager;
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -147,7 +148,7 @@
     }
 
     @Override
-    public void bindLoaderManager(LoaderManager loaderManager) {
+    public void bindFragment(LoaderManager loaderManager, final Bundle savedInstanceState) {
         // Do nothing. We don't need the loader manager.
     }
 
@@ -172,6 +173,16 @@
     }
 
     @Override
+    public void onConversationListVisibilityChanged(final boolean visible) {
+        // Do nothing
+    }
+
+    @Override
+    public void saveInstanceState(final Bundle outState) {
+        // Do nothing
+    }
+
+    @Override
     public boolean acceptsUserTaps() {
         return true;
     }

diff --git a/src/com/android/mail/ui/SecureConversationViewController.java b/src/com/android/mail/ui/SecureConversationViewController.java
index 7bd9254..1f9b13e 100644
--- a/src/com/android/mail/ui/SecureConversationViewController.java
+++ b/src/com/android/mail/ui/SecureConversationViewController.java

@@ -93,6 +93,7 @@
                 mCallbacks.getFragment(), mCallbacks.getHandler());
         mProgressController.instantiateProgressIndicators(rootView);
         mWebView = (MessageWebView) rootView.findViewById(R.id.webview);
+        mWebView.setOverScrollMode(View.OVER_SCROLL_NEVER);
         mWebView.setWebViewClient(mCallbacks.getWebViewClient());
         mWebView.setFocusable(false);
         final WebSettings settings = mWebView.getSettings();

diff --git a/src/com/android/mail/ui/TurnAutoSyncOnDialog.java b/src/com/android/mail/ui/TurnAutoSyncOnDialog.java
index 28e0d3e..562091a 100644
--- a/src/com/android/mail/ui/TurnAutoSyncOnDialog.java
+++ b/src/com/android/mail/ui/TurnAutoSyncOnDialog.java

@@ -39,6 +39,13 @@
 
     public static final String DIALOG_TAG = "auto sync";
 
+    public interface TurnAutoSyncOnDialogListener {
+        void onEnableAutoSync();
+        void onCancelAutoSync();
+    }
+
+    private TurnAutoSyncOnDialogListener mListener;
+
     // Public no-args constructor needed for fragment re-instantiation
     public TurnAutoSyncOnDialog() {}
 
@@ -78,9 +85,23 @@
                                         new Account(accountName, accountType),
                                         syncAuthority,
                                         true);
+                                if (mListener != null) {
+                                    mListener.onEnableAutoSync();
+                                }
                             }
                         })
-                .setNegativeButton(R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (mListener != null) {
+                            mListener.onCancelAutoSync();
+                        }
+                    }
+                })
                 .create();
     }
+
+    public void setListener(final TurnAutoSyncOnDialogListener listener) {
+        mListener = listener;
+    }
 }

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index eec9293..0269b56 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java

@@ -41,9 +41,20 @@
  * abounds.
  */
 public final class TwoPaneController extends AbstractActivityController {
+
+    private static final String SAVED_MISCELLANEOUS_VIEW = "saved-miscellaneous-view";
+    private static final String SAVED_MISCELLANEOUS_VIEW_TRANSACTION_ID =
+            "saved-miscellaneous-view-transaction-id";
+
     private TwoPaneLayout mLayout;
     private Conversation mConversationToShow;
 
+    /**
+     * Used to determine whether onViewModeChanged should skip a potential
+     * fragment transaction that would remove a miscellaneous view.
+     */
+    private boolean mSavedMiscellaneousView = false;
+
     public TwoPaneController(MailActivity activity, ViewMode viewMode) {
         super(activity, viewMode);
     }
@@ -118,6 +129,12 @@
         mLayout.setController(this, Intent.ACTION_SEARCH.equals(mActivity.getIntent().getAction()));
         mLayout.setDrawerLayout(mDrawerContainer);
 
+        if (savedState != null) {
+            mSavedMiscellaneousView = savedState.getBoolean(SAVED_MISCELLANEOUS_VIEW, false);
+            mMiscellaneousViewTransactionId =
+                    savedState.getInt(SAVED_MISCELLANEOUS_VIEW_TRANSACTION_ID, -1);
+        }
+
         // 2-pane layout is the main listener of view mode changes, and issues secondary
         // notifications upon animation completion:
         // (onConversationVisibilityChanged, onConversationListVisibilityChanged)
@@ -126,6 +143,14 @@
     }
 
     @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putBoolean(SAVED_MISCELLANEOUS_VIEW, mMiscellaneousViewTransactionId >= 0);
+        outState.putInt(SAVED_MISCELLANEOUS_VIEW_TRANSACTION_ID, mMiscellaneousViewTransactionId);
+    }
+
+    @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         if (hasFocus && !mLayout.isConversationListCollapsed()) {
             // The conversation list is visible.
@@ -156,12 +181,13 @@
 
     @Override
     public void onViewModeChanged(int newMode) {
-        if (mMiscellaneousViewTransactionId >= 0) {
+        if (!mSavedMiscellaneousView && mMiscellaneousViewTransactionId >= 0) {
             final FragmentManager fragmentManager = mActivity.getFragmentManager();
             fragmentManager.popBackStackImmediate(mMiscellaneousViewTransactionId,
                     FragmentManager.POP_BACK_STACK_INCLUSIVE);
             mMiscellaneousViewTransactionId = -1;
         }
+        mSavedMiscellaneousView = false;
 
         super.onViewModeChanged(newMode);
         if (newMode != ViewMode.WAITING_FOR_ACCOUNT_INITIALIZATION) {
@@ -554,11 +580,13 @@
         final int containerViewId = TwoPaneLayout.MISCELLANEOUS_VIEW_ID;
 
         final FragmentManager fragmentManager = mActivity.getFragmentManager();
-        final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-        fragmentTransaction.addToBackStack(null);
-        fragmentTransaction.replace(containerViewId, fragment, TAG_CUSTOM_FRAGMENT);
-        mMiscellaneousViewTransactionId = fragmentTransaction.commitAllowingStateLoss();
-        fragmentManager.executePendingTransactions();
+        if (fragmentManager.findFragmentByTag(TAG_CUSTOM_FRAGMENT) == null) {
+            final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+            fragmentTransaction.addToBackStack(null);
+            fragmentTransaction.replace(containerViewId, fragment, TAG_CUSTOM_FRAGMENT);
+            mMiscellaneousViewTransactionId = fragmentTransaction.commitAllowingStateLoss();
+            fragmentManager.executePendingTransactions();
+        }
 
         if (selectPosition >= 0) {
             getConversationListFragment().setRawSelected(selectPosition, true);

diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index f4276a3..98687be 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java

@@ -450,7 +450,7 @@
                 break;
             case ViewMode.AD:
                 dispatchConversationVisibilityChanged(false);
-                dispatchConversationListVisibilityChange(false);
+                dispatchConversationListVisibilityChange(!isConversationListCollapsed());
 
                 break;
             default:

diff --git a/src/com/android/mail/utils/Clock.java b/src/com/android/mail/utils/Clock.java
new file mode 100644
index 0000000..accd4e2
--- /dev/null
+++ b/src/com/android/mail/utils/Clock.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mail.utils;
+
+/**
+ * A class provide the current time (like {@link System#currentTimeMillis()}).
+ * It's intended to be mocked out for unit tests.
+ */
+public class Clock {
+    public static final Clock INSTANCE = new Clock();
+
+    protected Clock() {
+    }
+
+    public long getTime() {
+        return System.currentTimeMillis();
+    }
+}

diff --git a/src/com/android/mail/utils/LogUtils.java b/src/com/android/mail/utils/LogUtils.java
index 3203422..5d4f434 100644
--- a/src/com/android/mail/utils/LogUtils.java
+++ b/src/com/android/mail/utils/LogUtils.java

@@ -64,7 +64,7 @@
      * production releases.  This should be set to DEBUG for production releases, and VERBOSE for
      * internal builds.
      */
-    private static final int MAX_ENABLED_LOG_LEVEL = VERBOSE;
+    private static final int MAX_ENABLED_LOG_LEVEL = DEBUG;
 
     private static Boolean sDebugLoggingEnabledForTests = null;
 

diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 65cf035..d58ad01 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java

@@ -97,7 +97,7 @@
                 }
             };
 
-    private static final BidiFormatter sBidiFormatter = BidiFormatter.getInstance();
+    private static final BidiFormatter BIDI_FORMATTER = BidiFormatter.getInstance();
 
     /**
      * Clears all notifications in response to the user tapping "Clear" in the status bar.
@@ -583,8 +583,6 @@
                                 null);
                     }
 
-                    Analytics.getInstance().setCustomDimension(Analytics.CD_INDEX_ACCOUNT_TYPE,
-                            AnalyticsUtils.getAccountTypeForAccount(account.name));
                     Analytics.getInstance().sendEvent("notification_create",
                             launchConversationMode ? "conversation" : "conversation_list",
                             folder.getTypeDescription(), unseenCount);
@@ -819,13 +817,8 @@
                                 sendersBuilder = getStyledSenders(context, conversationCursor,
                                         sendersLength, notificationAccount);
                             } else {
-                                if (from == null) {
-                                    LogUtils.e(LOG_TAG, "null from string in " +
-                                            "configureLatestEventInfoFromConversation");
-                                    from = "";
-                                }
-                                sendersBuilder = new SpannableStringBuilder(
-                                        sBidiFormatter.unicodeWrap(from));
+                                sendersBuilder =
+                                        new SpannableStringBuilder(getWrappedFromString(from));
                             }
                             final CharSequence digestLine = getSingleMessageInboxLine(context,
                                     sendersBuilder.toString(),
@@ -908,7 +901,7 @@
                         // For a single new conversation, the ticker is based on the sender's name.
                         notificationTicker = sendersBuilder.toString();
                     } else {
-                        from = sBidiFormatter.unicodeWrap(from);
+                        from = getWrappedFromString(from);
                         // The title of a single message the sender.
                         notification.setContentTitle(from);
                         // For a single new conversation, the ticker is based on the sender's name.
@@ -999,6 +992,15 @@
         notification.setContentIntent(clickIntent);
     }
 
+    private static String getWrappedFromString(String from) {
+        if (from == null) {
+            LogUtils.e(LOG_TAG, "null from string in getWrappedFromString");
+            from = "";
+        }
+        from = BIDI_FORMATTER.unicodeWrap(from);
+        return from;
+    }
+
     private static SpannableStringBuilder getStyledSenders(final Context context,
             final Cursor conversationCursor, final int maxLength, final String account) {
         final Conversation conversation = new Conversation(conversationCursor);
@@ -1115,7 +1117,7 @@
             // senders is already individually unicode wrapped so it does not need to be done here
             final String instantiatedString = String.format(formatString,
                     senders,
-                    sBidiFormatter.unicodeWrap(subjectSnippet));
+                    BIDI_FORMATTER.unicodeWrap(subjectSnippet));
 
             final SpannableString spannableString = new SpannableString(instantiatedString);
 

diff --git a/src/com/android/mail/utils/Throttle.java b/src/com/android/mail/utils/Throttle.java
new file mode 100644
index 0000000..0dea3bc
--- /dev/null
+++ b/src/com/android/mail/utils/Throttle.java

@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mail.utils;
+
+import android.os.Handler;
+import android.util.Log;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * This class used to "throttle" a flow of events.
+ *
+ * When {@link #onEvent()} is called, it calls the callback in a certain timeout later.
+ * Initially {@link #mMinTimeout} is used as the timeout, but if it gets multiple {@link #onEvent}
+ * calls in a certain amount of time, it extends the timeout, until it reaches {@link #mMaxTimeout}.
+ *
+ * This class is primarily used to throttle content changed events.
+ */
+public class Throttle {
+    public static final boolean DEBUG = false; // Don't submit with true
+
+    public static final int DEFAULT_MIN_TIMEOUT = 150;
+    public static final int DEFAULT_MAX_TIMEOUT = 2500;
+    /* package */ static final int TIMEOUT_EXTEND_INTERVAL = 500;
+
+    private static final String LOG_TAG = LogTag.getLogTag();
+
+    private static Timer TIMER = new Timer();
+
+    private final Clock mClock;
+    private final Timer mTimer;
+
+    /** Name of the instance.  Only for logging. */
+    private final String mName;
+
+    /** Handler for UI thread. */
+    private final Handler mHandler;
+
+    /** Callback to be called */
+    private final Runnable mCallback;
+
+    /** Minimum (default) timeout, in milliseconds.  */
+    private final int mMinTimeout;
+
+    /** Max timeout, in milliseconds.  */
+    private final int mMaxTimeout;
+
+    /** Current timeout, in milliseconds. */
+    private int mTimeout;
+
+    /** When {@link #onEvent()} was last called. */
+    private long mLastEventTime;
+
+    private MyTimerTask mRunningTimerTask;
+
+    /** Constructor with default timeout */
+    public Throttle(String name, Runnable callback, Handler handler) {
+        this(name, callback, handler, DEFAULT_MIN_TIMEOUT, DEFAULT_MAX_TIMEOUT);
+    }
+
+    /** Constructor that takes custom timeout */
+    public Throttle(String name, Runnable callback, Handler handler,int minTimeout,
+            int maxTimeout) {
+        this(name, callback, handler, minTimeout, maxTimeout, Clock.INSTANCE, TIMER);
+    }
+
+    /** Constructor for tests */
+    /* package */ Throttle(String name, Runnable callback, Handler handler,int minTimeout,
+            int maxTimeout, Clock clock, Timer timer) {
+        if (maxTimeout < minTimeout) {
+            throw new IllegalArgumentException();
+        }
+        mName = name;
+        mCallback = callback;
+        mClock = clock;
+        mTimer = timer;
+        mHandler = handler;
+        mMinTimeout = minTimeout;
+        mMaxTimeout = maxTimeout;
+        mTimeout = mMinTimeout;
+    }
+
+    private void debugLog(String message) {
+        Log.d(LOG_TAG, "Throttle: [" + mName + "] " + message);
+    }
+
+    private boolean isCallbackScheduled() {
+        return mRunningTimerTask != null;
+    }
+
+    public void cancelScheduledCallback() {
+        if (mRunningTimerTask != null) {
+            if (DEBUG) debugLog("Canceling scheduled callback");
+            mRunningTimerTask.cancel();
+            mRunningTimerTask = null;
+        }
+    }
+
+    /* package */ void updateTimeout() {
+        final long now = mClock.getTime();
+        if ((now - mLastEventTime) <= TIMEOUT_EXTEND_INTERVAL) {
+            mTimeout *= 2;
+            if (mTimeout >= mMaxTimeout) {
+                mTimeout = mMaxTimeout;
+            }
+            if (DEBUG) debugLog("Timeout extended " + mTimeout);
+        } else {
+            mTimeout = mMinTimeout;
+            if (DEBUG) debugLog("Timeout reset to " + mTimeout);
+        }
+
+        mLastEventTime = now;
+    }
+
+    public void onEvent() {
+        if (DEBUG) debugLog("onEvent");
+
+        updateTimeout();
+
+        if (isCallbackScheduled()) {
+            if (DEBUG) debugLog("    callback already scheduled");
+        } else {
+            if (DEBUG) debugLog("    scheduling callback");
+            mRunningTimerTask = new MyTimerTask();
+            mTimer.schedule(mRunningTimerTask, mTimeout);
+        }
+    }
+
+    /**
+     * Timer task called on timeout,
+     */
+    private class MyTimerTask extends TimerTask {
+        private boolean mCanceled;
+
+        @Override
+        public void run() {
+            mHandler.post(new HandlerRunnable());
+        }
+
+        @Override
+        public boolean cancel() {
+            mCanceled = true;
+            return super.cancel();
+        }
+
+        private class HandlerRunnable implements Runnable {
+            @Override
+            public void run() {
+                mRunningTimerTask = null;
+                if (!mCanceled) { // This check has to be done on the UI thread.
+                    if (DEBUG) debugLog("Kicking callback");
+                    mCallback.run();
+                }
+            }
+        }
+    }
+
+    /* package */ int getTimeoutForTest() {
+        return mTimeout;
+    }
+
+    /* package */ long getLastEventTimeForTest() {
+        return mLastEventTime;
+    }
+}

diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index 15fb444..f3fd875 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java

@@ -33,14 +33,11 @@
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Typeface;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Browser;
-import android.provider.Settings;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -1407,23 +1404,4 @@
         }
     }
 
-    public static boolean isAirplaneModeOnAndDeviceOffline(Context context) {
-        final int airplaneMode;
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            airplaneMode = Settings.System.getInt(context.getContentResolver(),
-                    Settings.System.AIRPLANE_MODE_ON, 0);
-        } else {
-            airplaneMode = Settings.Global.getInt(context.getContentResolver(),
-                    Settings.Global.AIRPLANE_MODE_ON, 0);
-        }
-        if (airplaneMode == 0) {
-            return false;
-        }
-        // Otherwise check if device is online, since it's possible to still use
-        // wifi when airplane mode is on
-        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-        NetworkInfo info = connectivityManager.getActiveNetworkInfo();
-        return (info == null || !info.isConnected());
-    }
 }
commit	03f1239aec39f8e3e3ade0e8c78df5836d5f4fc2	[log] [tgz]
author	Alice Yang <alice@google.com>	Wed Sep 04 07:26:28 2013 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Sep 04 07:26:28 2013 +0000
tree	478d16871ea656aea0dd28139c855b54f77033a5
parent	a797e4669ee2c1243438ea22197fd5cdf8e1038d [diff]
parent	ebeef1babe39de2c1d97429a93ea956c655cd377 [diff]