Import translations. DO NOT MERGE

Change-Id: I003de9b6504c8345260012698092e708c393d144
Auto-generated-cl: translation import
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 18e823b..bdcb50f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -40,7 +40,12 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- 转发的邮件 ----------&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="cc_attribution" msgid="374493748526504562">"抄送:<xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"选择附件类型"</string>
-    <string name="too_large_to_attach" msgid="6355534239324333583">"文件过大,无法附加。"</string>
+    <!-- no translation found for too_large_to_attach_single (2996733972478212136) -->
+    <skip />
+    <!-- no translation found for too_large_to_attach_multiple (5452547998184881210) -->
+    <skip />
+    <!-- no translation found for too_large_to_attach_additional (3366607594339390249) -->
+    <skip />
     <string name="generic_attachment_problem" msgid="8775959340559458709">"无法附加文件。"</string>
     <string name="recipient_needed" msgid="999037027358925655">"请至少添加一位收件人。"</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"收件人出错"</string>
@@ -63,6 +68,8 @@
     <string name="mark_not_spam" msgid="694891665407228160">"这不是垃圾邮件"</string>
     <string name="report_phishing" msgid="5714205737453138338">"举报网上诱骗行为"</string>
     <string name="delete" msgid="844871204175957681">"删除"</string>
+    <!-- no translation found for discard_drafts (6862272443470085375) -->
+    <skip />
     <string name="next" msgid="4674401197968248302">"更早"</string>
     <string name="previous" msgid="309943944831349924">"更晚"</string>
     <string name="refresh" msgid="490989798005710951">"刷新"</string>
@@ -167,6 +174,8 @@
     <item quantity="one" msgid="2990537295519552069">"要将此会话归档吗?"</item>
     <item quantity="other" msgid="4713469868399246772">"要将这 <xliff:g id="COUNT">%1$d</xliff:g> 个会话归档吗?"</item>
   </plurals>
+    <!-- no translation found for confirm_discard_drafts_conversation:one (5974090449454432874) -->
+    <!-- no translation found for confirm_discard_drafts_conversation:other (4173815457177336569) -->
     <string name="confirm_discard_text" msgid="1149834186404614612">"要舍弃此邮件吗?"</string>
     <string name="no_conversations" msgid="35400008890372241">"无会话。"</string>
     <string name="undo" msgid="6070869718469782251">"撤消"</string>
@@ -280,10 +289,8 @@
     <string name="show_images" msgid="1875700481186331432">"显示图片"</string>
     <string name="always_show_images" msgid="5966408990164581801">"总是显示来自此发件人的图片"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"系统会自动显示来自此发件人的图片。"</string>
-    <!-- no translation found for address_display_format (3581303608028992576) -->
-    <skip />
-    <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
-    <skip />
+    <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
+    <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> 来自 <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"邮件已另存为草稿。"</string>
     <string name="sending_message" msgid="2822171587017313151">"正在将邮件送到发件箱…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 无效。"</string>