summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-03-23 15:41:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-03-23 15:41:51 +0000
commitabdbf1860c7855687aacbb4e293a6e6ec40c0213 (patch)
treed69147fd248677debdd082d4c7dd9f84e39ffbfe
parent4d17b9549e0223b1efb2b66cf71e36b7a56420ee (diff)
parent762e4ed2eeaa43d2c58e88a123a327488c0b7e2d (diff)
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
-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 6d1f733d7a54..3139211f3361 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -200,8 +200,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>