From 2f5299a11b9c5f650c583d4765f95e599ed8c713 Mon Sep 17 00:00:00 2001
From: GodFox <y>
Date: Sun, 6 Nov 2011 15:19:14 +0800
Subject: [PATCH 1/3] merge

Change-Id: I4e3ce686c39a4be7d84a9941791aa7f5aacd7f6e
---
 core/res/res/values-zh-rCN/strings.xml | 37 ++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 2e53746a8eebc..e349bb3e6a7d5 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -35,6 +35,8 @@
     <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string>
     <string name="mmiError" msgid="5154499457739052907">"出现连接问题或 MMI 码无效。"</string>
     <string name="mmiFdnError" msgid="5224398216385316471">"只能对固定拨号号码执行此类操作。"</string>
+
+    <!-- Name of wildcard profile. -->
     <string name="wildcardProfile">其它</string>
     <string name="serviceEnabled" msgid="8147278346414714315">"已启用服务。"</string>
     <string name="serviceEnabledFor" msgid="6856228140453471041">"已针对以下内容启用了服务："</string>
@@ -133,9 +135,18 @@
     <string name="turn_on_radio" msgid="3912793092339962371">"打开收音机"</string>
     <string name="turn_off_radio" msgid="8198784949987062346">"关闭收音机"</string>
     <string name="screen_lock" msgid="799094655496098153">"屏幕锁定"</string>
-    <string name="power_off" msgid="4266614107412865048">"关机"</string>
-    <string name="global_action_screenshot">截屏</string>
-    <string name="reboot_system">重启</string>
+    <string name="power_off" msgid="4266614107412865048">"关闭手机"</string>
+    <string name="reboot_system">重新启动</string>
+    <!-- Button to reboot the phone, within the Reboot Options dialog -->
+    <string name="reboot_reboot">正常重启</string>
+    <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+    <string name="reboot_recovery">恢复模式</string>
+    <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+    <string name="reboot_bootloader">刷机模式</string>
+    <!-- Button to reboot the phone into bootmenu, within the Reboot Options dialog -->
+    <string name="reboot_bootmenu">启动菜单</string>
+    <!-- Button to reboot the phone into fastboot, within the Reboot Options dialog -->
+    <string name="reboot_fastboot">快速启动</string>
     <string name="shutdown_progress" msgid="2281079257329981203">"正在关机..."</string>
     <string name="reboot_progress">正在重启...</string>
     <string name="shutdown_confirm" msgid="649792175242821353">"您的手机会关机。"</string>
@@ -149,8 +160,8 @@
     <!-- label for item that emulates the hardware button: back -->
     <string name="global_action_back">返回</string>
     <string name="global_action_lock" msgid="2844945191792119712">"屏幕锁定"</string>
-    <string name="global_action_power_off" msgid="4471879440839879722">"关机"</string>
-    <string name="global_action_reboot">重启</string>
+    <string name="global_action_power_off" msgid="4471879440839879722">"关闭手机"</string>
+    <string name="global_action_reboot">重新启动</string>
     <string name="global_action_choose_profile">情景模式</string>
     <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"静音模式"</string>
     <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"声音已关闭"</string>
@@ -158,6 +169,8 @@
     <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"飞行模式"</string>
     <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"已开启飞行模式"</string>
     <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"已关闭飞行模式"</string>
+        <!-- label for item that screenshots in phone options dialog -->
+    <string name="global_action_screenshot">屏幕截图</string>
     <string name="safeMode" msgid="2788228061547930246">"安全模式"</string>
     <string name="android_system_label" msgid="6577375335728551336">"Android 系统"</string>
     <string name="permgrouplab_costMoney" msgid="5429808217861460401">"需要您付费的服务"</string>
@@ -327,6 +340,13 @@
     <string name="permdesc_recordAudio" msgid="6493228261176552356">"允许应用程序访问录音路径。"</string>
     <string name="permlab_camera" msgid="3616391919559751192">"拍摄照片和视频"</string>
     <string name="permdesc_camera" msgid="6004878235852154239">"允许应用程序使用相机拍摄照片和视频，这样应用程序可随时收集进入相机镜头中的图片。"</string>
