Merge remote-tracking branch 'github/cm-11.0' into HEAD

13 files changed, 162 insertions, 31 deletions

diff --git a/res/values-fr/cm_arrays.xml b/res/values-fr/cm_arrays.xml
index 1b1f6e88b..b26bf1f3b 100644
--- a/res/values-fr/cm_arrays.xml
+++ b/res/values-fr/cm_arrays.xml
@@ -18,11 +18,11 @@
 <resources>
   <string-array name="preferences_interface_general_icons_text_font_family_entries">
     <item>Régulier</item>
-    <item>Clair</item>
+    <item>Light</item>
     <item>Condensé</item>
   </string-array>
   <string-array name="transition_effect_entries">
-    <item>Aucun</item>
+    <item>None</item>
     <item>Zoom avant</item>
     <item>Zoom arrière</item>
     <item>Rotation vers le haut</item>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 804c4b84e..19affe122 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -27,14 +27,12 @@
   <string name="scrolling_page_outlines">Espacement des pages</string>
   <string name="scrolling_fade_adjacent">Estomper les pages adjacentes</string>
   <string name="wallpaper_scroll">Défilement du fond d\'écran</string>
-  <string name="preferences_title">Paramètres</string>
   <string name="preferences_application_title">Application</string>
   <string name="preferences_interface_homescreen_title">Écran d\'accueil</string>
   <string name="preferences_interface_homescreen_search_title">Barre de recherche</string>
   <string name="preferences_interface_homescreen_search_summary">Afficher la barre de recherche persistante en haut de l\'écran</string>
   <string name="preferences_interface_drawer_title">Liste d\'applications</string>
   <string name="preferences_interface_dock_title">Dock</string>
-  <string name="preferences_interface_general_title">Général</string>
   <string name="preferences_interface_general_icons_category">Icônes</string>
   <string name="preferences_interface_general_icons_large_title">Grandes icônes</string>
   <string name="preferences_interface_general_icons_large_summary">Utiliser des icônes extra-larges dans l\'écran d\'accueil et la liste d\'applications</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-hu/cm_arrays.xml
index 3df79dff1..fa7e1e182 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-hu/cm_arrays.xml
@@ -16,5 +16,25 @@
      limitations under the License.
 -->
 <resources>
-  <string name="preferences_interface_general_title">一般</string>
+  <string-array name="preferences_interface_general_icons_text_font_family_entries">
+    <item>Szokásos</item>
+    <item>Light</item>
+    <item>Tömörített</item>
+  </string-array>
+  <string-array name="transition_effect_entries">
+    <item>None</item>
+    <item>Nagyítás befelé</item>
+    <item>Nagyítás kifelé</item>
+    <item>Forgatás felfelé</item>
+    <item>Forgatás lefelé</item>
+    <item>Kocka belül</item>
+    <item>Kocka kívül</item>
+    <item>Kártyapakli</item>
+    <item>Harmónika</item>
+    <item>Forgatás</item>
+    <item>Henger belül</item>
+    <item>Henger kívül</item>
+    <item>Körhinta</item>
+    <item>Áttekintés</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index d082a70de..2f23226fb 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -16,5 +16,32 @@
      limitations under the License.
 -->
 <resources>
-  <string name="preferences_title">Beállítások</string>
+  <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
+  <string name="sort_button_text">Rendezés</string>
+  <string name="filter_button_text">Szűrő</string>
+  <string name="default_screen_button_text">Alapértelmezett képernyő</string>
+  <string name="transition_effect_button_text">Görgetés effekt</string>
+  <string name="sort_mode_title">Név</string>
+  <string name="sort_mode_launch_count">Indítások száma</string>
+  <string name="sort_mode_install_time">Telepítés ideje</string>
+  <string name="scrolling_page_outlines">Oldal körvonalak</string>
+  <string name="scrolling_fade_adjacent">Elhalványuló váltás az oldalak közt</string>
+  <string name="wallpaper_scroll">Háttérkép görgetése</string>
+  <string name="preferences_application_title">Alkamazás</string>
+  <string name="preferences_interface_homescreen_title">Kezdőképernyő</string>
+  <string name="preferences_interface_homescreen_search_title">Keresési sáv</string>
+  <string name="preferences_interface_homescreen_search_summary">Állandó keresési sáv megjelenítése a képernyő felső </string>
+  <string name="preferences_interface_drawer_title">Alkalmazásképernyők</string>
+  <string name="preferences_interface_dock_title">Dokkoló</string>
+  <string name="preferences_interface_general_icons_category">Ikonok</string>
+  <string name="preferences_interface_general_icons_large_title">Nagyobb ikonok</string>
+  <string name="preferences_interface_general_icons_large_summary">Extra méretű ikonok a kezdő ill. alkalmazás képernyőkön</string>
+  <string name="preferences_interface_general_icons_text_style_title">Szöveg betűtípusa</string>
+  <string name="preferences_interface_general_icons_text_style_summary">Ikon szövegének típusa</string>
+  <string name="dialog_pick_iconpack_title">Ikoncsomag választása</string>
+  <string name="default_iconpack_title">Alapértelmezett ikonok</string>
+  <string name="icon_packs_title">Ikon csomagok</string>
+  <string name="no_iconpacks_summary">Nincsenek telepítve ikoncsomagok</string>
+  <string name="all_apps_cling_cm">Alkalmazásképernyők testreszabása</string>
+  <string name="all_apps_cling_summary">Érintse meg az oldaljelölőt a további konfigurációs beállítások megtekintéséhez</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index fc43d8733..2056c8915 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -16,6 +16,7 @@
      limitations under the License.
 -->
 <resources>
