summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-03-23 15:41:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-23 15:41:25 +0000
commitecad2e2c344651fa9538f113d908a405acbc03b6 (patch)
tree9b8055cb3566722defef0429dcac7e99179aa02f
parent521c125d56e80bb24a2e05d33f554a3fd24d4b6a (diff)
parentbd43ee44b2a1f3da120f5d1849deb2fb1e123ac3 (diff)
downloadframeworks_base-ecad2e2c344651fa9538f113d908a405acbc03b6.zip
frameworks_base-ecad2e2c344651fa9538f113d908a405acbc03b6.tar.gz
frameworks_base-ecad2e2c344651fa9538f113d908a405acbc03b6.tar.bz2
Merge "Import translations. DO NOT MERGE"
-rw-r--r--core/res/res/values-zh-rCN/strings.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 269afba..e7c6bee 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -203,8 +203,7 @@
<string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"已开启飞行模式"</string>
<string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"未开启飞行模式"</string>
<string name="global_action_settings" msgid="1756531602592545966">"设置"</string>
- <!-- no translation found for global_action_assist (3892832961594295030) -->
- <skip />
+ <string name="global_action_assist" msgid="3892832961594295030">"助理"</string>
<string name="global_action_voice_assist" msgid="7751191495200504480">"语音助理"</string>
<string name="global_action_lockdown" msgid="8751542514724332873">"立即锁定"</string>
<string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>