Skip to content

Commit

Permalink
Connect strings of xml and javacode to strings.xml .
Browse files Browse the repository at this point in the history
Update Simplified Chinese translations.

patch set 3: fix spaces in strings.xml and remove duplicates

Change-Id: If6096bcf91fcf29ae11edbfda52d12d71df23b41
Signed-off-by: YULIANGMAX <yuliangmax@gmail.com>
  • Loading branch information
YULIANGMAX authored and Gerrit Code Review committed May 22, 2012
1 parent 2a2b047 commit 73ae0d4
Show file tree
Hide file tree
Showing 12 changed files with 313 additions and 146 deletions.
2 changes: 1 addition & 1 deletion AndroidManifest.xml
Expand Up @@ -85,7 +85,7 @@
</activity> </activity>
<activity <activity
android:name=".tools.VoltageControl" android:name=".tools.VoltageControl"
android:label="Voltage Control" > android:label="@string/pt_volt_control" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>
Expand Down
4 changes: 2 additions & 2 deletions res/menu/lockscreens.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/remove_wallpaper" <item android:id="@+id/remove_wallpaper"
android:title="Reset lockscreen wallpaper"/> android:title="@string/menu_lockscreens_remove_wallpaper"/>
</menu> </menu>
4 changes: 2 additions & 2 deletions res/menu/main_activity.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/change_locale" <item android:id="@+id/change_locale"
android:title="Locale" android:title="@string/menu_main_activity_change_locale"
android:showAsAction="ifRoom|withText" /> android:showAsAction="ifRoom|withText" />
</menu> </menu>
4 changes: 2 additions & 2 deletions res/menu/nav_bar.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/reset" <item android:id="@+id/reset"
android:title="Reset nav bar" android:title="@string/menu_nav_bar_reset"
android:showAsAction="ifRoom|withText" /> android:showAsAction="ifRoom|withText" />
</menu> </menu>
4 changes: 2 additions & 2 deletions res/menu/weather.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/get_weather" <item android:id="@+id/get_weather"
android:title="Get weather" android:title="@string/menu_weather_get_weather"
android:showAsAction="ifRoom|withText" /> android:showAsAction="ifRoom|withText" />
</menu> </menu>
53 changes: 31 additions & 22 deletions res/values-zh-rCN/arrays.xml
Expand Up @@ -6,6 +6,7 @@
<item>两者</item> <item>两者</item>
<item>移除</item> <item>移除</item>
</string-array> </string-array>
<!-- right is the default, easier to keep 0 as first index -->
<string-array name="pref_navigation_menu_values"> <string-array name="pref_navigation_menu_values">
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
Expand Down Expand Up @@ -119,7 +120,7 @@
<item>63</item> <item>63</item>
</string-array> </string-array>
<string-array name="led_entries"> <string-array name="led_entries">
<item>.5 秒</item> <item>0.5 秒</item>
<item>1 秒</item> <item>1 秒</item>
<item>1.5 秒</item> <item>1.5 秒</item>
<item>2 秒</item> <item>2 秒</item>
Expand All @@ -136,6 +137,7 @@
<item>9 秒</item> <item>9 秒</item>
<item>10 秒</item> <item>10 秒</item>
</string-array> </string-array>
<!-- values must be in milliseconds!~@@#E!@ -->
<string-array name="led_values"> <string-array name="led_values">
<item>500</item> <item>500</item>
<item>1000</item> <item>1000</item>
Expand Down Expand Up @@ -180,6 +182,14 @@
<item>25</item> <item>25</item>
<item>0</item> <item>0</item>
</string-array> </string-array>
<string-array name="statusbar_fontsize_entries">
<item>8dp</item>
<item>12dp</item>
<item>14dp</item>
<item>16dp (默认)</item>
<item>20dp</item>
<item>24dp</item>
</string-array>
<string-array name="statusbar_layout_entries"> <string-array name="statusbar_layout_entries">
<item>常规</item> <item>常规</item>
<item>逆转</item> <item>逆转</item>
Expand All @@ -190,6 +200,7 @@
<item>1</item> <item>1</item>
<item>2</item> <item>2</item>
</string-array> </string-array>
<!-- clock stuff -->
<string-array name="clock_style_entries"> <string-array name="clock_style_entries">
<item>右边</item> <item>右边</item>
<item>中间</item> <item>中间</item>
Expand Down Expand Up @@ -220,6 +231,7 @@
<item>1</item> <item>1</item>
<item>2</item> <item>2</item>
</string-array> </string-array>
<!-- Toggles -->
<string-array name="brightness_location_entries"> <string-array name="brightness_location_entries">
<item>顶部</item> <item>顶部</item>
<item>底部</item> <item>底部</item>
Expand Down Expand Up @@ -336,12 +348,8 @@
<item>2048,3072,6144,15360,17920,20480</item> <item>2048,3072,6144,15360,17920,20480</item>
<item>2560,3840,6400,12800,12800,25600</item> <item>2560,3840,6400,12800,12800,25600</item>
</string-array> </string-array>
<array name="entries_scrollingcache">
<item>@string/pref_scrollingcache_force_enable</item>
<item>@string/pref_scrollingcache_default_enable</item>
<item>@string/pref_scrollingcache_default_disable</item>
<item>@string/pref_scrollingcache_force_disable</item>
</array>
<string-array name="values_scrollingcache"> <string-array name="values_scrollingcache">
<item>0</item> <item>0</item>
<item>1</item> <item>1</item>
Expand Down Expand Up @@ -404,29 +412,30 @@
<item>AIRPLANE_MODE</item> <item>AIRPLANE_MODE</item>
<item>VIBRATE</item> <item>VIBRATE</item>
<item>SILENT</item> <item>SILENT</item>
<item>TORCH</item>
<item>SYNC</item> <item>SYNC</item>
<item>DATA</item> <item>DATA</item>
<item>2G</item> <item>2G</item>
<item>AP</item> <item>AP</item>
<item>TORCH</item> <item>SWAGGER</item>
<item>SWAGGER</item> <item>FCHARGE</item>
<item>FCHARGE</item>
</string-array> </string-array>
<string-array name="available_toggles_values"> <string-array name="available_toggles_values">
<item>旋转</item> <item>屏幕自动旋转</item>
<item>蓝牙</item> <item>蓝牙</item>
<item>GPS</item> <item>GPS 定位</item>
<item>WiFi</item> <item>Wi-Fi 无线网络</item>
<item>飞行</item> <item>飞行模式</item>
<item>振动</item> <item>振动模式</item>
<item>静音</item> <item>静音模式</item>
<item>手电筒</item>
<item>同步</item> <item>同步</item>
<item>数据</item> <item>移动网络数据</item>
<item>2G</item> <item>仅使用 2G 网络</item>
<item>热点</item> <item>Wi-Fi 热点</item>
<item>手电</item> <item>USB 网络共享</item>
<item>自爆</item> <item>手机自爆</item>
<item>快充</item> <item>快速充电</item>
</string-array> </string-array>
<string-array name="lockscreen_choice_entries"> <string-array name="lockscreen_choice_entries">
<item>解锁</item> <item>解锁</item>
Expand Down

0 comments on commit 73ae0d4

Please sign in to comment.