+  <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
   <string name="sort_button_text">מיין</string>
   <string name="filter_button_text">סינון</string>
   <string name="default_screen_button_text">מסך ברירת מחדל</string>
diff --git a/res/values-ja/cm_arrays.xml b/res/values-ja/cm_arrays.xml
new file mode 100644
index 000000000..e78f2b716
--- /dev/null
+++ b/res/values-ja/cm_arrays.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <string-array name="preferences_interface_general_icons_text_font_family_entries">
+    <item>標準</item>
+    <item>Light</item>
+    <item>Condensed</item>
+  </string-array>
+  <string-array name="transition_effect_entries">
+    <item>なし</item>
+    <item>ズームイン</item>
+    <item>ズームアウト</item>
+    <item>上回転</item>
+    <item>下回転</item>
+    <item>キューブイン</item>
+    <item>キューブアウト</item>
+    <item>スタック</item>
+    <item>アコーディオン</item>
+    <item>フリップ</item>
+    <item>シリンダーイン</item>
+    <item>シリンダーアウト</item>
+    <item>カルーセル</item>
+    <item>オーバービュー</item>
+  </string-array>
+</resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index bd7c9ee2b..bddeece9c 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -45,5 +45,5 @@
   <string name="icon_packs_title">アイコンパック</string>
   <string name="no_iconpacks_summary">アイコンパックがインストールされていません</string>
   <string name="all_apps_cling_cm">ドロワーをカスタマイズ</string>
-  <string name="all_apps_cling_summary">追加の構成設定を見るには、ページインジケーターをタップします。</string>
+  <string name="all_apps_cling_summary">追加の構成設定を表示するには、ページインジケーターをタップします。</string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index ebbc9f8b5..65e40748e 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -19,7 +19,7 @@
   <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
   <string name="sort_button_text">Sorteren</string>
   <string name="filter_button_text">Filteren</string>
-  <string name="default_screen_button_text">Standaardscherm</string>
+  <string name="default_screen_button_text">Standaard\nscherm</string>
   <string name="transition_effect_button_text">Overgangseffect</string>
   <string name="sort_mode_title">Titel</string>
   <string name="sort_mode_launch_count">Aantal starts</string>
@@ -42,7 +42,7 @@
   <string name="preferences_interface_general_icons_text_style_summary">Stijl van tekst bij pictogrammen</string>
   <string name="dialog_pick_iconpack_title">Pictogrammenpakket kiezen</string>
   <string name="default_iconpack_title">Standaard</string>
-  <string name="icon_packs_title">Pictogrammenpakketten</string>
+  <string name="icon_packs_title">Pictogrammen\npakketten</string>
   <string name="no_iconpacks_summary">Geen pictogrammenpakketten geïnstalleerd</string>
   <string name="all_apps_cling_cm">App-overzicht aanpassen</string>
   <string name="all_apps_cling_summary">Tik op de pagina-indicator voor extra instellingen</string>
diff --git a/res/values-pl/cm_arrays.xml b/res/values-pl/cm_arrays.xml
index fda5e0c6b..c5e7253ab 100644
--- a/res/values-pl/cm_arrays.xml
+++ b/res/values-pl/cm_arrays.xml
@@ -17,9 +17,9 @@
 -->
 <resources>
   <string-array name="preferences_interface_general_icons_text_font_family_entries">
-    <item>Regularna</item>
-    <item>Lekka</item>
-    <item>Skondensowana</item>
+    <item>Regularny</item>
+    <item>Lekki</item>
+    <item>Skondensowany</item>
   </string-array>
   <string-array name="transition_effect_entries">
     <item>Brak</item>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 6628a23ed..a524d456e 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -17,7 +17,7 @@
 -->
 <resources>
   <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
-  <string name="sort_button_text">Sortuj</string>
+  <string name="sort_button_text">Sortowanie</string>
   <string name="filter_button_text">Filtruj</string>
   <string name="default_screen_button_text">Ekran domyślny</string>
   <string name="transition_effect_button_text">Efekt przewijania</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 605c4be06..338f166ae 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,5 +16,33 @@
      limitations under the License.
 -->
 <resources>
