Import translations. DO NOT MERGE

Change-Id: Id0268d2c1cc3ec0c4749d39f72ebb1644c7a9e8f
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b02c6bc..603fe2d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"统一电子邮件"</string>
     <string name="to" msgid="4392614766835725698">"收件人"</string>
     <string name="cc" msgid="7017720927911078193">"抄送"</string>
     <string name="bcc" msgid="3098643138241111579">"密送"</string>
@@ -55,7 +54,7 @@
     <string name="add_star" msgid="2866003744391266498">"加注星标"</string>
     <string name="remove_star" msgid="4372327933122106128">"删除星标"</string>
     <string name="archive" msgid="847250094775910499">"归档"</string>
-    <string name="report_spam" msgid="6467567747975393907">"举报垃圾内容"</string>
+    <string name="report_spam" msgid="6467567747975393907">"举报垃圾邮件"</string>
     <string name="delete" msgid="844871204175957681">"删除"</string>
     <string name="next" msgid="4674401197968248302">"更早"</string>
     <string name="previous" msgid="309943944831349924">"更晚"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"转发"</string>
     <string name="menu_compose" msgid="6274193058224230645">"写邮件"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"更改标签"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"更改文件夹"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"管理标签"</string>
     <string name="label_list_title" msgid="7948730824763052410">"标签"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同步与通知"</string>
@@ -158,8 +156,8 @@
     <item quantity="other" msgid="1941193356069303587">"已忽略 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话。"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="3060864972122279220">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾内容。"</item>
-    <item quantity="other" msgid="5071459475389411227">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾内容。"</item>
+    <item quantity="one" msgid="3060864972122279220">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾邮件。"</item>
+    <item quantity="other" msgid="5071459475389411227">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾邮件。"</item>
   </plurals>
   <plurals name="conversation_archived">
     <item quantity="one" msgid="5457612502965117672">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话归档。"</item>
@@ -189,16 +187,11 @@
     <item quantity="one" msgid="365581967734960166">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为未读。"</item>
     <item quantity="other" msgid="858491333253953462">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为未读。"</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"已更改文件夹。"</item>
+    <item quantity="other" msgid="8918589141287976985">"已更改文件夹。"</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"结果"</string>
-    <string name="searchMode" msgid="3329807422114758583">"搜索模式"</string>
-    <string name="searchConversationMode" msgid="8015441927706455618">"搜索会话模式"</string>
-    <string name="setBackButton" msgid="3004728881963818222">"设置“返回”按钮"</string>
-    <string name="removeBackButton" msgid="860383341267568260">"删除“返回”按钮"</string>
-    <string name="normalMode" msgid="4250277414924926730">"设置普通模式"</string>
-    <string name="searchResultMode" msgid="3564180712046711968">"搜索结果模式"</string>
-    <string name="labelMode" msgid="1821987146443702635">"设置标签模式"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"正在搜索..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"最近"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"展开收件人详细信息"</string>
@@ -229,39 +222,30 @@
     <string name="cancel" msgid="8762981157252199115">"取消"</string>
     <string name="close" msgid="419945428844076406">"关闭"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"此帐户尚未设置文件夹。"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"成功"</item>
+    <item msgid="5037283655022689372">"连接错误"</item>
+    <item msgid="4252875340758600974">"身份验证错误"</item>
+    <item msgid="7611299631880179587">"安全错误"</item>
+    <item msgid="665244114363057627">"存储错误"</item>
+    <item msgid="9190542479647789762">"内部错误"</item>
+  </string-array>
+    <string name="tap_to_configure" msgid="1181356242354390930">"触摸以设置"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"要查看会话,请同步此文件夹。"</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步文件夹"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"查看更多会话"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"正在加载..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"选择帐户"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"选择文件夹"</string>
+    <string name="sync_all" msgid="1057043212338233359">"同步:全部"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"同步:过去 <xliff:g id="COUNT">%1$d</xliff:g> 天的会话"</item>
+    <item quantity="other" msgid="6856940335775567991">"同步:过去 <xliff:g id="COUNT">%1$d</xliff:g> 天的会话"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"同步:否"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"同步文件夹"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"要查看该窗口小部件中的会话,请同步此文件夹。"</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"同步过去 <xliff:g id="NUMSYNCDAYS">%d</xliff:g> 天的会话"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"更改文件夹"</string>
 </resources>