From 2269c2d12b1ada529fb8ca0aa6afb307c7b8636f Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 9 Apr 2012 15:02:34 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: Icf78d443b9bd55cab09bead04c8046bcecab171d
---
 res/values-zh-rCN/arrays.xml  |  7 -------
 res/values-zh-rCN/strings.xml | 27 ++++++++++-----------------
 2 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'res/values-zh-rCN')

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 9b7f8d0..c85cc2a 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -282,11 +282,4 @@
     <item msgid="4042143101664725090">"超时"</item>
     <item msgid="7664124146786465092">"失败"</item>
   </string-array>
-  <string-array name="user_content_ratings_entries">
-    <item msgid="6695142042685002581">"Ascended being"</item>
-    <item msgid="5947820123307066039">"Human"</item>
-    <item msgid="8199409897107872131">"Neanderthal"</item>
-    <item msgid="5420874533358730735">"Chimp"</item>
-    <item msgid="3409224639317409791">"Monkey"</item>
-  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a85fdc2..6c6128d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1098,10 +1098,8 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
     <string name="pointer_settings_category" msgid="8183819795164034286">"鼠标/触控板"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"指针速度"</string>
-    <!-- no translation found for keyboard_layout_picker_title (2980668240678577691) -->
-    <skip />
-    <!-- no translation found for keyboard_layout_picker_empty_text (3104781634456597547) -->
-    <skip />
+    <string name="keyboard_layout_picker_title" msgid="2980668240678577691">"选择键盘布局"</string>
+    <string name="keyboard_layout_picker_empty_text" msgid="3104781634456597547">"没有可以使用的键盘布局。"</string>
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
     <string name="user_dict_single_settings_title" msgid="524997218433540614">"个人词典"</string>
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"个人词典"</string>
@@ -1505,8 +1503,7 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"单独显示 4G 流量"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"显示 Wi-Fi 使用情况"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"显示以太网使用情况"</string>
-    <!-- no translation found for data_usage_menu_metered (6373223066892765423) -->
-    <skip />
+    <string name="data_usage_menu_metered" msgid="6373223066892765423">"高收费网络"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"更改周期..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"流量使用周期的日期设置："</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"没有任何应用在此期间产生过数据流量。"</string>
@@ -1551,14 +1548,10 @@
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"已删除的应用"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>，已发送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
     <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <!-- no translation found for data_usage_metered_title (7521278446526606838) -->
-    <skip />
-    <!-- no translation found for data_usage_metered_body (1805251707096571387) -->
-    <skip />
-    <!-- no translation found for data_usage_metered_mobile (5423305619126978393) -->
-    <skip />
-    <!-- no translation found for data_usage_metered_wifi (4151511616349458705) -->
-    <skip />
+    <string name="data_usage_metered_title" msgid="7521278446526606838">"高收费网络"</string>
+    <string name="data_usage_metered_body" msgid="1805251707096571387">"选择数据使用收费高的网络。这样可限制应用在后台使用这些网络。应用在使用这些网络下载较大文件时，还会发出警告。"</string>
+    <string name="data_usage_metered_mobile" msgid="5423305619126978393">"移动网络"</string>
+    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi 网络"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通话"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名称"</string>
@@ -1633,10 +1626,10 @@
     <string name="user_information_heading" msgid="8728151075759863162">"用户信息"</string>
     <string name="user_name_title" msgid="7563724675699398319">"用户名"</string>
     <string name="user_restrictions_heading" msgid="4426403050397418553">"内容限制"</string>
-    <string name="user_market_requires_pin" msgid="3571878227804334190">"下载内容需要输入 PIN"</string>
+    <string name="user_market_requires_pin" msgid="3260702297207279414">"需要 PIN"</string>
     <string name="user_max_content_rating" msgid="8297759970216482772">"内容评级"</string>
-    <string name="user_system_apps_heading" msgid="1956840109252079533">"要启用的系统应用"</string>
-    <string name="user_market_apps_heading" msgid="6165106147189170463">"要启用的已安装应用"</string>
+    <string name="user_system_apps_heading" msgid="2408331798732183682">"系统应用"</string>
+    <string name="user_market_apps_heading" msgid="4657387297168308251">"已安装的应用"</string>
     <string name="user_discard_user_menu" msgid="6638388031088461242">"舍弃"</string>
     <string name="user_remove_user_menu" msgid="3210146886949340574">"删除用户"</string>
     <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
-- 
cgit v1.1