Import translations. DO NOT MERGE

Change-Id: Idacd354d13b0bac59fee0ea9654abe01663bcc1d
Auto-generated-cl: translation import
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index af592da..88124b7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -378,24 +378,25 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>:<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"静音"</string>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"删除操作"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"归档会话"</item>
-    <item msgid="1894624633891654411">"删除会话"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"将会话归档(而不是删除)"</item>
-    <item msgid="6515786566522105643">"删除会话(而不是归档)"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"删除操作"</string>
+    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
+    <skip />
+    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
+    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
+    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
+    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
+    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
+    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
+    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
+    <skip />
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"全部回复"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"用作默认的邮件回复方式"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"滑动即可删除"</string>
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
+    <skip />
     <string name="preference_swipe_description" msgid="5132683510510041028">"在会话列表中"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
-    <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
-    <skip />
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"发件人头像"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"在会话列表中的名称旁显示"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下拉即可刷新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
     <string name="empty_trash" msgid="652435297593538512">"清空已删除邮件"</string>
@@ -403,9 +404,11 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"要清空已删除邮件吗?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"要清空垃圾邮件吗?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将遭到永久删除。"</item>
-    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将遭到永久删除。"</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将会永久删除。"</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将会永久删除。"</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航栏"</string>
     <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航栏"</string>
+    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
+    <skip />
 </resources>