-  <string name="preferences_title">设置</string>
+  <string name="application_copyright">版权所有 \u00A9 2014 CyanogenMod 项目</string>
+  <string name="sort_button_text">排序</string>
+  <string name="filter_button_text">过滤器</string>
+  <string name="default_screen_button_text">默认屏幕</string>
+  <string name="transition_effect_button_text">滚动特效</string>
+  <string name="sort_mode_title">标题</string>
+  <string name="sort_mode_launch_count">启动次数</string>
+  <string name="sort_mode_install_time">安装时间</string>
+  <string name="scrolling_page_outlines">页概述</string>
+  <string name="scrolling_fade_adjacent">边页淡出</string>
+  <string name="wallpaper_scroll">滚动壁纸</string>
+  <string name="preferences_application_title">应用程序</string>
+  <string name="preferences_interface_homescreen_title">主屏</string>
+  <string name="preferences_interface_homescreen_search_title">搜索栏</string>
+  <string name="preferences_interface_homescreen_search_summary">在屏幕上方始终显示搜索栏</string>
+  <string name="preferences_interface_drawer_title">抽屉</string>
+  <string name="preferences_interface_dock_title">基座</string>
+  <string name="preferences_interface_general_title">通用</string>
+  <string name="preferences_interface_general_icons_category">图标</string>
+  <string name="preferences_interface_general_icons_large_title">大图标</string>
+  <string name="preferences_interface_general_icons_large_summary">显示大图标</string>
+  <string name="preferences_interface_general_icons_text_style_title">字体样式</string>
+  <string name="preferences_interface_general_icons_text_style_summary">图标字体样式</string>
+  <string name="dialog_pick_iconpack_title">选择图标包</string>
+  <string name="default_iconpack_title">默认图标</string>
+  <string name="icon_packs_title">图标包</string>
+  <string name="no_iconpacks_summary">没有安装的图标包</string>
+  <string name="all_apps_cling_cm">自定义抽屉</string>
+  <string name="all_apps_cling_summary">点击页面指示器以查看其他设置</string>
 </resources>
diff --git a/res/values/cm_extra.xml b/res/values/cm_extra.xml
new file mode 100644
index 000000000..1290c7ce5
--- /dev/null
+++ b/res/values/cm_extra.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- AOSP dummy strings (required by old Launcher3 code) -->
+    <string name="chooser_wallpaper" translatable="false">""</string>
+    <string name="folder_cling_move_item" translatable="false">""</string>
+    <string name="group_wallpapers" translatable="false">""</string>
+    <string name="menu_add" translatable="false">""</string>
+    <string name="menu_help" translatable="false">""</string>
+    <string name="menu_manage_apps" translatable="false">""</string>
+    <string name="menu_notifications" translatable="false">""</string>
+    <string name="menu_search" translatable="false">""</string>
+    <string name="menu_settings" translatable="false">""</string>
+    <string name="menu_wallpaper" translatable="false">""</string>
+    <string name="workspace_cling_open_all_apps" translatable="false">""</string>
+</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 286794da1..33da3d2e9 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -28,13 +28,13 @@
     <!-- Text for filter button -->
     <string name="filter_button_text">Filter</string>
     <!-- Text for default screen button -->
-    <string name="default_screen_button_text">Default Screen</string>
+    <string name="default_screen_button_text">Default screen</string>
     <!-- Text for transition effect button -->
-    <string name="transition_effect_button_text">Scroll Effect</string>
+    <string name="transition_effect_button_text">Scroll effect</string>
 
     <string name="sort_mode_title">Title</string>
-    <string name="sort_mode_launch_count">Launch Count</string>
-    <string name="sort_mode_install_time">Install Time</string>
+    <string name="sort_mode_launch_count">Launch count</string>
+    <string name="sort_mode_install_time">Install time</string>
 
     <string name="scrolling_page_outlines">Page outlines</string>
     <string name="scrolling_fade_adjacent">Fade side pages</string>
@@ -78,17 +78,4 @@
     <string name="all_apps_cling_cm">Customize your drawer</string>
     <!-- The description of how to access Trebuchet settings [CHAR_LIMIT=160] -->
     <string name="all_apps_cling_summary">Tap the page indicator to view additional configuration settings</string>
-
-    <!-- AOSP dummy strings (required by old Launcher3 code) -->
-    <string name="chooser_wallpaper" translatable="false">""</string>
-    <string name="folder_cling_move_item" translatable="false">""</string>
-    <string name="group_wallpapers" translatable="false">""</string>
-    <string name="menu_add" translatable="false">""</string>
-    <string name="menu_help" translatable="false">""</string>
-    <string name="menu_manage_apps" translatable="false">""</string>
-    <string name="menu_notifications" translatable="false">""</string>
-    <string name="menu_search" translatable="false">""</string>
-    <string name="menu_settings" translatable="false">""</string>
-    <string name="menu_wallpaper" translatable="false">""</string>
-    <string name="workspace_cling_open_all_apps" translatable="false">""</string>
 </resources>