From 8a156091eff22a360f802332daf2fe00b4267ad7 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 2 Mar 2009 22:54:43 -0800
Subject: auto import from //depot/cupcake/@137055

---
 res/values-zh-rCN/arrays.xml  | 21 +++++++++------------
 res/values-zh-rCN/strings.xml | 28 ++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 18 deletions(-)

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

diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 0cc7a2c03..5b3b65134 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -55,18 +55,15 @@
     <item>"插入后从不进入休眠状态"</item>
     <item>"从不"</item>
   </string-array>
-  <string-array name="battery_history_type_spinner">
-    <item>"CPU 使用"</item>
-    <item>"网络使用"</item>
-    <item>"传感器使用"</item>
-    <item>"屏幕开启时间"</item>
-  </string-array>
-  <string-array name="battery_history_which_spinner">
-    <item>"自设备重置后"</item>
-    <item>"在上次引导前"</item>
-    <item>"自上次引导后"</item>
-    <item>"自上次拔除后"</item>
-  </string-array>
+    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
   <string-array name="usage_stats_display_order_types">
     <item>"使用时间"</item>
     <item>"启动次数"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 51e8bd6e5..45148de9f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -94,23 +94,24 @@
     <string name="bluetooth_disconnected">"已断开连接"</string>
     <string name="bluetooth_disconnecting">"正在断开连接..."</string>
     <string name="bluetooth_connecting">"正在连接..."</string>
-    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <!-- no translation found for bluetooth_unknown (1905151516611093010) -->
     <skip />
     <string name="bluetooth_not_connected">"与此设备配对"</string>
     <string name="bluetooth_pairing">"正在配对..."</string>
-    <string name="bluetooth_paired">"已配对。已断开连接。"</string>
+    <!-- no translation found for bluetooth_paired (1247541089000057726) -->
+    <skip />
     <string name="bluetooth_device">"免持听筒/耳机"</string>
     <string name="progress_scanning">"正在扫描"</string>
     <string name="bluetooth_notif_ticker">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title">"配对请求"</string>
-    <string name="bluetooth_notif_message">"选择以与以下对象配对"</string>
+    <string name="bluetooth_notif_message">"选择以与以下对象配对 "</string>
     <string name="date_and_time">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample">"下午 1:00"</string>
     <string name="date_time_24_hour_sample">"13:00"</string>
     <string name="choose_timezone">"选择时区"</string>
     <string name="display_preview_label">"预览："</string>
     <string name="display_font_size_label">"字体大小："</string>
-    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <!-- no translation found for intent_sender_data_label (8363026381459131554) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text">"发送<xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
     <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>："</string>
@@ -429,7 +430,7 @@
     <string name="sd_format">"格式化 SD 卡"</string>
     <string name="sd_format_summary">"格式化（清除）SD 卡"</string>
     <string name="sd_unavailable">"不可用"</string>
-    <string name="read_only">"（只读）"</string>
+    <string name="read_only">" （只读）"</string>
     <string name="battery_status_title">"电池状态"</string>
     <string name="battery_level_title">"电池级别"</string>
     <string name="apn_settings">"APN"</string>
@@ -622,7 +623,10 @@
     <string name="keep_screen_on_summary">"充电时屏幕不会休眠"</string>
     <string name="allow_mock_location">"允许模仿位置"</string>
     <string name="allow_mock_location_summary">"允许模仿位置"</string>
-    <string name="gadget_picker_title">"选择小工具"</string>
+    <!-- no translation found for gadget_picker_title (98374951396755811) -->
+    <skip />
+    <!-- no translation found for widget_picker_title (9130684134213467557) -->
+    <skip />
     <string name="battery_history_details_for">"有关用户 ID %d 的详情"</string>
     <string name="battery_history_uid">"用户 ID <xliff:g id="USER_ID">%1$d</xliff:g>"</string>
     <string name="battery_history_network_usage">"有关<xliff:g id="APP_NAME">%1$s</xliff:g>的网络使用详情："</string>
@@ -641,10 +645,22 @@
     <string name="battery_history_packages_sharing_this_uid">"共享该用户 ID 的数据包："</string>
     <string name="battery_history_no_data">"没有可用的电池使用数据"</string>
     <string name="battery_history_sensor">"传感器："</string>
+    <!-- no translation found for battery_history_wakelock (608683447522396293) -->
+    <skip />
     <string name="battery_history_used_by_packages">"包使用的传感器："</string>
     <string name="battery_history_sensor_usage">"<xliff:g id="PACKAGE">%2$s</xliff:g>使用了 <xliff:g id="COUNT">%1$d</xliff:g> 次"</string>
     <string name="battery_history_sensor_usage_multi">"由以下某项使用过 <xliff:g id="COUNT">%1$d</xliff:g> 次："</string>
+    <!-- no translation found for battery_history_awake_label (8449792868990080882) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_label (1848936521786339362) -->
+    <skip />
+    <!-- no translation found for battery_history_phone_on_label (700191958853142297) -->
+    <skip />
+    <!-- no translation found for battery_history_awake (4350886665719031057) -->
+    <skip />
     <string name="battery_history_screen_on">"屏幕开启所花费的时间："</string>
+    <!-- no translation found for battery_history_phone_on (4891504401623839532) -->
+    <skip />
     <string name="battery_history_screen_on_battery">"正在使用电池："</string>
     <string name="battery_history_screen_on_plugged">"已插入："</string>
     <string name="usage_stats_label">"使用情况统计"</string>
-- 
cgit v1.2.3