Revert "Import translations. DO NOT MERGE"

This reverts commit 0956a7442cb69f4c058677fdd4fca20c3265d4cf.

Change-Id: Ie53344b0967185eede59c729ef84fe120df149d7

1 files changed, 81 insertions, 21 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1ad4acf71..8937b6f55 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -135,16 +135,28 @@
     <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>
-    <!-- no translation found for draft (2915238043901489851) -->
+  <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>
-    <!-- no translation found for confirm_delete_conversation (722036566531251559) -->
-    <!-- no translation found for confirm_archive_conversation (7760911183221317694) -->
-    <!-- no translation found for confirm_discard_drafts_conversation (4704744461929249410) -->
+  <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>
@@ -154,32 +166,66 @@
     <string name="empty_folder" msgid="3227552635613553855">"此文件夹中没有任何邮件。"</string>
     <string name="getting_messages" msgid="8403333791332403244">"正在获取您的邮件"</string>
     <string name="undo" msgid="8256285267701059609">"撤消"</string>
-    <!-- no translation found for conversation_unstarred (5242113602090059215) -->
-    <!-- no translation found for conversation_muted (3280752122212714131) -->
-    <!-- no translation found for conversation_spammed (4264670191485300404) -->
-    <!-- no translation found for conversation_not_spam (341281429212783466) -->
-    <!-- no translation found for conversation_not_important (8090128248406661440) -->
-    <!-- no translation found for conversation_phished (5902127137916313501) -->
-    <!-- no translation found for conversation_archived (476119927226343340) -->
-    <!-- no translation found for conversation_deleted (146676597775224315) -->
+  <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>
-    <!-- no translation found for conversation_folder_changed (6812277407422164007) -->
+  <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>
-    <!-- no translation found for new_incoming_messages (95265907926727940) -->
+  <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">"密送： "</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>
-    <!-- no translation found for show_messages_read (2880246565585406705) -->
-    <!-- no translation found for super_collapsed_block_accessibility_announcement (2222271345704794428) -->
+  <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>
@@ -226,7 +272,9 @@
     <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>
-    <!-- no translation found for actionbar_unread_messages (7570899809760688947) -->
+  <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>
@@ -302,7 +350,10 @@
     <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>
-    <!-- no translation found for new_messages (1136518322478480716) -->
+  <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>
@@ -325,7 +376,10 @@
     <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>
-    <!-- no translation found for empty_folder_dialog_message (4783346716525541632) -->
+  <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>
@@ -345,12 +399,18 @@
     <string name="hide_folders" msgid="7618891933409521283">"隐藏文件夹"</string>
     <string name="print" msgid="7987949243936577207">"打印"</string>
     <string name="print_all" msgid="4011022762279519941">"全部打印"</string>
-    <!-- no translation found for num_messages (5376675141101465755) -->
+  <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>
-    <!-- no translation found for num_attachments (3349677754516200488) -->
+  <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>