summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-06-30 03:12:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-30 03:12:19 +0000
commit798f95552b9da671c2923bf960ecbe162a49213b (patch)
tree674b5bb014ea406f6540c78a125334efed45c538 /res
parent1bce7fd342875be8f7c1f82c8cf21d0199c8d544 (diff)
parent9deafc4750917e39d2bb3cd0984b1d2a988a86b0 (diff)
downloadandroid_packages_apps_Trebuchet-798f95552b9da671c2923bf960ecbe162a49213b.tar.gz
android_packages_apps_Trebuchet-798f95552b9da671c2923bf960ecbe162a49213b.tar.bz2
android_packages_apps_Trebuchet-798f95552b9da671c2923bf960ecbe162a49213b.zip
Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary
Diffstat (limited to 'res')
-rw-r--r--res/values-ru/strings.xml3
-rw-r--r--res/values-zh-rCN/strings.xml3
2 files changed, 2 insertions, 4 deletions
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ef550d797..630319024 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -72,8 +72,7 @@
<string name="wallpaper_button_text" msgid="8404103075899945851">"Обои"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Настройки"</string>
<string name="msg_disabled_by_admin" msgid="6898038085516271325">"Функция отключена администратором"</string>
- <!-- no translation found for accessibility_action_overview (6257665857640347026) -->
- <skip />
+ <string name="accessibility_action_overview" msgid="6257665857640347026">"Обзор"</string>
<string name="allow_rotation_title" msgid="3132336367556833843">"Разрешить поворачивать главный экран"</string>
<string name="allow_rotation_desc" msgid="7635719920854330492">"При повороте устройства"</string>
<string name="allow_rotation_blocked_desc" msgid="3212602545192996253">"В настройках отключен поворот экрана"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5e2c44e7c..d18352c94 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -72,8 +72,7 @@
<string name="wallpaper_button_text" msgid="8404103075899945851">"壁纸"</string>
<string name="settings_button_text" msgid="8119458837558863227">"设置"</string>
<string name="msg_disabled_by_admin" msgid="6898038085516271325">"已被您的管理员停用"</string>
- <!-- no translation found for accessibility_action_overview (6257665857640347026) -->
- <skip />
+ <string name="accessibility_action_overview" msgid="6257665857640347026">"概览"</string>
<string name="allow_rotation_title" msgid="3132336367556833843">"允许旋转主屏幕"</string>
<string name="allow_rotation_desc" msgid="7635719920854330492">"设备旋转时"</string>
<string name="allow_rotation_blocked_desc" msgid="3212602545192996253">"当前的显示设置不允许旋转设备"</string>