summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-09-09 19:46:19 (GMT)
committerBrint E. Kriebel <bekit@cyngn.com>2014-09-09 19:46:19 (GMT)
commit21df17fb62e8499c43018eb239d9cfef85bac51a (patch)
tree754d3100e28a39329c2f1f484e27ebb6858c649f
parent9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532 (diff)
parent2b29ddf49372ebea7e5e504f27f9f5219cca981c (diff)
downloadandroid_packages_apps_Trebuchet-21df17fb62e8499c43018eb239d9cfef85bac51a.zip
android_packages_apps_Trebuchet-21df17fb62e8499c43018eb239d9cfef85bac51a.tar.gz
android_packages_apps_Trebuchet-21df17fb62e8499c43018eb239d9cfef85bac51a.tar.bz2
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0b
Change-Id: I5e3ca7fbaabfee28537031ad4126187e03e84d0a
-rw-r--r--res/values-sr/cm_strings.xml2
-rw-r--r--res/values-zh-rTW/cm_strings.xml6
2 files changed, 7 insertions, 1 deletions
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 53ffe4c..0595b36 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -52,6 +52,6 @@
<string name="search_screen_left_text">Панел за претрагу</string>
<string name="search_screen_left_unsupported_toast">Мораш да имаш подржану апликацију за претрагу и CyanogenMod да би користио ову функцију.</string>
<string name="dialog_confirm">Потврди</string>
- <string name="permission_label_read_extension_data">Захтевање података за DashClock додатак</string>
+ <string name="permission_label_read_extension_data">захтевање података за DashClock додатак</string>
<string name="permission_desc_read_extension_data">Дозвољава апликацији да захтева податке за DashClock додатак</string>
</resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 843b9d6..638dadc 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -20,10 +20,16 @@
<string name="setting_state_off">關閉</string>
<string name="themes_button_text">主題</string>
<string name="scrolling_fade_adjacent">邊頁淡出</string>
+ <string name="scrolling_wallpaper">滾動桌面</string>
<string name="hidden_apps_title">隱藏的應用程式</string>
+ <string name="scroll_effect_text">滾動效果</string>
+ <string name="drawer_sorting_text">排序模式</string>
<string name="sort_mode_title">標題</string>
<string name="sort_mode_launch_count">啟動次數</string>
<string name="sort_mode_install_time">安裝時間</string>
<string name="home_screen_search_text">搜尋列</string>
<string name="larger_icons_text">大圖示</string>
+ <string name="icon_labels">程式名稱</string>
+ <string name="icon_labels_show">顯示</string>
+ <string name="icon_labels_hide">隱藏</string>
</resources>