[automerger] Filter Attachment file name of forward slashes for .eml attachments. am: 53b40fd185 am: eb8ae2ec17 Change-Id: I2cf9efcf027eab88675dd7690d7e731979abc294

commit: be56f659314cb3487f3418e59f363d95047b7712 [log] [tgz]
author: Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jun 04 20:37:55 2018 +0000
committer: Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jun 04 20:37:55 2018 +0000
tree: 958fb4a201e432f86b1e3a74e23c424ef5b02a4a
parent: 7764908d8d66f9a9557330321a37e2b7b950f703 [diff]
parent: eb8ae2ec1702db9c02e4175d2187a94b890fa6ce [diff]
diff --git a/Android.mk b/Android.mk
index d00c9c1..3a2db90 100644
--- a/Android.mk
+++ b/Android.mk

@@ -18,9 +18,9 @@
 chips_dir := ../../../frameworks/opt/chips/res
 
 #Include res dir from libraries
-appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat/res
+appcompat_dir := ../../../$(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res
 photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/appcompat/res
-gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res
+gridlayout_dir := ../../../$(SUPPORT_LIBRARY_ROOT)/v7/gridlayout/res
 bitmap_dir := ../../../frameworks/opt/bitmap/res
 datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
 res_dirs := res $(appcompat_dir) $(chips_dir) $(photo_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir)

diff --git a/res/layout/undo_notification.xml b/res/layout/undo_notification.xml
index 58b1fca..8659a78 100644
--- a/res/layout/undo_notification.xml
+++ b/res/layout/undo_notification.xml

@@ -21,9 +21,7 @@
     xmlns:internal="http://schemas.android.com/apk/prv/res/android"
     android:id="@+id/status_bar_latest_event_content"
     android:layout_width="match_parent"
-    android:layout_height="64dp"
-    internal:layout_maxHeight="64dp"
-    internal:layout_minHeight="64dp" >
+    android:layout_height="64dp" >
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f61d89e..96d6e41 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -438,7 +438,7 @@
     <string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
     <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g> weergawe <xliff:g id="VERSION">%2$s</xliff:g>"</string>
     <string name="view_app_page" msgid="3241990517052398927"></string>
-    <string name="print_dialog" msgid="8895536548487605661">"Druk uit…"</string>
+    <string name="print_dialog" msgid="8895536548487605661">"Druk uit …"</string>
     <string name="copyright_information" msgid="971422874488783312">"Kopiereginligting"</string>
     <string name="privacy_policy" msgid="212094623396418302">"Privaatheidsbeleid"</string>
     <string name="open_source_licenses" msgid="8643615555920977752">"Oopbronlisensies"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1cdabce..e1a08ab 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -93,7 +93,7 @@
     <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> ኪባ"</string>
     <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> ሜባ"</string>
     <string name="attachment_image" msgid="6375306026208274564">"ምስል"</string>
-    <string name="attachment_video" msgid="7119476472603939848">"ቪዲዮ"</string>
+    <string name="attachment_video" msgid="7119476472603939848">"ቪድዮ"</string>
     <string name="attachment_audio" msgid="7097658089301809284">"ኦዲዮ"</string>
     <string name="attachment_text" msgid="3485853714965922173">"ፅሑፍ"</string>
     <string name="attachment_application_msword" msgid="2110108876623152162">"ሰነድ"</string>
@@ -196,7 +196,7 @@
   </plurals>
   <plurals name="conversation_deleted">
     <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ተሰርዟል"</item>
-    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ተሰርዘዋል"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ተሰርዟል"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"ተሰርዟል"</string>
     <string name="archived" msgid="6283673603512713022">"ተሰንዷል"</string>

diff --git a/res/values-az-rAZ-sw600dp/strings.xml b/res/values-az-rAZ-sw600dp/strings.xml
new file mode 100644
index 0000000..3a972f5
--- /dev/null
+++ b/res/values-az-rAZ-sw600dp/strings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2012 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="add_cc_label" msgid="5504248178750252553">"+ Nüsxəni alan/Nüsxəni gizli alan"</string>
+    <string name="add_bcc_label" msgid="2464329024392383408">"+ Nüsxəni gizli alan"</string>
+    <string name="menu_manage_folders" msgid="2575462565700103317">"Qovluqları idarə edin"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"Mesaj bildirişlərinə defolt cavablar olaraq istifadə edin"</string>
+</resources>

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..04362ae
--- /dev/null
+++ b/res/values-az-rAZ/strings.xml

@@ -0,0 +1,484 @@
+<?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="from" msgid="5159056500059912358">"Kimdən"</string>
+    <string name="to" msgid="3971614275716830581">"Kimə"</string>
+    <string name="cc" msgid="8768828862207919684">"Nüsxəni alan"</string>
+    <string name="bcc" msgid="519303553518479171">"Nüsxəni gizli alan"</string>
+    <string name="subject_hint" msgid="2136470287303571827">"Mövzu"</string>
+    <string name="body_hint" msgid="6478994981747057817">"E-məktub yazın"</string>
+    <string name="add_file_attachment" msgid="2604880054248593993">"Fayl qoşun"</string>
+    <string name="add_photo_attachment" msgid="7163589794940909528">"Şəkil qoşun"</string>
+    <string name="save_draft" msgid="2669523480789672118">"Qaralamanı yadda saxlayın"</string>
+    <string name="discard" msgid="4905982179911608430">"İmtina et"</string>
+    <string name="compose" msgid="2602861958391035523">"Tərtib edin"</string>
+    <string name="compose_title" msgid="5673376086133995913">"Tərtib edin"</string>
+  <string-array name="compose_modes">
+    <item msgid="9000553538766397816">"Cavablayın"</item>
+    <item msgid="2767793214788399009">"Hamıya cavab"</item>
+    <item msgid="2758162027982270607">"Yönləndirin"</item>
+  </string-array>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> tarixində, <xliff:g id="PERSON">%s</xliff:g> yazıb:"</string>
+    <string name="forward_attribution" msgid="597850048345475752">"---------- Yönləndirilmiş mesaj ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tarix: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Mövzu: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
+    <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Yönləndirilmiş mesaj ----------"</string>
+    <string name="cc_attribution" msgid="2928584226469388899">"Nüsxəni alan: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
+    <string name="select_attachment_type" msgid="353236686616663062">"Qoşma növü seçin"</string>
+    <string name="too_large_to_attach_single" msgid="2669897137966512530">"<xliff:g id="MAXSIZE">%1$s</xliff:g> ölçüdən çox fayl qoşula bilməz."</string>
+    <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Bir və ya daha çox fayl qoşulmadı. Limit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Fayl qoşulmadı. <xliff:g id="MAXSIZE">%1$s</xliff:g> limiti keçildi."</string>
+    <string name="generic_attachment_problem" msgid="4683974765387240723">"Fayl qoşula bilmədi."</string>
+    <string name="attachment_permission_denied" msgid="2274397783497640486">"Qoşmaya icazə verilmədi."</string>
+    <string name="recipient_needed" msgid="319816879398937214">"Ən azı bir alıcı əlavə edin."</string>
+    <string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Mesaj mövzusunda mətn yoxdur."</string>
+    <string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Mesaj bölməsində heç bir mətn yoxdur."</string>
+    <string name="confirm_send_message" msgid="6211518590166222735">"Bu mesaj göndərilsin?"</string>
+    <string name="message_discarded" msgid="6792661321962262024">"Mesaj atıldı."</string>
+    <string name="signature" msgid="3172144541947408374">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
+    <string name="custom_from_account_label" msgid="5042317430007736322">"Məktubu bu şəkildə göndərin:"</string>
+    <string name="send" msgid="4269810089682120826">"Göndər"</string>
+    <string name="mark_read" msgid="579388143288052493">"Oxunmuş olaraq qeyd edin"</string>
+    <string name="mark_unread" msgid="6245060538061533191">"Oxunmamış olaraq qeyd edin"</string>
+    <string name="toggle_read_unread" msgid="1006469736520919028">"Oxunub/oxunmayıb keçidi"</string>
+    <string name="mute" msgid="9164839998562321569">"Susdur"</string>
+    <string name="add_star" msgid="3275117671153616270">"Ulduz əlavə edin"</string>
+    <string name="remove_star" msgid="9126690774161840733">"Ulduzu yığışdırın"</string>
+    <string name="remove_folder" msgid="2379905457788576297">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> qovluğundan silin"</string>
+    <string name="archive" msgid="5978663590021719939">"Arxiv"</string>
+    <string name="report_spam" msgid="4106897677959987340">"Spamı bildirin"</string>
+    <string name="mark_not_spam" msgid="8617774236231366651">"Spam olmadığını bildirin"</string>
+    <string name="report_phishing" msgid="8454666464488413739">"Fişinqi xəbər verin"</string>
+    <string name="delete" msgid="6784262386780496958">"Sil"</string>
+    <string name="discard_drafts" msgid="5881484193628472105">"Qaralamaları atın"</string>
+    <string name="discard_failed" msgid="7520780769812210279">"Silinmə alınmadı"</string>
+    <string name="refresh" msgid="1533748989749277511">"Təzələyin"</string>
+    <string name="reply" msgid="8337757482824207118">"Cavablayın"</string>
+    <string name="reply_all" msgid="5366796103758360957">"Hər kəsə cavab"</string>
+    <string name="resume_draft" msgid="1272723181782570649">"Düzəliş edin"</string>
+    <string name="forward" msgid="4397585145490426320">"Yönləndirin"</string>
+    <string name="menu_compose" msgid="4575025207594709432">"Tərtib edin"</string>
+    <string name="menu_change_folders" msgid="2194946192901276625">"Qovluqları dəyişin"</string>
+    <string name="menu_move_to" msgid="7948877550284452830">"Daşıyın:"</string>
+    <string name="menu_move_to_inbox" msgid="258554178236001444">"Gələnlərə köçürün"</string>
+    <string name="menu_manage_folders" msgid="8486398523679534519">"Qovluq ayarları"</string>
+    <string name="menu_show_original" msgid="2330398228979616661">"Avtomatik ölçüləməni çevirin"</string>
+    <string name="menu_settings" msgid="7993485401501778040">"Ayarlar"</string>
+    <string name="menu_search" msgid="1949652467806052768">"Axtar"</string>
+    <string name="menu_toggle_drawer" msgid="8653049392208282481">"Keçid siyirtməsi"</string>
+    <string name="drawer_title" msgid="3766219846644975778">"Naviqasiya"</string>
+    <string name="mark_important" msgid="8781680450177768820">"Önəmli olaraq qeyd edin"</string>
+    <string name="mark_not_important" msgid="3342258155408116917">"Önəmsiz olaraq qeyd edin"</string>
+    <string name="add_cc_label" msgid="2249679001141195213">"Nüsxəni alan/Nüsxəni gizli alan əlavə edin"</string>
+    <string name="add_bcc_label" msgid="963745641238037813">"Nüsxəni gizli alan əlavə edin"</string>
+    <string name="quoted_text" msgid="977782904293216533">"Sitat gətirilən mətn daxil edin"</string>
+    <string name="quoted_text_label" msgid="2296807722849923934">"Mətni sitat gətirin"</string>
+    <string name="respond_inline" msgid="6609746292081928078">"Sətiriçi cavablayın"</string>
+    <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
+    <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> KB"</string>
+    <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>
+    <string name="attachment_image" msgid="6375306026208274564">"Təsvir"</string>
+    <string name="attachment_video" msgid="7119476472603939848">"Video"</string>
+    <string name="attachment_audio" msgid="7097658089301809284">"Audio"</string>
+    <string name="attachment_text" msgid="3485853714965922173">"Mətn"</string>
+    <string name="attachment_application_msword" msgid="2110108876623152162">"Sənəd"</string>
+    <string name="attachment_application_vnd_ms_powerpoint" msgid="425353008963359230">"Təqdimat"</string>
+    <string name="attachment_application_vnd_ms_excel" msgid="5585781311136609103">"Cədvəl"</string>
+    <string name="attachment_application_pdf" msgid="4207340200944655970">"PDF"</string>
+    <string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> Fayl"</string>
+    <string name="preview_attachment" msgid="6265457626086113833">"Önizləmə"</string>
+    <string name="save_attachment" msgid="375685179032130033">"Yadda saxlayın"</string>
+    <string name="download_again" msgid="8195787340878328119">"Yenidən endirin"</string>
+    <string name="remove_attachment_desc" msgid="1478445871170879140">"<xliff:g id="ATTACHMENTNAME">%s</xliff:g> qoşmasını silin"</string>
+    <string name="more_info_attachment" msgid="2899691682394864507">"İnfo"</string>
+    <string name="no_application_found" msgid="7309485680354949680">"Bu qoşmanı göstərmək üçün heç bir tətbiq aça bilməz."</string>
+    <string name="fetching_attachment" msgid="2286628490159574159">"Qoşma əldə edilir"</string>
+    <string name="please_wait" msgid="3953824147776128899">"Lütfən, gözləyin..."</string>
+    <string name="saved" msgid="161536102236967534">"Yadda saxlanmış, <xliff:g id="SIZE">%s</xliff:g>"</string>
+    <string name="download_failed" msgid="3878373998269062395">"Endirmək olmadı. Yenidən cəhd etmək üçün toxunun."</string>
+    <string name="menu_photo_save_all" msgid="2742869476474613396">"Hamısını yadda saxla"</string>
+    <string name="menu_photo_share" msgid="6410980274832639330">"Paylaşın"</string>
+    <string name="menu_photo_share_all" msgid="3049053252719665320">"Hamısını paylaşın"</string>
+    <string name="menu_photo_print" msgid="3084679038179342333">"Çap"</string>
+    <string name="saving" msgid="6274238733828387433">"Yadda saxlanılır..."</string>
+    <string name="choosertitle_sharevia" msgid="3539537264873337959">"Bunun vasitəsilə paylaş"</string>
+    <string name="contextmenu_openlink" msgid="6952228183947135362">"Brauzerdə açın"</string>
+    <string name="contextmenu_copy" msgid="2584243784216385180">"Kopyala"</string>
+    <string name="contextmenu_copylink" msgid="8659897702269320063">"URL linkini kopyalayın"</string>
+    <string name="contextmenu_view_image" msgid="1031172763893491000">"Şəklə baxın"</string>
+    <string name="contextmenu_dial_dot" msgid="8881095692316726628">"Nömrə yığın..."</string>
+    <string name="contextmenu_sms_dot" msgid="5319737001771622657">"SMS..."</string>
+    <string name="contextmenu_add_contact" msgid="2310064151427072475">"Kontakt əlavə et"</string>
+    <string name="contextmenu_send_mail" msgid="3834654593200105396">"E-poçt göndərin"</string>
+    <string name="contextmenu_map" msgid="5118951927399465521">"Xəritə"</string>
+    <string name="contextmenu_sharelink" msgid="8670940060477758709">"Linki paylaşın"</string>
+    <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> haqqında, <xliff:g id="DATE">%5$s</xliff:g> tarixində <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> haqqında, <xliff:g id="TIME">%5$s</xliff:g> radəsində <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
+    <string name="content_description_with_folders" msgid="482368474097191879">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> haqqında <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> tarixində: <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>, etiketlər: <xliff:g id="FOLDERS">%7$s</xliff:g>"</string>
+    <string name="content_description_today_with_folders" msgid="860548626146933495">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> haqqında <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> radəsində: <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>, etiketlər: <xliff:g id="FOLDERS">%7$s</xliff:g>"</string>
+    <string name="read_string" msgid="5495929677508576520">"oxunmuş söhbət"</string>
+    <string name="unread_string" msgid="7342558841698083381">"söhbət oxunmayıb"</string>
+    <string name="filtered_tag" msgid="721666921386074505">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="badge_and_subject" msgid="3979372269373936750">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+  <plurals name="draft">
+    <item quantity="one" msgid="6717535677167943402">"Qaralama"</item>
+    <item quantity="other" msgid="1335781147509740039">"Qaralamalar"</item>
+  </plurals>
+    <string name="sending" msgid="5600034886763930499">"Göndərilir..."</string>
+    <string name="message_retrying" msgid="5335188121407261331">"Yenidən sınanılır..."</string>
+    <string name="message_failed" msgid="7887650587384601790">"Uğursuz oldu"</string>
+    <string name="send_failed" msgid="2186285547449865010">"Mesaj göndərilmədi."</string>
+    <string name="me_object_pronoun" msgid="4674452244417913816">"mən"</string>
+    <string name="me_subject_pronoun" msgid="7479328865714008288">"mən"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="7605755011865575440">"Bu söhbət silinsin?"</item>
+    <item quantity="other" msgid="1585660381208712562">"Bu <xliff:g id="COUNT">%1$d</xliff:g> söhbət silinsin?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="9105551557653306945">"Bu söhbət arxivləşdirilsin?"</item>
+    <item quantity="other" msgid="2001972798185641108">"Bu <xliff:g id="COUNT">%1$d</xliff:g> söhbət arxivləşdirilsin?"</item>
+  </plurals>
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="2030421499893210789">"Bu məktub kənar edilsin?"</item>
+    <item quantity="other" msgid="782234447471532005">"Bu <xliff:g id="COUNT">%1$d</xliff:g> mesaj atılsın?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="5172680524418848519">"Bu məktub kənar edilsin?"</string>
+    <string name="loading_conversations" msgid="7255732786298655246">"Yüklənir…"</string>
+    <string name="empty_inbox" msgid="5901734942362315228">"Hər şeyi tamamladınız! Gününüzdən həzz alın."</string>
+    <string name="empty_search" msgid="8564899353449880818">"Vay! Biz \"<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\" sorğusu üçün heç nə tapmadıq."</string>
+    <string name="empty_spam_folder" msgid="3288985543286122800">"Ura, heç bir spam yoxdur!"</string>
+    <string name="empty_trash_folder" msgid="378119063015945020">"Burada heç bir zibil yoxdur. Boşaltdığınız üçün təşəkkür edirik!"</string>
+    <string name="empty_folder" msgid="3227552635613553855">"Burada heç bir məktub yoxdur."</string>
+    <string name="getting_messages" msgid="8403333791332403244">"Mesajlarınız əldə edilir"</string>
+    <string name="undo" msgid="8256285267701059609">"Geri alın"</string>
+  <plurals name="conversation_unstarred">
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> söhbətin ulduzu silinir"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> söhbətin ulduzu silinir"</item>
+  </plurals>
+  <plurals name="conversation_muted">
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; susduruldu"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; susduruldu"</item>
+  </plurals>
+  <plurals name="conversation_spammed">
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spam olaraq bildirildi"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; spam olaraq bildirildi"</item>
+  </plurals>
+  <plurals name="conversation_not_spam">
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; qeyri-spam olaraq bildirildi"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; qeyri-spam olaraq bildirildi"</item>
+  </plurals>
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; önəmsiz olaraq işarələndi"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; önəmsiz olaraq işarələndi"</item>
+  </plurals>
+  <plurals name="conversation_phished">
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; fişinq olaraq bildirildi"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; fişinq olaraq bildirildi"</item>
+  </plurals>
+  <plurals name="conversation_archived">
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arxivləndi"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arxivləndi"</item>
+  </plurals>
+  <plurals name="conversation_deleted">
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silindi"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; silindi"</item>
+  </plurals>
+    <string name="deleted" msgid="7378013910782008375">"Silindi"</string>
+    <string name="archived" msgid="6283673603512713022">"Arxivlənmiş"</string>
+    <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> qovluğundan silindi"</string>
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="7787126147584620603">"Qovluq dəyişildi"</item>
+    <item quantity="other" msgid="6307772984911017972">"Qovluq dəyişildi"</item>
+  </plurals>
+    <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> qovluğuna köçürülüb"</string>
+    <string name="search_results_header" msgid="1529438451150580188">"Nəticələr"</string>
+    <string name="search_unsupported" msgid="2873920566477359177">"Axtarış bu hesabda dəstəklənmir"</string>
+    <string name="search_suggestion_desc" msgid="4165491276003825492">"Təklif: <xliff:g id="SUGGESTION">%s</xliff:g>"</string>
+    <string name="add_label" msgid="3285338046038610902">"Qovluq əlavə edin"</string>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> yeni mesaj"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> yeni mesaj"</item>
+  </plurals>
+    <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
+    <string name="hide_details" msgid="8018801050702453314">"Detalları gizlət"</string>
+    <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> adlı alıcıya"</string>
+    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"nüsxəni gizli alan: "</string>
+    <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> üçün kontakt məlumatları göstər"</string>
+    <string name="contact_info_string_default" msgid="6204228921864816351">"Əlaqə məlumatlarını göstər"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="8094857552036574099">"<xliff:g id="COUNT">%1$d</xliff:g> köhnə mesajı genişləndir"</item>
+  </plurals>
+  <plurals name="super_collapsed_block_accessibility_announcement">
+    <item quantity="other" msgid="2016326586162784420">"<xliff:g id="COUNT">%1$d</xliff:g> köhnə mesaj genişləndi"</item>
+  </plurals>
+    <string name="from_heading" msgid="48290556829713090">"Kimdən:"</string>
+    <string name="replyto_heading" msgid="8275255318292059079">"Cavablayın:"</string>
+    <string name="to_heading" msgid="3495203282540398336">"Kimə: "</string>
+    <string name="to_heading_no_space" msgid="679167047628308670">"Kimə:"</string>
+    <string name="cc_heading" msgid="5603892257866345823">"Nüsxəni alan:"</string>
+    <string name="bcc_heading" msgid="1482186590756218269">"Nüsxəni gizli alan"</string>
+    <string name="date_heading" msgid="4213063948406397168">"Tarix:"</string>
+    <string name="show_images" msgid="436044894053204084">"Şəkilləri göstər"</string>
+    <string name="always_show_images" msgid="556087529413707819">"Həmişə bu göndəricidən şəkillər göstər"</string>
+    <string name="always_show_images_toast" msgid="3763157294047555051">"Bu göndəricidən olan şəkillər avtomatik göstəriləcək."</string>
+    <string name="address_display_format" msgid="2098008376913966177">"<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="8108294635074750048">"<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> vasitəsilə <xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
+    <string name="message_saved" msgid="3291655042310241793">"Mesaj qaralama şəklində saxlandı."</string>
+    <string name="sending_message" msgid="2487846954946637084">"Mesaj göndərilir ..."</string>
+    <string name="invalid_recipient" msgid="9157434699389936584">"<xliff:g id="WRONGEMAIL">%s</xliff:g> ünvanı etibarsızdır."</string>
+    <string name="show_elided" msgid="3456154624105704327">"Sitat gətirilmiş mətni göstər"</string>
+    <string name="hide_elided" msgid="5768235486834692733">"▼ Sitat gətirilmiş mətni gizlət"</string>
+    <string name="message_invite_title" msgid="5985161025144867256">"Təqvim dəvəti"</string>
+    <string name="message_invite_calendar_view" msgid="9181966650840809197">"Təqvimdə Baxın"</string>
+    <string name="message_invite_label_attending" msgid="4194264767870003397">"Gedirsiniz?"</string>
+    <string name="message_invite_accept" msgid="8002758842580134835">"Hə"</string>
+    <string name="message_invite_tentative" msgid="3199418731566655887">"Bəlkə"</string>
+    <string name="message_invite_decline" msgid="6331040872447290777">"Yox"</string>
+    <string name="enumeration_comma" msgid="2848850136844740850">", "</string>
+    <string name="send_anyway" msgid="2727576121007079643">"İstənilən halda göndər"</string>
+    <string name="ok" msgid="6178802457914802336">"OK"</string>
+    <string name="done" msgid="344354738335270292">"Tamam"</string>
+    <string name="cancel" msgid="4831678293149626190">"Ləğv et"</string>
+    <string name="clear" msgid="765949970989448022">"Təmizlə"</string>
+    <string name="next" msgid="2662478712866255138">"Növbəti"</string>
+    <string name="previous" msgid="8985379053279804274">"Öncəki"</string>
+  <string-array name="sync_status">
+    <item msgid="4600303222943450797">"Uğur"</item>
+    <item msgid="2835492307658712596">"Bağlantı yoxdur"</item>
+    <item msgid="5932644761344898987">"Daxil ola bilmədi"</item>
+    <item msgid="7335227237106118306">"Təhlükəsizlik xətası"</item>
+    <item msgid="8148525741623865182">"Sinxronlaşa bilmədi"</item>
+    <item msgid="8026148967150231130">"Daxili Xəta"</item>
+    <item msgid="5442620760791553027">"Server Xətası"</item>
+  </string-array>
+    <string name="tap_to_configure" msgid="137172348280050643">"Quraşdırmaq üçün toxunun"</string>
+    <string name="non_synced_folder_description" msgid="3044618511909304701">"Söhbətləri görmək üçün bu qovluğu sinxronlaşdırın."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Sinx Qovluğu"</string>
+    <string name="widget_large_unread_count" msgid="8699435859096455837">"%d+"</string>
+    <string name="large_unseen_count" msgid="3055042669246912518">"<xliff:g id="COUNT">%d</xliff:g>+ yeni"</string>
+    <string name="unseen_count" msgid="5509898665569695288">"<xliff:g id="COUNT">%d</xliff:g> yeni"</string>
+  <plurals name="actionbar_unread_messages">
+    <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> oxunmamış"</item>
+  </plurals>
+    <string name="view_more_conversations" msgid="8377920000247101901">"Daha çox söhbətə baxın"</string>
+    <string name="loading_conversation" msgid="7931600025861500397">"Yüklənir…"</string>
+    <string name="activity_mailbox_selection" msgid="7489813868539767701">"Hesab seçin"</string>
+    <string name="activity_folder_selection" msgid="8375243281001234750">"Qovluq seçin"</string>
+    <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-poçt qovluğu"</string>
+    <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Qovluqları dəyiş"</string>
+    <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Buraya daşıyın:"</string>
+    <string name="search_hint" msgid="7060626585689391003">"Axtar"</string>
+    <!-- no translation found for search_results_loaded (1784879343458807514) -->
+    <skip />
+    <string name="voice_search_not_supported" msgid="8493517060419469738">"Səs axtarışı bu cihazda dəstəklənmir."</string>
+    <string name="search_back_desc" msgid="8038224690392783652">"Axtarışı bağlayın"</string>
+    <string name="search_voice_desc" msgid="9103854398344077204">"Səs axtarışına başlayın"</string>
+    <string name="search_clear_desc" msgid="3044261775183044862">"Axtarış mətnini təmizləyin"</string>
+    <string name="network_error" msgid="5931164247644972255">"Bağlantı yoxdur"</string>
+    <string name="retry" msgid="916102442074217293">"Yenidən cəhd edin"</string>
+    <string name="load_more" msgid="8702691358453560575">"Daha çox yükləyin"</string>
+    <!-- no translation found for load_attachment (3894318473827290350) -->
+    <skip />
+    <string name="shortcut_name_title" msgid="1562534040126088628">"Qovluq qısayolunu adlandırın"</string>
+    <string name="wait_for_sync_title" msgid="4577632826912823075">"Sinx gözlənilir"</string>
+    <string name="not_synced_title" msgid="3600180500934086346">"Hesab sinxronlaşmayıb"</string>
+    <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"Bu hesab avtomatik sinxronlaşma üçün quraşdırlmayıb.\n"<b>"İndi Sinxronlaşdır"</b>" seçiminə toxunun ki, poçtu sinxronlaşdırasınız və ya  "<b>"Sinxronlaşma Ayarlarını Dəyişin"</b>" ki, bu hesabın avtomatik sinxronlaşmasını quraşdırasınız."</string>
+    <string name="manual_sync" msgid="2271479734895537848">"İndi sinxronlaşdırın"</string>
+    <string name="change_sync_settings" msgid="3615852118397055361">"Sinx ayarlarını dəyişin"</string>
+    <string name="photo_load_failed" msgid="577471721679146999">"Təsvir yüklənə bilmədi"</string>
+    <string name="cant_move_or_change_labels" msgid="4155490583610926755">"Seçim çox fəaliyyət içərdiyi üçün daşına bilməz."</string>
+    <string name="multiple_new_message_notification_item" msgid="1386588046275174918"><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="2170154732664242904">"<xliff:g id="SUBJECT">%1$s</xliff:g>\n<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
+    <string name="ignore_spam_warning" msgid="8760314545535838430">"İqnor et, bu mesaja inanıram"</string>
+    <string name="via_domain" msgid="537951148511529082">"<xliff:g id="VIADOMAIN">%1$s</xliff:g> vasitəsilə"</string>
+    <string name="signin" msgid="4699091478139791244">"Daxil olun"</string>
+    <string name="info" msgid="1357564480946178121">"İnfo"</string>
+    <string name="report" msgid="4318141326014579036">"Xəbər verin"</string>
+    <string name="show" msgid="2874876876336599985">"Göstərin"</string>
+    <string name="sync_error" msgid="1795794969006241678">"Sinx alınmadı."</string>
+    <string name="sync_error_message" msgid="4182644657243736635">"Cihazınız sinxronizasiya üçün yetərincə yaddaşa malik deyil."</string>
+    <string name="storage" msgid="4783683938444150638">"Yaddaş"</string>
+    <string name="senders_split_token" msgid="6549228851819460081">", "</string>
+    <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
+    <string name="all_folders_heading" msgid="9023770187629170967">"Bütün qovluqlar"</string>
+    <string name="recent_folders_heading" msgid="8943134955788867702">"Son qovluqlar"</string>
+    <string name="message_details_title" msgid="60771875776494764">"Mesaj detalları"</string>
+    <string name="preference_advance_to_title" msgid="6385669491239514630">"Avto-irəliləmə"</string>
+  <string-array name="prefEntries_autoAdvance">
+    <item msgid="1505450878799459652">"Yeni"</item>
+    <item msgid="8000986144872247139">"Köhnə"</item>
+    <item msgid="8015001161633421314">"Söhbət siyahısı"</item>
+  </string-array>
+  <string-array name="prefSummaries_autoAdvance">
+    <item msgid="8221665977497655719">"Silinəndən sonra yeni söhbəti göstər"</item>
+    <item msgid="1721869262893378141">"Silinəndən sonra köhnə söhbəti göstər"</item>
+    <item msgid="880913657385630195">"Silinəndən sonra söhbət siyahısı göstər"</item>
+  </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="5459235590885640678">"Buna doğru irəlilədin"</string>
+    <string name="clear_display_images_whitelist_title" msgid="2012677202404471778">"Şəkil təsdiqlərini təmizlə"</string>
+    <string name="clear_display_images_whitelist_dialog_title" msgid="1942692501166848471">"Şəkil təsdiqləri təmizlənsin?"</string>
+    <string name="clear_display_images_whitelist_dialog_message" msgid="3952553078559373729">"Daha əvvəldən icazə verilən göndərənlərdən sətiriçi şəkilləri göstərməyi dayandır."</string>
+    <string name="sender_whitelist_cleared" msgid="2490984995927904030">"Şəkillər avtomatik olaraq göstərilməyəcək."</string>
+    <string name="preferences_signature_title" msgid="2318034745474929902">"İmza"</string>
+    <string name="preferences_signature_dialog_title" msgid="4801741764511807064">"İmza"</string>
+    <string name="preferences_signature_summary_not_set" msgid="3776614319388053784">"Ayarlanmayıb"</string>
+    <string name="notification_action_reply" msgid="8378725460102575919">"Cavablayın"</string>
+    <string name="notification_action_reply_all" msgid="5693469099941000037">"Hamıya cavab"</string>
+    <string name="notification_action_archive" msgid="2884874164831039047">"Arxiv"</string>
+    <string name="notification_action_remove_label" msgid="3714785653186750981">"Etiketi silin"</string>
+    <string name="notification_action_delete" msgid="3201627482564624132">"Sil"</string>
+    <string name="notification_action_undo_archive" msgid="600186958134073582">"Arxivləşmiş"</string>
+    <string name="notification_action_undo_remove_label" msgid="8341924850540100690">"Etiket Yığışdırıldı"</string>
+    <string name="notification_action_undo_delete" msgid="6915612337413587103">"Silindi"</string>
+    <string name="veiled_address" msgid="2670378260196977266"></string>
+    <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
+    <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
+    <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> yeni mesaj"</item>
+    <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> yeni mesaj"</item>
+  </plurals>
+    <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="silent_ringtone" msgid="1570794756474381886">"Səssiz"</string>
+    <string name="preference_removal_action_title" msgid="3128186577060329884">"Defolt fəaliyyət"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="7381624742404593351">"Arxiv"</item>
+    <item msgid="2567465476369142505">"Sil"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="4080896545573973751">"Arxiv"</item>
+    <item msgid="6088164268501960435">"Sil"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Defolt fəaliyyət"</string>
+    <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Hamıya cavab"</string>
+    <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Mesaj cavabları üçün defolt olaraq istifadə edin"</string>
+    <string name="preference_swipe_title" msgid="2073613840893904205">"Vurma fəaliyyəti"</string>
+    <string name="preference_swipe_description" msgid="3036560323237015010">"Söhbət siyahısında"</string>
+    <string name="preference_sender_image_title" msgid="7890813537985591865">"Göndərici şəkli"</string>
+    <string name="preference_sender_image_description" msgid="3586817690132199889">"Söhbət siyahısı yanında ad göstərin"</string>
+    <string name="empty_trash" msgid="3385937024924728399">"Boş zibil yeşiyi"</string>
+    <string name="empty_spam" msgid="2911988289997281371">"Boş Spam qovluğu"</string>
+    <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Zibil Qutusu Boşaldılsın?"</string>
+    <string name="empty_spam_dialog_title" msgid="1130319045917820569">"Span Boşaldılsın?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj həmişəlik silinəcək."</item>
+    <item quantity="other" msgid="263840304486020101">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj həmişəlik silinəcək."</item>
+  </plurals>
+    <string name="drawer_open" msgid="2285557278907103851">"Naviqasiya siyirtməsini aç"</string>
+    <string name="drawer_close" msgid="2065829742127544297">"Naviqasiya siyirtməsini bağla"</string>
+    <string name="conversation_photo_welcome_text" msgid="836483155429003787">"O söhbəti seçmək üçün göndərici şəklinə toxunun."</string>
+    <string name="long_press_to_select_tip" msgid="1660881999120625177">"Bir söhbəti seçmək üçün toxunaraq barmağınızı saxlayın, sonra daha çoxunu seçmək üçün toxunun."</string>
+    <string name="folder_icon_desc" msgid="6272938864914794739">"Qovluq ikonası"</string>
+    <string name="add_account" msgid="5905863370226612377">"Hesab əlavə edin"</string>
+    <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"İpucunu qapadın"</string>
+    <string name="auto_sync_off" msgid="3691189864057581214">"Avto sinxronizasiya deaktivdir. Aktiv etmək üçün toxunun."</string>
+    <string name="account_sync_off" msgid="5720018952998097061">"Hesab sinxronizasiyası deaktivdir. Hesab ayarlarını &lt;a href=\'http://www.example.com\'&gt;daxilində aktivləşdirin.&lt;/a&gt;"</string>
+    <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> qovluğuna göndərilməmiş <xliff:g id="NUMBER">%1$s</xliff:g> mesaj"</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Avto-sinxronizasiya yandırılsın?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Sadəcə Gmail deyil, bütün tətbiqlər və hesablarda edəcəyiniz bütün dəyişikliklər veb,  <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> cihazınız və digər cihazlarınız arasında sinxronlaşdırılacaq."</string>
+    <string name="phone" msgid="4142617042507912053">"telefon"</string>
+    <string name="tablet" msgid="4593581125469224791">"planşet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Yandır"</string>
+    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> qovluğu göstər"</string>
+    <string name="hide_folders" msgid="7618891933409521283">"Qovluqları gizlət"</string>
+    <string name="print" msgid="7987949243936577207">"Çap"</string>
+    <string name="print_all" msgid="4011022762279519941">"Hamısını çap edin"</string>
+  <plurals name="num_messages">
+    <item quantity="one" msgid="8071234386915191851">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj"</item>
+    <item quantity="other" msgid="962415099931188360">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj"</item>
+  </plurals>
+    <string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> saat <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="draft_to_heading" msgid="7370121943946205024">"Qaralama:"</string>
+    <string name="draft_heading" msgid="7032951343184552800">"Qaralama"</string>
+    <string name="quoted_text_hidden_print" msgid="5256754205675159141">"Sitat gətirilmiş mətn gizlidir."</string>
+  <plurals name="num_attachments">
+    <item quantity="one" msgid="5494465717267988888">"<xliff:g id="COUNT">%1$d</xliff:g> qoşma"</item>
+    <item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> qoşma"</item>
+  </plurals>
+    <string name="no_subject" msgid="5622708348540036959">"(mövzu yoxdur)"</string>
+    <string name="vacation_responder" msgid="5570132559074523806">"Avtocavab"</string>
+    <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"Avtocavab"</string>
+    <string name="vacation_responder_body_hint_text" msgid="9087613123105158494">"Mesaj"</string>
+    <string name="send_to_contacts_text" msgid="124432913980620545">"Yalnız Kontaktlarıma göndər"</string>
+    <string name="send_to_domain_text" msgid="5064559546745918393">"Yalnız <xliff:g id="DOMAIN">%1$s</xliff:g> domeninə göndər"</string>
+    <string name="pick_start_date_title" msgid="2274665037355224165">"Başlayır"</string>
+    <string name="pick_end_date_title" msgid="733396083649496600">"Bitir (Seçimli)"</string>
+    <string name="date_not_set" msgid="3251555782945051904">"Ayarlanmamış"</string>
+    <string name="set_end_date_dialog_title" msgid="7543009262788808443">"Son tarix (seçimli)"</string>
+    <string name="custom_date" msgid="5794846334232367838">"Fərdi"</string>
+    <string name="date_none" msgid="1061426502665431412">"Heç biri"</string>
+    <string name="discard_changes" msgid="5699760550972324746">"Dəyişikliklər ləğv edilsin?"</string>
+    <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Avtocavabnın dəyişiklikləri saxlanıldı"</string>
+    <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"Avtocavabnın dəyişiklikləri ləğv edildi"</string>
+    <string name="vacation_responder_off" msgid="4429909341193366667">"Deaktiv"</string>
+    <string name="vacation_responder_on" msgid="4913238379320882449">"Aktiv, <xliff:g id="DATE">%1$s</xliff:g> tarixindən"</string>
+    <string name="vacation_responder_on_with_end_date" msgid="4360941815371475955">"Aktiv, <xliff:g id="START_DATE">%1$s</xliff:g> tarixindən  <xliff:g id="END_DATE">%2$s</xliff:g> qədər"</string>
+    <string name="vacation_responder_empty_subject_and_body_warning" msgid="6233629618520852439">"Mövzu və ya mesaj əlavə et"</string>
+    <string name="view_entire_message" msgid="823281796655014454">"Bütün mesajı göstər"</string>
+    <string name="eml_loader_error_toast" msgid="6577383216635400167">"Fayl açılmır"</string>
+    <string name="help_and_info" msgid="3708286489943154681">"Yardım"</string>
+    <string name="help_and_feedback" msgid="7211458338163287670">"Yardım və geri əlaqə"</string>
+    <string name="feedback" msgid="204247008751740034">"Cavab rəyi göndərin"</string>
+    <string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
+    <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g> versiya <xliff:g id="VERSION">%2$s</xliff:g>"</string>
+    <string name="view_app_page" msgid="3241990517052398927"></string>
+    <string name="print_dialog" msgid="8895536548487605661">"Çap et..."</string>
+    <string name="copyright_information" msgid="971422874488783312">"Müəlliflik məlumatı"</string>
+    <string name="privacy_policy" msgid="212094623396418302">"Məxfilik siyasəti"</string>
+    <string name="open_source_licenses" msgid="8643615555920977752">"Açıq mənbə lisenziyaları"</string>
+    <string name="reply_choice_yes" msgid="3327633032975373220">"Bəli"</string>
+    <string name="reply_choice_no" msgid="7068775605915475207">"Yox"</string>
+    <string name="reply_choice_ok" msgid="7881073621845053152">"Ok"</string>
+    <string name="reply_choice_hehe" msgid="6054314968043050748">"Heh"</string>
+    <string name="reply_choice_thanks" msgid="4978961954288364694">"Çox sağ olun"</string>
+    <string name="reply_choice_i_agree" msgid="2496652737796884298">"Razıyam"</string>
+    <string name="reply_choice_nice" msgid="4465894941302838676">"Yaxşıdır"</string>
+    <string name="reply_on_my_way" msgid="5645003971107444269">"Yolumda"</string>
+    <string name="reply_choice_later" msgid="4629219072859486413">"Oldu, Sizinlə sonra əlaqə saxlayacam"</string>
+    <string name="reply_choice_smiling_face" msgid="1772253938506548631">":)"</string>
+    <string name="reply_choice_frowning_face" msgid="6260338807944002651">":("</string>
+    <string name="preference_header_action_confirmations" msgid="3922674681156121948">"Fəaliyyət Təsdiqləmələri"</string>
+    <string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"Silmədən öncə təsdiqləyin"</string>
+    <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"Arxivləmədən öncə təsdiqləyin"</string>
+    <string name="preference_confirm_before_send_title" msgid="4136585783513077039">"Göndərmədən öncə təsdiqləyin"</string>
+    <string name="preferences_conversation_mode_title" msgid="389352009651720838">"Mesajları avtomatik uyğunlaşdır"</string>
+    <string name="preferences_conversation_mode_summary" msgid="5730999743867653106">"Mesajları ekrana uyğunlaşdırmaq üçün yığın"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7257824136988429629">"Mesaj fəaliyyətləri"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="43373293784193461">"Həmişə mesaj əməliyyatlarını ekranın yuxarısında göstər"</item>
+    <item msgid="1765271305989996747">"Yalnız portret rejiminə keçən zaman mesaj əməliyyatlarını ekranın yuxarısında göstər"</item>
+    <item msgid="6311113076575333488">"Mesaj başlığından kənarda mesaj əməliyyatlarını göstərmə"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="6906986566816683587">"Həmişə göstər"</item>
+    <item msgid="113299655708990672">"Yalnız portret rejimində göstər"</item>
+    <item msgid="4403750311175924065">"Göstərmə"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="5536216295725760357">"Axtarış tarixçəsini təmizləyin"</string>
+    <string name="search_history_cleared" msgid="1461946302763342640">"Axtarış tarixçəsi təmizləndi."</string>
+    <string name="clear_history_dialog_title" msgid="3503603389704365385">"Axtarış tarixçəsi təmizlənsin?"</string>
+    <string name="clear_history_dialog_message" msgid="5202922561632407778">"Əvvəllər yerinə yetirdiyiniz bütün axtarışlar silinəcək."</string>
+    <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Hesabları idarə edin"</string>
+    <string name="general_preferences_title" msgid="4212138728220418162">"Ümumi ayarlar"</string>
+    <string name="activity_preferences" msgid="8966077432517613292">"Ayarlar"</string>
+    <string name="overflow_description" msgid="7886090597023240426">"Daha çox seçim"</string>
+    <string name="security_hold_required_text" msgid="6619955920101834286">"<xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> üçün təhlükəsizlik yeniliyi tələb olunur"</string>
+    <string name="update_security_text" msgid="3527335757205741077">"indi yenilə"</string>
+    <string name="forms_are_disabled" msgid="2876312737118986789">"Formalar Gmail\'də deaktivləşdirilib"</string>
+</resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b4ca758..89fa320 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -251,7 +251,7 @@
     <string name="message_invite_decline" msgid="6331040872447290777">"Не."</string>
     <string name="enumeration_comma" msgid="2848850136844740850">", "</string>
     <string name="send_anyway" msgid="2727576121007079643">"Изпращ. въпреки това"</string>
-    <string name="ok" msgid="6178802457914802336">"Става"</string>
+    <string name="ok" msgid="6178802457914802336">"ОК"</string>
     <string name="done" msgid="344354738335270292">"Готово"</string>
     <string name="cancel" msgid="4831678293149626190">"Отказ"</string>
     <string name="clear" msgid="765949970989448022">"Изчистване"</string>
@@ -444,7 +444,7 @@
     <string name="open_source_licenses" msgid="8643615555920977752">"Лицензи за отворен код"</string>
     <string name="reply_choice_yes" msgid="3327633032975373220">"Да."</string>
     <string name="reply_choice_no" msgid="7068775605915475207">"Не."</string>
-    <string name="reply_choice_ok" msgid="7881073621845053152">"Става"</string>
+    <string name="reply_choice_ok" msgid="7881073621845053152">"ОК"</string>
     <string name="reply_choice_hehe" msgid="6054314968043050748">"Ха-ха"</string>
     <string name="reply_choice_thanks" msgid="4978961954288364694">"Благодаря"</string>
     <string name="reply_choice_i_agree" msgid="2496652737796884298">"Приемам"</string>

diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 42571d9..2e4e666 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml

@@ -19,7 +19,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="from" msgid="5159056500059912358">"প্রেরক"</string>
-    <string name="to" msgid="3971614275716830581">"প্রতি"</string>
+    <string name="to" msgid="3971614275716830581">"প্রাপক"</string>
     <string name="cc" msgid="8768828862207919684">"Cc"</string>
     <string name="bcc" msgid="519303553518479171">"Bcc"</string>
     <string name="subject_hint" msgid="2136470287303571827">"বিষয়"</string>
@@ -36,7 +36,7 @@
     <item msgid="2758162027982270607">"ফরোয়ার্ড"</item>
   </string-array>
     <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> এ, <xliff:g id="PERSON">%s</xliff:g> লিখেছেন:"</string>
-    <string name="forward_attribution" msgid="597850048345475752">"---------- ফরোয়ার্ড করা বার্তা ----------&lt;br&gt;থেকে: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;তারিখ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;বিষয়: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;প্রতি: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
+    <string name="forward_attribution" msgid="597850048345475752">"---------- ফরোয়ার্ড করা বার্তা ----------&lt;br&gt;থেকে: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;তারিখ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;বিষয়: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;প্রাপক: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ফরোয়ার্ড করা বার্তা ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="353236686616663062">"সংযুক্তির প্রকার চয়ন করুন"</string>
@@ -228,8 +228,8 @@
   </plurals>
     <string name="from_heading" msgid="48290556829713090">"প্রেরক:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"একে-উত্তর দিন:"</string>
-    <string name="to_heading" msgid="3495203282540398336">"প্রতি: "</string>
-    <string name="to_heading_no_space" msgid="679167047628308670">"প্রতি:"</string>
+    <string name="to_heading" msgid="3495203282540398336">"প্রাপক: "</string>
+    <string name="to_heading_no_space" msgid="679167047628308670">"প্রাপক:"</string>
     <string name="cc_heading" msgid="5603892257866345823">"Cc:"</string>
     <string name="bcc_heading" msgid="1482186590756218269">"Bcc:"</string>
     <string name="date_heading" msgid="4213063948406397168">"তারিখ:"</string>
@@ -404,7 +404,7 @@
     <item quantity="other" msgid="962415099931188360">"<xliff:g id="COUNT">%1$d</xliff:g>টি বার্তা"</item>
   </plurals>
     <string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> তারিখে <xliff:g id="TIME">%2$s</xliff:g> এ"</string>
-    <string name="draft_to_heading" msgid="7370121943946205024">"খসড়া প্রতি:"</string>
+    <string name="draft_to_heading" msgid="7370121943946205024">"খসড়া প্রাপক:"</string>
     <string name="draft_heading" msgid="7032951343184552800">"খসড়া"</string>
     <string name="quoted_text_hidden_print" msgid="5256754205675159141">"উদ্ধৃত পাঠ্য লুক্কায়িত"</string>
   <plurals name="num_attachments">

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d940de5..fe93704 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -245,7 +245,7 @@
     <string name="hide_elided" msgid="5768235486834692733">"▼ Amaga el text citat"</string>
     <string name="message_invite_title" msgid="5985161025144867256">"Invitació del calendari"</string>
     <string name="message_invite_calendar_view" msgid="9181966650840809197">"Mostra-ho al calendari"</string>
-    <string name="message_invite_label_attending" msgid="4194264767870003397">"Hi aniràs?"</string>
+    <string name="message_invite_label_attending" msgid="4194264767870003397">"Hi assistireu?"</string>
     <string name="message_invite_accept" msgid="8002758842580134835">"Sí"</string>
     <string name="message_invite_tentative" msgid="3199418731566655887">"Potser"</string>
     <string name="message_invite_decline" msgid="6331040872447290777">"No"</string>
@@ -297,7 +297,7 @@
     <string name="shortcut_name_title" msgid="1562534040126088628">"Tecla de drecera per posar nom a la carpeta"</string>
     <string name="wait_for_sync_title" msgid="4577632826912823075">"S\'està esperant per sincronitzar"</string>
     <string name="not_synced_title" msgid="3600180500934086346">"El compte no s\'ha sincronitzat"</string>
-    <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"Aquest compte no està configurat per sincronitzar automàticament.\nToca "<b>"Sincronitza ara"</b>" per sincronitzar el correu una vegada o bé "<b>"Canvia la configuració de sincronització"</b>" per configurar aquest compte per sincronitzar el correu de manera automàtica."</string>
+    <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"Aquest compte no està configurat per sincronitzar-se automàticament.\nToqueu "<b>"Sincronitza ara"</b>" per sincronitzar el correu una vegada o bé "<b>"Canvia config. sincronització"</b>" per configurar la sincronització automàtica del correu en aquest compte."</string>
     <string name="manual_sync" msgid="2271479734895537848">"Sincronitza ara"</string>
     <string name="change_sync_settings" msgid="3615852118397055361">"Canvia config. sincronització"</string>
     <string name="photo_load_failed" msgid="577471721679146999">"No s\'ha pogut carr. la imatge"</string>
@@ -386,7 +386,7 @@
     <string name="long_press_to_select_tip" msgid="1660881999120625177">"Mantén premuda una conversa per seleccionar-la i, a continuació, toca\'n més per seleccionar-les."</string>
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icona de la carpeta"</string>
     <string name="add_account" msgid="5905863370226612377">"Afegeix un compte"</string>
-    <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Omet el consell"</string>
+    <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ignora el consell"</string>
     <string name="auto_sync_off" msgid="3691189864057581214">"La sincronització automàtica està desactivada. Toqueu aquí per activar-la."</string>
     <string name="account_sync_off" msgid="5720018952998097061">"La sincronització del compte està desactivada. Activeu-la a &lt;a href=\'http://www.example.com\'&gt;Configuració del compte.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> missatges no enviats a <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
@@ -434,7 +434,7 @@
     <string name="eml_loader_error_toast" msgid="6577383216635400167">"No es pot obrir aquest fitxer."</string>
     <string name="help_and_info" msgid="3708286489943154681">"Ajuda"</string>
     <string name="help_and_feedback" msgid="7211458338163287670">"Ajuda i suggeriments"</string>
-    <string name="feedback" msgid="204247008751740034">"Envia comentaris"</string>
+    <string name="feedback" msgid="204247008751740034">"Envia suggeriments"</string>
     <string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
     <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g> versió <xliff:g id="VERSION">%2$s</xliff:g>"</string>
     <string name="view_app_page" msgid="3241990517052398927"></string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6089e99..34a2b6f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -388,7 +388,7 @@
     <string name="add_account" msgid="5905863370226612377">"Přidat účet"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Zavřít tip"</string>
     <string name="auto_sync_off" msgid="3691189864057581214">"Automatická synchronizace je vypnutá. Zapnete ji klepnutím."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Synchronizace účtu je vypnutá. Zapnout ji můžete v &lt;a href=\'http://www.example.com\'&gt;Nastaveních účtu.&lt;/a&gt;"</string>
+    <string name="account_sync_off" msgid="5720018952998097061">"Synchronizace účtů je vypnutá. Zapnout ji můžete v &lt;a href=\'http://www.example.com\'&gt;Nastaveních účtu.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"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="543412762396502297">"Zapnout automatickou synchronizaci?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"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>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8e805ec..273a3b1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -183,8 +183,8 @@
     <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som ikke spam"</item>
   </plurals>
   <plurals name="conversation_not_important">
-    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver markeret som ikke vigtig"</item>
-    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver markeret som ikke vigtig"</item>
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er markeret som uvigtig"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er markeret som uvigtig"</item>
   </plurals>
   <plurals name="conversation_phished">
     <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; bliver rapporteret som phishing"</item>
@@ -195,8 +195,8 @@
     <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; arkiveret"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; slettes"</item>
-    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; slettes"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er slettet"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er slettet"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Slettet"</string>
     <string name="archived" msgid="6283673603512713022">"Arkiveret"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b62b512..4916566 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -27,7 +27,7 @@
     <string name="add_file_attachment" msgid="2604880054248593993">"Datei anhängen"</string>
     <string name="add_photo_attachment" msgid="7163589794940909528">"Bild anhängen"</string>
     <string name="save_draft" msgid="2669523480789672118">"Entwurf speichern"</string>
-    <string name="discard" msgid="4905982179911608430">"Löschen"</string>
+    <string name="discard" msgid="4905982179911608430">"Verwerfen"</string>
     <string name="compose" msgid="2602861958391035523">"Schreiben"</string>
     <string name="compose_title" msgid="5673376086133995913">"Schreiben"</string>
   <string-array name="compose_modes">
@@ -65,7 +65,7 @@
     <string name="mark_not_spam" msgid="8617774236231366651">"Kein Spam"</string>
     <string name="report_phishing" msgid="8454666464488413739">"Phishing melden"</string>
     <string name="delete" msgid="6784262386780496958">"Löschen"</string>
-    <string name="discard_drafts" msgid="5881484193628472105">"Entwürfe löschen"</string>
+    <string name="discard_drafts" msgid="5881484193628472105">"Entwürfe verwerfen"</string>
     <string name="discard_failed" msgid="7520780769812210279">"Fehler beim Verwerfen"</string>
     <string name="refresh" msgid="1533748989749277511">"Aktualisieren"</string>
     <string name="reply" msgid="8337757482824207118">"Antworten"</string>
@@ -154,10 +154,10 @@
     <item quantity="other" msgid="2001972798185641108">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Konversationen archivieren?"</item>
   </plurals>
   <plurals name="confirm_discard_drafts_conversation">
-    <item quantity="one" msgid="2030421499893210789">"Nachricht löschen?"</item>
-    <item quantity="other" msgid="782234447471532005">"<xliff:g id="COUNT">%1$d</xliff:g> Nachrichten löschen?"</item>
+    <item quantity="one" msgid="2030421499893210789">"Nachricht verwerfen?"</item>
+    <item quantity="other" msgid="782234447471532005">"<xliff:g id="COUNT">%1$d</xliff:g> Nachrichten verwerfen?"</item>
   </plurals>
-    <string name="confirm_discard_text" msgid="5172680524418848519">"Nachricht löschen?"</string>
+    <string name="confirm_discard_text" msgid="5172680524418848519">"Nachricht verwerfen?"</string>
     <string name="loading_conversations" msgid="7255732786298655246">"Wird geladen…"</string>
     <string name="empty_inbox" msgid="5901734942362315228">"Der Posteingang ist leer."</string>
     <string name="empty_search" msgid="8564899353449880818">"Keine Ergebnisse für Ihre Suche nach \"<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\""</string>

diff --git a/res/values-en-rAU-sw600dp/strings.xml b/res/values-en-rAU-sw600dp/strings.xml
new file mode 100644
index 0000000..b0fd86e
--- /dev/null
+++ b/res/values-en-rAU-sw600dp/strings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2012 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="add_cc_label" msgid="5504248178750252553">"+ Cc/Bcc"</string>
+    <string name="add_bcc_label" msgid="2464329024392383408">"+ Bcc"</string>
+    <string name="menu_manage_folders" msgid="2575462565700103317">"Manage folders"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"Use as default for replies to message notifications"</string>
+</resources>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..53212c5
--- /dev/null
+++ b/res/values-en-rAU/strings.xml

@@ -0,0 +1,484 @@
+<?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="from" msgid="5159056500059912358">"From"</string>
+    <string name="to" msgid="3971614275716830581">"To"</string>
+    <string name="cc" msgid="8768828862207919684">"Cc"</string>
+    <string name="bcc" msgid="519303553518479171">"Bcc"</string>
+    <string name="subject_hint" msgid="2136470287303571827">"Subject"</string>
+    <string name="body_hint" msgid="6478994981747057817">"Compose email"</string>
+    <string name="add_file_attachment" msgid="2604880054248593993">"Attach file"</string>
+    <string name="add_photo_attachment" msgid="7163589794940909528">"Attach picture"</string>
+    <string name="save_draft" msgid="2669523480789672118">"Save draft"</string>
+    <string name="discard" msgid="4905982179911608430">"Discard"</string>
+    <string name="compose" msgid="2602861958391035523">"Compose"</string>
+    <string name="compose_title" msgid="5673376086133995913">"Compose"</string>
+  <string-array name="compose_modes">
+    <item msgid="9000553538766397816">"Reply"</item>
+    <item msgid="2767793214788399009">"Reply all"</item>
+    <item msgid="2758162027982270607">"Forward"</item>
+  </string-array>
+    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> wrote:"</string>
+    <string name="forward_attribution" msgid="597850048345475752">"---------- Forwarded message ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subject: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
+    <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Forwarded message ----------"</string>
+    <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
+    <string name="select_attachment_type" msgid="353236686616663062">"Choose type of attachment"</string>
+    <string name="too_large_to_attach_single" msgid="2669897137966512530">"Can\'t attach file over <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"One or more files not attached. Limit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_additional" msgid="4964155563465970480">"File not attached. <xliff:g id="MAXSIZE">%1$s</xliff:g> limit reached."</string>
+    <string name="generic_attachment_problem" msgid="4683974765387240723">"Unable to attach file."</string>
+    <string name="attachment_permission_denied" msgid="2274397783497640486">"Permission denied for the attachment."</string>
+    <string name="recipient_needed" msgid="319816879398937214">"Add at least one recipient."</string>
+    <string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"There\'s no text in the message subject."</string>
+    <string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"There\'s no text in the message body."</string>
+    <string name="confirm_send_message" msgid="6211518590166222735">"Send this message?"</string>
+    <string name="message_discarded" msgid="6792661321962262024">"Message discarded."</string>
+    <string name="signature" msgid="3172144541947408374">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
+    <string name="custom_from_account_label" msgid="5042317430007736322">"Send mail as:"</string>
+    <string name="send" msgid="4269810089682120826">"Send"</string>
+    <string name="mark_read" msgid="579388143288052493">"Mark read"</string>
+    <string name="mark_unread" msgid="6245060538061533191">"Mark unread"</string>
+    <string name="toggle_read_unread" msgid="1006469736520919028">"Toggle read/unread"</string>
+    <string name="mute" msgid="9164839998562321569">"Mute"</string>
+    <string name="add_star" msgid="3275117671153616270">"Add star"</string>
+    <string name="remove_star" msgid="9126690774161840733">"Remove star"</string>
+    <string name="remove_folder" msgid="2379905457788576297">"Remove from <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+    <string name="archive" msgid="5978663590021719939">"Archive"</string>
+    <string name="report_spam" msgid="4106897677959987340">"Report spam"</string>
+    <string name="mark_not_spam" msgid="8617774236231366651">"Report not spam"</string>
+    <string name="report_phishing" msgid="8454666464488413739">"Report phishing"</string>
+    <string name="delete" msgid="6784262386780496958">"Delete"</string>
+    <string name="discard_drafts" msgid="5881484193628472105">"Discard drafts"</string>
+    <string name="discard_failed" msgid="7520780769812210279">"Discard failed"</string>
+    <string name="refresh" msgid="1533748989749277511">"Refresh"</string>
+    <string name="reply" msgid="8337757482824207118">"Reply"</string>
+    <string name="reply_all" msgid="5366796103758360957">"Reply all"</string>
+    <string name="resume_draft" msgid="1272723181782570649">"Edit"</string>
+    <string name="forward" msgid="4397585145490426320">"Forward"</string>
+    <string name="menu_compose" msgid="4575025207594709432">"Compose"</string>
+    <string name="menu_change_folders" msgid="2194946192901276625">"Change folders"</string>
+    <string name="menu_move_to" msgid="7948877550284452830">"Move to"</string>
+    <string name="menu_move_to_inbox" msgid="258554178236001444">"Move to Inbox"</string>
+    <string name="menu_manage_folders" msgid="8486398523679534519">"Folder settings"</string>
+    <string name="menu_show_original" msgid="2330398228979616661">"Revert auto-sizing"</string>
+    <string name="menu_settings" msgid="7993485401501778040">"Settings"</string>
+    <string name="menu_search" msgid="1949652467806052768">"Search"</string>
+    <string name="menu_toggle_drawer" msgid="8653049392208282481">"Toggle drawer"</string>
+    <string name="drawer_title" msgid="3766219846644975778">"Navigation"</string>
+    <string name="mark_important" msgid="8781680450177768820">"Mark as important"</string>
+    <string name="mark_not_important" msgid="3342258155408116917">"Mark as not important"</string>
+    <string name="add_cc_label" msgid="2249679001141195213">"Add Cc/Bcc"</string>
+    <string name="add_bcc_label" msgid="963745641238037813">"Add Bcc"</string>
+    <string name="quoted_text" msgid="977782904293216533">"Include quoted text"</string>
+    <string name="quoted_text_label" msgid="2296807722849923934">"Quoted text"</string>
+    <string name="respond_inline" msgid="6609746292081928078">"Respond in-line"</string>
+    <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
+    <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> KB"</string>
+    <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>
+    <string name="attachment_image" msgid="6375306026208274564">"Image"</string>
+    <string name="attachment_video" msgid="7119476472603939848">"Video"</string>
+    <string name="attachment_audio" msgid="7097658089301809284">"Audio"</string>
+    <string name="attachment_text" msgid="3485853714965922173">"Text"</string>
+    <string name="attachment_application_msword" msgid="2110108876623152162">"Document"</string>
+    <string name="attachment_application_vnd_ms_powerpoint" msgid="425353008963359230">"Presentation"</string>
+    <string name="attachment_application_vnd_ms_excel" msgid="5585781311136609103">"Spreadsheet"</string>
+    <string name="attachment_application_pdf" msgid="4207340200944655970">"PDF"</string>
+    <string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> File"</string>
+    <string name="preview_attachment" msgid="6265457626086113833">"Preview"</string>
+    <string name="save_attachment" msgid="375685179032130033">"Save"</string>
+    <string name="download_again" msgid="8195787340878328119">"Download again"</string>
+    <string name="remove_attachment_desc" msgid="1478445871170879140">"Remove attachment <xliff:g id="ATTACHMENTNAME">%s</xliff:g>"</string>
+    <string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
+    <string name="no_application_found" msgid="7309485680354949680">"No app can open this attachment for viewing."</string>
+    <string name="fetching_attachment" msgid="2286628490159574159">"Fetching attachment"</string>
+    <string name="please_wait" msgid="3953824147776128899">"Please wait…"</string>
+    <string name="saved" msgid="161536102236967534">"Saved, <xliff:g id="SIZE">%s</xliff:g>"</string>
+    <string name="download_failed" msgid="3878373998269062395">"Couldn\'t download. Touch to retry."</string>
+    <string name="menu_photo_save_all" msgid="2742869476474613396">"Save all"</string>
+    <string name="menu_photo_share" msgid="6410980274832639330">"Share"</string>
+    <string name="menu_photo_share_all" msgid="3049053252719665320">"Share all"</string>
+    <string name="menu_photo_print" msgid="3084679038179342333">"Print"</string>
+    <string name="saving" msgid="6274238733828387433">"Saving…"</string>
+    <string name="choosertitle_sharevia" msgid="3539537264873337959">"Share via"</string>
+    <string name="contextmenu_openlink" msgid="6952228183947135362">"Open in Browser"</string>
+    <string name="contextmenu_copy" msgid="2584243784216385180">"Copy"</string>
+    <string name="contextmenu_copylink" msgid="8659897702269320063">"Copy link URL"</string>
+    <string name="contextmenu_view_image" msgid="1031172763893491000">"View image"</string>
+    <string name="contextmenu_dial_dot" msgid="8881095692316726628">"Dial…"</string>
+    <string name="contextmenu_sms_dot" msgid="5319737001771622657">"SMS…"</string>
+    <string name="contextmenu_add_contact" msgid="2310064151427072475">"Add contact"</string>
+    <string name="contextmenu_send_mail" msgid="3834654593200105396">"Send email"</string>
+    <string name="contextmenu_map" msgid="5118951927399465521">"Map"</string>
+    <string name="contextmenu_sharelink" msgid="8670940060477758709">"Share link"</string>
+    <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> on <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> at <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
+    <string name="content_description_with_folders" msgid="482368474097191879">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> on <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>, labels: <xliff:g id="FOLDERS">%7$s</xliff:g>"</string>
+    <string name="content_description_today_with_folders" msgid="860548626146933495">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> at <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>, labels: <xliff:g id="FOLDERS">%7$s</xliff:g>"</string>
+    <string name="read_string" msgid="5495929677508576520">"conversation read"</string>
+    <string name="unread_string" msgid="7342558841698083381">"conversation unread"</string>
+    <string name="filtered_tag" msgid="721666921386074505">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="badge_and_subject" msgid="3979372269373936750">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+  <plurals name="draft">
+    <item quantity="one" msgid="6717535677167943402">"Draft"</item>
+    <item quantity="other" msgid="1335781147509740039">"Drafts"</item>
+  </plurals>
+    <string name="sending" msgid="5600034886763930499">"Sending…"</string>
+    <string name="message_retrying" msgid="5335188121407261331">"Retrying…"</string>
+    <string name="message_failed" msgid="7887650587384601790">"Failed"</string>
+    <string name="send_failed" msgid="2186285547449865010">"Message wasn\'t sent."</string>
+    <string name="me_object_pronoun" msgid="4674452244417913816">"me"</string>
+    <string name="me_subject_pronoun" msgid="7479328865714008288">"me"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="7605755011865575440">"Delete this conversation?"</item>
+    <item quantity="other" msgid="1585660381208712562">"Delete these <xliff:g id="COUNT">%1$d</xliff:g> conversations?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="9105551557653306945">"Archive this conversation?"</item>
+    <item quantity="other" msgid="2001972798185641108">"Archive these <xliff:g id="COUNT">%1$d</xliff:g> conversations?"</item>
+  </plurals>
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="2030421499893210789">"Discard this message?"</item>
+    <item quantity="other" msgid="782234447471532005">"Discard these <xliff:g id="COUNT">%1$d</xliff:g> messages?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="5172680524418848519">"Discard this message?"</string>
+    <string name="loading_conversations" msgid="7255732786298655246">"Loading…"</string>
+    <string name="empty_inbox" msgid="5901734942362315228">"You\'ve finished! Enjoy your day."</string>
+    <string name="empty_search" msgid="8564899353449880818">"Whoops! We didn\'t find anything for \"<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\"."</string>
+    <string name="empty_spam_folder" msgid="3288985543286122800">"Hooray, no spam here!"</string>
+    <string name="empty_trash_folder" msgid="378119063015945020">"Nothing in here. Thanks for recycling!"</string>
+    <string name="empty_folder" msgid="3227552635613553855">"There is no mail here."</string>
+    <string name="getting_messages" msgid="8403333791332403244">"Getting your messages"</string>
+    <string name="undo" msgid="8256285267701059609">"Undo"</string>
+  <plurals name="conversation_unstarred">
+    <item quantity="one" msgid="1701235480675303125">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversation"</item>
+    <item quantity="other" msgid="1154441830432477256">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversations"</item>
+  </plurals>
+  <plurals name="conversation_muted">
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; muted"</item>
+  </plurals>
+  <plurals name="conversation_spammed">
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as spam"</item>
+  </plurals>
+  <plurals name="conversation_not_spam">
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as not spam"</item>
+  </plurals>
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked as not important"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked as not important"</item>
+  </plurals>
+  <plurals name="conversation_phished">
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; reported as phishing"</item>
+  </plurals>
+  <plurals name="conversation_archived">
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; archived"</item>
+  </plurals>
+  <plurals name="conversation_deleted">
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; deleted"</item>
+  </plurals>
+    <string name="deleted" msgid="7378013910782008375">"Deleted"</string>
+    <string name="archived" msgid="6283673603512713022">"Archived"</string>
+    <string name="folder_removed" msgid="5656281444688183676">"Removed from <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="7787126147584620603">"Changed folder"</item>
+    <item quantity="other" msgid="6307772984911017972">"Changed folders"</item>
+  </plurals>
+    <string name="conversation_folder_moved" msgid="6475872337373081683">"Moved to <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
+    <string name="search_results_header" msgid="1529438451150580188">"Results"</string>
+    <string name="search_unsupported" msgid="2873920566477359177">"Search is not supported on this account."</string>
+    <string name="search_suggestion_desc" msgid="4165491276003825492">"Suggestion: <xliff:g id="SUGGESTION">%s</xliff:g>"</string>
+    <string name="add_label" msgid="3285338046038610902">"Add folder"</string>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>
+  </plurals>
+    <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
+    <string name="hide_details" msgid="8018801050702453314">"Hide details"</string>
+    <string name="to_message_header" msgid="3954385178027011919">"to <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
+    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
+    <string name="contact_info_string" msgid="6484930184867405276">"Show contact information for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="contact_info_string_default" msgid="6204228921864816351">"Show contact information"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="8094857552036574099">"Expand <xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
+  </plurals>
+  <plurals name="super_collapsed_block_accessibility_announcement">
+    <item quantity="other" msgid="2016326586162784420">"Expanded <xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
+  </plurals>
+    <string name="from_heading" msgid="48290556829713090">"From:"</string>
+    <string name="replyto_heading" msgid="8275255318292059079">"Reply to:"</string>
+    <string name="to_heading" msgid="3495203282540398336">"To: "</string>
+    <string name="to_heading_no_space" msgid="679167047628308670">"To:"</string>
+    <string name="cc_heading" msgid="5603892257866345823">"Cc:"</string>
+    <string name="bcc_heading" msgid="1482186590756218269">"Bcc:"</string>
+    <string name="date_heading" msgid="4213063948406397168">"Date:"</string>
+    <string name="show_images" msgid="436044894053204084">"Show pictures"</string>
+    <string name="always_show_images" msgid="556087529413707819">"Always show pictures from this sender"</string>
+    <string name="always_show_images_toast" msgid="3763157294047555051">"Pictures from this sender will be shown automatically."</string>
+    <string name="address_display_format" msgid="2098008376913966177">"<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="8108294635074750048">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+    <string name="message_saved" msgid="3291655042310241793">"Message saved as draft."</string>
+    <string name="sending_message" msgid="2487846954946637084">"Sending message…"</string>
+    <string name="invalid_recipient" msgid="9157434699389936584">"The address <xliff:g id="WRONGEMAIL">%s</xliff:g> is invalid."</string>
+    <string name="show_elided" msgid="3456154624105704327">"Show quoted text"</string>
+    <string name="hide_elided" msgid="5768235486834692733">"▼ Hide quoted text"</string>
+    <string name="message_invite_title" msgid="5985161025144867256">"Calendar invite"</string>
+    <string name="message_invite_calendar_view" msgid="9181966650840809197">"View in Calendar"</string>
+    <string name="message_invite_label_attending" msgid="4194264767870003397">"Going?"</string>
+    <string name="message_invite_accept" msgid="8002758842580134835">"Yes"</string>
+    <string name="message_invite_tentative" msgid="3199418731566655887">"Maybe"</string>
+    <string name="message_invite_decline" msgid="6331040872447290777">"No"</string>
+    <string name="enumeration_comma" msgid="2848850136844740850">", "</string>
+    <string name="send_anyway" msgid="2727576121007079643">"Send anyway"</string>
+    <string name="ok" msgid="6178802457914802336">"OK"</string>
+    <string name="done" msgid="344354738335270292">"Done"</string>
+    <string name="cancel" msgid="4831678293149626190">"Cancel"</string>
+    <string name="clear" msgid="765949970989448022">"Clear"</string>
+    <string name="next" msgid="2662478712866255138">"Next"</string>
+    <string name="previous" msgid="8985379053279804274">"Previous"</string>
+  <string-array name="sync_status">
+    <item msgid="4600303222943450797">"Success"</item>
+    <item msgid="2835492307658712596">"No connection"</item>
+    <item msgid="5932644761344898987">"Couldn\'t sign in"</item>
+    <item msgid="7335227237106118306">"Security error"</item>
+    <item msgid="8148525741623865182">"Couldn\'t sync"</item>
+    <item msgid="8026148967150231130">"Internal Error"</item>
+    <item msgid="5442620760791553027">"Server Error"</item>
+  </string-array>
+    <string name="tap_to_configure" msgid="137172348280050643">"Touch to set up"</string>
+    <string name="non_synced_folder_description" msgid="3044618511909304701">"To view conversations, sync this folder."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Sync Folder"</string>
+    <string name="widget_large_unread_count" msgid="8699435859096455837">"%d+"</string>
+    <string name="large_unseen_count" msgid="3055042669246912518">"<xliff:g id="COUNT">%d</xliff:g>+ new"</string>
+    <string name="unseen_count" msgid="5509898665569695288">"<xliff:g id="COUNT">%d</xliff:g> new"</string>
+  <plurals name="actionbar_unread_messages">
+    <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> unread"</item>
+  </plurals>
+    <string name="view_more_conversations" msgid="8377920000247101901">"View more conversations"</string>
+    <string name="loading_conversation" msgid="7931600025861500397">"Loading…"</string>
+    <string name="activity_mailbox_selection" msgid="7489813868539767701">"Choose account"</string>
+    <string name="activity_folder_selection" msgid="8375243281001234750">"Choose folder"</string>
+    <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Email folder"</string>
+    <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Change folders"</string>
+    <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Move to"</string>
+    <string name="search_hint" msgid="7060626585689391003">"Search"</string>
+    <!-- no translation found for search_results_loaded (1784879343458807514) -->
+    <skip />
+    <string name="voice_search_not_supported" msgid="8493517060419469738">"Voice search is not supported on this device."</string>
+    <string name="search_back_desc" msgid="8038224690392783652">"Close search"</string>
+    <string name="search_voice_desc" msgid="9103854398344077204">"Start voice search"</string>
+    <string name="search_clear_desc" msgid="3044261775183044862">"Clear search text"</string>
+    <string name="network_error" msgid="5931164247644972255">"No connection"</string>
+    <string name="retry" msgid="916102442074217293">"Retry"</string>
+    <string name="load_more" msgid="8702691358453560575">"Load more"</string>
+    <!-- no translation found for load_attachment (3894318473827290350) -->
+    <skip />
+    <string name="shortcut_name_title" msgid="1562534040126088628">"Name folder shortcut"</string>
+    <string name="wait_for_sync_title" msgid="4577632826912823075">"Waiting for sync"</string>
+    <string name="not_synced_title" msgid="3600180500934086346">"Account not synced"</string>
+    <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"This account isn\'t set up to sync automatically.\nTouch "<b>"Sync Now"</b>" to sync mail once, or "<b>"Change Sync Settings"</b>" to set up this account to sync mail automatically."</string>
+    <string name="manual_sync" msgid="2271479734895537848">"Sync now"</string>
+    <string name="change_sync_settings" msgid="3615852118397055361">"Change sync settings"</string>
+    <string name="photo_load_failed" msgid="577471721679146999">"Couldn\'t load image"</string>
+    <string name="cant_move_or_change_labels" msgid="4155490583610926755">"Can\'t move because selection contains multiple accounts."</string>
+    <string name="multiple_new_message_notification_item" msgid="1386588046275174918"><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="2170154732664242904">"<xliff:g id="SUBJECT">%1$s</xliff:g>\n<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
+    <string name="ignore_spam_warning" msgid="8760314545535838430">"Ignore, I trust this message"</string>
+    <string name="via_domain" msgid="537951148511529082">"via <xliff:g id="VIADOMAIN">%1$s</xliff:g>"</string>
+    <string name="signin" msgid="4699091478139791244">"Sign-in"</string>
+    <string name="info" msgid="1357564480946178121">"Info"</string>
+    <string name="report" msgid="4318141326014579036">"Report"</string>
+    <string name="show" msgid="2874876876336599985">"Show"</string>
+    <string name="sync_error" msgid="1795794969006241678">"Couldn\'t sync."</string>
+    <string name="sync_error_message" msgid="4182644657243736635">"Your device doesn\'t have enough storage space to sync."</string>
+    <string name="storage" msgid="4783683938444150638">"Storage"</string>
+    <string name="senders_split_token" msgid="6549228851819460081">", "</string>
+    <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
+    <string name="all_folders_heading" msgid="9023770187629170967">"All folders"</string>
+    <string name="recent_folders_heading" msgid="8943134955788867702">"Recent folders"</string>
+    <string name="message_details_title" msgid="60771875776494764">"Message details"</string>
+    <string name="preference_advance_to_title" msgid="6385669491239514630">"Auto-advance"</string>
+  <string-array name="prefEntries_autoAdvance">
+    <item msgid="1505450878799459652">"Newer"</item>
+    <item msgid="8000986144872247139">"Older"</item>
+    <item msgid="8015001161633421314">"Conversation list"</item>
+  </string-array>
+  <string-array name="prefSummaries_autoAdvance">
+    <item msgid="8221665977497655719">"Show newer conversation after you delete"</item>
+    <item msgid="1721869262893378141">"Show older conversation after you delete"</item>
+    <item msgid="880913657385630195">"Show conversation list after you delete"</item>
+  </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="5459235590885640678">"Advance to"</string>
+    <string name="clear_display_images_whitelist_title" msgid="2012677202404471778">"Clear picture approvals"</string>
+    <string name="clear_display_images_whitelist_dialog_title" msgid="1942692501166848471">"Clear picture approvals?"</string>
+    <string name="clear_display_images_whitelist_dialog_message" msgid="3952553078559373729">"Stop displaying inline images from senders that you previously allowed."</string>
+    <string name="sender_whitelist_cleared" msgid="2490984995927904030">"Pictures won\'t be shown automatically."</string>
+    <string name="preferences_signature_title" msgid="2318034745474929902">"Signature"</string>
+    <string name="preferences_signature_dialog_title" msgid="4801741764511807064">"Signature"</string>
+    <string name="preferences_signature_summary_not_set" msgid="3776614319388053784">"Not set"</string>
+    <string name="notification_action_reply" msgid="8378725460102575919">"Reply"</string>
+    <string name="notification_action_reply_all" msgid="5693469099941000037">"Reply all"</string>
+    <string name="notification_action_archive" msgid="2884874164831039047">"Archive"</string>
+    <string name="notification_action_remove_label" msgid="3714785653186750981">"Remove label"</string>
+    <string name="notification_action_delete" msgid="3201627482564624132">"Delete"</string>
+    <string name="notification_action_undo_archive" msgid="600186958134073582">"Archived"</string>
+    <string name="notification_action_undo_remove_label" msgid="8341924850540100690">"Label Removed"</string>
+    <string name="notification_action_undo_delete" msgid="6915612337413587103">"Deleted"</string>
+    <string name="veiled_address" msgid="2670378260196977266"></string>
+    <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
+    <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
+    <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
+    <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>
+  </plurals>
+    <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="silent_ringtone" msgid="1570794756474381886">"Silent"</string>
+    <string name="preference_removal_action_title" msgid="3128186577060329884">"Default action"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="7381624742404593351">"Archive"</item>
+    <item msgid="2567465476369142505">"Delete"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="4080896545573973751">"Archive"</item>
+    <item msgid="6088164268501960435">"Delete"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Default action"</string>
+    <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Reply all"</string>
+    <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Use as default for message replies"</string>
+    <string name="preference_swipe_title" msgid="2073613840893904205">"Swipe actions"</string>
+    <string name="preference_swipe_description" msgid="3036560323237015010">"In conversation list"</string>
+    <string name="preference_sender_image_title" msgid="7890813537985591865">"Sender image"</string>
+    <string name="preference_sender_image_description" msgid="3586817690132199889">"Show beside name in conversation list"</string>
+    <string name="empty_trash" msgid="3385937024924728399">"Empty Bin"</string>
+    <string name="empty_spam" msgid="2911988289997281371">"Empty Spam"</string>
+    <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Empty Bin?"</string>
+    <string name="empty_spam_dialog_title" msgid="1130319045917820569">"Empty Spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> message will be permanently deleted."</item>
+    <item quantity="other" msgid="263840304486020101">"<xliff:g id="COUNT">%1$d</xliff:g> messages will be permanently deleted."</item>
+  </plurals>
+    <string name="drawer_open" msgid="2285557278907103851">"Open navigation drawer"</string>
+    <string name="drawer_close" msgid="2065829742127544297">"Close navigation drawer"</string>
+    <string name="conversation_photo_welcome_text" msgid="836483155429003787">"Touch a sender image to select that conversation."</string>
+    <string name="long_press_to_select_tip" msgid="1660881999120625177">"Touch &amp; hold to select one conversation, then touch to select more."</string>
+    <string name="folder_icon_desc" msgid="6272938864914794739">"Folder icon"</string>
+    <string name="add_account" msgid="5905863370226612377">"Add account"</string>
+    <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Dismiss tip"</string>
+    <string name="auto_sync_off" msgid="3691189864057581214">"Auto-sync is off. Touch to turn on."</string>
+    <string name="account_sync_off" msgid="5720018952998097061">"Account sync is off. Turn it on in &lt;a href=\'http://www.example.com\'&gt;Account settings.&lt;/a&gt;"</string>
+    <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<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="543412762396502297">"Turn auto-sync on?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"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="4142617042507912053">"phone"</string>
+    <string name="tablet" msgid="4593581125469224791">"tablet"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Turn on"</string>
+    <string name="show_n_more_folders" msgid="1005879825500056552">"Show <xliff:g id="NUMBER">%1$s</xliff:g> folders"</string>
+    <string name="hide_folders" msgid="7618891933409521283">"Hide folders"</string>
+    <string name="print" msgid="7987949243936577207">"Print"</string>
+    <string name="print_all" msgid="4011022762279519941">"Print all"</string>
+  <plurals name="num_messages">
+    <item quantity="one" msgid="8071234386915191851">"<xliff:g id="COUNT">%1$d</xliff:g> message"</item>
+    <item quantity="other" msgid="962415099931188360">"<xliff:g id="COUNT">%1$d</xliff:g> messages"</item>
+  </plurals>
+    <string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
+    <string name="draft_to_heading" msgid="7370121943946205024">"Draft To:"</string>
+    <string name="draft_heading" msgid="7032951343184552800">"Draft"</string>
+    <string name="quoted_text_hidden_print" msgid="5256754205675159141">"Quoted text hidden"</string>
+  <plurals name="num_attachments">
+    <item quantity="one" msgid="5494465717267988888">"<xliff:g id="COUNT">%1$d</xliff:g> attachment"</item>
+    <item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> attachments"</item>
+  </plurals>
+    <string name="no_subject" msgid="5622708348540036959">"(no subject)"</string>
+    <string name="vacation_responder" msgid="5570132559074523806">"Vacation responder"</string>
+    <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"Vacation responder"</string>
+    <string name="vacation_responder_body_hint_text" msgid="9087613123105158494">"Message"</string>
+    <string name="send_to_contacts_text" msgid="124432913980620545">"Send only to my Contacts"</string>
+    <string name="send_to_domain_text" msgid="5064559546745918393">"Send only to <xliff:g id="DOMAIN">%1$s</xliff:g>"</string>
+    <string name="pick_start_date_title" msgid="2274665037355224165">"Starts"</string>
+    <string name="pick_end_date_title" msgid="733396083649496600">"Ends (Optional)"</string>
+    <string name="date_not_set" msgid="3251555782945051904">"Not set"</string>
+    <string name="set_end_date_dialog_title" msgid="7543009262788808443">"End date (optional)"</string>
+    <string name="custom_date" msgid="5794846334232367838">"Customise"</string>
+    <string name="date_none" msgid="1061426502665431412">"None"</string>
+    <string name="discard_changes" msgid="5699760550972324746">"Discard changes?"</string>
+    <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Vacation responder changes saved"</string>
+    <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"Vacation responder changes discarded"</string>
+    <string name="vacation_responder_off" msgid="4429909341193366667">"Off"</string>
+    <string name="vacation_responder_on" msgid="4913238379320882449">"On, from <xliff:g id="DATE">%1$s</xliff:g>"</string>
+    <string name="vacation_responder_on_with_end_date" msgid="4360941815371475955">"On, from <xliff:g id="START_DATE">%1$s</xliff:g> to <xliff:g id="END_DATE">%2$s</xliff:g>"</string>
+    <string name="vacation_responder_empty_subject_and_body_warning" msgid="6233629618520852439">"Add a subject or message"</string>
+    <string name="view_entire_message" msgid="823281796655014454">"View entire message"</string>
+    <string name="eml_loader_error_toast" msgid="6577383216635400167">"Can\'t open this file"</string>
+    <string name="help_and_info" msgid="3708286489943154681">"Help"</string>
+    <string name="help_and_feedback" msgid="7211458338163287670">"Help &amp; feedback"</string>
+    <string name="feedback" msgid="204247008751740034">"Send feedback"</string>
+    <string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
+    <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g> version <xliff:g id="VERSION">%2$s</xliff:g>"</string>
+    <string name="view_app_page" msgid="3241990517052398927"></string>
+    <string name="print_dialog" msgid="8895536548487605661">"Print…"</string>
+    <string name="copyright_information" msgid="971422874488783312">"Copyright information"</string>
+    <string name="privacy_policy" msgid="212094623396418302">"Privacy policy"</string>
+    <string name="open_source_licenses" msgid="8643615555920977752">"Open source licences"</string>
+    <string name="reply_choice_yes" msgid="3327633032975373220">"Yes"</string>
+    <string name="reply_choice_no" msgid="7068775605915475207">"No"</string>
+    <string name="reply_choice_ok" msgid="7881073621845053152">"OK"</string>
+    <string name="reply_choice_hehe" msgid="6054314968043050748">"Hehe"</string>
+    <string name="reply_choice_thanks" msgid="4978961954288364694">"Thanks"</string>
+    <string name="reply_choice_i_agree" msgid="2496652737796884298">"I agree"</string>
+    <string name="reply_choice_nice" msgid="4465894941302838676">"Nice"</string>
+    <string name="reply_on_my_way" msgid="5645003971107444269">"On my way"</string>
+    <string name="reply_choice_later" msgid="4629219072859486413">"OK, let me get back to you"</string>
+    <string name="reply_choice_smiling_face" msgid="1772253938506548631">":)"</string>
+    <string name="reply_choice_frowning_face" msgid="6260338807944002651">":("</string>
+    <string name="preference_header_action_confirmations" msgid="3922674681156121948">"Action Confirmations"</string>
+    <string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"Confirm before deleting"</string>
+    <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"Confirm before archiving"</string>
+    <string name="preference_confirm_before_send_title" msgid="4136585783513077039">"Confirm before sending"</string>
+    <string name="preferences_conversation_mode_title" msgid="389352009651720838">"Auto-fit messages"</string>
+    <string name="preferences_conversation_mode_summary" msgid="5730999743867653106">"Shrink messages to fit the screen"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7257824136988429629">"Message actions"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="43373293784193461">"Always show message actions at the top of the screen"</item>
+    <item msgid="1765271305989996747">"Only show message actions at the top of the screen when rotated to portrait"</item>
+    <item msgid="6311113076575333488">"Don\'t show message actions outside the message header"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="6906986566816683587">"Always show"</item>
+    <item msgid="113299655708990672">"Only show in portrait"</item>
+    <item msgid="4403750311175924065">"Don\'t show"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="5536216295725760357">"Clear search history"</string>
+    <string name="search_history_cleared" msgid="1461946302763342640">"Search history cleared."</string>
+    <string name="clear_history_dialog_title" msgid="3503603389704365385">"Clear search history?"</string>
+    <string name="clear_history_dialog_message" msgid="5202922561632407778">"All the searches that you\'ve previously performed will be removed."</string>
+    <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Manage Accounts"</string>
+    <string name="general_preferences_title" msgid="4212138728220418162">"General settings"</string>
+    <string name="activity_preferences" msgid="8966077432517613292">"Settings"</string>
+    <string name="overflow_description" msgid="7886090597023240426">"More options"</string>
+    <string name="security_hold_required_text" msgid="6619955920101834286">"Security update required for <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="update_security_text" msgid="3527335757205741077">"update now"</string>
+    <string name="forms_are_disabled" msgid="2876312737118986789">"Forms are disabled in Gmail"</string>
+</resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f046252..53212c5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -372,9 +372,9 @@
     <string name="preference_swipe_description" msgid="3036560323237015010">"In conversation list"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Sender image"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Show beside name in conversation list"</string>
-    <string name="empty_trash" msgid="3385937024924728399">"Empty Trash"</string>
+    <string name="empty_trash" msgid="3385937024924728399">"Empty Bin"</string>
     <string name="empty_spam" msgid="2911988289997281371">"Empty Spam"</string>
-    <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Empty Trash?"</string>
+    <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Empty Bin?"</string>
     <string name="empty_spam_dialog_title" msgid="1130319045917820569">"Empty Spam?"</string>
   <plurals name="empty_folder_dialog_message">
     <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> message will be permanently deleted."</item>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f046252..53212c5 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -372,9 +372,9 @@
     <string name="preference_swipe_description" msgid="3036560323237015010">"In conversation list"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Sender image"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Show beside name in conversation list"</string>
-    <string name="empty_trash" msgid="3385937024924728399">"Empty Trash"</string>
+    <string name="empty_trash" msgid="3385937024924728399">"Empty Bin"</string>
     <string name="empty_spam" msgid="2911988289997281371">"Empty Spam"</string>
-    <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Empty Trash?"</string>
+    <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Empty Bin?"</string>
     <string name="empty_spam_dialog_title" msgid="1130319045917820569">"Empty Spam?"</string>
   <plurals name="empty_folder_dialog_message">
     <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> message will be permanently deleted."</item>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8ef5d75..5dc8d0d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -143,8 +143,8 @@
     <string name="message_retrying" msgid="5335188121407261331">"Reintentando..."</string>
     <string name="message_failed" msgid="7887650587384601790">"Error"</string>
     <string name="send_failed" msgid="2186285547449865010">"No se ha enviado el mensaje."</string>
-    <string name="me_object_pronoun" msgid="4674452244417913816">"mí"</string>
-    <string name="me_subject_pronoun" msgid="7479328865714008288">"mí"</string>
+    <string name="me_object_pronoun" msgid="4674452244417913816">"yo"</string>
+    <string name="me_subject_pronoun" msgid="7479328865714008288">"yo"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="7605755011865575440">"¿Eliminar esta conversación?"</item>
     <item quantity="other" msgid="1585660381208712562">"¿Eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>

diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 42e5099..8253072 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml

@@ -373,9 +373,9 @@
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Igorlearen irudia"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Erakutsi izenaren ondoan elkarrizketen zerrendan"</string>
     <string name="empty_trash" msgid="3385937024924728399">"Hustu zaborrontzia"</string>
-    <string name="empty_spam" msgid="2911988289997281371">"Hustu Spam karpeta"</string>
+    <string name="empty_spam" msgid="2911988289997281371">"Hustu Spama karpeta"</string>
     <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Zaborrontzia hustu nahi duzu?"</string>
-    <string name="empty_spam_dialog_title" msgid="1130319045917820569">"Spam karpeta hustu nahi duzu?"</string>
+    <string name="empty_spam_dialog_title" msgid="1130319045917820569">"Spama karpeta hustu nahi duzu?"</string>
   <plurals name="empty_folder_dialog_message">
     <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> mezu betiko ezabatuko da."</item>
     <item quantity="other" msgid="263840304486020101">"<xliff:g id="COUNT">%1$d</xliff:g> mezu betiko ezabatuko dira."</item>

diff --git a/res/values-fa-sw600dp/strings.xml b/res/values-fa-sw600dp/strings.xml
index 5647aca..cd19372 100644
--- a/res/values-fa-sw600dp/strings.xml
+++ b/res/values-fa-sw600dp/strings.xml

@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="5504248178750252553">"+ گیرندهٔ کپی/گیرنده مخفی"</string>
     <string name="add_bcc_label" msgid="2464329024392383408">"+ گیرنده مخفی"</string>
     <string name="menu_manage_folders" msgid="2575462565700103317">"مدیریت پوشه‌ها"</string>
-    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"به عنوان پیش‌فرض برای پاسخ به اعلان‌های پیام استفاده شود"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"به عنوان پیش‌فرض برای پاسخ به اعلان پیام استفاده شود"</string>
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6fec545..1798726 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -55,7 +55,7 @@
     <string name="send" msgid="4269810089682120826">"ارسال"</string>
     <string name="mark_read" msgid="579388143288052493">"علامت‌گذاری به‌عنوان خوانده‌شده"</string>
     <string name="mark_unread" msgid="6245060538061533191">"علامت‌گذاری به‌عنوان خوانده‌نشده"</string>
-    <string name="toggle_read_unread" msgid="1006469736520919028">"جابجا شدن بین حالت «خوانده شده» و «خوانده نشده»"</string>
+    <string name="toggle_read_unread" msgid="1006469736520919028">"جابه‌جایی بین خوانده شده و خوانده نشده"</string>
     <string name="mute" msgid="9164839998562321569">"نادیده گرفتن"</string>
     <string name="add_star" msgid="3275117671153616270">"افزودن ستاره"</string>
     <string name="remove_star" msgid="9126690774161840733">"حذف ستاره"</string>
@@ -80,7 +80,7 @@
     <string name="menu_show_original" msgid="2330398228979616661">"برگرداندن اندازه خودکار"</string>
     <string name="menu_settings" msgid="7993485401501778040">"تنظیمات"</string>
     <string name="menu_search" msgid="1949652467806052768">"جستجو"</string>
-    <string name="menu_toggle_drawer" msgid="8653049392208282481">"جابجا کردن کشو"</string>
+    <string name="menu_toggle_drawer" msgid="8653049392208282481">"نمایان/پنهان کردن کشو"</string>
     <string name="drawer_title" msgid="3766219846644975778">"پیمایش"</string>
     <string name="mark_important" msgid="8781680450177768820">"علامت‌گذاری به‌عنوان مهم"</string>
     <string name="mark_not_important" msgid="3342258155408116917">"علامت‌گذاری به‌عنوان غیرمهم"</string>
@@ -224,7 +224,7 @@
     <item quantity="other" msgid="8094857552036574099">"باز کردن <xliff:g id="COUNT">%1$d</xliff:g> پیام قدیمی‌تر"</item>
   </plurals>
   <plurals name="super_collapsed_block_accessibility_announcement">
-    <item quantity="other" msgid="2016326586162784420">"<xliff:g id="COUNT">%1$d</xliff:g> پیام قدیمی‌تر بازشده"</item>
+    <item quantity="other" msgid="2016326586162784420">"<xliff:g id="COUNT">%1$d</xliff:g> پیام قدیمی‌تر باز شد"</item>
   </plurals>
     <string name="from_heading" msgid="48290556829713090">"از:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"پاسخ به:"</string>
@@ -312,7 +312,7 @@
     <string name="show" msgid="2874876876336599985">"نمایش پیام‌های جدید"</string>
     <string name="sync_error" msgid="1795794969006241678">"همگام‌سازی نشد."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"دستگاه شما فضای ذخیره کافی برای همگام‌سازی ندارد."</string>
-    <string name="storage" msgid="4783683938444150638">"محل ذخیره"</string>
+    <string name="storage" msgid="4783683938444150638">"ذخیره‌سازی"</string>
     <string name="senders_split_token" msgid="6549228851819460081">"، "</string>
     <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="9023770187629170967">"همه پوشه‌ها"</string>
@@ -367,7 +367,7 @@
   </string-array>
     <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"اقدام پیش‌فرض"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"پاسخ به همه"</string>
-    <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"به‌ عنوان پیش‌فرض برای پاسخ‌ به پیام‌ها استفاده شود"</string>
+    <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"به‌ عنوان پیش‌فرض برای پاسخ‌ پیام استفاده شود"</string>
     <string name="preference_swipe_title" msgid="2073613840893904205">"اقداماتی با کشیدن سریع انگشت"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"در لیست مکالمه"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"تصویر فرستنده"</string>
@@ -462,7 +462,7 @@
     <string name="preferences_disable_snap_headers_title" msgid="7257824136988429629">"عملکردهای پیام"</string>
   <string-array name="prefSummaries_snapHeader">
     <item msgid="43373293784193461">"عملکردهای پیام همیشه در بالای صفحه نشان داده شود"</item>
-    <item msgid="1765271305989996747">"عملکردهای پیام فقط وقتی در بالای صفحه نشان داده شود که به حالت پرتره چرخانده می‌شود"</item>
+    <item msgid="1765271305989996747">"عملکردهای پیام فقط وقتی در بالای صفحه نشان داده شود که به حالت عمودی چرخانده می‌شود"</item>
     <item msgid="6311113076575333488">"عملکردهای پیام خارج از سرصفحه پیام نشان داده نشود"</item>
   </string-array>
   <string-array name="prefEntries_snapHeader">

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8c345e3..9bc07f3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -312,7 +312,7 @@
     <string name="show" msgid="2874876876336599985">"Näytä"</string>
     <string name="sync_error" msgid="1795794969006241678">"Synkronointi epäonnistui."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Laitteessa ei ole tarpeeksi tallennustilaa synkronointiin."</string>
-    <string name="storage" msgid="4783683938444150638">"Tallentaminen"</string>
+    <string name="storage" msgid="4783683938444150638">"Tallennustila"</string>
     <string name="senders_split_token" msgid="6549228851819460081">", "</string>
     <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="9023770187629170967">"Kaikki kansiot"</string>
@@ -393,7 +393,7 @@
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Otetaanko automaattinen synkronointi käyttöön?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"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="4142617042507912053">"puhelin"</string>
-    <string name="tablet" msgid="4593581125469224791">"tablet-laite"</string>
+    <string name="tablet" msgid="4593581125469224791">"tabletti"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Ota käyttöön"</string>
     <string name="show_n_more_folders" msgid="1005879825500056552">"Näytä <xliff:g id="NUMBER">%1$s</xliff:g> kansiota"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Piilota kansiot"</string>

diff --git a/res/values-gu-rIN-sw600dp/strings.xml b/res/values-gu-rIN-sw600dp/strings.xml
new file mode 100644
index 0000000..6725ef1
--- /dev/null
+++ b/res/values-gu-rIN-sw600dp/strings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2012 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="add_cc_label" msgid="5504248178750252553">"+ Cc/Bcc"</string>
+    <string name="add_bcc_label" msgid="2464329024392383408">"+ Bcc"</string>
+    <string name="menu_manage_folders" msgid="2575462565700103317">"ફોલ્ડર્સનું સંચાલન કરો"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"સંદેશ સૂચનાઓના જવાબો આપવા માટે ડિફોલ્ટ તરીકે ઉપયોગ કરો"</string>
+</resources>

diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..fa5a2cc
--- /dev/null
+++ b/res/values-gu-rIN/strings.xml

@@ -0,0 +1,484 @@
+<?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="from" msgid="5159056500059912358">"પ્રેષક"</string>
+    <string name="to" msgid="3971614275716830581">"પ્રતિ"</string>
+    <string name="cc" msgid="8768828862207919684">"Cc"</string>
+    <string name="bcc" msgid="519303553518479171">"Bcc"</string>
+    <string name="subject_hint" msgid="2136470287303571827">"વિષય"</string>
+    <string name="body_hint" msgid="6478994981747057817">"ઇમેઇલ કંપોઝ કરો"</string>
+    <string name="add_file_attachment" msgid="2604880054248593993">"ફાઇલ જોડો"</string>
+    <string name="add_photo_attachment" msgid="7163589794940909528">"ચિત્ર જોડો"</string>
+    <string name="save_draft" msgid="2669523480789672118">"ડ્રાફ્ટ સાચવો"</string>
+    <string name="discard" msgid="4905982179911608430">"છોડી દો"</string>
+    <string name="compose" msgid="2602861958391035523">"કમ્પોઝ કરો"</string>
+    <string name="compose_title" msgid="5673376086133995913">"કમ્પોઝ કરો"</string>
+  <string-array name="compose_modes">
+    <item msgid="9000553538766397816">"જવાબ આપો"</item>
+    <item msgid="2767793214788399009">"બધાને જવાબ આપો"</item>
+    <item msgid="2758162027982270607">"ફોરવર્ડ કરો"</item>
+  </string-array>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> ના રોજ, <xliff:g id="PERSON">%s</xliff:g> એ લખ્યું:"</string>
+    <string name="forward_attribution" msgid="597850048345475752">"---------- ફોરવર્ડ કરેલો સંદેશ ----------&lt;br&gt;પ્રેષક: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;તારીખ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;વિષય: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;પ્રતિ: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
+    <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ફોરવર્ડ કરેલ સંદેશ ----------"</string>
+    <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
+    <string name="select_attachment_type" msgid="353236686616663062">"જોડાણનો પ્રકાર પસંદ કરો"</string>
+    <string name="too_large_to_attach_single" msgid="2669897137966512530">"<xliff:g id="MAXSIZE">%1$s</xliff:g> થી વધુની ફાઇલ જોડી શકતા નથી."</string>
+    <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"એક અથવા વધુ ફાઇલો જોડાઈ નથી. મર્યાદા <xliff:g id="MAXSIZE">%1$s</xliff:g> ."</string>
+    <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ફાઇલ જોડાયેલ નથી. <xliff:g id="MAXSIZE">%1$s</xliff:g> ની મર્યાદા સુધી પહોંચ્યા."</string>
+    <string name="generic_attachment_problem" msgid="4683974765387240723">"ફાઇલ જોડી શક્યાં નથી."</string>
+    <string name="attachment_permission_denied" msgid="2274397783497640486">"જોડાણ માટે પરવાનગી નકારી."</string>
+    <string name="recipient_needed" msgid="319816879398937214">"ઓછામાં ઓછો એક પ્રાપ્તકર્તા ઉમેરો."</string>
+    <string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"સંદેશના વિષયમાં કોઇ ટેક્સ્ટ નથી."</string>
+    <string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"સંદેશના મુખ્ય ભાગમાં કોઇ ટેક્સ્ટ નથી."</string>
+    <string name="confirm_send_message" msgid="6211518590166222735">"આ સંદેશ મોકલીએ?"</string>
+    <string name="message_discarded" msgid="6792661321962262024">"સંદેશ નિકાળ્યો."</string>
+    <string name="signature" msgid="3172144541947408374">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
+    <string name="custom_from_account_label" msgid="5042317430007736322">"તરીકે મેઇલ મોકલો:"</string>
+    <string name="send" msgid="4269810089682120826">"મોકલો"</string>
+    <string name="mark_read" msgid="579388143288052493">"વાંચેલાં તરીકે ચિહ્નિત કરો"</string>
+    <string name="mark_unread" msgid="6245060538061533191">"ન વાંચેલા તરીકે ચિહ્નિત કરો"</string>
+    <string name="toggle_read_unread" msgid="1006469736520919028">"વાંચેલાં વાંચ્યા વગરનાને ટોગલ કરો"</string>
+    <string name="mute" msgid="9164839998562321569">"મ્યૂટ કરો"</string>
+    <string name="add_star" msgid="3275117671153616270">"સ્ટાર ઉમેરો"</string>
+    <string name="remove_star" msgid="9126690774161840733">"સ્ટાર દૂર કરો"</string>
+    <string name="remove_folder" msgid="2379905457788576297">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> માંથી દૂર કરો"</string>
+    <string name="archive" msgid="5978663590021719939">"આર્કાઇવ"</string>
+    <string name="report_spam" msgid="4106897677959987340">"સ્પામ તરીકે જાણ કરો"</string>
+    <string name="mark_not_spam" msgid="8617774236231366651">"સ્પામ નથી તરીકે જાણ કરો"</string>
+    <string name="report_phishing" msgid="8454666464488413739">"ફિશિંગની જાણ કરો"</string>
+    <string name="delete" msgid="6784262386780496958">"કાઢી નાખો"</string>
+    <string name="discard_drafts" msgid="5881484193628472105">"ડ્રાફ્ટ્સ કાઢી નાખો"</string>
+    <string name="discard_failed" msgid="7520780769812210279">"નિકાળવું નિષ્ફળ થયું"</string>
+    <string name="refresh" msgid="1533748989749277511">"તાજું કરો"</string>
+    <string name="reply" msgid="8337757482824207118">"જવાબ આપો"</string>
+    <string name="reply_all" msgid="5366796103758360957">"બધાને જવાબ આપો"</string>
+    <string name="resume_draft" msgid="1272723181782570649">"સંપાદિત કરો"</string>
+    <string name="forward" msgid="4397585145490426320">"ફોરવર્ડ કરો"</string>
+    <string name="menu_compose" msgid="4575025207594709432">"કમ્પોઝ કરો"</string>
+    <string name="menu_change_folders" msgid="2194946192901276625">"ફોલ્ડર્સ બદલાવો"</string>
+    <string name="menu_move_to" msgid="7948877550284452830">"આમાં ખસેડો"</string>
+    <string name="menu_move_to_inbox" msgid="258554178236001444">"ઇન્બોક્સમાં ખસેડો"</string>
+    <string name="menu_manage_folders" msgid="8486398523679534519">"ફોલ્ડર સેટિંગ્સ"</string>
+    <string name="menu_show_original" msgid="2330398228979616661">"સ્વતઃ-કદ બદલવા પર પાછું ફેરવો"</string>
+    <string name="menu_settings" msgid="7993485401501778040">"સેટિંગ્સ"</string>
+    <string name="menu_search" msgid="1949652467806052768">"શોધ"</string>
+    <string name="menu_toggle_drawer" msgid="8653049392208282481">"ડ્રોઅરને ટોગલ કરો"</string>
+    <string name="drawer_title" msgid="3766219846644975778">"નેવિગેશન"</string>
+    <string name="mark_important" msgid="8781680450177768820">"મહત્વપૂર્ણ તરીકે ચિહ્નિત કરો"</string>
+    <string name="mark_not_important" msgid="3342258155408116917">"મહત્વપૂર્ણ નથી તરીકે ચિહ્નિત કરો"</string>
+    <string name="add_cc_label" msgid="2249679001141195213">"Cc/Bcc ઉમેરો"</string>
+    <string name="add_bcc_label" msgid="963745641238037813">"Bcc ઉમેરો"</string>
+    <string name="quoted_text" msgid="977782904293216533">"ક્વોટ કરેલા પાઠ્યનો સમાવેશ કરો"</string>
+    <string name="quoted_text_label" msgid="2296807722849923934">"ટેક્સ્ટ ક્વોટ કરો"</string>
+    <string name="respond_inline" msgid="6609746292081928078">"ઇનલાઇન પ્રતિસાદ આપો"</string>
+    <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
+    <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> KB"</string>
+    <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>
+    <string name="attachment_image" msgid="6375306026208274564">"છબી"</string>
+    <string name="attachment_video" msgid="7119476472603939848">"વિડિઓ"</string>
+    <string name="attachment_audio" msgid="7097658089301809284">"ઑડિઓ"</string>
+    <string name="attachment_text" msgid="3485853714965922173">"ટેક્સ્ટ"</string>
+    <string name="attachment_application_msword" msgid="2110108876623152162">"દસ્તાવેજ"</string>
+    <string name="attachment_application_vnd_ms_powerpoint" msgid="425353008963359230">"પ્રસ્તુતિ"</string>
+    <string name="attachment_application_vnd_ms_excel" msgid="5585781311136609103">"સ્પ્રેડશીટ"</string>
+    <string name="attachment_application_pdf" msgid="4207340200944655970">"PDF"</string>
+    <string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ફાઇલ"</string>
+    <string name="preview_attachment" msgid="6265457626086113833">"પૂર્વાવલોકન કરો"</string>
+    <string name="save_attachment" msgid="375685179032130033">"સાચવો"</string>
+    <string name="download_again" msgid="8195787340878328119">"ફરીથી ડાઉનલોડ કરો"</string>
+    <string name="remove_attachment_desc" msgid="1478445871170879140">"જોડાણ દૂર કરો <xliff:g id="ATTACHMENTNAME">%s</xliff:g>"</string>
+    <string name="more_info_attachment" msgid="2899691682394864507">"માહિતી"</string>
+    <string name="no_application_found" msgid="7309485680354949680">"આ જોડાણને જોવા માટે કોઇ એપ્લિકેશન ખોલી શકતી નથી."</string>
+    <string name="fetching_attachment" msgid="2286628490159574159">"જોડાણ આનયન કરી રહ્યાં છે"</string>
+    <string name="please_wait" msgid="3953824147776128899">"કૃપા કરીને રાહ જુઓ..."</string>
+    <string name="saved" msgid="161536102236967534">"સાચવેલ, <xliff:g id="SIZE">%s</xliff:g>"</string>
+    <string name="download_failed" msgid="3878373998269062395">"ડાઉનલોડ કરી શકાઈ નથી. ફરી પ્રયાસ કરવા ટચ કરો."</string>
+    <string name="menu_photo_save_all" msgid="2742869476474613396">"બધા સાચવો"</string>
+    <string name="menu_photo_share" msgid="6410980274832639330">"શેર કરો"</string>
+    <string name="menu_photo_share_all" msgid="3049053252719665320">"બધા શેર કરો"</string>
+    <string name="menu_photo_print" msgid="3084679038179342333">"છાપો"</string>
+    <string name="saving" msgid="6274238733828387433">"સાચવી રહ્યું છે..."</string>
+    <string name="choosertitle_sharevia" msgid="3539537264873337959">"આના દ્વારા શેર કરો"</string>
+    <string name="contextmenu_openlink" msgid="6952228183947135362">"બ્રાઉઝરમાં ખોલો"</string>
+    <string name="contextmenu_copy" msgid="2584243784216385180">"કૉપિ કરો"</string>
+    <string name="contextmenu_copylink" msgid="8659897702269320063">"લિંક URL કૉપિ કરો"</string>
+    <string name="contextmenu_view_image" msgid="1031172763893491000">"છબી જુઓ"</string>
+    <string name="contextmenu_dial_dot" msgid="8881095692316726628">"ડાયલ કરો..."</string>
+    <string name="contextmenu_sms_dot" msgid="5319737001771622657">"SMS…"</string>
+    <string name="contextmenu_add_contact" msgid="2310064151427072475">"સંપર્ક ઉમેરો"</string>
+    <string name="contextmenu_send_mail" msgid="3834654593200105396">"ઇમેઇલ મોકલો"</string>
+    <string name="contextmenu_map" msgid="5118951927399465521">"નકશો"</string>
+    <string name="contextmenu_sharelink" msgid="8670940060477758709">"લિંક શેર કરો"</string>
+    <string name="content_description" msgid="854320355052962069">"<xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g> ના રોજ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> વિશે <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g> વાગ્યે <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>  વિશે <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>"</string>
+    <string name="content_description_with_folders" msgid="482368474097191879">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g> વિશે, <xliff:g id="DATE">%5$s</xliff:g> ના રોજ <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>, લેબલ્સ: <xliff:g id="FOLDERS">%7$s</xliff:g>"</string>
+    <string name="content_description_today_with_folders" msgid="860548626146933495">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g> વિશે, <xliff:g id="TIME">%5$s</xliff:g> વાગ્યે <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>, લેબલ્સ: <xliff:g id="FOLDERS">%7$s</xliff:g>"</string>
+    <string name="read_string" msgid="5495929677508576520">"વાર્તાલાપ વાંચેલ"</string>
+    <string name="unread_string" msgid="7342558841698083381">"વાંચ્યા વગરનો વાર્તાલાપ"</string>
+    <string name="filtered_tag" msgid="721666921386074505">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="badge_and_subject" msgid="3979372269373936750">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+  <plurals name="draft">
+    <item quantity="one" msgid="6717535677167943402">"ડ્રાફ્ટ"</item>
+    <item quantity="other" msgid="1335781147509740039">"ડ્રાફ્ટ્સ"</item>
+  </plurals>
+    <string name="sending" msgid="5600034886763930499">"મોકલી રહ્યાં છે…"</string>
+    <string name="message_retrying" msgid="5335188121407261331">"ફરી પ્રયાસ કરી રહ્યાં છે..."</string>
+    <string name="message_failed" msgid="7887650587384601790">"નિષ્ફળ થયું"</string>
+    <string name="send_failed" msgid="2186285547449865010">"સંદેશ મોકલવામાં આવ્યો ન હતો."</string>
+    <string name="me_object_pronoun" msgid="4674452244417913816">"મારા દ્વારા"</string>
+    <string name="me_subject_pronoun" msgid="7479328865714008288">"મારા દ્વારા"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="7605755011865575440">"આ વાર્તાલાપ કાઢી નાખીએ?"</item>
+    <item quantity="other" msgid="1585660381208712562">"આ <xliff:g id="COUNT">%1$d</xliff:g> વાર્તાલાપ કાઢી નાખીએ?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="9105551557653306945">"આ વાર્તાલાપ આર્કાઇવ કરીએ?"</item>
+    <item quantity="other" msgid="2001972798185641108">"આ <xliff:g id="COUNT">%1$d</xliff:g> વાર્તાલાપ આર્કાઇવ કરીએ?"</item>
+  </plurals>
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="2030421499893210789">"આ સંદેશ નિકાળીએ?"</item>
+    <item quantity="other" msgid="782234447471532005">"આ <xliff:g id="COUNT">%1$d</xliff:g> સંદેશા નિકાળીએ?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="5172680524418848519">"આ સંદેશ નિકાળીએ?"</string>
+    <string name="loading_conversations" msgid="7255732786298655246">"લોડિંગ…"</string>
+    <string name="empty_inbox" msgid="5901734942362315228">"તમે બધું પૂર્ણ કરી લીધું! કૃપા કરીને તમારા દિવસનો આનંદ માણો."</string>
+    <string name="empty_search" msgid="8564899353449880818">"ઓહ! અમને \"<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\" માટે કંઇપણ મળ્યું નથી."</string>
+    <string name="empty_spam_folder" msgid="3288985543286122800">"હુર્રે, અહીં કોઇ સ્પામ નથી!"</string>
+    <string name="empty_trash_folder" msgid="378119063015945020">"અહીં કોઈ ટ્રેશ નથી. રીસાયક્લિંગ માટે આભાર!"</string>
+    <string name="empty_folder" msgid="3227552635613553855">"અહીં કોઈ મેઇલ નથી."</string>
+    <string name="getting_messages" msgid="8403333791332403244">"તમારા સંદેશા મેળવી રહ્યાં છે"</string>
+    <string name="undo" msgid="8256285267701059609">"પૂર્વવત્ કરો"</string>
+  <plurals name="conversation_unstarred">
+    <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> વાર્તાલાપનું તારાંકન રદ કરી રહ્યાં છે"</item>
+    <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> વાર્તાલાપનું તારાંકન રદ કરી રહ્યાં છે"</item>
+  </plurals>
+  <plurals name="conversation_muted">
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ને મ્યૂટ કર્યાં"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ને મ્યૂટ કર્યાં"</item>
+  </plurals>
+  <plurals name="conversation_spammed">
+    <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ની સ્પામ તરીકે જાણ કરી"</item>
+    <item quantity="other" msgid="664292592683692920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ની સ્પામ તરીકે જાણ કરી"</item>
+  </plurals>
+  <plurals name="conversation_not_spam">
+    <item quantity="one" msgid="3680479171846552641">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ની સ્પામ નથી તરીકે જાણ કરી"</item>
+    <item quantity="other" msgid="6351739502184556635">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ની સ્પામ નથી તરીકે જાણ કરી"</item>
+  </plurals>
+  <plurals name="conversation_not_important">
+    <item quantity="one" msgid="7432667428974709669">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ને મહત્વના નથી તરીકે ચિહ્નિત કર્યાં"</item>
+    <item quantity="other" msgid="4823331037057239763">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ને મહત્વના નથી તરીકે ચિહ્નિત કર્યાં"</item>
+  </plurals>
+  <plurals name="conversation_phished">
+    <item quantity="one" msgid="3511804715065046338">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ની ફિશિંગ તરીકે જાણ કરી"</item>
+    <item quantity="other" msgid="8400382886585779414">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ની ફિશિંગ તરીકે જાણ કરી"</item>
+  </plurals>
+  <plurals name="conversation_archived">
+    <item quantity="one" msgid="4859172326053399351">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; આર્કાઇવ કર્યાં"</item>
+    <item quantity="other" msgid="8520761617935818623">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; આર્કાઇવ કર્યાં"</item>
+  </plurals>
+  <plurals name="conversation_deleted">
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; કાઢી નાખ્યા"</item>
+    <item quantity="other" msgid="6287534453625638257">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; કાઢી નાખ્યા"</item>
+  </plurals>
+    <string name="deleted" msgid="7378013910782008375">"કાઢી નાખ્યું"</string>
+    <string name="archived" msgid="6283673603512713022">"આર્કાઇવ કરેલા"</string>
+    <string name="folder_removed" msgid="5656281444688183676">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> માંથી દૂર કર્યું"</string>
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="7787126147584620603">"બદલાયેલ ફોલ્ડર"</item>
+    <item quantity="other" msgid="6307772984911017972">"બદલાયેલ ફોલ્ડર્સ"</item>
+  </plurals>
+    <string name="conversation_folder_moved" msgid="6475872337373081683">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> માં ખસેડ્યા"</string>
+    <string name="search_results_header" msgid="1529438451150580188">"પરિણામો"</string>
+    <string name="search_unsupported" msgid="2873920566477359177">"શોધ આ એકાઉન્ટ પર સમર્થિત નથી."</string>
+    <string name="search_suggestion_desc" msgid="4165491276003825492">"સૂચન: <xliff:g id="SUGGESTION">%s</xliff:g>"</string>
+    <string name="add_label" msgid="3285338046038610902">"ફોલ્ડર ઉમેરો"</string>
+  <plurals name="new_incoming_messages">
+    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> નવો સંદેશ"</item>
+    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> નવા સંદેશા"</item>
+  </plurals>
+    <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;વિગતો જુઓ&lt;/a&gt;"</string>
+    <string name="hide_details" msgid="8018801050702453314">"વિગતો છુપાવો"</string>
+    <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> ને"</string>
+    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
+    <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> માટે સંપર્ક માહિતી દર્શાવો"</string>
+    <string name="contact_info_string_default" msgid="6204228921864816351">"સંપર્ક માહિતી દર્શાવો"</string>
+  <plurals name="show_messages_read">
+    <item quantity="other" msgid="8094857552036574099">"<xliff:g id="COUNT">%1$d</xliff:g> જૂના સંદેશા વિસ્તૃત કરો"</item>
+  </plurals>
+  <plurals name="super_collapsed_block_accessibility_announcement">
+    <item quantity="other" msgid="2016326586162784420">"<xliff:g id="COUNT">%1$d</xliff:g> જૂના સંદેશા વિસ્તૃત કર્યા"</item>
+  </plurals>
+    <string name="from_heading" msgid="48290556829713090">"પ્રેષક:"</string>
+    <string name="replyto_heading" msgid="8275255318292059079">"આને જવાબ આપો:"</string>
+    <string name="to_heading" msgid="3495203282540398336">"આમાં: "</string>
+    <string name="to_heading_no_space" msgid="679167047628308670">"આમાં:"</string>
+    <string name="cc_heading" msgid="5603892257866345823">"Cc:"</string>
+    <string name="bcc_heading" msgid="1482186590756218269">"Bcc:"</string>
+    <string name="date_heading" msgid="4213063948406397168">"તારીખ:"</string>
+    <string name="show_images" msgid="436044894053204084">"ફોટા બતાવો"</string>
+    <string name="always_show_images" msgid="556087529413707819">"આ પ્રેષક તરફથી ચિત્રો હંમેશા દર્શાવો"</string>
+    <string name="always_show_images_toast" msgid="3763157294047555051">"આ મોકલનાર તરફથી ચિત્રો આપમેળે દર્શાવવામાં આવશે."</string>
+    <string name="address_display_format" msgid="2098008376913966177">"<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="8108294635074750048">"<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> મારફતે <xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
+    <string name="message_saved" msgid="3291655042310241793">"સંદેશ ડ્રાફ્ટ તરીકે સાચવ્યો."</string>
+    <string name="sending_message" msgid="2487846954946637084">"સંદેશ મોકલી રહ્યાં છે…"</string>
+    <string name="invalid_recipient" msgid="9157434699389936584">"<xliff:g id="WRONGEMAIL">%s</xliff:g> સરનામું અમાન્ય છે."</string>
+    <string name="show_elided" msgid="3456154624105704327">"અવતરવાળો ટેક્સ્ટ બતાવો"</string>
+    <string name="hide_elided" msgid="5768235486834692733">"▼ ક્વોટ કરેલી ટેક્સ્ટ છુપાવો"</string>
+    <string name="message_invite_title" msgid="5985161025144867256">"કેલેન્ડર આમંત્રણ"</string>
+    <string name="message_invite_calendar_view" msgid="9181966650840809197">"કેલેન્ડરમાં જુઓ"</string>
+    <string name="message_invite_label_attending" msgid="4194264767870003397">"જવું છે?"</string>
+    <string name="message_invite_accept" msgid="8002758842580134835">"હા"</string>
+    <string name="message_invite_tentative" msgid="3199418731566655887">"કદાચ"</string>
+    <string name="message_invite_decline" msgid="6331040872447290777">"નહીં"</string>
+    <string name="enumeration_comma" msgid="2848850136844740850">", "</string>
+    <string name="send_anyway" msgid="2727576121007079643">"કોઈપણ રીતે મોકલો"</string>
+    <string name="ok" msgid="6178802457914802336">"ઑકે"</string>
+    <string name="done" msgid="344354738335270292">"થઈ ગયું"</string>
+    <string name="cancel" msgid="4831678293149626190">"રદ કરો"</string>
+    <string name="clear" msgid="765949970989448022">"સાફ કરો"</string>
+    <string name="next" msgid="2662478712866255138">"આગલું"</string>
+    <string name="previous" msgid="8985379053279804274">"પહેલાનું"</string>
+  <string-array name="sync_status">
+    <item msgid="4600303222943450797">"સફળતા"</item>
+    <item msgid="2835492307658712596">"કોઈ કનેક્શન નથી"</item>
+    <item msgid="5932644761344898987">"સાઇન ઇન કરી શક્યાં નથી"</item>
+    <item msgid="7335227237106118306">"સુરક્ષા ભૂલ"</item>
+    <item msgid="8148525741623865182">"સમન્વયિત કરી શક્યાં નથી"</item>
+    <item msgid="8026148967150231130">"આંતરિક ભૂલ"</item>
+    <item msgid="5442620760791553027">"સર્વર ભૂલ"</item>
+  </string-array>
+    <string name="tap_to_configure" msgid="137172348280050643">"સેટ કરવા માટે ટચ કરો"</string>
+    <string name="non_synced_folder_description" msgid="3044618511909304701">"વાર્તાલાપ જોવા માટે, આ ફોલ્ડર સમન્વયિત કરો."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"ફોલ્ડર સમન્વયિત કરો"</string>
+    <string name="widget_large_unread_count" msgid="8699435859096455837">"%d+"</string>
+    <string name="large_unseen_count" msgid="3055042669246912518">"<xliff:g id="COUNT">%d</xliff:g>+ નવા"</string>
+    <string name="unseen_count" msgid="5509898665569695288">"<xliff:g id="COUNT">%d</xliff:g> નવા"</string>
+  <plurals name="actionbar_unread_messages">
+    <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g> વાંચ્યા વગરના"</item>
+  </plurals>
+    <string name="view_more_conversations" msgid="8377920000247101901">"વધુ વાર્તાલાપ જુઓ"</string>
+    <string name="loading_conversation" msgid="7931600025861500397">"લોડિંગ…"</string>
+    <string name="activity_mailbox_selection" msgid="7489813868539767701">"એકાઉન્ટ પસંદ કરો"</string>
+    <string name="activity_folder_selection" msgid="8375243281001234750">"ફોલ્ડર પસંદ કરો"</string>
+    <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ઇમેઇલ ફોલ્ડર"</string>
+    <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ફોલ્ડર્સ બદલાવો"</string>
+    <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"આમાં ખસેડો"</string>
+    <string name="search_hint" msgid="7060626585689391003">"શોધ"</string>
+    <!-- no translation found for search_results_loaded (1784879343458807514) -->
+    <skip />
+    <string name="voice_search_not_supported" msgid="8493517060419469738">"આ ઉપકરણ પર વૉઇસ શોધ સમર્થિત નથી."</string>
+    <string name="search_back_desc" msgid="8038224690392783652">"શોધ બંધ કરો"</string>
+    <string name="search_voice_desc" msgid="9103854398344077204">"વૉઇસ શોધ શરૂ કરો"</string>
+    <string name="search_clear_desc" msgid="3044261775183044862">"શોધ ટેક્સ્ટ સાફ કરો"</string>
+    <string name="network_error" msgid="5931164247644972255">"કોઈ કનેક્શન નથી"</string>
+    <string name="retry" msgid="916102442074217293">"ફરી પ્રયાસ કરો"</string>
+    <string name="load_more" msgid="8702691358453560575">"વધુ લોડ કરો..."</string>
+    <!-- no translation found for load_attachment (3894318473827290350) -->
+    <skip />
+    <string name="shortcut_name_title" msgid="1562534040126088628">"ફોલ્ડર શૉર્ટકટને નામ આપો"</string>
+    <string name="wait_for_sync_title" msgid="4577632826912823075">"સમન્વયન માટે રાહ જુએ છે"</string>
+    <string name="not_synced_title" msgid="3600180500934086346">"એકાઉન્ટ સમન્વયિત કરેલ નથી"</string>
+    <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"આ એકાઉન્ટ આપમેળે સમન્વયિત થવા માટે સેટ થયેલું નથી.\nએકવાર મેઇલને સમન્વયિત કરવા માટે "<b>"હમણાં સમન્વયિત કરો"</b>" ટચ કરો અથવા આ એકાઉન્ટને આપમેળે મેઇલ સમન્વયિત કરવા માટે સેટ કરવા "<b>"સમન્વયન સેટિંગ્સ બદલાવો"</b>"."</string>
+    <string name="manual_sync" msgid="2271479734895537848">"હવે સહકાલિક કરો"</string>
+    <string name="change_sync_settings" msgid="3615852118397055361">"સમન્વયન સેટિંગ્સ બદલાવો"</string>
+    <string name="photo_load_failed" msgid="577471721679146999">"છબી લોડ કરી શકાઈ નથી"</string>
+    <string name="cant_move_or_change_labels" msgid="4155490583610926755">"પસંદગીમાં બહુવિધ એકાન્ટ્સ શામેલ હોવાને કારણે ખસેડી શકતા નથી."</string>
+    <string name="multiple_new_message_notification_item" msgid="1386588046275174918"><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="2170154732664242904">"<xliff:g id="SUBJECT">%1$s</xliff:g>\n<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
+    <string name="ignore_spam_warning" msgid="8760314545535838430">"અવગણો, હું આ સંદેશ પર વિશ્વાસ કરું છું"</string>
+    <string name="via_domain" msgid="537951148511529082">"<xliff:g id="VIADOMAIN">%1$s</xliff:g> દ્વારા"</string>
+    <string name="signin" msgid="4699091478139791244">"સાઇન-ઇન કરો"</string>
+    <string name="info" msgid="1357564480946178121">"માહિતી"</string>
+    <string name="report" msgid="4318141326014579036">"જાણ કરો"</string>
+    <string name="show" msgid="2874876876336599985">"બતાવો"</string>
+    <string name="sync_error" msgid="1795794969006241678">"સમન્વયિત કરી શક્યાં નથી."</string>
+    <string name="sync_error_message" msgid="4182644657243736635">"તમારા ઉપકરણ પાસે સમન્વયન કરવા માટે પૂરતું સંગ્રહ સ્થાન નથી."</string>
+    <string name="storage" msgid="4783683938444150638">"સ્ટોરેજ"</string>
+    <string name="senders_split_token" msgid="6549228851819460081">", "</string>
+    <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
+    <string name="all_folders_heading" msgid="9023770187629170967">"બધા ફોલ્ડર્સ"</string>
+    <string name="recent_folders_heading" msgid="8943134955788867702">"તાજેતરના ફોલ્ડર્સ"</string>
+    <string name="message_details_title" msgid="60771875776494764">"સંદેશ વિગતો"</string>
+    <string name="preference_advance_to_title" msgid="6385669491239514630">"સ્વત: - પ્રગત"</string>
+  <string-array name="prefEntries_autoAdvance">
+    <item msgid="1505450878799459652">"વધુ નવું"</item>
+    <item msgid="8000986144872247139">"જૂનું"</item>
+    <item msgid="8015001161633421314">"વાર્તાલાપની સૂચિ"</item>
+  </string-array>
+  <string-array name="prefSummaries_autoAdvance">
+    <item msgid="8221665977497655719">"તમે કાઢી નાખો તે પછી નવો વાર્તાલાપ દર્શાવો"</item>
+    <item msgid="1721869262893378141">"તમે કાઢી નાખો તે પછી જૂનો વાર્તાલાપ દર્શાવો"</item>
+    <item msgid="880913657385630195">"તમે કાઢી નાખો તે પછી વાર્તાલાપ સૂચિ દર્શાવો"</item>
+  </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="5459235590885640678">"આનાથી એડવાન્સ"</string>
+    <string name="clear_display_images_whitelist_title" msgid="2012677202404471778">"ચિત્ર મંજૂરીઓ સાફ કરો"</string>
+    <string name="clear_display_images_whitelist_dialog_title" msgid="1942692501166848471">"ચિત્ર મંજૂરીઓ સાફ કરીએ?"</string>
+    <string name="clear_display_images_whitelist_dialog_message" msgid="3952553078559373729">"તમે પહેલાંથી મંજૂર કરેલ મોકલનાર તરફથી ઇનલાઇન છબીઓ પ્રદર્શિત કરવાનું રોકો."</string>
+    <string name="sender_whitelist_cleared" msgid="2490984995927904030">"ચિત્રો આપમેળે બતાવવામાં આવશે નહીં."</string>
+    <string name="preferences_signature_title" msgid="2318034745474929902">"સહી"</string>
+    <string name="preferences_signature_dialog_title" msgid="4801741764511807064">"સહી"</string>
+    <string name="preferences_signature_summary_not_set" msgid="3776614319388053784">"સેટ નથી"</string>
+    <string name="notification_action_reply" msgid="8378725460102575919">"જવાબ આપો"</string>
+    <string name="notification_action_reply_all" msgid="5693469099941000037">"બધાને જવાબ આપો"</string>
+    <string name="notification_action_archive" msgid="2884874164831039047">"આર્કાઇવ"</string>
+    <string name="notification_action_remove_label" msgid="3714785653186750981">"લેબલ દૂર કરો"</string>
+    <string name="notification_action_delete" msgid="3201627482564624132">"કાઢી નાખો"</string>
+    <string name="notification_action_undo_archive" msgid="600186958134073582">"આર્કાઇવ કરેલા"</string>
+    <string name="notification_action_undo_remove_label" msgid="8341924850540100690">"લેબલ દૂર કર્યું"</string>
+    <string name="notification_action_undo_delete" msgid="6915612337413587103">"કાઢી નાખ્યું"</string>
+    <string name="veiled_address" msgid="2670378260196977266"></string>
+    <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
+    <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
+    <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> નવો સંદેશ"</item>
+    <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> નવા સંદેશા"</item>
+  </plurals>
+    <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <string name="silent_ringtone" msgid="1570794756474381886">"શાંત"</string>
+    <string name="preference_removal_action_title" msgid="3128186577060329884">"ડિફોલ્ટ ક્રિયા"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="7381624742404593351">"આર્કાઇવ"</item>
+    <item msgid="2567465476369142505">"કાઢી નાખો"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="4080896545573973751">"આર્કાઇવ"</item>
+    <item msgid="6088164268501960435">"કાઢી નાખો"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ડિફોલ્ટ ક્રિયા"</string>
+    <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"બધાને જવાબ આપો"</string>
+    <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"સંદેશ જવાબો માટે ડિફૉલ્ટ તરીકે ઉપયોગ કરો"</string>
+    <string name="preference_swipe_title" msgid="2073613840893904205">"સ્વાઇપ ક્રિયાઓ"</string>
+    <string name="preference_swipe_description" msgid="3036560323237015010">"વાર્તાલાપ સૂચિમાં"</string>
+    <string name="preference_sender_image_title" msgid="7890813537985591865">"પ્રેષક છબી"</string>
+    <string name="preference_sender_image_description" msgid="3586817690132199889">"વાર્તાલાપ સૂચિમાં નામની બાજુમાં દર્શાવો"</string>
+    <string name="empty_trash" msgid="3385937024924728399">"ટ્રેશને ખાલી કરો"</string>
+    <string name="empty_spam" msgid="2911988289997281371">"સ્પામ ખાલી કરો"</string>
+    <string name="empty_trash_dialog_title" msgid="2104898489663621508">"ટ્રેશ ખાલી કરીએ?"</string>
+    <string name="empty_spam_dialog_title" msgid="1130319045917820569">"સ્પામ ખાલી કરીએ?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> સંદેશ કાયમી રીતે કાઢી નાખવામાં આવશે."</item>
+    <item quantity="other" msgid="263840304486020101">"<xliff:g id="COUNT">%1$d</xliff:g> સંદેશા કાયમી રીતે કાઢી નાખવામાં આવશે."</item>
+  </plurals>
+    <string name="drawer_open" msgid="2285557278907103851">"નેવિગેશન ડ્રોવર ખોલો"</string>
+    <string name="drawer_close" msgid="2065829742127544297">"નેવિગેશન ડ્રોવર બંધ કરો"</string>
+    <string name="conversation_photo_welcome_text" msgid="836483155429003787">"વાર્તાલાપને પસંદ કરવા માટે એક પ્રેષક છબી ટચ કરો."</string>
+    <string name="long_press_to_select_tip" msgid="1660881999120625177">"એક વાર્તાલાપ પસંદ કરવા માટે ટચ કરો અને પકડી રાખો, પછી વધુ પસંદ કરવા માટે ટચ કરો."</string>
+    <string name="folder_icon_desc" msgid="6272938864914794739">"ફોલ્ડર આયકન"</string>
+    <string name="add_account" msgid="5905863370226612377">"એકાઉન્ટ ઉમેરો"</string>
+    <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"ટિપ કાઢી નાખો"</string>
+    <string name="auto_sync_off" msgid="3691189864057581214">"સ્વતઃ સમન્વયન બંધ છે. ચાલુ કરવા માટે ટચ કરો."</string>
+    <string name="account_sync_off" msgid="5720018952998097061">"એકાઉન્ટ સમન્વયન બંધ છે. &lt;a href=\'http://www.example.com\'&gt;એકાઉન્ટ સેટિંગ્સ&lt;/a&gt;માં ચાલુ કરો."</string>
+    <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<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="543412762396502297">"સ્વતઃ-સમન્વયન ચાલુ કરીએ?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"તમે બધી એપ્લિકેશન્સ અને એકાઉન્ટ્સમાં જે ફેરફારો કરો છો, માત્ર Gmail માં નહીં, તે વેબ, તમારા અન્ય ઉપકરણો અને તમારા <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> વચ્ચે સમન્વયિત થાય છે."</string>
+    <string name="phone" msgid="4142617042507912053">"ફોન"</string>
+    <string name="tablet" msgid="4593581125469224791">"ટેબ્લેટ"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ચાલુ કરો"</string>
+    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> ફોલ્ડર્સ દર્શાવો"</string>
+    <string name="hide_folders" msgid="7618891933409521283">"ફોલ્ડર્સ છુપાવો"</string>
+    <string name="print" msgid="7987949243936577207">"છાપો"</string>
+    <string name="print_all" msgid="4011022762279519941">"તમામને પ્રિન્ટ કરો"</string>
+  <plurals name="num_messages">
+    <item quantity="one" msgid="8071234386915191851">"<xliff:g id="COUNT">%1$d</xliff:g> સંદેશ"</item>
+    <item quantity="other" msgid="962415099931188360">"<xliff:g id="COUNT">%1$d</xliff:g> સંદેશાઓ"</item>
+  </plurals>
+    <string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> ના રોજ <xliff:g id="TIME">%2$s</xliff:g> વાગ્યે"</string>
+    <string name="draft_to_heading" msgid="7370121943946205024">"ને ડ્રાફ્ટ કરો:"</string>
+    <string name="draft_heading" msgid="7032951343184552800">"ડ્રાફ્ટ"</string>
+    <string name="quoted_text_hidden_print" msgid="5256754205675159141">"ક્વોટ કરેલા પાઠ્ય છૂપાયેલા છે"</string>
+  <plurals name="num_attachments">
+    <item quantity="one" msgid="5494465717267988888">"<xliff:g id="COUNT">%1$d</xliff:g> જોડાણ"</item>
+    <item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> જોડાણો"</item>
+  </plurals>
+    <string name="no_subject" msgid="5622708348540036959">"વિષય નથી"</string>
+    <string name="vacation_responder" msgid="5570132559074523806">"છુટ્ટીનો જવાબ"</string>
+    <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"છુટ્ટીનો જવાબ"</string>
+    <string name="vacation_responder_body_hint_text" msgid="9087613123105158494">"સંદેશ"</string>
+    <string name="send_to_contacts_text" msgid="124432913980620545">"માત્ર મારા સંપર્કોને મોકલો"</string>
+    <string name="send_to_domain_text" msgid="5064559546745918393">"માત્ર <xliff:g id="DOMAIN">%1$s</xliff:g> પર જ મોકલો"</string>
+    <string name="pick_start_date_title" msgid="2274665037355224165">"પ્રારંભ"</string>
+    <string name="pick_end_date_title" msgid="733396083649496600">"સમાપ્તિ (વૈકલ્પિક)"</string>
+    <string name="date_not_set" msgid="3251555782945051904">"સેટ નથી"</string>
+    <string name="set_end_date_dialog_title" msgid="7543009262788808443">"સમાપ્તિ તારીખ (વૈકલ્પિક)"</string>
+    <string name="custom_date" msgid="5794846334232367838">"કસ્ટમ"</string>
+    <string name="date_none" msgid="1061426502665431412">"કોઈ નહીં"</string>
+    <string name="discard_changes" msgid="5699760550972324746">"ફેરફારો નિકાળીએ?"</string>
+    <string name="vacation_responder_changes_saved" msgid="91448817268121249">"છુટ્ટીના જવાબના ફેરફારો સાચવ્યા"</string>
+    <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"છુટ્ટીના જવાબના ફેરફારો નિકાળ્યા"</string>
+    <string name="vacation_responder_off" msgid="4429909341193366667">"ઓફ"</string>
+    <string name="vacation_responder_on" msgid="4913238379320882449">"ચાલુ, <xliff:g id="DATE">%1$s</xliff:g> થી"</string>
+    <string name="vacation_responder_on_with_end_date" msgid="4360941815371475955">"ચાલુ, <xliff:g id="START_DATE">%1$s</xliff:g> થી <xliff:g id="END_DATE">%2$s</xliff:g> સુધી"</string>
+    <string name="vacation_responder_empty_subject_and_body_warning" msgid="6233629618520852439">"એક વિષય અથવા સંદેશ ઉમેરો"</string>
+    <string name="view_entire_message" msgid="823281796655014454">"સમગ્ર સંદેશ જુઓ"</string>
+    <string name="eml_loader_error_toast" msgid="6577383216635400167">"આ ફાઇલ ખોલી શકાતી નથી"</string>
+    <string name="help_and_info" msgid="3708286489943154681">"સહાય"</string>
+    <string name="help_and_feedback" msgid="7211458338163287670">"સહાય અને પ્રતિસાદ"</string>
+    <string name="feedback" msgid="204247008751740034">"પ્રતિસાદ મોકલો"</string>
+    <string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
+    <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g> સંસ્કરણ <xliff:g id="VERSION">%2$s</xliff:g>"</string>
+    <string name="view_app_page" msgid="3241990517052398927"></string>
+    <string name="print_dialog" msgid="8895536548487605661">"છાપો..."</string>
+    <string name="copyright_information" msgid="971422874488783312">"કૉપિરાઇટ માહિતી"</string>
+    <string name="privacy_policy" msgid="212094623396418302">"ગોપનીયતા નીતિ"</string>
+    <string name="open_source_licenses" msgid="8643615555920977752">"ઓપન સોર્સ લાઇસેંસેસ"</string>
+    <string name="reply_choice_yes" msgid="3327633032975373220">"હા"</string>
+    <string name="reply_choice_no" msgid="7068775605915475207">"નહીં"</string>
+    <string name="reply_choice_ok" msgid="7881073621845053152">"ઑકે"</string>
+    <string name="reply_choice_hehe" msgid="6054314968043050748">"હીહી"</string>
+    <string name="reply_choice_thanks" msgid="4978961954288364694">"થન્ક્સ"</string>
+    <string name="reply_choice_i_agree" msgid="2496652737796884298">"હું સ્વીકારું છું"</string>
+    <string name="reply_choice_nice" msgid="4465894941302838676">"નિસ"</string>
+    <string name="reply_on_my_way" msgid="5645003971107444269">"મારા રસ્તા પર"</string>
+    <string name="reply_choice_later" msgid="4629219072859486413">"ઠીક છે, મને પાછા ત્યાં પહોંચવા દો"</string>
+    <string name="reply_choice_smiling_face" msgid="1772253938506548631">":)"</string>
+    <string name="reply_choice_frowning_face" msgid="6260338807944002651">":("</string>
+    <string name="preference_header_action_confirmations" msgid="3922674681156121948">"ક્રિયા પુષ્ટિકરણો"</string>
+    <string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"કાઢી નાખતા પહેલાં પુષ્ટિ કરો"</string>
+    <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"આર્કાઇવ કરતા પહેલાં પુષ્ટિ કરો"</string>
+    <string name="preference_confirm_before_send_title" msgid="4136585783513077039">"મોકલતા પહેલા પુષ્ટિ કરો"</string>
+    <string name="preferences_conversation_mode_title" msgid="389352009651720838">"સંદેશા સ્વતઃ ફિટ કરો"</string>
+    <string name="preferences_conversation_mode_summary" msgid="5730999743867653106">"સ્ક્રીન પર ફીટ કરવા માટે સંદેશા સંકોચો"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7257824136988429629">"સંદેશ ક્રિયાઓ"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="43373293784193461">"હંમેશા સ્ક્રીનની ટોચ પર સંદેશ ક્રિયાઓ દર્શાવો"</item>
+    <item msgid="1765271305989996747">"માત્ર પોટ્રેટમાં ફેરવવા પર સ્ક્રીનની ટોચ પર માત્ર સંદેશ ક્રિયાઓ દર્શાવો"</item>
+    <item msgid="6311113076575333488">"સંદેશ હેડરની બહાર સંદેશ ક્રિયાઓ બતાવશો નહીં"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="6906986566816683587">"હંમેશા બતાવો"</item>
+    <item msgid="113299655708990672">"માત્ર પોર્ટ્રેટમાં દર્શાવો"</item>
+    <item msgid="4403750311175924065">"બતાવશો નહીં"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="5536216295725760357">"શોધ ઇતિહાસ સાફ કરો"</string>
+    <string name="search_history_cleared" msgid="1461946302763342640">"શોધ ઇતિહાસ સાફ કર્યો"</string>
+    <string name="clear_history_dialog_title" msgid="3503603389704365385">"શોધ ઇતિહાસ સાફ કરીએ?"</string>
+    <string name="clear_history_dialog_message" msgid="5202922561632407778">"તમે અગાઉ કરેલી બધી શોધો દૂર કરવામાં આવશે."</string>
+    <string name="manage_accounts_menu_item" msgid="4734660452395086786">"એકાઉન્ટ્સ સંચાલિત કરો"</string>
+    <string name="general_preferences_title" msgid="4212138728220418162">"સામાન્ય સેટિંગ્સ"</string>
+    <string name="activity_preferences" msgid="8966077432517613292">"સેટિંગ્સ"</string>
+    <string name="overflow_description" msgid="7886090597023240426">"વધુ વિકલ્પો"</string>
+    <string name="security_hold_required_text" msgid="6619955920101834286">"<xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> માટે સુરક્ષા અપડેટ આવશ્યક"</string>
+    <string name="update_security_text" msgid="3527335757205741077">"હમણાં અપડેટ કરો"</string>
+    <string name="forms_are_disabled" msgid="2876312737118986789">"Gmail માં ફોર્મ્સ અક્ષમ કર્યાં છે"</string>
+</resources>

diff --git a/res/values-hi-sw600dp/strings.xml b/res/values-hi-sw600dp/strings.xml
index d2bbed7..e17e2cc 100644
--- a/res/values-hi-sw600dp/strings.xml
+++ b/res/values-hi-sw600dp/strings.xml

@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="5504248178750252553">"Cc/Bcc जोड़ें"</string>
     <string name="add_bcc_label" msgid="2464329024392383408">"Bcc जोड़ें"</string>
     <string name="menu_manage_folders" msgid="2575462565700103317">"फ़ोल्‍डर प्रबंधित करें"</string>
-    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"संदेश सूचनाओं के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"संदेश नोटिफिकेशन के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 97160e8..333adae 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -159,7 +159,7 @@
   </plurals>
     <string name="confirm_discard_text" msgid="5172680524418848519">"यह संदेश छोड़ें?"</string>
     <string name="loading_conversations" msgid="7255732786298655246">"लोड हो रहा है…"</string>
-    <string name="empty_inbox" msgid="5901734942362315228">"आपने पूर्ण कर लिया है! कृपया अपने दिन का आनंद लें."</string>
+    <string name="empty_inbox" msgid="5901734942362315228">"आपने सभी ईमेल पढ़ लिया है! कृपया अपने दिन का आनंद लें."</string>
     <string name="empty_search" msgid="8564899353449880818">"ओह! हमें \"<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\" के लिए कुछ भी नहीं मिला."</string>
     <string name="empty_spam_folder" msgid="3288985543286122800">"हुर्रे, कोई अनचाहा ईमेल नहीं है!"</string>
     <string name="empty_trash_folder" msgid="378119063015945020">"कोई मिटाए गए ईमेल नहीं है. रिसाइकलिंग के लिए धन्यवाद!"</string>
@@ -253,7 +253,7 @@
     <string name="send_anyway" msgid="2727576121007079643">"फिर भी भेजें"</string>
     <string name="ok" msgid="6178802457914802336">"ठीक"</string>
     <string name="done" msgid="344354738335270292">"पूर्ण"</string>
-    <string name="cancel" msgid="4831678293149626190">"रहने दें"</string>
+    <string name="cancel" msgid="4831678293149626190">"अभी नहीं"</string>
     <string name="clear" msgid="765949970989448022">"साफ़ करें"</string>
     <string name="next" msgid="2662478712866255138">"अगला"</string>
     <string name="previous" msgid="8985379053279804274">"पिछला"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5fe7a8e..d95a959 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -195,8 +195,8 @@
     <item quantity="other" msgid="8520761617935818623">"Arhiviranih razgovora: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; izbirsan razgovor"</item>
-    <item quantity="other" msgid="6287534453625638257">"Izbrisanih razgovora: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;"</item>
+    <item quantity="one" msgid="4819167474123685161">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; poruka izbrisana"</item>
+    <item quantity="other" msgid="6287534453625638257">"Izbrisano &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; poruka"</item>
   </plurals>
     <string name="deleted" msgid="7378013910782008375">"Izbrisano"</string>
     <string name="archived" msgid="6283673603512713022">"Arhivirano"</string>

diff --git a/res/values-hy-rAM-sw600dp/strings.xml b/res/values-hy-rAM-sw600dp/strings.xml
index dfc5663..5c478a2 100644
--- a/res/values-hy-rAM-sw600dp/strings.xml
+++ b/res/values-hy-rAM-sw600dp/strings.xml

@@ -18,8 +18,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="add_cc_label" msgid="5504248178750252553">"+ Պտճ/Ծածկպտճ"</string>
-    <string name="add_bcc_label" msgid="2464329024392383408">"+ Ծածկպտճ"</string>
-    <string name="menu_manage_folders" msgid="2575462565700103317">"Կառավարել թղթապանակները"</string>
+    <string name="add_cc_label" msgid="5504248178750252553">"+ Պճ/Ծպճ"</string>
+    <string name="add_bcc_label" msgid="2464329024392383408">"+ Ծպճ"</string>
+    <string name="menu_manage_folders" msgid="2575462565700103317">"Կառավարել պանակները"</string>
     <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"Օգտագործել ըստ կանխադրման՝ բոլոր ծանուցումների համար"</string>
 </resources>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 39588dc..9fcd843 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -20,8 +20,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="from" msgid="5159056500059912358">"Ումից"</string>
     <string name="to" msgid="3971614275716830581">"Ստացող`"</string>
-    <string name="cc" msgid="8768828862207919684">"Պտճ"</string>
-    <string name="bcc" msgid="519303553518479171">"Ծածկպտճ"</string>
+    <string name="cc" msgid="8768828862207919684">"Պճ"</string>
+    <string name="bcc" msgid="519303553518479171">"Ծպճ"</string>
     <string name="subject_hint" msgid="2136470287303571827">"Վերնագիր"</string>
     <string name="body_hint" msgid="6478994981747057817">"Գրել նամակ"</string>
     <string name="add_file_attachment" msgid="2604880054248593993">"Կցել ֆայլ"</string>
@@ -38,7 +38,7 @@
     <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>-ին, <xliff:g id="PERSON">%s</xliff:g>-ը գրել է`"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Փոխանցված հաղորդագրություն ----------&lt;br&gt;Ումից` <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Ամսաթիվը` <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Վերնագիրը` <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Ում` <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Փոխանցված հաղորդագրություն ----------"</string>
-    <string name="cc_attribution" msgid="2928584226469388899">"Պտճ` <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
+    <string name="cc_attribution" msgid="2928584226469388899">"Պճ` <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="353236686616663062">"Ընտրեք կցորդի տեսակը"</string>
     <string name="too_large_to_attach_single" msgid="2669897137966512530">"Հնարավոր չէ կցել ֆայլը <xliff:g id="MAXSIZE">%1$s</xliff:g>-ում:"</string>
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Մեկ կամ ավելի ֆայլեր չեն կցվել: Սահմանափակում <xliff:g id="MAXSIZE">%1$s</xliff:g>:"</string>
@@ -56,12 +56,12 @@
     <string name="mark_read" msgid="579388143288052493">"Նշել որպես կարդացված"</string>
     <string name="mark_unread" msgid="6245060538061533191">"Նշել որպես չկարդացված"</string>
     <string name="toggle_read_unread" msgid="1006469736520919028">"Նշել որպես կարդացված/չկարդացված"</string>
-    <string name="mute" msgid="9164839998562321569">"Խլացնել"</string>
+    <string name="mute" msgid="9164839998562321569">"Թաքցնել"</string>
     <string name="add_star" msgid="3275117671153616270">"Ավելացնել աստղանիշ"</string>
     <string name="remove_star" msgid="9126690774161840733">"Հեռացնել աստղանիշը"</string>
     <string name="remove_folder" msgid="2379905457788576297">"Հեռացված է <xliff:g id="FOLDERNAME">%1$s</xliff:g>-ից"</string>
-    <string name="archive" msgid="5978663590021719939">"Պահոց"</string>
-    <string name="report_spam" msgid="4106897677959987340">"Զեկուցել որպես լցոն"</string>
+    <string name="archive" msgid="5978663590021719939">"Արխիվ"</string>
+    <string name="report_spam" msgid="4106897677959987340">"Հաղորդել լցոնի մասին"</string>
     <string name="mark_not_spam" msgid="8617774236231366651">"Հաղորդել` թափոն չէ"</string>
     <string name="report_phishing" msgid="8454666464488413739">"Զեկուցել որսման մասին"</string>
     <string name="delete" msgid="6784262386780496958">"Ջնջել"</string>
@@ -73,10 +73,10 @@
     <string name="resume_draft" msgid="1272723181782570649">"Խմբագրել"</string>
     <string name="forward" msgid="4397585145490426320">"Փոխանցել"</string>
     <string name="menu_compose" msgid="4575025207594709432">"Գրել"</string>
-    <string name="menu_change_folders" msgid="2194946192901276625">"Փոխել թղթապանակները"</string>
+    <string name="menu_change_folders" msgid="2194946192901276625">"Փոխել պանակները"</string>
     <string name="menu_move_to" msgid="7948877550284452830">"Տեղափոխել՝"</string>
     <string name="menu_move_to_inbox" msgid="258554178236001444">"Տեղափոխել Մուտքի արկղ"</string>
-    <string name="menu_manage_folders" msgid="8486398523679534519">"Թղթապանակի կարգավորումներ"</string>
+    <string name="menu_manage_folders" msgid="8486398523679534519">"Պանակի կարգավորումներ"</string>
     <string name="menu_show_original" msgid="2330398228979616661">"Հետադարձել ավտոչափավորումը"</string>
     <string name="menu_settings" msgid="7993485401501778040">"Կարգավորումներ"</string>
     <string name="menu_search" msgid="1949652467806052768">"Որոնել"</string>
@@ -84,14 +84,14 @@
     <string name="drawer_title" msgid="3766219846644975778">"Նավարկում"</string>
     <string name="mark_important" msgid="8781680450177768820">"Նշել կարևոր"</string>
     <string name="mark_not_important" msgid="3342258155408116917">"Նշել որպես ոչ կարևոր"</string>
-    <string name="add_cc_label" msgid="2249679001141195213">"Ավելացնել Պտճ/Ծածկպտճ"</string>
-    <string name="add_bcc_label" msgid="963745641238037813">"Ավելացնել Ծածկպտճ"</string>
+    <string name="add_cc_label" msgid="2249679001141195213">"Ավելացնել Պճ/Ծպճ"</string>
+    <string name="add_bcc_label" msgid="963745641238037813">"Ավելացնել Ծպճ"</string>
     <string name="quoted_text" msgid="977782904293216533">"Ներառել մեջբերված տեքստը"</string>
     <string name="quoted_text_label" msgid="2296807722849923934">"Մեջբերել տեքստ"</string>
     <string name="respond_inline" msgid="6609746292081928078">"Պատասխանել մեջտեղում"</string>
     <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> Բ"</string>
-    <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> Կբ"</string>
-    <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> Մբ"</string>
+    <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> ԿԲ"</string>
+    <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> ՄԲ"</string>
     <string name="attachment_image" msgid="6375306026208274564">"Պատկեր"</string>
     <string name="attachment_video" msgid="7119476472603939848">"Տեսանյութեր"</string>
     <string name="attachment_audio" msgid="7097658089301809284">"Ձայնանյութ"</string>
@@ -117,7 +117,7 @@
     <string name="menu_photo_print" msgid="3084679038179342333">"Տպել"</string>
     <string name="saving" msgid="6274238733828387433">"Պահվում է..."</string>
     <string name="choosertitle_sharevia" msgid="3539537264873337959">"Տարածել"</string>
-    <string name="contextmenu_openlink" msgid="6952228183947135362">"Բացել Զննարկչում"</string>
+    <string name="contextmenu_openlink" msgid="6952228183947135362">"Բացել դիտարկիչում"</string>
     <string name="contextmenu_copy" msgid="2584243784216385180">"Պատճենել"</string>
     <string name="contextmenu_copylink" msgid="8659897702269320063">"Պատճենել հղման հասցեն"</string>
     <string name="contextmenu_view_image" msgid="1031172763893491000">"Դիտել նկարը"</string>
@@ -171,8 +171,8 @@
     <item quantity="other" msgid="1154441830432477256">"Ապաստղանշվում է <xliff:g id="COUNT">%1$d</xliff:g> խոսակցություն"</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; խլացված"</item>
-    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; խլացված"</item>
+    <item quantity="one" msgid="3622533556738049499">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; անտեսված"</item>
+    <item quantity="other" msgid="4559007262578295280">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; անտեսված"</item>
   </plurals>
   <plurals name="conversation_spammed">
     <item quantity="one" msgid="1749550834135461470">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; հաղորդված՝ որպես սպամ"</item>
@@ -202,14 +202,14 @@
     <string name="archived" msgid="6283673603512713022">"Արխիվացված"</string>
     <string name="folder_removed" msgid="5656281444688183676">"Հեռացվել է <xliff:g id="FOLDERNAME">%1$s</xliff:g>-ից"</string>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="7787126147584620603">"Փոխված թղթապանակ"</item>
-    <item quantity="other" msgid="6307772984911017972">"Փոխված թղթապանակներ"</item>
+    <item quantity="one" msgid="7787126147584620603">"Փոխված պանակ"</item>
+    <item quantity="other" msgid="6307772984911017972">"Փոխված պանակներ"</item>
   </plurals>
     <string name="conversation_folder_moved" msgid="6475872337373081683">"Տեղափոխվել է <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="search_results_header" msgid="1529438451150580188">"Արդյունքներ"</string>
     <string name="search_unsupported" msgid="2873920566477359177">"Որոնումը չի աջակցվում այս հաշվի համար:"</string>
     <string name="search_suggestion_desc" msgid="4165491276003825492">"Առաջարկ՝ <xliff:g id="SUGGESTION">%s</xliff:g>"</string>
-    <string name="add_label" msgid="3285338046038610902">"Ավելացնել թղթապանակ"</string>
+    <string name="add_label" msgid="3285338046038610902">"Ավելացնել պանակ"</string>
   <plurals name="new_incoming_messages">
     <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն"</item>
     <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն"</item>
@@ -230,8 +230,8 @@
     <string name="replyto_heading" msgid="8275255318292059079">"Պատասխանել"</string>
     <string name="to_heading" msgid="3495203282540398336">"Ստացող՝ "</string>
     <string name="to_heading_no_space" msgid="679167047628308670">"Ում`"</string>
-    <string name="cc_heading" msgid="5603892257866345823">"Պտճ`"</string>
-    <string name="bcc_heading" msgid="1482186590756218269">"Ծածկպտճ`"</string>
+    <string name="cc_heading" msgid="5603892257866345823">"Պճ`"</string>
+    <string name="bcc_heading" msgid="1482186590756218269">"Ծպճ`"</string>
     <string name="date_heading" msgid="4213063948406397168">"Ամսաթիվ՝"</string>
     <string name="show_images" msgid="436044894053204084">"Պատկերները ցուցադրել"</string>
     <string name="always_show_images" msgid="556087529413707819">"Միշտ ցուցադրել այս ուղարկողի պատկերները"</string>
@@ -267,8 +267,8 @@
     <item msgid="5442620760791553027">"Սերվերի սխալ"</item>
   </string-array>
     <string name="tap_to_configure" msgid="137172348280050643">"Հպեք՝ կարգավորելու համար"</string>
-    <string name="non_synced_folder_description" msgid="3044618511909304701">"Զրույցները դիտելու համար համաժամեցրել այս թղթապանակը:"</string>
-    <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Համաժամեցնել թղթապանակը"</string>
+    <string name="non_synced_folder_description" msgid="3044618511909304701">"Զրույցները դիտելու համար համաժամեցրել այս պանակը:"</string>
+    <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Համաժամեցնել պանակը"</string>
     <string name="widget_large_unread_count" msgid="8699435859096455837">"%d+"</string>
     <string name="large_unseen_count" msgid="3055042669246912518">"<xliff:g id="COUNT">%d</xliff:g>+ նոր"</string>
     <string name="unseen_count" msgid="5509898665569695288">"<xliff:g id="COUNT">%d</xliff:g> նոր"</string>
@@ -278,9 +278,9 @@
     <string name="view_more_conversations" msgid="8377920000247101901">"Տեսնել այլ զրույցներ"</string>
     <string name="loading_conversation" msgid="7931600025861500397">"Բեռնում..."</string>
     <string name="activity_mailbox_selection" msgid="7489813868539767701">"Ընտրեք հաշիվը"</string>
-    <string name="activity_folder_selection" msgid="8375243281001234750">"Ընտրեք թղթապանակը"</string>
-    <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Փոստային թղթապանակ"</string>
-    <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Փոխել թղթապանակները"</string>
+    <string name="activity_folder_selection" msgid="8375243281001234750">"Ընտրեք պանակը"</string>
+    <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Փոստային պանակ"</string>
+    <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Փոխել պանակները"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Տեղափոխել"</string>
     <string name="search_hint" msgid="7060626585689391003">"Որոնել"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
@@ -294,7 +294,7 @@
     <string name="load_more" msgid="8702691358453560575">"Բեռնել ավելին"</string>
     <!-- no translation found for load_attachment (3894318473827290350) -->
     <skip />
-    <string name="shortcut_name_title" msgid="1562534040126088628">"Անվանեք դյուրանցման թղթապանակը"</string>
+    <string name="shortcut_name_title" msgid="1562534040126088628">"Անվանեք դյուրանցման պանակը"</string>
     <string name="wait_for_sync_title" msgid="4577632826912823075">"Սպասում է համաժամեցմանը"</string>
     <string name="not_synced_title" msgid="3600180500934086346">"Հաշիվը համաժամեցված չէ"</string>
     <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"Այս հաշիվը չի կարգավորվել ավտոմատ համաժամեցման համար:\nՀպեք "<b>"Համաժամեցնել հիմա՝"</b>" էլփոստը միանվագ համաժամեցնելու համար կամ "<b>"Փոխել համաժամեցման կարգավորումները`"</b>" այս հաշվի էլփոստը ինքնաբերաբար համաժամեցնելով կարգավորելու համար:"</string>
@@ -315,8 +315,8 @@
     <string name="storage" msgid="4783683938444150638">"Պահոց"</string>
     <string name="senders_split_token" msgid="6549228851819460081">", "</string>
     <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
-    <string name="all_folders_heading" msgid="9023770187629170967">"Բոլոր թղթապանակները"</string>
-    <string name="recent_folders_heading" msgid="8943134955788867702">"Վերջին թղթապանակները"</string>
+    <string name="all_folders_heading" msgid="9023770187629170967">"Բոլոր պանակները"</string>
+    <string name="recent_folders_heading" msgid="8943134955788867702">"Վերջին պանակները"</string>
     <string name="message_details_title" msgid="60771875776494764">"Հաղորդագրության մանրամասները"</string>
     <string name="preference_advance_to_title" msgid="6385669491239514630">"Ինքնաընդլայնում"</string>
   <string-array name="prefEntries_autoAdvance">
@@ -339,7 +339,7 @@
     <string name="preferences_signature_summary_not_set" msgid="3776614319388053784">"Սահմանված չէ"</string>
     <string name="notification_action_reply" msgid="8378725460102575919">"Պատասխանել"</string>
     <string name="notification_action_reply_all" msgid="5693469099941000037">"Պատասխանել բոլորին"</string>
-    <string name="notification_action_archive" msgid="2884874164831039047">"Պահոց"</string>
+    <string name="notification_action_archive" msgid="2884874164831039047">"Արխիվացնել"</string>
     <string name="notification_action_remove_label" msgid="3714785653186750981">"Հեռացնել պիտակը"</string>
     <string name="notification_action_delete" msgid="3201627482564624132">"Ջնջել"</string>
     <string name="notification_action_undo_archive" msgid="600186958134073582">"Արխիվացված"</string>
@@ -358,18 +358,18 @@
     <string name="silent_ringtone" msgid="1570794756474381886">"Լուռ"</string>
     <string name="preference_removal_action_title" msgid="3128186577060329884">"Կանխադրված գործողություն"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Արխիվ"</item>
+    <item msgid="7381624742404593351">"Արխիվացնել"</item>
     <item msgid="2567465476369142505">"Ջնջել"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Արխիվ"</item>
+    <item msgid="4080896545573973751">"Արխիվացնել"</item>
     <item msgid="6088164268501960435">"Ջնջել"</item>
   </string-array>
     <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Կանխադրված գործողություն"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Պատասխանել բոլորին"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Օգտագործել որպես լռելյայն բոլոր պատասխանների համար"</string>
     <string name="preference_swipe_title" msgid="2073613840893904205">"Սահահարվածել գործողություններին"</string>
-    <string name="preference_swipe_description" msgid="3036560323237015010">"Զրույցի ցանկում"</string>
+    <string name="preference_swipe_description" msgid="3036560323237015010">"Շղթաների ցանկում"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Ուղարկողի պատկերը"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Ցուցադրել անվան կողքին խոսակցության ցանկում"</string>
     <string name="empty_trash" msgid="3385937024924728399">"Դատարկ աղբարկղ"</string>
@@ -384,7 +384,7 @@
     <string name="drawer_close" msgid="2065829742127544297">"Փակել նավարկման դարակը"</string>
     <string name="conversation_photo_welcome_text" msgid="836483155429003787">"Հպեք ուղարկողի պատկերը` ընտրելու այդ խոսակցությունը:"</string>
     <string name="long_press_to_select_tip" msgid="1660881999120625177">"Հպեք &amp; պահեք՝ մեկ խոսակցություն ընտրելու համար, այնուհետ հպեք` ավելին ընտրելու համար:"</string>
-    <string name="folder_icon_desc" msgid="6272938864914794739">"Թղթապանակի պատկերակ"</string>
+    <string name="folder_icon_desc" msgid="6272938864914794739">"Պանակի պատկերակ"</string>
     <string name="add_account" msgid="5905863370226612377">"Ավելացնել հաշիվ"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Անտեսել հուշումը"</string>
     <string name="auto_sync_off" msgid="3691189864057581214">"Ինքնուրույն համաժամեցումն անջատված է: Միացնելու համար հպեք:"</string>
@@ -395,8 +395,8 @@
     <string name="phone" msgid="4142617042507912053">"հեռախոսահամար"</string>
     <string name="tablet" msgid="4593581125469224791">"գրասալիկ"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Միացնել"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Ցույց տալ <xliff:g id="NUMBER">%1$s</xliff:g> թղթապանակ"</string>
-    <string name="hide_folders" msgid="7618891933409521283">"Թաքցնել թղթապանակները"</string>
+    <string name="show_n_more_folders" msgid="1005879825500056552">"Ցույց տալ <xliff:g id="NUMBER">%1$s</xliff:g> պանակ"</string>
+    <string name="hide_folders" msgid="7618891933409521283">"Թաքցնել պանակները"</string>
     <string name="print" msgid="7987949243936577207">"Տպել"</string>
     <string name="print_all" msgid="4011022762279519941">"Տպել ամբողջը"</string>
   <plurals name="num_messages">
@@ -411,7 +411,7 @@
     <item quantity="one" msgid="5494465717267988888">"<xliff:g id="COUNT">%1$d</xliff:g> կցորդ"</item>
     <item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> կցորդ"</item>
   </plurals>
-    <string name="no_subject" msgid="5622708348540036959">"(անվերնագիր)"</string>
+    <string name="no_subject" msgid="5622708348540036959">"(առանց թեմայի)"</string>
     <string name="vacation_responder" msgid="5570132559074523806">"Արձակուրդային պատասխանիչ"</string>
     <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"Արձակուրդային պատասխանիչ"</string>
     <string name="vacation_responder_body_hint_text" msgid="9087613123105158494">"Հաղորդագրություն"</string>

diff --git a/res/values-ja-sw600dp/strings.xml b/res/values-ja-sw600dp/strings.xml
index 3277a81..2e6e4ba 100644
--- a/res/values-ja-sw600dp/strings.xml
+++ b/res/values-ja-sw600dp/strings.xml

@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="5504248178750252553">"Cc/Bccを追加"</string>
     <string name="add_bcc_label" msgid="2464329024392383408">"Bccを追加"</string>
     <string name="menu_manage_folders" msgid="2575462565700103317">"フォルダを管理"</string>
-    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"メッセージ通知への返信時のデフォルトとして使用する"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"メッセージ通知への返信時の既定値として使用する"</string>
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c290672..020d446 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -211,8 +211,8 @@
     <string name="search_suggestion_desc" msgid="4165491276003825492">"候補: <xliff:g id="SUGGESTION">%s</xliff:g>"</string>
     <string name="add_label" msgid="3285338046038610902">"フォルダを追加"</string>
   <plurals name="new_incoming_messages">
-    <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</item>
-    <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</item>
+    <item quantity="one" msgid="1532079301006372605">"新着メール<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
+    <item quantity="other" msgid="4085982174357328926">"新着メール<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g>&lt;a href=\'http://www.example.com\'&gt;詳細を表示&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"詳細を表示しない"</string>
@@ -271,7 +271,7 @@
     <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"フォルダを同期"</string>
     <string name="widget_large_unread_count" msgid="8699435859096455837">"%d超"</string>
     <string name="large_unseen_count" msgid="3055042669246912518">"新着<xliff:g id="COUNT">%d</xliff:g>件以上"</string>
-    <string name="unseen_count" msgid="5509898665569695288">"<xliff:g id="COUNT">%d</xliff:g>通の新着"</string>
+    <string name="unseen_count" msgid="5509898665569695288">"新着<xliff:g id="COUNT">%d</xliff:g>件"</string>
   <plurals name="actionbar_unread_messages">
     <item quantity="other" msgid="3863201473731766006">"<xliff:g id="COUNT">%1$d</xliff:g>件の未読"</item>
   </plurals>
@@ -351,8 +351,8 @@
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
     <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
   <plurals name="new_messages">
-    <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</item>
-    <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</item>
+    <item quantity="one" msgid="3446656407520493241">"新着メール<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
+    <item quantity="other" msgid="3531683811183204615">"新着メール<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"マナーモード"</string>
@@ -434,7 +434,7 @@
     <string name="eml_loader_error_toast" msgid="6577383216635400167">"このファイルを開けません"</string>
     <string name="help_and_info" msgid="3708286489943154681">"ヘルプ"</string>
     <string name="help_and_feedback" msgid="7211458338163287670">"ヘルプとフィードバック"</string>
-    <string name="feedback" msgid="204247008751740034">"ご意見、ご感想"</string>
+    <string name="feedback" msgid="204247008751740034">"フィードバック"</string>
     <string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
     <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g>、バージョン<xliff:g id="VERSION">%2$s</xliff:g>"</string>
     <string name="view_app_page" msgid="3241990517052398927"></string>

diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 9bc759b..88b5535 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml

@@ -67,7 +67,7 @@
     <string name="delete" msgid="6784262386780496958">"ಅಳಿಸು"</string>
     <string name="discard_drafts" msgid="5881484193628472105">"ಡ್ರಾಫ್ಟ್‌ಗಳನ್ನು ತಿರಸ್ಕರಿಸು"</string>
     <string name="discard_failed" msgid="7520780769812210279">"ತ್ಯಜಿಸು ವಿಫಲವಾಗಿದೆ"</string>
-    <string name="refresh" msgid="1533748989749277511">"ರೀಫ್ರೆಶ್‌‌ ಮಾಡಿ"</string>
+    <string name="refresh" msgid="1533748989749277511">"ರಿಫ್ರೆಶ್‌ ಮಾಡಿ"</string>
     <string name="reply" msgid="8337757482824207118">"ಪ್ರತ್ಯುತ್ತರ"</string>
     <string name="reply_all" msgid="5366796103758360957">"ಎಲ್ಲರಿಗೂ ಪ್ರತ್ಯುತ್ತರಿಸು"</string>
     <string name="resume_draft" msgid="1272723181782570649">"ಸಂಪಾದಿಸು"</string>
@@ -298,7 +298,7 @@
     <string name="wait_for_sync_title" msgid="4577632826912823075">"ಸಿಂಕ್‍ಗಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="not_synced_title" msgid="3600180500934086346">"ಖಾತೆ ಸಿಂಕ್ ಆಗಿಲ್ಲ"</string>
     <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"ಈ ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತ ಸಿಂಕ್‍‍ಗೆ ಹೊಂದಿಸಲಾಗಿಲ್ಲ.\nಒಂದು ಬಾರಿ ಮೇಲ್‌ಗೆ ಸಿಂಕ್ ಮಾಡಲು "<b>"ಇದೀಗ ಸಿಂಕ್ ಮಾಡು"</b>", ಅಥವಾ ಈ ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಿಂಕ್ ಮೇಲ್‍‍ಗೆ ಹೊಂದಿಸಲು "<b>"ಸಿಂಕ್ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳನ್ನು ಬದಲಿಸು"</b>" ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
-    <string name="manual_sync" msgid="2271479734895537848">"ಇದೀಗ ಸಿಂಕ್ ಮಾಡಿ"</string>
+    <string name="manual_sync" msgid="2271479734895537848">"ಸಿಂಕ್ ಮಾಡು"</string>
     <string name="change_sync_settings" msgid="3615852118397055361">"ಸಿಂಕ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಬದಲಿಸಿ"</string>
     <string name="photo_load_failed" msgid="577471721679146999">"ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
     <string name="cant_move_or_change_labels" msgid="4155490583610926755">"ಆಯ್ಕೆಯು ಬಹು ಖಾತೆಗಳನ್ನು ಒಳಗೊಂಡಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
@@ -385,7 +385,7 @@
     <string name="conversation_photo_welcome_text" msgid="836483155429003787">"ಆ ಸಂವಾದವನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಕಳುಹಿಸುವವರ ಚಿತ್ರವನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="long_press_to_select_tip" msgid="1660881999120625177">"ಒಂದು ಸಂವಾದವನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ &amp; ಹಿಡಿದಿಟ್ಟುಕೊಳ್ಳಿ, ನಂತರ ಹೆಚ್ಚು ಆಯ್ಕೆಗಾಗಿ ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="folder_icon_desc" msgid="6272938864914794739">"ಫೋಲ್ಡರ್ ಐಕಾನ್"</string>
-    <string name="add_account" msgid="5905863370226612377">"ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="add_account" msgid="5905863370226612377">"ಖಾತೆ ಸೇರಿಸು"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"ಸಲಹೆ ವಜಾಗೊಳಿಸು"</string>
     <string name="auto_sync_off" msgid="3691189864057581214">"ಸ್ವಯಂಚಾಲಿತ ಸಿಂಕ್ ಆಫ್ ಆಗಿದೆ. ಆನ್ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="account_sync_off" msgid="5720018952998097061">"ಖಾತೆ ಸಿಂಕ್ ಆಫ್ ಆಗಿದೆ. &lt; href=\'http://www.example.com\'&gt;Account settings.&lt;/a&gt; ನಲ್ಲಿ ಆನ್ ಮಾಡಿ"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 5ecd32f..3b6625e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -312,7 +312,7 @@
     <string name="show" msgid="2874876876336599985">"Rodyti"</string>
     <string name="sync_error" msgid="1795794969006241678">"Nepavyko sinchronizuoti."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"Jūsų įrenginyje nėra pakankamai vietos, kad būtų galima sinchronizuoti."</string>
-    <string name="storage" msgid="4783683938444150638">"Atmintinė"</string>
+    <string name="storage" msgid="4783683938444150638">"Saugykla"</string>
     <string name="senders_split_token" msgid="6549228851819460081">", "</string>
     <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="9023770187629170967">"Visi aplankai"</string>

diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index fd995e9..4c0c8b4 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml

@@ -293,7 +293,7 @@
     <string name="single_new_message_notification_big_text" msgid="2170154732664242904">"<xliff:g id="SUBJECT">%1$s</xliff:g>\n<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
     <string name="ignore_spam_warning" msgid="8760314545535838430">"Игнорирај, ѝ верувам на оваа порака"</string>
     <string name="via_domain" msgid="537951148511529082">"преку <xliff:g id="VIADOMAIN">%1$s</xliff:g>"</string>
-    <string name="signin" msgid="4699091478139791244">"Пријави се"</string>
+    <string name="signin" msgid="4699091478139791244">"Најави се"</string>
     <string name="info" msgid="1357564480946178121">"Информации"</string>
     <string name="report" msgid="4318141326014579036">"Пријави"</string>
     <!-- no translation found for show (2874876876336599985) -->

diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 3af406a..5d9eec7 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml

@@ -312,7 +312,7 @@
     <string name="show" msgid="2874876876336599985">"കാണിക്കുക"</string>
     <string name="sync_error" msgid="1795794969006241678">"സമന്വയിപ്പിക്കാനായില്ല."</string>
     <string name="sync_error_message" msgid="4182644657243736635">"നിങ്ങളുടെ ഉപകരണത്തിൽ സമന്വയിപ്പിക്കുന്നതിനാവശ്യമായ സംഭരണമില്ല."</string>
-    <string name="storage" msgid="4783683938444150638">"സംഭരണം"</string>
+    <string name="storage" msgid="4783683938444150638">"സ്റ്റോറേജ്"</string>
     <string name="senders_split_token" msgid="6549228851819460081">", "</string>
     <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="9023770187629170967">"എല്ലാ ഫോള്‍ഡറുകളും"</string>
@@ -441,7 +441,7 @@
     <string name="print_dialog" msgid="8895536548487605661">"പ്രിന്റുചെയ്യുക…"</string>
     <string name="copyright_information" msgid="971422874488783312">"പകർപ്പവകാശ വിവരം"</string>
     <string name="privacy_policy" msgid="212094623396418302">"സ്വകാര്യതാ നയം"</string>
-    <string name="open_source_licenses" msgid="8643615555920977752">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസുകൾ"</string>
+    <string name="open_source_licenses" msgid="8643615555920977752">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസ്"</string>
     <string name="reply_choice_yes" msgid="3327633032975373220">"അതെ"</string>
     <string name="reply_choice_no" msgid="7068775605915475207">"ഇല്ല"</string>
     <string name="reply_choice_ok" msgid="7881073621845053152">"ശരി"</string>

diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 0e2ec78..aa1154a 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml

@@ -215,7 +215,7 @@
     <item quantity="other" msgid="4085982174357328926">"စာ အသစ် <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;သေးစိတ် ကြည့်&lt;/a&gt;"</string>
-    <string name="hide_details" msgid="8018801050702453314">"အသေးစိတ်များ ဝှက်ထားရန်"</string>
+    <string name="hide_details" msgid="8018801050702453314">"အသေးစိတ်မပြနှင့်"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> ထံသို့"</string>
     <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> အတွက် ဆက်သွယ်ရေး အချက်အလက်ကို ပြပါ။"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3580e7c..94c53d4 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -61,8 +61,8 @@
     <string name="remove_star" msgid="9126690774161840733">"Fjern stjerne"</string>
     <string name="remove_folder" msgid="2379905457788576297">"Fjern fra <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
     <string name="archive" msgid="5978663590021719939">"Arkivér"</string>
-    <string name="report_spam" msgid="4106897677959987340">"Meld fra om nettsøppel"</string>
-    <string name="mark_not_spam" msgid="8617774236231366651">"Rapportér som ikke nettsøppel"</string>
+    <string name="report_spam" msgid="4106897677959987340">"Rapportér søppelpost"</string>
+    <string name="mark_not_spam" msgid="8617774236231366651">"Rapportér som ikke søppelpost"</string>
     <string name="report_phishing" msgid="8454666464488413739">"Rapportér nettfisking"</string>
     <string name="delete" msgid="6784262386780496958">"Slett"</string>
     <string name="discard_drafts" msgid="5881484193628472105">"Forkast utkastene"</string>
@@ -382,7 +382,7 @@
   </plurals>
     <string name="drawer_open" msgid="2285557278907103851">"Åpne uttrekksmenyen for navigasjon"</string>
     <string name="drawer_close" msgid="2065829742127544297">"Lukk uttrekksmenyen for navigasjon"</string>
-    <string name="conversation_photo_welcome_text" msgid="836483155429003787">"Trykk på avsenderbildet for å velge den samtalen."</string>
+    <string name="conversation_photo_welcome_text" msgid="836483155429003787">"Trykk på avsenderbildet for å velge samtalen du vil lese."</string>
     <string name="long_press_to_select_tip" msgid="1660881999120625177">"Trykk og hold nede for å velge én samtale, og trykk deretter på andre samtaler du vil velge."</string>
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mappeikon"</string>
     <string name="add_account" msgid="5905863370226612377">"Legg til konto"</string>
@@ -433,7 +433,7 @@
     <string name="view_entire_message" msgid="823281796655014454">"Se hele e-posten"</string>
     <string name="eml_loader_error_toast" msgid="6577383216635400167">"Kan ikke åpne denne filen"</string>
     <string name="help_and_info" msgid="3708286489943154681">"Hjelp"</string>
-    <string name="help_and_feedback" msgid="7211458338163287670">"Hjelp og tilbakemeldinger"</string>
+    <string name="help_and_feedback" msgid="7211458338163287670">"Hjelp og tilbakemelding"</string>
     <string name="feedback" msgid="204247008751740034">"Send tilbakemelding"</string>
     <string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
     <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g> versjon <xliff:g id="VERSION">%2$s</xliff:g>"</string>
@@ -457,7 +457,7 @@
     <string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"Bekreft før sletting"</string>
     <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"Bekreft før arkivering"</string>
     <string name="preference_confirm_before_send_title" msgid="4136585783513077039">"Bekreft før sending"</string>
-    <string name="preferences_conversation_mode_title" msgid="389352009651720838">"Automatisk tilpassing"</string>
+    <string name="preferences_conversation_mode_title" msgid="389352009651720838">"Tilpass meldinger automatisk"</string>
     <string name="preferences_conversation_mode_summary" msgid="5730999743867653106">"Krymp e-poster slik at de passer til skjermen"</string>
     <string name="preferences_disable_snap_headers_title" msgid="7257824136988429629">"E-postalternativer"</string>
   <string-array name="prefSummaries_snapHeader">

diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 7a821a9..e5e0802 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml

@@ -57,7 +57,7 @@
     <string name="mark_unread" msgid="6245060538061533191">"नपढिएकोलाई चिन्ह लगाउनुहोस्"</string>
     <string name="toggle_read_unread" msgid="1006469736520919028">"टगल पठित अपठित"</string>
     <string name="mute" msgid="9164839998562321569">"आवाज बन्द गर्नुहोस्"</string>
-    <string name="add_star" msgid="3275117671153616270">"स्टार थप गर्नुहोस्"</string>
+    <string name="add_star" msgid="3275117671153616270">"तारा थप गर्नुहोस्"</string>
     <string name="remove_star" msgid="9126690774161840733">"तारा हटाउनुहोस्"</string>
     <string name="remove_folder" msgid="2379905457788576297">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> बाट हटाउनुहोस्"</string>
     <string name="archive" msgid="5978663590021719939">"अभिलेख"</string>
@@ -104,10 +104,10 @@
     <string name="preview_attachment" msgid="6265457626086113833">"पूर्वावलोकन"</string>
     <string name="save_attachment" msgid="375685179032130033">"सुरक्षित गर्नुहोस्"</string>
     <string name="download_again" msgid="8195787340878328119">"पुन: डाउनलोड गर्नुहोस्"</string>
-    <string name="remove_attachment_desc" msgid="1478445871170879140">"संलग्नक <xliff:g id="ATTACHMENTNAME">%s</xliff:g> हटाउनुहोस्"</string>
+    <string name="remove_attachment_desc" msgid="1478445871170879140">"संलग्न <xliff:g id="ATTACHMENTNAME">%s</xliff:g> हटाउनुहोस्"</string>
     <string name="more_info_attachment" msgid="2899691682394864507">"जानकारी"</string>
     <string name="no_application_found" msgid="7309485680354949680">"कुनै अनुप्रयोगले हेर्नको लागि यो संलग्नकलाई खोल्न सक्दैन।"</string>
-    <string name="fetching_attachment" msgid="2286628490159574159">"संलग्नक ल्याइँदै"</string>
+    <string name="fetching_attachment" msgid="2286628490159574159">"संलग्न ल्याइँदै"</string>
     <string name="please_wait" msgid="3953824147776128899">"कृपया प्रतीक्षा गर्नुहोला..."</string>
     <string name="saved" msgid="161536102236967534">"<xliff:g id="SIZE">%s</xliff:g>, सुरक्षित भयो"</string>
     <string name="download_failed" msgid="3878373998269062395">"डाउनलोड गर्न सकिएन। पुन: प्रयास गर्नको लागि छुनुहोस्।"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b87eed0..322b512 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -27,7 +27,7 @@
     <string name="add_file_attachment" msgid="2604880054248593993">"Bestand bijvoegen"</string>
     <string name="add_photo_attachment" msgid="7163589794940909528">"Foto bijvoegen"</string>
     <string name="save_draft" msgid="2669523480789672118">"Concept opslaan"</string>
-    <string name="discard" msgid="4905982179911608430">"Verwijderen"</string>
+    <string name="discard" msgid="4905982179911608430">"Weggooien"</string>
     <string name="compose" msgid="2602861958391035523">"Opstellen"</string>
     <string name="compose_title" msgid="5673376086133995913">"Opstellen"</string>
   <string-array name="compose_modes">
@@ -65,8 +65,8 @@
     <string name="mark_not_spam" msgid="8617774236231366651">"Melden dat dit geen spam is"</string>
     <string name="report_phishing" msgid="8454666464488413739">"Phishing melden"</string>
     <string name="delete" msgid="6784262386780496958">"Verwijderen"</string>
-    <string name="discard_drafts" msgid="5881484193628472105">"Concepten verwijderen"</string>
-    <string name="discard_failed" msgid="7520780769812210279">"Annuleren mislukt"</string>
+    <string name="discard_drafts" msgid="5881484193628472105">"Concepten weggooien"</string>
+    <string name="discard_failed" msgid="7520780769812210279">"Niet opslaan mislukt"</string>
     <string name="refresh" msgid="1533748989749277511">"Vernieuwen"</string>
     <string name="reply" msgid="8337757482824207118">"Beantwoorden"</string>
     <string name="reply_all" msgid="5366796103758360957">"Allen beantwoorden"</string>
@@ -154,10 +154,10 @@
     <item quantity="other" msgid="2001972798185641108">"Deze <xliff:g id="COUNT">%1$d</xliff:g> conversaties archiveren?"</item>
   </plurals>
   <plurals name="confirm_discard_drafts_conversation">
-    <item quantity="one" msgid="2030421499893210789">"Dit bericht verwijderen?"</item>
-    <item quantity="other" msgid="782234447471532005">"Deze <xliff:g id="COUNT">%1$d</xliff:g> berichten verwijderen?"</item>
+    <item quantity="one" msgid="2030421499893210789">"Dit bericht weggooien?"</item>
+    <item quantity="other" msgid="782234447471532005">"Deze <xliff:g id="COUNT">%1$d</xliff:g> berichten weggooien?"</item>
   </plurals>
-    <string name="confirm_discard_text" msgid="5172680524418848519">"Dit bericht verwijderen?"</string>
+    <string name="confirm_discard_text" msgid="5172680524418848519">"Dit bericht weggooien?"</string>
     <string name="loading_conversations" msgid="7255732786298655246">"Laden…"</string>
     <string name="empty_inbox" msgid="5901734942362315228">"U bent klaar. Nog een fijne dag gewenst."</string>
     <string name="empty_search" msgid="8564899353449880818">"Oeps! We hebben geen resultaten gevonden voor \'<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\'."</string>
@@ -380,8 +380,8 @@
     <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> bericht wordt permanent verwijderd."</item>
     <item quantity="other" msgid="263840304486020101">"<xliff:g id="COUNT">%1$d</xliff:g> berichten worden permanent verwijderd."</item>
   </plurals>
-    <string name="drawer_open" msgid="2285557278907103851">"Navigatielade openen"</string>
-    <string name="drawer_close" msgid="2065829742127544297">"Navigatielade sluiten"</string>
+    <string name="drawer_open" msgid="2285557278907103851">"Zijmenu openen"</string>
+    <string name="drawer_close" msgid="2065829742127544297">"Zijmenu sluiten"</string>
     <string name="conversation_photo_welcome_text" msgid="836483155429003787">"Raak de afbeelding van een afzender aan om dat gesprek te selecteren."</string>
     <string name="long_press_to_select_tip" msgid="1660881999120625177">"Blijf aanraken om één gesprek te selecteren en raak aan om meer te selecteren."</string>
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mappictogram"</string>
@@ -423,7 +423,7 @@
     <string name="set_end_date_dialog_title" msgid="7543009262788808443">"Einddatum (optioneel)"</string>
     <string name="custom_date" msgid="5794846334232367838">"Aangepast"</string>
     <string name="date_none" msgid="1061426502665431412">"Geen"</string>
-    <string name="discard_changes" msgid="5699760550972324746">"Wijzigingen annuleren?"</string>
+    <string name="discard_changes" msgid="5699760550972324746">"Wijzigingen niet opslaan?"</string>
     <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Wijzigingen in automatisch antwoord opgeslagen"</string>
     <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"Wijzigingen in automatisch antwoord geannuleerd"</string>
     <string name="vacation_responder_off" msgid="4429909341193366667">"Uit"</string>
@@ -479,6 +479,6 @@
     <string name="activity_preferences" msgid="8966077432517613292">"Instellingen"</string>
     <string name="overflow_description" msgid="7886090597023240426">"Meer opties"</string>
     <string name="security_hold_required_text" msgid="6619955920101834286">"Beveiligingsupdate vereist voor <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
-    <string name="update_security_text" msgid="3527335757205741077">"nu bijwerken"</string>
+    <string name="update_security_text" msgid="3527335757205741077">"nu updaten"</string>
     <string name="forms_are_disabled" msgid="2876312737118986789">"Formulieren zijn uitgeschakeld in Gmail"</string>
 </resources>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ee05799..1a0d871 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -80,7 +80,7 @@
     <string name="menu_show_original" msgid="2330398228979616661">"Przywróć automatyczne wymiary"</string>
     <string name="menu_settings" msgid="7993485401501778040">"Ustawienia"</string>
     <string name="menu_search" msgid="1949652467806052768">"Szukaj"</string>
-    <string name="menu_toggle_drawer" msgid="8653049392208282481">"Włącz/wyłącz szufladę"</string>
+    <string name="menu_toggle_drawer" msgid="8653049392208282481">"Włącz/wyłącz panel"</string>
     <string name="drawer_title" msgid="3766219846644975778">"Nawigacja"</string>
     <string name="mark_important" msgid="8781680450177768820">"Oznacz jako ważne"</string>
     <string name="mark_not_important" msgid="3342258155408116917">"Oznacz jako mało ważne"</string>
@@ -143,7 +143,7 @@
     <string name="message_retrying" msgid="5335188121407261331">"Próbuję ponownie…"</string>
     <string name="message_failed" msgid="7887650587384601790">"Niepowodzenie"</string>
     <string name="send_failed" msgid="2186285547449865010">"Wiadomość nie została wysłana."</string>
-    <string name="me_object_pronoun" msgid="4674452244417913816">"ja"</string>
+    <string name="me_object_pronoun" msgid="4674452244417913816">"mnie"</string>
     <string name="me_subject_pronoun" msgid="7479328865714008288">"ja"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="7605755011865575440">"Usunąć wątek?"</item>
@@ -163,7 +163,7 @@
     <string name="empty_search" msgid="8564899353449880818">"Brak wyników dla zapytania „<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>”."</string>
     <string name="empty_spam_folder" msgid="3288985543286122800">"Hurra! Brak spamu!"</string>
     <string name="empty_trash_folder" msgid="378119063015945020">"Kosz jest pusty. Miło, że dbasz o porządek."</string>
-    <string name="empty_folder" msgid="3227552635613553855">"Brak wiadomości."</string>
+    <string name="empty_folder" msgid="3227552635613553855">"Brak wiadomości"</string>
     <string name="getting_messages" msgid="8403333791332403244">"Wczytuję wiadomości"</string>
     <string name="undo" msgid="8256285267701059609">"Cofnij"</string>
   <plurals name="conversation_unstarred">
@@ -281,7 +281,7 @@
     <string name="activity_folder_selection" msgid="8375243281001234750">"Wybierz folder"</string>
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Folder Poczta"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Zmień foldery"</string>
-    <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Przenieś do"</string>
+    <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Przenieś do:"</string>
     <string name="search_hint" msgid="7060626585689391003">"Szukaj"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
@@ -371,7 +371,7 @@
     <string name="preference_swipe_title" msgid="2073613840893904205">"Działania przesuwania"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Na liście wątków"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Zdjęcie nadawcy"</string>
-    <string name="preference_sender_image_description" msgid="3586817690132199889">"Pokaż obok imienia i nazwiska na liście wątków"</string>
+    <string name="preference_sender_image_description" msgid="3586817690132199889">"Pokazuj obok imienia i nazwiska na liście wątków"</string>
     <string name="empty_trash" msgid="3385937024924728399">"Opróżnij kosz"</string>
     <string name="empty_spam" msgid="2911988289997281371">"Opróżnij spam"</string>
     <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Opróżnić kosz?"</string>
@@ -380,8 +380,8 @@
     <item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> wiadomość zostanie trwale usunięta."</item>
     <item quantity="other" msgid="263840304486020101">"Liczba wiadomości, które zostaną trwale usunięte: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
-    <string name="drawer_open" msgid="2285557278907103851">"Otwórz szufladę nawigacji"</string>
-    <string name="drawer_close" msgid="2065829742127544297">"Zamknij szufladę nawigacji"</string>
+    <string name="drawer_open" msgid="2285557278907103851">"Otwórz panel nawigacji"</string>
+    <string name="drawer_close" msgid="2065829742127544297">"Zamknij panel nawigacji"</string>
     <string name="conversation_photo_welcome_text" msgid="836483155429003787">"Kliknij zdjęcie nadawcy, by wybrać wątek."</string>
     <string name="long_press_to_select_tip" msgid="1660881999120625177">"Kliknij i przytrzymaj, by zaznaczyć jeden wątek, a następnie kliknij, by zaznaczyć więcej."</string>
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikona folderu"</string>
@@ -421,7 +421,7 @@
     <string name="pick_end_date_title" msgid="733396083649496600">"Zakończenie (opcjonalnie)"</string>
     <string name="date_not_set" msgid="3251555782945051904">"Nie ustawiono"</string>
     <string name="set_end_date_dialog_title" msgid="7543009262788808443">"Data zakończenia (opcjonalna)"</string>
-    <string name="custom_date" msgid="5794846334232367838">"Niestandardowa"</string>
+    <string name="custom_date" msgid="5794846334232367838">"Niestandardowa data"</string>
     <string name="date_none" msgid="1061426502665431412">"Brak"</string>
     <string name="discard_changes" msgid="5699760550972324746">"Odrzucić zmiany?"</string>
     <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Zmiany w wiadomości o nieobecności zostały zapisane"</string>
@@ -454,9 +454,9 @@
     <string name="reply_choice_smiling_face" msgid="1772253938506548631">":)"</string>
     <string name="reply_choice_frowning_face" msgid="6260338807944002651">":("</string>
     <string name="preference_header_action_confirmations" msgid="3922674681156121948">"Potwierdzenia czynności"</string>
-    <string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"Potwierdź przed usunięciem"</string>
-    <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"Potwierdź przed zarchiwizowaniem"</string>
-    <string name="preference_confirm_before_send_title" msgid="4136585783513077039">"Potwierdź przed wysłaniem"</string>
+    <string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"Potwierdź usuwanie"</string>
+    <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"Potwierdź archiwizowanie"</string>
+    <string name="preference_confirm_before_send_title" msgid="4136585783513077039">"Potwierdź wysyłanie"</string>
     <string name="preferences_conversation_mode_title" msgid="389352009651720838">"Autodopasowanie wiadomości"</string>
     <string name="preferences_conversation_mode_summary" msgid="5730999743867653106">"Zmniejsz wiadomości, by zmieścić je na ekranie"</string>
     <string name="preferences_disable_snap_headers_title" msgid="7257824136988429629">"Pasek opcji"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e021ce1..3f1dd62 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -88,7 +88,7 @@
     <string name="add_bcc_label" msgid="963745641238037813">"Adicionar Cco"</string>
     <string name="quoted_text" msgid="977782904293216533">"Incluir texto das mensagens anteriores"</string>
     <string name="quoted_text_label" msgid="2296807722849923934">"Texto mensag. anteriores"</string>
-    <string name="respond_inline" msgid="6609746292081928078">"Responder em linha"</string>
+    <string name="respond_inline" msgid="6609746292081928078">"Responder inline"</string>
     <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
     <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> KB"</string>
     <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ab87629..cc291ab 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -45,13 +45,13 @@
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Fişierul nu a fost ataşat. A fost atinsă limita maximă de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Nu s-a putut ataşa fişierul."</string>
     <string name="attachment_permission_denied" msgid="2274397783497640486">"S-a refuzat accesul la atașament."</string>
-    <string name="recipient_needed" msgid="319816879398937214">"Adăugaţi cel puţin un destinatar."</string>
+    <string name="recipient_needed" msgid="319816879398937214">"Introduceți cel puţin un destinatar."</string>
     <string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Nu există text în subiectul mesajului."</string>
     <string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Nu există text în corpul mesajului."</string>
     <string name="confirm_send_message" msgid="6211518590166222735">"Trimiteţi acest mesaj?"</string>
     <string name="message_discarded" msgid="6792661321962262024">"Mesaj refuzat."</string>
     <string name="signature" msgid="3172144541947408374">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
-    <string name="custom_from_account_label" msgid="5042317430007736322">"Trim. ca de la:"</string>
+    <string name="custom_from_account_label" msgid="5042317430007736322">"Trimiteți ca:"</string>
     <string name="send" msgid="4269810089682120826">"Trimiteţi"</string>
     <string name="mark_read" msgid="579388143288052493">"Marcaţi drept citită"</string>
     <string name="mark_unread" msgid="6245060538061533191">"Marcaţi drept necitită"</string>
@@ -143,7 +143,7 @@
     <string name="message_retrying" msgid="5335188121407261331">"Se reîncearcă..."</string>
     <string name="message_failed" msgid="7887650587384601790">"Nu a reușit"</string>
     <string name="send_failed" msgid="2186285547449865010">"Mesaj netrimis."</string>
-    <string name="me_object_pronoun" msgid="4674452244417913816">"eu"</string>
+    <string name="me_object_pronoun" msgid="4674452244417913816">"mine"</string>
     <string name="me_subject_pronoun" msgid="7479328865714008288">"eu"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="7605755011865575440">"Ștergeţi această conversaţie?"</item>
@@ -165,7 +165,7 @@
     <string name="empty_trash_folder" msgid="378119063015945020">"Niciun articol în coșul de gunoi. Vă mulțumim că reciclați."</string>
     <string name="empty_folder" msgid="3227552635613553855">"Nu există niciun e-mail în acest dosar."</string>
     <string name="getting_messages" msgid="8403333791332403244">"Mesaje în curs de încărcare"</string>
-    <string name="undo" msgid="8256285267701059609">"Anulaţi"</string>
+    <string name="undo" msgid="8256285267701059609">"Anulați"</string>
   <plurals name="conversation_unstarred">
     <item quantity="one" msgid="1701235480675303125">"Se anulează marcarea cu stea pentru <xliff:g id="COUNT">%1$d</xliff:g> conversație"</item>
     <item quantity="other" msgid="1154441830432477256">"Se anulează marcarea cu stea pentru <xliff:g id="COUNT">%1$d</xliff:g> (de) conversații"</item>
@@ -253,7 +253,7 @@
     <string name="send_anyway" msgid="2727576121007079643">"Trimiteți oricum"</string>
     <string name="ok" msgid="6178802457914802336">"OK"</string>
     <string name="done" msgid="344354738335270292">"Terminat"</string>
-    <string name="cancel" msgid="4831678293149626190">"Anulaţi"</string>
+    <string name="cancel" msgid="4831678293149626190">"Anulați"</string>
     <string name="clear" msgid="765949970989448022">"Ștergeți"</string>
     <string name="next" msgid="2662478712866255138">"Înainte"</string>
     <string name="previous" msgid="8985379053279804274">"Înapoi"</string>
@@ -368,7 +368,7 @@
     <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Acțiune prestabilită"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Răspundeți tuturor"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Utilizați ca setare prestabilită pentru răspunsurile la mesaje"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Glisați acțiunile"</string>
+    <string name="preference_swipe_title" msgid="2073613840893904205">"Acțiunile de glisare"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"În lista de conversații"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imaginea expeditorului"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Afișați lângă nume în lista de conversații"</string>
@@ -457,7 +457,7 @@
     <string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"Confirmaţi înainte de a şterge"</string>
     <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"Confirmaţi înainte de a arhiva"</string>
     <string name="preference_confirm_before_send_title" msgid="4136585783513077039">"Confirmaţi înainte de a trimite"</string>
-    <string name="preferences_conversation_mode_title" msgid="389352009651720838">"Ajustați mesajele automat"</string>
+    <string name="preferences_conversation_mode_title" msgid="389352009651720838">"Încadrează automat mesajele"</string>
     <string name="preferences_conversation_mode_summary" msgid="5730999743867653106">"Micșorați mesajele pentru a se încadra pe ecran"</string>
     <string name="preferences_disable_snap_headers_title" msgid="7257824136988429629">"Acţiuni pentru mesaje"</string>
   <string-array name="prefSummaries_snapHeader">

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c05c48e..be49b4e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -144,7 +144,7 @@
     <string name="message_failed" msgid="7887650587384601790">"Ошибка"</string>
     <string name="send_failed" msgid="2186285547449865010">"Не отправлено."</string>
     <string name="me_object_pronoun" msgid="4674452244417913816">"мне"</string>
-    <string name="me_subject_pronoun" msgid="7479328865714008288">"мне"</string>
+    <string name="me_subject_pronoun" msgid="7479328865714008288">"я"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="7605755011865575440">"Удалить эту цепочку?"</item>
     <item quantity="other" msgid="1585660381208712562">"Удалить эти цепочки (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 33586c4..4004c2f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -441,7 +441,7 @@
     <string name="print_dialog" msgid="8895536548487605661">"Tlačiť..."</string>
     <string name="copyright_information" msgid="971422874488783312">"Informácie o aut. právach"</string>
     <string name="privacy_policy" msgid="212094623396418302">"Pravidlá ochrany údajov"</string>
-    <string name="open_source_licenses" msgid="8643615555920977752">"Otvorený zdroj – licencie"</string>
+    <string name="open_source_licenses" msgid="8643615555920977752">"Licencie open source"</string>
     <string name="reply_choice_yes" msgid="3327633032975373220">"Áno"</string>
     <string name="reply_choice_no" msgid="7068775605915475207">"Nie"</string>
     <string name="reply_choice_ok" msgid="7881073621845053152">"OK"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d3edfa5..76b326b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -86,7 +86,7 @@
     <string name="mark_not_important" msgid="3342258155408116917">"Означи као неважно"</string>
     <string name="add_cc_label" msgid="2249679001141195213">"Додај Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="963745641238037813">"Додај Bcc"</string>
-    <string name="quoted_text" msgid="977782904293216533">"Уврсти наведени текст"</string>
+    <string name="quoted_text" msgid="977782904293216533">"Додај и цитирани текст"</string>
     <string name="quoted_text_label" msgid="2296807722849923934">"Цитирај текст"</string>
     <string name="respond_inline" msgid="6609746292081928078">"Одговори у тексту"</string>
     <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
@@ -241,8 +241,8 @@
     <string name="message_saved" msgid="3291655042310241793">"Порука је сачувана као недовршена."</string>
     <string name="sending_message" msgid="2487846954946637084">"Слање поруке…"</string>
     <string name="invalid_recipient" msgid="9157434699389936584">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> је неважећа."</string>
-    <string name="show_elided" msgid="3456154624105704327">"Прикажи наведени текст"</string>
-    <string name="hide_elided" msgid="5768235486834692733">"▼ Сакриј наведени текст"</string>
+    <string name="show_elided" msgid="3456154624105704327">"Прикажи цитирани текст"</string>
+    <string name="hide_elided" msgid="5768235486834692733">"▼ Сакриј цитирани текст"</string>
     <string name="message_invite_title" msgid="5985161025144867256">"Позивница за Календар"</string>
     <string name="message_invite_calendar_view" msgid="9181966650840809197">"Прикажи у Календару"</string>
     <string name="message_invite_label_attending" msgid="4194264767870003397">"Идете?"</string>
@@ -406,14 +406,14 @@
     <string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> у <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="draft_to_heading" msgid="7370121943946205024">"Недовршена за:"</string>
     <string name="draft_heading" msgid="7032951343184552800">"Недовршена"</string>
-    <string name="quoted_text_hidden_print" msgid="5256754205675159141">"Наведени текст је сакривен"</string>
+    <string name="quoted_text_hidden_print" msgid="5256754205675159141">"Цитирани текст је сакривен"</string>
   <plurals name="num_attachments">
     <item quantity="one" msgid="5494465717267988888">"<xliff:g id="COUNT">%1$d</xliff:g> прилог"</item>
     <item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> прилога"</item>
   </plurals>
     <string name="no_subject" msgid="5622708348540036959">"(без наслова)"</string>
-    <string name="vacation_responder" msgid="5570132559074523806">"Одговор на одмору"</string>
-    <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"Одговор на одмору"</string>
+    <string name="vacation_responder" msgid="5570132559074523806">"Аутоматски одговор"</string>
+    <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"Аутоматски одговор"</string>
     <string name="vacation_responder_body_hint_text" msgid="9087613123105158494">"Порука"</string>
     <string name="send_to_contacts_text" msgid="124432913980620545">"Пошаљи само мојим контактима"</string>
     <string name="send_to_domain_text" msgid="5064559546745918393">"Пошаљи само на <xliff:g id="DOMAIN">%1$s</xliff:g>"</string>
@@ -424,8 +424,8 @@
     <string name="custom_date" msgid="5794846334232367838">"Прилагођено"</string>
     <string name="date_none" msgid="1061426502665431412">"Нема"</string>
     <string name="discard_changes" msgid="5699760550972324746">"Желите ли да одбаците промене?"</string>
-    <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Промене одговора на одмору су сачуване"</string>
-    <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"Промене одговора на одмору су одбачене"</string>
+    <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Промене аутоматског одговора су сачуване"</string>
+    <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"Промене аутоматског одговора су одбачене"</string>
     <string name="vacation_responder_off" msgid="4429909341193366667">"Искључено"</string>
     <string name="vacation_responder_on" msgid="4913238379320882449">"Укључено од <xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="vacation_responder_on_with_end_date" msgid="4360941815371475955">"Укључено од <xliff:g id="START_DATE">%1$s</xliff:g> до <xliff:g id="END_DATE">%2$s</xliff:g>"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d15a4b4..4fb869f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -88,7 +88,7 @@
     <string name="add_bcc_label" msgid="963745641238037813">"Lägg t. hemlig kopia"</string>
     <string name="quoted_text" msgid="977782904293216533">"Inkludera citerad text"</string>
     <string name="quoted_text_label" msgid="2296807722849923934">"Citerad text"</string>
-    <string name="respond_inline" msgid="6609746292081928078">"Svara inbäddade"</string>
+    <string name="respond_inline" msgid="6609746292081928078">"Svara inbäddat"</string>
     <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
     <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> kB"</string>
     <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>
@@ -215,7 +215,7 @@
     <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Visa information&lt;/a&gt;"</string>
-    <string name="hide_details" msgid="8018801050702453314">"Dölj detaljer"</string>
+    <string name="hide_details" msgid="8018801050702453314">"Dölj information"</string>
     <string name="to_message_header" msgid="3954385178027011919">"till <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
     <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Hemlig kopia: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Visa kontaktuppgifter för <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -267,7 +267,7 @@
     <item msgid="5442620760791553027">"Serverfel"</item>
   </string-array>
     <string name="tap_to_configure" msgid="137172348280050643">"Tryck om du vill konfigurera"</string>
-    <string name="non_synced_folder_description" msgid="3044618511909304701">"Synka för att visa konversationer."</string>
+    <string name="non_synced_folder_description" msgid="3044618511909304701">"Synkronisera för att visa konversationer."</string>
     <string name="tap_to_configure_folder_sync" msgid="3280434399275638071">"Synkronisera mappen"</string>
     <string name="widget_large_unread_count" msgid="8699435859096455837">"%d+"</string>
     <string name="large_unseen_count" msgid="3055042669246912518">"<xliff:g id="COUNT">%d</xliff:g>+ nya"</string>
@@ -296,7 +296,7 @@
     <skip />
     <string name="shortcut_name_title" msgid="1562534040126088628">"Kortkommando för att namnge mapp"</string>
     <string name="wait_for_sync_title" msgid="4577632826912823075">"Väntar på synk"</string>
-    <string name="not_synced_title" msgid="3600180500934086346">"Kontot är inte synkat"</string>
+    <string name="not_synced_title" msgid="3600180500934086346">"Kontot är inte synkroniserat"</string>
     <string name="wait_for_manual_sync_body" msgid="2823149409451003378">"Det här kontot har inte konfigurerats så att det synkroniseras automatiskt.\nTryck på "<b>"Synka nu"</b>" om du vill synkronisera e-post en gång eller "<b>"Ändra synkroniseringsinställn."</b>" om du vill konfigurera kontot så att e-post synkroniseras automatiskt."</string>
     <string name="manual_sync" msgid="2271479734895537848">"Synka nu"</string>
     <string name="change_sync_settings" msgid="3615852118397055361">"Ändra synkroniseringsinställn."</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 96a1c2b..3b7644a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -155,7 +155,7 @@
   </plurals>
   <plurals name="confirm_discard_drafts_conversation">
     <item quantity="one" msgid="2030421499893210789">"Ungependa kutupa ujumbe huu?"</item>
-    <item quantity="other" msgid="782234447471532005">"Ungependa kufuta ujumbe huu <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+    <item quantity="other" msgid="782234447471532005">"Ungependa kufuta rasimu hizi <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
   </plurals>
     <string name="confirm_discard_text" msgid="5172680524418848519">"Ujumbe huu utupwe?"</string>
     <string name="loading_conversations" msgid="7255732786298655246">"Inapakia…"</string>
@@ -211,8 +211,8 @@
     <string name="search_suggestion_desc" msgid="4165491276003825492">"Pendekezo: <xliff:g id="SUGGESTION">%s</xliff:g>"</string>
     <string name="add_label" msgid="3285338046038610902">"Ongeza folda"</string>
   <plurals name="new_incoming_messages">
-    <item quantity="one" msgid="1532079301006372605">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
-    <item quantity="other" msgid="4085982174357328926">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
+    <item quantity="one" msgid="1532079301006372605">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
+    <item quantity="other" msgid="4085982174357328926">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
   </plurals>
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tazama maelezo&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ficha maelezo"</string>
@@ -351,8 +351,8 @@
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
     <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
   <plurals name="new_messages">
-    <item quantity="one" msgid="3446656407520493241">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
-    <item quantity="other" msgid="3531683811183204615">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
+    <item quantity="one" msgid="3446656407520493241">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
+    <item quantity="other" msgid="3531683811183204615">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Kimya"</string>
@@ -377,8 +377,8 @@
     <string name="empty_trash_dialog_title" msgid="2104898489663621508">"Ungependa Kusafisha Tupio?"</string>
     <string name="empty_spam_dialog_title" msgid="1130319045917820569">"Ungependa Kuondoa Barua taka?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="3315412388217832914">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> utafutwa kabisa."</item>
-    <item quantity="other" msgid="263840304486020101">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> utafutwa kabisa."</item>
+    <item quantity="one" msgid="3315412388217832914">"Mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yatafutwa kabisa."</item>
+    <item quantity="other" msgid="263840304486020101">"Mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yatafutwa kabisa."</item>
   </plurals>
     <string name="drawer_open" msgid="2285557278907103851">"Fungua menyu"</string>
     <string name="drawer_close" msgid="2065829742127544297">"Funga menyu"</string>
@@ -400,8 +400,8 @@
     <string name="print" msgid="7987949243936577207">"Chapisha"</string>
     <string name="print_all" msgid="4011022762279519941">"Chapisha zote"</string>
   <plurals name="num_messages">
-    <item quantity="one" msgid="8071234386915191851">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-    <item quantity="other" msgid="962415099931188360">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="one" msgid="8071234386915191851">"Mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="962415099931188360">"Mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> saa <xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="draft_to_heading" msgid="7370121943946205024">"Rasimu Kwa:"</string>
@@ -439,7 +439,7 @@
     <string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g> toleo la <xliff:g id="VERSION">%2$s</xliff:g>"</string>
     <string name="view_app_page" msgid="3241990517052398927"></string>
     <string name="print_dialog" msgid="8895536548487605661">"Chapisha..."</string>
-    <string name="copyright_information" msgid="971422874488783312">"Maelezo ya hakimilki"</string>
+    <string name="copyright_information" msgid="971422874488783312">"Maelezo ya hakimiliki"</string>
     <string name="privacy_policy" msgid="212094623396418302">"Sera ya faragha"</string>
     <string name="open_source_licenses" msgid="8643615555920977752">"Leseni za programu huria"</string>
     <string name="reply_choice_yes" msgid="3327633032975373220">"Ndiyo"</string>

diff --git a/res/values-ur-rPK-sw600dp/strings.xml b/res/values-ur-rPK-sw600dp/strings.xml
index 643df38..bb80cc0 100644
--- a/res/values-ur-rPK-sw600dp/strings.xml
+++ b/res/values-ur-rPK-sw600dp/strings.xml

@@ -18,8 +18,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="add_cc_label" msgid="5504248178750252553">"‎+ Cc/Bcc"</string>
-    <string name="add_bcc_label" msgid="2464329024392383408">"‎+ Bcc"</string>
+    <string name="add_cc_label" msgid="5504248178750252553">"‏‎+ سی سی / بی سی سی"</string>
+    <string name="add_bcc_label" msgid="2464329024392383408">"‏‎+ بی سی سی"</string>
     <string name="menu_manage_folders" msgid="2575462565700103317">"فولڈرز کا نظم کریں"</string>
     <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"پیغام کی اطلاعات کے جوابات کیلئے ڈیفالٹ کے بطور استعمال کریں"</string>
 </resources>

diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index f648a24..370c636 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml

@@ -20,8 +20,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="from" msgid="5159056500059912358">"منجانب"</string>
     <string name="to" msgid="3971614275716830581">"بنام"</string>
-    <string name="cc" msgid="8768828862207919684">"Cc"</string>
-    <string name="bcc" msgid="519303553518479171">"Bcc"</string>
+    <string name="cc" msgid="8768828862207919684">"سی سی"</string>
+    <string name="bcc" msgid="519303553518479171">"بی سی سی"</string>
     <string name="subject_hint" msgid="2136470287303571827">"موضوع"</string>
     <string name="body_hint" msgid="6478994981747057817">"ای میل تحریر کریں"</string>
     <string name="add_file_attachment" msgid="2604880054248593993">"فائل منسلک کریں"</string>
@@ -38,7 +38,7 @@
     <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> کو <xliff:g id="PERSON">%s</xliff:g> نے لکھا:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"‏---------- فارورڈ کیا ہوا پیغام ----------&lt;br&gt;منجانب: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;تاریخ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;موضوع: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;بنام: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- فارورڈ کیا ہوا پیغام ----------"</string>
-    <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
+    <string name="cc_attribution" msgid="2928584226469388899">"‏سی سی: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="353236686616663062">"منسلکہ کی قسم منتخب کریں"</string>
     <string name="too_large_to_attach_single" msgid="2669897137966512530">"<xliff:g id="MAXSIZE">%1$s</xliff:g> سے بڑی فائل منسلک نہیں ہوسکتی۔"</string>
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ایک یا زائد فائلیں منسلک نہیں ہوئیں۔ حد <xliff:g id="MAXSIZE">%1$s</xliff:g>۔"</string>
@@ -84,8 +84,8 @@
     <string name="drawer_title" msgid="3766219846644975778">"نیویگیشن"</string>
     <string name="mark_important" msgid="8781680450177768820">"اہم کا نشان لگائیں"</string>
     <string name="mark_not_important" msgid="3342258155408116917">"اہم نہیں کا نشان لگائیں"</string>
-    <string name="add_cc_label" msgid="2249679001141195213">"‏Cc/Bcc شامل کریں"</string>
-    <string name="add_bcc_label" msgid="963745641238037813">"‏Bcc شامل کریں"</string>
+    <string name="add_cc_label" msgid="2249679001141195213">"سی سی / بی سی سی شامل کریں"</string>
+    <string name="add_bcc_label" msgid="963745641238037813">"بی سی سی شامل کریں"</string>
     <string name="quoted_text" msgid="977782904293216533">"حوالے کا متن شامل کریں"</string>
     <string name="quoted_text_label" msgid="2296807722849923934">"متن کا حوالہ دیں"</string>
     <string name="respond_inline" msgid="6609746292081928078">"درون سطر جواب دیں"</string>
@@ -217,7 +217,7 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;تفصیل دیکھیں&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"تفصیلات چھپائیں"</string>
     <string name="to_message_header" msgid="3954385178027011919">"بنام <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc:‎ "</string>
+    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"بی سی سی: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> کیلئے رابطے کی معلومات دکھائیں"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"رابطے کی معلومات دکھائیں"</string>
   <plurals name="show_messages_read">
@@ -230,8 +230,8 @@
     <string name="replyto_heading" msgid="8275255318292059079">"جواب دیں بنام:"</string>
     <string name="to_heading" msgid="3495203282540398336">"بنام: "</string>
     <string name="to_heading_no_space" msgid="679167047628308670">"بنام:"</string>
-    <string name="cc_heading" msgid="5603892257866345823">"Cc:"</string>
-    <string name="bcc_heading" msgid="1482186590756218269">"Bcc:‎"</string>
+    <string name="cc_heading" msgid="5603892257866345823">"سی سی:"</string>
+    <string name="bcc_heading" msgid="1482186590756218269">"بی سی سی:"</string>
     <string name="date_heading" msgid="4213063948406397168">"تاریخ:"</string>
     <string name="show_images" msgid="436044894053204084">"تصاویر دکھائیں"</string>
     <string name="always_show_images" msgid="556087529413707819">"ہمیشہ اس مرسل کی جانب سے تصاویر دکھائیں"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index efe60a5..8937b6f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -312,7 +312,7 @@
     <string name="show" msgid="2874876876336599985">"显示"</string>
     <string name="sync_error" msgid="1795794969006241678">"无法同步。"</string>
     <string name="sync_error_message" msgid="4182644657243736635">"您的设备存储空间不足，无法同步。"</string>
-    <string name="storage" msgid="4783683938444150638">"存储"</string>
+    <string name="storage" msgid="4783683938444150638">"存储空间"</string>
     <string name="senders_split_token" msgid="6549228851819460081">"、"</string>
     <string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="9023770187629170967">"所有文件夹"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 134c652..0c814f1 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -80,7 +80,7 @@
     <string name="menu_show_original" msgid="2330398228979616661">"取消自動調整大小"</string>
     <string name="menu_settings" msgid="7993485401501778040">"設定"</string>
     <string name="menu_search" msgid="1949652467806052768">"搜尋"</string>
-    <string name="menu_toggle_drawer" msgid="8653049392208282481">"切換導覽匣"</string>
+    <string name="menu_toggle_drawer" msgid="8653049392208282481">"切換導覽列"</string>
     <string name="drawer_title" msgid="3766219846644975778">"瀏覽"</string>
     <string name="mark_important" msgid="8781680450177768820">"標示為重要"</string>
     <string name="mark_not_important" msgid="3342258155408116917">"標示為不重要"</string>

diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index 6215a1b..dde641f 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java

@@ -1999,6 +1999,13 @@
     }
 
     @Override
