summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-01-26 16:42:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-26 16:42:52 +0000
commit4fe4bca1725d8205d00a36b656d2787b16e86984 (patch)
treed62a088820cefcaff3cf385c1dfe7d1808b56e54 /core
parentd03047168b5ded2f851f1ff9ce35b17bde6dd717 (diff)
parentaebfb8ac1666cb881038ce5dc14c129265f207f0 (diff)
downloadframeworks_base-4fe4bca1725d8205d00a36b656d2787b16e86984.zip
frameworks_base-4fe4bca1725d8205d00a36b656d2787b16e86984.tar.gz
frameworks_base-4fe4bca1725d8205d00a36b656d2787b16e86984.tar.bz2
Merge "Import translations. DO NOT MERGE"
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values-zh-rCN/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 680618e..4a03e7b 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -1465,9 +1465,9 @@
<string name="permdesc_copyProtectedData" msgid="4390697124288317831">"允许应用调用默认的容器服务,以便复制内容。普通应用不应使用此权限。"</string>
<string name="permlab_route_media_output" msgid="1642024455750414694">"更改媒体输出线路"</string>
<string name="permdesc_route_media_output" msgid="4932818749547244346">"允许该应用将媒体输出线路更改到其他外部设备。"</string>
- <string name="permlab_access_keyguard_secure_storage" msgid="7565552237977815047">"访问密钥保护安全存储空间"</string>
+ <string name="permlab_access_keyguard_secure_storage" msgid="7565552237977815047">"访问锁屏安全存储空间"</string>
<string name="permdesc_access_keyguard_secure_storage" msgid="5866245484303285762">"允许应用访问密钥保护安全存储空间。"</string>
- <string name="permlab_control_keyguard" msgid="172195184207828387">"控制是显示还是隐藏锁屏"</string>
+ <string name="permlab_control_keyguard" msgid="172195184207828387">"控制锁屏界面的显示和隐藏状态"</string>
<string name="permdesc_control_keyguard" msgid="3043732290518629061">"允许应用控制锁屏。"</string>
<string name="permlab_trust_listener" msgid="1765718054003704476">"检测信任状态的变化。"</string>
<string name="permdesc_trust_listener" msgid="8233895334214716864">"允许应用检测信任状态的变化。"</string>