summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-05-21 00:23:19 (GMT)
committerBrint E. Kriebel <bekit@cyngn.com>2014-05-21 00:23:19 (GMT)
commit5bc1b815f243a78ae35364b2dcec7820ea80013b (patch)
tree729a1763a830dd97d2bcdb66235a4bb701d0c67a
parent46c118a3dba721724f5c819f535d0d410d7c6185 (diff)
parent0b4362157fdc930f0eb342194dfb553c80a238bd (diff)
downloadandroid_packages_apps_Trebuchet-5bc1b815f243a78ae35364b2dcec7820ea80013b.zip
android_packages_apps_Trebuchet-5bc1b815f243a78ae35364b2dcec7820ea80013b.tar.gz
android_packages_apps_Trebuchet-5bc1b815f243a78ae35364b2dcec7820ea80013b.tar.bz2
Merge remote-tracking branch 'github/cm-11.0' into HEAD
-rw-r--r--AndroidManifest.xml44
-rw-r--r--res/values-af/cm_strings.xml1
-rw-r--r--res/values-et/cm_arrays.xml40
-rw-r--r--res/values-in/cm_arrays.xml40
-rw-r--r--res/values-in/cm_strings.xml64
-rw-r--r--res/values-it/cm_strings.xml4
-rw-r--r--res/values-iw/cm_strings.xml1
-rw-r--r--res/values-ja/cm_strings.xml1
-rw-r--r--res/values-lt/cm_strings.xml2
-rw-r--r--res/values-nb/cm_arrays.xml40
-rw-r--r--res/values-nb/cm_strings.xml64
-rw-r--r--res/values-pl/cm_strings.xml15
-rw-r--r--res/values-si/cm_arrays.xml40
-rw-r--r--res/values-si/cm_strings.xml64
-rw-r--r--res/values-sr/cm_arrays.xml4
-rw-r--r--res/values-sr/cm_strings.xml2
-rw-r--r--res/values-sv/cm_arrays.xml2
-rw-r--r--res/values-tr/cm_arrays.xml10
-rw-r--r--res/values-tr/cm_strings.xml9
-rw-r--r--res/values-uk/cm_arrays.xml40
-rw-r--r--res/values-uk/cm_strings.xml64
-rw-r--r--res/values-zh-rCN/cm_strings.xml15
-rw-r--r--res/values-zh-rHK/cm_arrays.xml40
-rw-r--r--res/values-zh-rHK/cm_strings.xml39
-rw-r--r--src/com/android/launcher3/DynamicGrid.java10
-rw-r--r--src/com/android/launcher3/Launcher.java7
-rw-r--r--src/com/android/launcher3/SearchDropTargetBar.java4
27 files changed, 607 insertions, 59 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95e6f7f..ba7c8b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,13 +34,13 @@
<permission
android:name="com.android.launcher3.permission.READ_SETTINGS"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
- android:protectionLevel="normal"
+ android:protectionLevel="dangerous"
android:label="@string/permlab_read_settings"
android:description="@string/permdesc_read_settings"/>
<permission
android:name="com.android.launcher3.permission.WRITE_SETTINGS"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
- android:protectionLevel="normal"
+ android:protectionLevel="dangerous"
android:label="@string/permlab_write_settings"
android:description="@string/permdesc_write_settings"/>
@@ -117,46 +117,6 @@
</intent-filter>
</activity>
- <activity
- android:name="com.android.launcher3.LockWallpaperPickerActivity"
- android:theme="@style/Theme.WallpaperCropper"
- android:label="@string/pick_wallpaper"
- android:icon="@mipmap/ic_launcher_wallpaper"
- android:finishOnCloseSystemDialogs="true"
- android:process=":wallpaper_chooser">
- <intent-filter>
- <action android:name="android.intent.action.SET_KEYGUARD_WALLPAPER" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <activity
- android:name="com.android.launcher3.WallpaperPickerActivity"
- android:theme="@style/Theme.WallpaperCropper"
- android:label="@string/pick_wallpaper"
- android:icon="@mipmap/ic_launcher_wallpaper"
- android:finishOnCloseSystemDialogs="true"
- android:process=":wallpaper_chooser">
- <intent-filter>
- <action android:name="android.intent.action.SET_WALLPAPER" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
- <activity
- android:name="com.android.launcher3.WallpaperCropActivity"
- android:theme="@style/Theme.WallpaperCropper"
- android:label="@string/crop_wallpaper"
- android:icon="@mipmap/ic_launcher_wallpaper"
- android:finishOnCloseSystemDialogs="true"
- android:process=":wallpaper_chooser">
- <intent-filter>
- <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="image/*" />
- </intent-filter>
- </activity>
-
<!-- Debugging tools -->
<activity
android:name="com.android.launcher3.MemoryDumpActivity"
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index cc27342..a501119 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -56,6 +56,7 @@
<string name="default_iconpack_title">Standaard ikone</string>
<string name="icon_packs_title">Ikoon stelle</string>
<string name="no_iconpacks_summary">Geen ikoon stelle geïnstalleer</string>
+ <string name="clear_keyguard_wallpaper">Verwyder</string>
<string name="all_apps_cling_cm">Verpersoonlik jou laai</string>
<string name="all_apps_cling_summary">Tik die bladsy aanwyser vir bykomende konfigurasie-instellings</string>
<string name="menu_hidden_apps_delete">Herstel</string>
diff --git a/res/values-et/cm_arrays.xml b/res/values-et/cm_arrays.xml
new file mode 100644
index 0000000..c652830
--- /dev/null
+++ b/res/values-et/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>Regulaarne</item>
+ <item>Kerge</item>
+ <item>Lühendatud</item>
+ </string-array>
+ <string-array name="transition_effect_entries">
+ <item>Puudub</item>
+ <item>Suumi Sisse</item>
+ <item>Suumi Välja</item>
+ <item>Pööra Üles</item>
+ <item>Pööra Alla</item>
+ <item>Kuubik Sisse</item>
+ <item>Kuubik Välja</item>
+ <item>Kihid</item>
+ <item>Akordion</item>
+ <item>Pööra ümber</item>
+ <item>Silinder Sisse</item>
+ <item>Silinder Välja</item>
+ <item>Karussell</item>
+ <item>Ülevaade</item>
+ </string-array>
+</resources>
diff --git a/res/values-in/cm_arrays.xml b/res/values-in/cm_arrays.xml
new file mode 100644
index 0000000..d7c2e6f
--- /dev/null
+++ b/res/values-in/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>Reguler</item>
+ <item>Terang</item>
+ <item>Condensed</item>
+ </string-array>
+ <string-array name="transition_effect_entries">
+ <item>Tidak Ada</item>
+ <item>Perkecil</item>
+ <item>Perbesar</item>
+ <item>Putar ke Atas</item>
+ <item>Putar ke Bawah</item>
+ <item>Kubus Masuk</item>
+ <item>Kubus Keluar</item>
+ <item>Tumpukan</item>
+ <item>Accordion</item>
+ <item>Membalik</item>
+ <item>Silinder Masuk</item>
+ <item>Silinder Keluar</item>
+ <item>Komedi putar</item>
+ <item>Overview</item>
+ </string-array>
+</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
new file mode 100644
index 0000000..85cd71b
--- /dev/null
+++ b/res/values-in/cm_strings.xml
@@ -0,0 +1,64 @@
+<?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 name="application_copyright">Hak cipta \u00A9 2013 The CyanogenMod Project</string>
+ <string name="sort_button_text">Urutkan</string>
+ <string name="filter_button_text">Filter</string>
+ <string name="default_screen_button_text">Layar default</string>
+ <string name="transition_effect_button_text">Efek scroll</string>
+ <string name="sort_mode_title">Judul</string>
+ <string name="sort_mode_launch_count">Hitungan peluncur</string>
+ <string name="sort_mode_install_time">Waktu pemasangan</string>
+ <string name="scrolling_page_outlines">Garis luar halaman</string>
+ <string name="scrolling_fade_adjacent">Fade side pages</string>
+ <string name="wallpaper_scroll">Wallpaper gulir</string>
+ <string name="preferences_title">Pengaturan</string>
+ <string name="preferences_application_title">App</string>
+ <string name="preferences_interface_homescreen_title">Layar home</string>
+ <string name="preferences_interface_homescreen_search_title">Bar pencarian</string>
+ <string name="preferences_interface_homescreen_search_summary">Tampilkan bar pencarian tetap di atas layar</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Sembunyikan label ikon</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Sembunyikan label ikon pada homescreen</string>
+ <string name="preferences_interface_drawer_title">Drawer</string>
+ <string name="preferences_interface_drawer_summary">Aplikasi dan widgets drawer</string>
+ <string name="preferences_interface_drawer_apps_category">Aplikasi</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">Aplikasi tersembunyi</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">Sembunyikan aplikasi dari drawer</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Hapus pintasan</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Hapus cara pintas apps yang tersembunyi dari homescreen</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">Hapus widget</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Hapus aplikasi widget tersembunyi dari homescreen</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_title">Sembunyikan label ikon</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_summary">Sembunyikan label ikon di drawer</string>
+ <string name="preferences_interface_dock_title">Dock</string>
+ <string name="preferences_interface_general_title">Umum</string>
+ <string name="preferences_interface_general_icons_category">Ikon</string>
+ <string name="preferences_interface_general_icons_large_title">Ikon lebih besar</string>
+ <string name="preferences_interface_general_icons_large_summary">Gunakan ikon aplikasi lebih besar di homescreen dan drawer</string>
+ <string name="preferences_interface_general_icons_text_style_title">Gaya teks font</string>
+ <string name="preferences_interface_general_icons_text_style_summary">Varian dan gaya font untuk menggunakan teks icon</string>
+ <string name="dialog_pick_iconpack_title">Pilih paket ikon</string>
+ <string name="default_iconpack_title">Ikon semula</string>
+ <string name="icon_packs_title">Paket ikon</string>
+ <string name="no_iconpacks_summary">Tidak ada ikon paket yang diinstal</string>
+ <string name="clear_keyguard_wallpaper">Bersihkan</string>
+ <string name="all_apps_cling_cm">Sesuaikan drawer anda</string>
+ <string name="all_apps_cling_summary">Tap indikator halaman untuk melihat pengaturan konfigurasi tambahan</string>
+ <string name="menu_hidden_apps_delete">Kembalikan</string>
+ <string name="hidden_apps_title">Aplikasi tersembunyi</string>
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index c3c0743..1b1e072 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -50,8 +50,8 @@
<string name="preferences_interface_general_icons_category">Icone</string>
<string name="preferences_interface_general_icons_large_title">Icone grandi</string>
<string name="preferences_interface_general_icons_large_summary">Usa le icone grandi delle app nella schermata Home e nel drawer</string>
- <string name="preferences_interface_general_icons_text_style_title">Stile font testo</string>
- <string name="preferences_interface_general_icons_text_style_summary">Varianti e stile del font per il testo dell\'icona</string>
+ <string name="preferences_interface_general_icons_text_style_title">Stile caratteri testo</string>
+ <string name="preferences_interface_general_icons_text_style_summary">Varianti e stile dei caratteri per il testo dell\'icona</string>
<string name="dialog_pick_iconpack_title">Scegli pacchetto icone</string>
<string name="default_iconpack_title">Icone predefinite</string>
<string name="icon_packs_title">Pacchetti icone</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index b839107..05d3287 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -56,6 +56,7 @@
<string name="default_iconpack_title">סמלי ברירת מחדל</string>
<string name="icon_packs_title">אוסף סמלים</string>
<string name="no_iconpacks_summary">לא מותקנות ערכות סמל</string>
+ <string name="clear_keyguard_wallpaper">נקה</string>
<string name="all_apps_cling_cm">התאמה אישית של מגירת היישומים</string>
<string name="all_apps_cling_summary">הקש על מחוון הדף כדי להציג הגדרות נוספות</string>
<string name="menu_hidden_apps_delete">אפס</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index eb6f43f..3a6bd86 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -56,6 +56,7 @@
<string name="default_iconpack_title">デフォルトのアイコン</string>
<string name="icon_packs_title">アイコンパック</string>
<string name="no_iconpacks_summary">アイコンパックがインストールされていません</string>
+ <string name="clear_keyguard_wallpaper">クリア</string>
<string name="all_apps_cling_cm">ドロワーをカスタマイズ</string>
<string name="all_apps_cling_summary">追加の構成設定を表示するには、ページインジケータをタップします。</string>
<string name="menu_hidden_apps_delete">リセット</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index e4ffbbf..116b19e 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -26,7 +26,7 @@
<string name="sort_mode_install_time">Įdiegimo laikas</string>
<string name="scrolling_page_outlines">Puslapio kontūrai</string>
<string name="scrolling_fade_adjacent">Išblukinti šoninius ekranus</string>
- <string name="wallpaper_scroll">Slinkti foną</string>
+ <string name="wallpaper_scroll">Slinkti ekrano foną</string>
<string name="preferences_title">Nustatymai</string>
<string name="preferences_application_title">Programa</string>
<string name="preferences_interface_homescreen_title">Pagrindinis ekranas</string>
diff --git a/res/values-nb/cm_arrays.xml b/res/values-nb/cm_arrays.xml
new file mode 100644
index 0000000..ffec66d
--- /dev/null
+++ b/res/values-nb/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>Vanlig</item>
+ <item>Lys</item>
+ <item>Kondensert</item>
+ </string-array>
+ <string-array name="transition_effect_entries">
+ <item>Ingen</item>
+ <item>Zoome inn</item>
+ <item>Zoome ut</item>
+ <item>Rotere opp</item>
+ <item>Rotere ned</item>
+ <item>Kube inn</item>
+ <item>Kube ut</item>
+ <item>Stabel</item>
+ <item>Trekkspill</item>
+ <item>Vend</item>
+ <item>Sylinder inn</item>
+ <item>Sylinder ut</item>
+ <item>Karusell</item>
+ <item>Oversikt</item>
+ </string-array>
+</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
new file mode 100644
index 0000000..ed18d71
--- /dev/null
+++ b/res/values-nb/cm_strings.xml
@@ -0,0 +1,64 @@
+<?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 name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
+ <string name="sort_button_text">Sorter</string>
+ <string name="filter_button_text">Filter</string>
+ <string name="default_screen_button_text">Standardskjermbildet</string>
+ <string name="transition_effect_button_text">Bla effekt</string>
+ <string name="sort_mode_title">Tittel</string>
+ <string name="sort_mode_launch_count">Start teller</string>
+ <string name="sort_mode_install_time">Installeringstid</string>
+ <string name="scrolling_page_outlines">Skjermkontur</string>
+ <string name="scrolling_fade_adjacent">Fade skjermsider</string>
+ <string name="wallpaper_scroll">Bla bakgrunn</string>
+ <string name="preferences_title">Innstillinger</string>
+ <string name="preferences_application_title">App</string>
+ <string name="preferences_interface_homescreen_title">Hjemmeskjerm</string>
+ <string name="preferences_interface_homescreen_search_title">Søkefeltet</string>
+ <string name="preferences_interface_homescreen_search_summary">Vis vedvarende søkefeltet øverst på skjermen</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skjule ikonetiketter</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skjule ikonetiketter på hjemmeskjerm</string>
+ <string name="preferences_interface_drawer_title">Skuff</string>
+ <string name="preferences_interface_drawer_summary">Programmer og widgets skuff</string>
+ <string name="preferences_interface_drawer_apps_category">Apps</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">Skjulte programmer</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">Skjul apps fra skuffen</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Fjern snarveier</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Fjerne snarveier til skjulte programmer fra hjemmeskjerm</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">Fjern widgets</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Fjerne widgeter av skjulte programmer fra hjemmeskjerm</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_title">Skjul ikonetiketter</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_summary">Skjul ikonetiketter i skuffen</string>
+ <string name="preferences_interface_dock_title">Dock</string>
+ <string name="preferences_interface_general_title">Generelt</string>
+ <string name="preferences_interface_general_icons_category">Ikoner</string>
+ <string name="preferences_interface_general_icons_large_title">Større ikoner</string>
+ <string name="preferences_interface_general_icons_large_summary">Bruk ekstra store programikoner på hjemmeskjerm og skuff</string>
+ <string name="preferences_interface_general_icons_text_style_title">Skrifttype</string>
+ <string name="preferences_interface_general_icons_text_style_summary">Variant og stil på skrift brukt til ikon tekst</string>
+ <string name="dialog_pick_iconpack_title">Velg ikon pakke</string>
+ <string name="default_iconpack_title">Standardikoner</string>
+ <string name="icon_packs_title">Symbol-pakker</string>
+ <string name="no_iconpacks_summary">Ingen ikon pakker installert</string>
+ <string name="clear_keyguard_wallpaper">Fjern</string>
+ <string name="all_apps_cling_cm">Tilpasse din skuff</string>
+ <string name="all_apps_cling_summary">Trykk på sideindikatoren for å vise flere konfigurasjonsinnstillinger</string>
+ <string name="menu_hidden_apps_delete">Tilbakestille</string>
+ <string name="hidden_apps_title">Skjulte programmer</string>
+</resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index a524d45..6bf22dc 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -32,7 +32,19 @@
<string name="preferences_interface_homescreen_title">Ekran głowny</string>
<string name="preferences_interface_homescreen_search_title">Pasek wyszukiwania</string>
<string name="preferences_interface_homescreen_search_summary">Pokazuj pasek wyszukiwania na stałe</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Ukryj etykiety ikon</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Ukrywa etykiety ikon na ekranie głównym</string>
<string name="preferences_interface_drawer_title">Szuflada</string>
+ <string name="preferences_interface_drawer_summary">Szuflada aplikacji i widżetów</string>
+ <string name="preferences_interface_drawer_apps_category">Aplikacje</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">Ukryte aplikacje</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">Ukrywanie aplikacji z szuflady</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Usuń skróty</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Usuwa skróty ukrytych aplikacji z ekranu głównego</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">Usuń widżety</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Usuwa widżety ukrytych aplikacji z ekranu głównego</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_title">Ukryj etykiety ikon</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_summary">Ukryj etykiety ikon w szufladzie</string>
<string name="preferences_interface_dock_title">Dok</string>
<string name="preferences_interface_general_title">Ogólne</string>
<string name="preferences_interface_general_icons_category">Ikony</string>
@@ -44,6 +56,9 @@
<string name="default_iconpack_title">Domyślne ikony</string>
<string name="icon_packs_title">Paczki ikon</string>
<string name="no_iconpacks_summary">Brak zainstalowanych paczek ikon</string>
+ <string name="clear_keyguard_wallpaper">Wyczyść</string>
<string name="all_apps_cling_cm">Dostosuj szufladę</string>
<string name="all_apps_cling_summary">Naciśnij na wskaźnik strony by zobaczyć dodatkowe opcje konfiguracji</string>
+ <string name="menu_hidden_apps_delete">Przywróć domyślne</string>
+ <string name="hidden_apps_title">Ukryte aplikacje</string>
</resources>
diff --git a/res/values-si/cm_arrays.xml b/res/values-si/cm_arrays.xml
new file mode 100644
index 0000000..3ff25c0
--- /dev/null
+++ b/res/values-si/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>සැහැල්ලු</item>
+ <item>ඝනීභූත</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-si/cm_strings.xml b/res/values-si/cm_strings.xml
new file mode 100644
index 0000000..9804bb9
--- /dev/null
+++ b/res/values-si/cm_strings.xml
@@ -0,0 +1,64 @@
+<?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 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_title">සැකසීම්</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_homescreen_general_hide_icon_labels_title">අයිකන ලේබල සඟවන්න</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">මුල් තිරයේ අයිකන ලේබල සඟවන්න</string>
+ <string name="preferences_interface_drawer_title">ලාච්චුව</string>
+ <string name="preferences_interface_drawer_summary">යෙදුම් සහ විජට ලාච්චුව</string>
+ <string name="preferences_interface_drawer_apps_category">යෙදුම්</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">සැඟවුණු යෙදුම්</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">යෙදුම් ලාච්චුවේ නොපෙන්වන්න</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">කෙටිමං ඉවත් කරන්න</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">සැඟවුණු යෙදුම්හි කෙටිමං මුල් තිරයෙන් ඉවත් කරන්න</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">විජට ඉවත් කරන්න</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_summary">සැඟවුණු යෙදුම්හි විජට මුල් තිරයෙන් ඉවත් කරන්න</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_title">අයිකන ලේබල සඟවන්න</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_summary">ලාච්චුව තුල අයිකන ලේබල සඟවන්න</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="clear_keyguard_wallpaper">හිස් කරන්න</string>
+ <string name="all_apps_cling_cm">ඔබගේ ලාච්චුව රිසිකරණය කරන්න</string>
+ <string name="all_apps_cling_summary">අතිරේක වින්‍යාසන සැකසීම් බැලීමට පිටු දර්ශකය මත තට්ටු කරන්න</string>
+ <string name="menu_hidden_apps_delete">ප්‍රත්‍යාරම්භනය</string>
+ <string name="hidden_apps_title">සැඟවුණු යෙදුම්</string>
+</resources>
diff --git a/res/values-sr/cm_arrays.xml b/res/values-sr/cm_arrays.xml
index d64210d..54f520e 100644
--- a/res/values-sr/cm_arrays.xml
+++ b/res/values-sr/cm_arrays.xml
@@ -29,12 +29,12 @@
<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-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 04ef3fa..4c4eaf4 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -45,7 +45,7 @@
<string name="preferences_interface_drawer_hidden_apps_widgets_summary">Уклоните виџете скривених апликација са почетног екрана</string>
<string name="preferences_interface_drawer_hide_icon_labels_title">Сакриј етикете икона</string>
<string name="preferences_interface_drawer_hide_icon_labels_summary">Сакријте етикете икона у фиоци</string>
- <string name="preferences_interface_dock_title">Доцк</string>
+ <string name="preferences_interface_dock_title">Док</string>
<string name="preferences_interface_general_title">Oпште</string>
<string name="preferences_interface_general_icons_category">Иконе</string>
<string name="preferences_interface_general_icons_large_title">Веће иконе</string>
diff --git a/res/values-sv/cm_arrays.xml b/res/values-sv/cm_arrays.xml
index fddfd9e..82f1a1f 100644
--- a/res/values-sv/cm_arrays.xml
+++ b/res/values-sv/cm_arrays.xml
@@ -31,7 +31,7 @@
<item>Kub ut</item>
<item>Stack</item>
<item>Dragspel</item>
- <item>Flip</item>
+ <item>Vänd</item>
<item>Cylinder in</item>
<item>Cylinder ut</item>
<item>Karusell</item>
diff --git a/res/values-tr/cm_arrays.xml b/res/values-tr/cm_arrays.xml
index d1a12a0..6631a71 100644
--- a/res/values-tr/cm_arrays.xml
+++ b/res/values-tr/cm_arrays.xml
@@ -27,14 +27,14 @@
<item>Uzaklaştır</item>
<item>Yukarı Döndür</item>
<item>Aşağı Döndür</item>
- <item>İçeri Küp</item>
- <item>Dışarı Küp</item>
+ <item>Kübün İçi</item>
+ <item>Kübün dışı</item>
<item>Yığın</item>
<item>Akordiyon</item>
<item>Çevir</item>
- <item>İçine Silindir</item>
- <item>Dışına Silindir</item>
+ <item>Silindirin İçi</item>
+ <item>Silindirin Dışı</item>
<item>Karusel</item>
- <item>GenelGörünüm</item>
+ <item>Genel Görünüm</item>
</string-array>
</resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index a2754e2..529b76b 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -22,6 +22,7 @@
<string name="default_screen_button_text">Varsayılan ekran</string>
<string name="transition_effect_button_text">Kaydırma efekti</string>
<string name="sort_mode_title">Başlık</string>
+ <string name="sort_mode_launch_count">Çalıştırma sayısı</string>
<string name="sort_mode_install_time">Kurulum zamanı</string>
<string name="scrolling_page_outlines">Sayfa anahatları</string>
<string name="scrolling_fade_adjacent">Yan sayfaları soldur</string>
@@ -29,7 +30,7 @@
<string name="preferences_title">Ayarlar</string>
<string name="preferences_application_title">Uygulama</string>
<string name="preferences_interface_homescreen_title">Ana Ekran</string>
- <string name="preferences_interface_homescreen_search_title">Arama kutusu</string>
+ <string name="preferences_interface_homescreen_search_title">Arama çubuğu</string>
<string name="preferences_interface_homescreen_search_summary">Ekranın üstünde kalıcı arama çubuğu göster</string>
<string name="preferences_interface_homescreen_general_hide_icon_labels_title">Simge etiketlerini gizle</string>
<string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Ana ekranda simge etiketlerini gizle</string>
@@ -40,16 +41,16 @@
<string name="preferences_interface_drawer_hidden_apps_summary">Uygulamaları menüden gizle</string>
<string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Kısayolları kaldır</string>
<string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Ana ekrandan gizli uygulamaların kısayollarını kaldır</string>
- <string name="preferences_interface_drawer_hidden_apps_widgets_title">Ekran araçlarını kaldır</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">Widgetları kaldır</string>
<string name="preferences_interface_drawer_hidden_apps_widgets_summary">Ana ekrandan gizli uygulamaların widgetlarını kaldır</string>
<string name="preferences_interface_drawer_hide_icon_labels_title">Simge etiketlerini gizle</string>
<string name="preferences_interface_drawer_hide_icon_labels_summary">Çekmecedeki simge etiketlerini gizle</string>
- <string name="preferences_interface_dock_title">Kilit</string>
+ <string name="preferences_interface_dock_title">Ünite</string>
<string name="preferences_interface_general_title">Genel</string>
<string name="preferences_interface_general_icons_category">Simgeler</string>
<string name="preferences_interface_general_icons_large_title">Büyük simgeler</string>
<string name="preferences_interface_general_icons_large_summary">Ana ekranda ve uygulama çekmecesinde çok büyük uyg. simgeleri kullan</string>
- <string name="preferences_interface_general_icons_text_style_title">Yazı fontu stili</string>
+ <string name="preferences_interface_general_icons_text_style_title">Yazı tipi stili</string>
<string name="preferences_interface_general_icons_text_style_summary">Simge yazısı için yazı tipi</string>
<string name="dialog_pick_iconpack_title">Simge paketi seç</string>
<string name="default_iconpack_title">Varsayılan simgeler</string>
diff --git a/res/values-uk/cm_arrays.xml b/res/values-uk/cm_arrays.xml
new file mode 100644
index 0000000..69fc3df
--- /dev/null
+++ b/res/values-uk/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>Легкий</item>
+ <item>Стиснутий</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-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
new file mode 100644
index 0000000..005ef45
--- /dev/null
+++ b/res/values-uk/cm_strings.xml
@@ -0,0 +1,64 @@
+<?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 name="application_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>
+ <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_title">Налаштування</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_homescreen_general_hide_icon_labels_title">Приховувати підписи значків</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Не відображати текст ярликів на домашньому екрані</string>
+ <string name="preferences_interface_drawer_title">Меню програм</string>
+ <string name="preferences_interface_drawer_summary">Список програм і віджетів</string>
+ <string name="preferences_interface_drawer_apps_category">Програми</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">Приховані програми</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">Приховати програми з меню програм</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Видаляти ярлики</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Прибирати ярлики прихованих програм з домашнього екрану</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">Видаляти віджети</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Прибирати віджети прихованих програм з домашнього екрану</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_title">Приховувати підписи значків</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_summary">Не відображати текст ярликів в меню програм</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="clear_keyguard_wallpaper">Очистити</string>
+ <string name="all_apps_cling_cm">Налаштуйте меню програм</string>
+ <string name="all_apps_cling_summary">Торкніться індикатора сторінки знизу, щоб перейти до налаштувань</string>
+ <string name="menu_hidden_apps_delete">Скидання</string>
+ <string name="hidden_apps_title">Приховані програми</string>
+</resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index d1d8cda..408769d 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -32,7 +32,19 @@
<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_homescreen_general_hide_icon_labels_title">隐藏图标标签</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">在主屏幕上隐藏图标标签</string>
<string name="preferences_interface_drawer_title">抽屉</string>
+ <string name="preferences_interface_drawer_summary">应用和小部件抽屉</string>
+ <string name="preferences_interface_drawer_apps_category">应用</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">隐藏的应用</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">从抽屉隐藏应用</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">移除快捷方式</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">从主屏幕移除已隐藏应用的快捷方式</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">移除小部件</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_summary">从主屏幕移除已隐藏应用的小部件</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_title">隐藏图标标签</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_summary">在抽屉里隐藏图标标签</string>
<string name="preferences_interface_dock_title">基座</string>
<string name="preferences_interface_general_title">通用</string>
<string name="preferences_interface_general_icons_category">图标</string>
@@ -44,6 +56,9 @@
<string name="default_iconpack_title">默认图标</string>
<string name="icon_packs_title">图标包</string>
<string name="no_iconpacks_summary">没有安装的图标包</string>
+ <string name="clear_keyguard_wallpaper">清除</string>
<string name="all_apps_cling_cm">自定义抽屉</string>
<string name="all_apps_cling_summary">点击页面指示器以查看其他设置</string>
+ <string name="menu_hidden_apps_delete">重置</string>
+ <string name="hidden_apps_title">隐藏的应用</string>
</resources>
diff --git a/res/values-zh-rHK/cm_arrays.xml b/res/values-zh-rHK/cm_arrays.xml
new file mode 100644
index 0000000..b589a80
--- /dev/null
+++ b/res/values-zh-rHK/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>明亮</item>
+ <item>簡明</item>
+ </string-array>
+ <string-array name="transition_effect_entries">
+ <item>無</item>
+ <item>放大</item>
+ <item>縮小</item>
+ <item>向上旋轉</item>
+ <item>向下旋轉</item>
+ <item>Cube In</item>
+ <item>Cube Out</item>
+ <item>堆疊</item>
+ <item>手風琴</item>
+ <item>翻轉</item>
+ <item>膛入</item>
+ <item>膛出</item>
+ <item>幻燈片 </item>
+ <item>概述</item>
+ </string-array>
+</resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 140c9bc..ce4bfcf 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -17,9 +17,48 @@
-->
<resources>
<string name="application_copyright">版權所有 \u00A9 2013年 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_title">設定</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_homescreen_general_hide_icon_labels_title">隱藏圖示標籤</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">隱藏主螢幕的圖示標籤</string>
+ <string name="preferences_interface_drawer_title">抽屜</string>
+ <string name="preferences_interface_drawer_summary">應用程式和小工具的抽屜</string>
+ <string name="preferences_interface_drawer_apps_category">應用程式</string>
+ <string name="preferences_interface_drawer_hidden_apps_title">隱藏的應用程式</string>
+ <string name="preferences_interface_drawer_hidden_apps_summary">隱藏從抽屜的應用程式</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">移除捷徑</string>
+ <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">從主螢幕移除已隱藏的應用程式捷徑</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_title">移除小工具</string>
+ <string name="preferences_interface_drawer_hidden_apps_widgets_summary">從主螢幕移除已隱藏的應用程式小工具</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_title">隱藏圖示標籤</string>
+ <string name="preferences_interface_drawer_hide_icon_labels_summary">隱藏在抽屜裡的圖示標籤</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="clear_keyguard_wallpaper">清除</string>
+ <string name="all_apps_cling_cm">自訂您的抽屜</string>
+ <string name="all_apps_cling_summary">點擊頁面指標來查看其他配置設定</string>
+ <string name="menu_hidden_apps_delete">重設</string>
+ <string name="hidden_apps_title">隱藏的應用程式</string>
</resources>
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 9be3134..6457fdc 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -31,6 +31,8 @@ import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
import com.android.launcher3.settings.SettingsProvider;
import java.util.ArrayList;
@@ -402,6 +404,14 @@ class DeviceProfile {
}
searchBar.setLayoutParams(lp);
+ // Layout the drop target icons
+ LinearLayout dropTargetBar = (LinearLayout) launcher.getSearchBar().getDropTargetBar();
+ if (hasVerticalBarLayout) {
+ dropTargetBar.setOrientation(LinearLayout.VERTICAL);
+ } else {
+ dropTargetBar.setOrientation(LinearLayout.HORIZONTAL);
+ }
+
// Layout the search bar
View qsbBar = launcher.getQsbBar();
qsbBar.setVisibility(searchBarVisible ? View.VISIBLE : View.GONE);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 3832048..416c806 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -195,6 +195,11 @@ public class Launcher extends Activity
private static final String TOOLBAR_VOICE_SEARCH_ICON_METADATA_NAME =
"com.android.launcher.toolbar_voice_search_icon";
+ private static final String WALLPAPER_PICKER_PACKAGE =
+ "com.android.wallpapercropper";
+ private static final String WALLPAPER_PICKER_ACTIVITY =
+ "com.android.wallpapercropper.WallpaperPickerActivity";
+
public static final String SHOW_WEIGHT_WATCHER = "debug.show_mem";
public static final boolean SHOW_WEIGHT_WATCHER_DEFAULT = false;
@@ -2322,7 +2327,7 @@ public class Launcher extends Activity
}
protected ComponentName getWallpaperPickerComponent() {
- return new ComponentName(getPackageName(), WallpaperPickerActivity.class.getName());
+ return new ComponentName(WALLPAPER_PICKER_PACKAGE, WALLPAPER_PICKER_ACTIVITY);
}
/**
diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index 435dbda..1545207 100644
--- a/src/com/android/launcher3/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -242,4 +242,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
return null;
}
}
+
+ public View getDropTargetBar() {
+ return mDropTargetBar;
+ }
}