+    public void setExtras(Bundle extras) {
+        if (mUnderlyingCursor != null) {
+            mUnderlyingCursor.setExtras(extras);
+        }
+    }
+
+    @Override
     public Bundle getExtras() {
         return mUnderlyingCursor != null ? mUnderlyingCursor.getExtras() : Bundle.EMPTY;
     }

diff --git a/src/com/android/mail/providers/ConversationInfo.java b/src/com/android/mail/providers/ConversationInfo.java
index 60d47e8..ebbc404 100644
--- a/src/com/android/mail/providers/ConversationInfo.java
+++ b/src/com/android/mail/providers/ConversationInfo.java

@@ -136,10 +136,13 @@
         for (ParticipantInfo pi : participantInfos) {
             changed |= pi.markRead(read);
         }
-        if (read) {
-            firstSnippet = lastSnippet;
-        } else {
-            firstSnippet = firstUnreadSnippet;
+        // Change the firstSnippet only if the conversion has messages.
+        if (messageCount > 0) {
+            if (read) {
+                firstSnippet = lastSnippet;
+            } else {
+                firstSnippet = firstUnreadSnippet;
+            }
         }
         return changed;
     }

diff --git a/src/com/android/mail/ui/AbstractMailActivity.java b/src/com/android/mail/ui/AbstractMailActivity.java
index 41cc1d6..00d2f5f 100644
--- a/src/com/android/mail/ui/AbstractMailActivity.java
+++ b/src/com/android/mail/ui/AbstractMailActivity.java

@@ -41,7 +41,8 @@
 
     private final UiHandler mUiHandler = new UiHandler();
 
-    private static final boolean STRICT_MODE = false;
+    // STOPSHIP: ship with false
+    private static final boolean STRICT_MODE = true;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

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

@@ -64,7 +64,8 @@
      * production releases.  This should be set to DEBUG for production releases, and VERBOSE for
      * internal builds.
      */
-    private static final int MAX_ENABLED_LOG_LEVEL = DEBUG;
+    // STOPSHIP: ship with DEBUG set
+    private static final int MAX_ENABLED_LOG_LEVEL = VERBOSE;
 
     private static Boolean sDebugLoggingEnabledForTests = null;
commit	be56f659314cb3487f3418e59f363d95047b7712	[log] [tgz]
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>	Mon Jun 04 20:37:55 2018 +0000
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>	Mon Jun 04 20:37:55 2018 +0000
tree	958fb4a201e432f86b1e3a74e23c424ef5b02a4a
parent	7764908d8d66f9a9557330321a37e2b7b950f703 [diff]
parent	eb8ae2ec1702db9c02e4175d2187a94b890fa6ce [diff]