+    
+    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permlab_rawAudio">底层音频设备访问权限</string>
+    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permdesc_rawAudio">允许应用程序完全控制音频设备.</string>
+    
+    
     <string name="permlab_brick" msgid="8337817093326370537">"永久停用手机"</string>
     <string name="permdesc_brick" msgid="5569526552607599221">"允许应用程序永久停用整个手机，这非常危险。"</string>
     <string name="permlab_reboot" msgid="2898560872462638242">"强行重新启动手机"</string>
@@ -732,6 +752,8 @@
     <string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
     <string name="selectAll" msgid="6876518925844129331">"全选"</string>
+    <!-- Item on EditText context menu. This action is used to copy all text in the edit field. -->
+    <string name="copyAll">复制全部</string>
     <string name="selectText" msgid="4862359311088898878">"选择文字"</string>
     <string name="cut" msgid="3092569408438626261">"剪切"</string>
     <string name="copy" msgid="2681946229533511987">"复制"</string>
@@ -765,6 +787,10 @@
     <string name="anr_process" msgid="1246866008169975783">"“<xliff:g id="PROCESS">%1$s</xliff:g>”进程无响应。"</string>
     <string name="force_close" msgid="3653416315450806396">"强行关闭"</string>
     <string name="report" msgid="4060218260984795706">"报告"</string>
+    <!-- Button allowing the user to open the application settings screen to edit permissions. -->
+    <string name="edit_perms">编辑权限</string>
+    <!-- Button allowing the user reset the revoked permissions for application which has encountered an error. -->
+    <string name="reset_perms">复位权限</string>
     <string name="wait" msgid="7147118217226317732">"等待"</string>
     <string name="launch_warning_title" msgid="8323761616052121936">"应用程序已重定向"</string>
     <string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g>目前正在运行。"</string>
@@ -900,6 +926,7 @@
     <string name="l2tp_vpn_description" msgid="3750692169378923304">"第 2 层隧道协议"</string>
     <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"基于预共享密钥的 L2TP/IPSec VPN"</string>
     <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"基于证书的 L2TP/IPSec VPN"</string>
+    <string name="openvpn_vpn_description">OpenVPN SSL VPN</string>
     <string name="upload_file" msgid="2897957172366730416">"选择文件"</string>
     <string name="reset" msgid="2448168080964209908">"重置"</string>
     <string name="submit" msgid="1602335572089911941">"提交"</string>

From 4bb6d03f1374e5e21fec200914e28b8c6518b578 Mon Sep 17 00:00:00 2001
From: GodFox <y>
Date: Sun, 6 Nov 2011 15:33:43 +0800
Subject: [PATCH 2/3] finished the translation for Chinese

Change-Id: I113228ca2bbc9d17ecba215313ff6e756f790830
---
 core/res/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index e349bb3e6a7d5..d3ea4daa99bd7 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -36,6 +36,7 @@
     <string name="mmiError" msgid="5154499457739052907">"出现连接问题或 MMI 码无效。"</string>
     <string name="mmiFdnError" msgid="5224398216385316471">"只能对固定拨号号码执行此类操作。"</string>
 
+
     <!-- Name of wildcard profile. -->
     <string name="wildcardProfile">其它</string>
     <string name="serviceEnabled" msgid="8147278346414714315">"已启用服务。"</string>

From 3ee126e802f15038ee7fde25ce882a5b3a303d27 Mon Sep 17 00:00:00 2001
From: GodFox <y>
Date: Mon, 7 Nov 2011 20:41:56 +0800
Subject: [PATCH 3/3] finished the translation for Chinese

Change-Id: I8def1d7bd50305e689797d799e7739c7f0a8c2c3
---
 core/res/res/values-zh-rCN/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index d3ea4daa99bd7..e349bb3e6a7d5 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -36,7 +36,6 @@
     <string name="mmiError" msgid="5154499457739052907">"出现连接问题或 MMI 码无效。"</string>
     <string name="mmiFdnError" msgid="5224398216385316471">"只能对固定拨号号码执行此类操作。"</string>
 
-
     <!-- Name of wildcard profile. -->
     <string name="wildcardProfile">其它</string>
     <string name="serviceEnabled" msgid="8147278346414714315">"已启用服务。"</string>