diff options
| author | John Hsing <tsyj2007@gmail.com> | 2011-12-09 09:58:54 +0800 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2012-06-07 18:43:27 +0200 |
| commit | 3e50c9c172c972e341c756fedc5aaef659d45797 (patch) | |
| tree | e53aaa4e581e5a23a10f60e282e38a0c06d1368c | |
| parent | 83538551f0adb00c0502d147e19837b927b15f07 (diff) | |
| download | frameworks_base-3e50c9c172c972e341c756fedc5aaef659d45797.zip frameworks_base-3e50c9c172c972e341c756fedc5aaef659d45797.tar.gz frameworks_base-3e50c9c172c972e341c756fedc5aaef659d45797.tar.bz2 | |
Frameworks/base: move translations in arrays.xml into strings.xml
Move Simplified Chinese about shutdown opitions into strings.xml
Change-Id: I2894b19bd573bea54ae4038f46a1e0cb5437d809
| -rw-r--r-- | core/res/res/values-zh-rCN/arrays.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values-zh-rCN/strings.xml | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/res/res/values-zh-rCN/arrays.xml b/core/res/res/values-zh-rCN/arrays.xml index 9aa36de..16da6d9 100644 --- a/core/res/res/values-zh-rCN/arrays.xml +++ b/core/res/res/values-zh-rCN/arrays.xml @@ -24,12 +24,6 @@ <item>39937795</item> <item>116387224</item> </integer-array> - <!-- Defines the shutdown options shown in the reboot dialog. --> - <array name="shutdown_reboot_options"> - <item>重启模式</item> - <item>刷机模式</item> - <item>引导模式</item> - </array> <!-- Do not translate. --> <integer-array name="maps_starting_zoom"> <item>2</item> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 0e988e7..c728045 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -136,6 +136,9 @@ <string name="power_off" msgid="4266614107412865048">"关机"</string> <string name="global_action_screenshot">截屏</string> <string name="reboot_system">重启</string> + <string name="reboot_reboot">重启</string> + <string name="reboot_recovery">恢复</string> + <string name="reboot_bootloader">引导</string> <string name="shutdown_progress" msgid="2281079257329981203">"正在关机..."</string> <string name="reboot_progress">正在重启...</string> <string name="shutdown_confirm" msgid="649792175242821353">"您的手机会关机。"</string> |