diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-07-29 11:18:40 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-07-29 11:18:40 -0700 |
| commit | 0017e8687a1f80cea17d20ffac25ecea78e5050d (patch) | |
| tree | c10d3732fdfe88288a6519a582e4451103b53eae | |
| parent | 48b187fc093e81e93885ad48d8e265513e818818 (diff) | |
| parent | 7b7ee6d5eb19ee24adfc85a47f2a436ea6c4ca8e (diff) | |
| download | android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.tar.gz android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.tar.bz2 android_packages_apps_Trebuchet-0017e8687a1f80cea17d20ffac25ecea78e5050d.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Conflicts:
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/OverviewSettingsPanel.java
src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
Change-Id: I752b61f7db8bb9dc69d64bbf3ac3fd7926cdc4e3
90 files changed, 1526 insertions, 143 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8262f4886..830e2c4b4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -52,7 +52,13 @@ android:name="com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS" android:protectionLevel="signature" /> + <permission + android:name="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA" + android:label="@string/permission_label_read_extension_data" + android:description="@string/permission_desc_read_extension_data" + android:protectionLevel="normal" /> + <uses-permission android:name="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA" /> <uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.SET_WALLPAPER" /> <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" /> @@ -75,9 +81,10 @@ android:icon="@mipmap/ic_launcher_home" android:hardwareAccelerated="true" android:largeHeap="@bool/config_largeHeap" + android:requiredForAllUsers="true" android:supportsRtl="true"> <activity - android:name="org.cyanogenmod.trebuchet.TrebuchetLauncher" + android:name="org.cyanogenmod.trebuchet.CustomHomeLauncher" android:launchMode="singleTask" android:clearTaskOnLaunch="true" android:stateNotNeeded="true" diff --git a/res/anim/drop_down.xml b/res/anim/drop_down.xml deleted file mode 100644 index 49059a048..000000000 --- a/res/anim/drop_down.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/accelerate_decelerate"> - <scale - android:fromXScale="1.0" - android:toXScale="1.0" - android:fromYScale="2.5" - android:toYScale="1.0" - android:pivotX="50%" - android:pivotY="50%" - android:duration="300" - android:fillBefore="false" /> -</set> diff --git a/res/values-af/cm_caf.xml b/res/values-af/cm_caf.xml new file mode 100644 index 000000000..d87537c04 --- /dev/null +++ b/res/values-af/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopieer jou program ikone</string> + <string name="migration_cling_description">Invoer ikone en lêergidse van jou ou tuis skerms?</string> + <string name="migration_cling_copy_apps">KOPIEER IKONE</string> + <string name="migration_cling_use_default">BEGIN OOR</string> +</resources> diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index 3ef65004b..95dd1fc49 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -19,12 +19,24 @@ <string name="launcher_settings">LANSEERDER INSTELLINGS</string> <string name="home_screen_settings">TUIS SKERM INSTELLINGS</string> <string name="drawer_settings">LAAI INSTELLINGS</string> + <string name="app_settings">PROG INSTELLINGS</string> <string name="setting_state_on">AAN</string> <string name="setting_state_off">AF</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Tuis</string> <string name="themes_button_text">Temas</string> <string name="scrolling_page_outlines">Bladsy buitelyne</string> <string name="scrolling_fade_adjacent">Vervaag kant bladsye</string> <string name="scrolling_wallpaper">Rol agtergrond</string> + <string name="grid_size_text">Rooster grootte</string> + <string name="grid_size_comfortable">Gemaklik</string> + <string name="grid_size_cozy">Snoesig</string> + <string name="grid_size_condensed">Verkorte</string> + <string name="grid_size_custom">Persoonlik</string> + <string name="grid_size_custom_and_size">Persoonlik (%1$s)</string> + <string name="preferences_interface_homescreen_custom">Kies persoonlike grootte</string> + <string name="preferences_interface_homescreen_rows_title">Aantal rye</string> + <string name="preferences_interface_homescreen_columns_title">Aantal kolomme</string> <string name="hidden_apps_title">Versteekte programme</string> <string name="scroll_effect_text">Rol effek</string> <string name="drawer_sorting_text">Sorteer metode</string> @@ -39,4 +51,7 @@ <string name="protected_app_settings">Beskermde programme</string> <string name="search_screen_left_text">Soek paneel</string> <string name="search_screen_left_unsupported_toast">Jy moet \'n ondersteunde soek program hê en CyanogenMod om hierdie funksie te gebruik.</string> + <string name="dialog_confirm">Bevestig</string> + <string name="permission_desc_read_extension_data">Laat toegang tot byvoegsels vir DashClock se data toe</string> + <string name="permission_label_read_extension_data">Vra byvoegsel vir DashClock data aan</string> </resources> diff --git a/res/values-ar/cm_caf.xml b/res/values-ar/cm_caf.xml new file mode 100644 index 000000000..c5fcd3b37 --- /dev/null +++ b/res/values-ar/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">نسخ أيقونات التطبيقات الخاصة بك</string> + <string name="migration_cling_description">استيراد الأيقونات والمجلدات من الشاشة الرئيسية القديمة الخاصة بك؟</string> + <string name="migration_cling_copy_apps">نسخ الأيقونات</string> + <string name="migration_cling_use_default">بداية جديدة</string> +</resources> diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml index e9fd70329..e7d5f02f3 100644 --- a/res/values-ar/cm_strings.xml +++ b/res/values-ar/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">إعدادات التطبيق</string> <string name="setting_state_on">يعمل</string> <string name="setting_state_off">لايعمل</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">منزل CM</string> <string name="themes_button_text">المواضيع</string> <string name="scrolling_page_outlines">الخطوط العريضة لي الصفحة</string> <string name="scrolling_fade_adjacent">تتلاشى الصفحات الجانبية</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">مريح</string> <string name="grid_size_condensed">مكثف</string> <string name="grid_size_custom">مخصص</string> + <string name="grid_size_custom_and_size">مخصص (%1$s)</string> <string name="preferences_interface_homescreen_custom">حدد حجم مخصص</string> <string name="preferences_interface_homescreen_rows_title">عدد الصفوف</string> <string name="preferences_interface_homescreen_columns_title">عدد الأعمدة</string> @@ -49,4 +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_desc_read_extension_data">يسمح بطلب بيانات ملحق DashClock</string> + <string name="permission_label_read_extension_data">طلب بيانات ملحق DashClock</string> </resources> diff --git a/res/values-ca/cm_caf.xml b/res/values-ca/cm_caf.xml new file mode 100644 index 000000000..12a476e24 --- /dev/null +++ b/res/values-ca/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Copia les teves icones d\'apps</string> + <string name="migration_cling_description">Vols importar les icones i carpetes de la teva antiga pantalla d\'inici?</string> + <string name="migration_cling_copy_apps">COPIA ICONES</string> + <string name="migration_cling_use_default">COMENÇA NET</string> +</resources> diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml index 5c153cc59..d89142d95 100644 --- a/res/values-ca/cm_strings.xml +++ b/res/values-ca/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">CONFIGURACIÓ DE L\'APP</string> <string name="setting_state_on">SÍ</string> <string name="setting_state_off">NO</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">Inici CM</string> <string name="themes_button_text">Temes</string> <string name="scrolling_page_outlines">Vores de la pàgina</string> <string name="scrolling_fade_adjacent">Esvaeix els costats de les pàgines</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Acollidora</string> <string name="grid_size_condensed">Condensada</string> <string name="grid_size_custom">Personalitzada</string> + <string name="grid_size_custom_and_size">Personalitzada (%1$s)</string> <string name="preferences_interface_homescreen_custom">Selecciona la mida personalitzada</string> <string name="preferences_interface_homescreen_rows_title">Nombre de files</string> <string name="preferences_interface_homescreen_columns_title">Nombre de columnes</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Quadre de cerca</string> <string name="search_screen_left_unsupported_toast">Has de tenir una app de cerca suportada i perquè CyanogenMod utilitzi aquesta característica.</string> <string name="dialog_confirm">Confirma</string> + <string name="permission_desc_read_extension_data">Permet sol·licitar dades d\'extensió del DashClock</string> + <string name="permission_label_read_extension_data">Sol·licita dades d\'extensió del DashClock</string> </resources> diff --git a/res/values-cs/cm_caf.xml b/res/values-cs/cm_caf.xml new file mode 100644 index 000000000..a1a223e2c --- /dev/null +++ b/res/values-cs/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopírovat ikony aplikací</string> + <string name="migration_cling_description">Importovat ikony a složky ze staré domácí obrazovky?</string> + <string name="migration_cling_copy_apps">KOPÍROVAT IKONY</string> + <string name="migration_cling_use_default">ČISTÁ PLOCHA</string> +</resources> diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index f5c603f52..d30c5039a 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">NASTAVENÍ APL</string> <string name="setting_state_on">Zap.</string> <string name="setting_state_off">Vyp.</string> + <string name="search_panel_gel">Chytré karty Google</string> + <string name="search_panel_custom_home">CM Plocha</string> <string name="themes_button_text">Motivy</string> <string name="scrolling_page_outlines">Ohraničení stránek</string> <string name="scrolling_fade_adjacent">Prolínat hrany ploch</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Pohodlná</string> <string name="grid_size_condensed">Zůžená</string> <string name="grid_size_custom">Vlastní</string> + <string name="grid_size_custom_and_size">Vlastní (%1$s)</string> <string name="preferences_interface_homescreen_custom">Zvolte vlastní velikost</string> <string name="preferences_interface_homescreen_rows_title">Počet řádek</string> <string name="preferences_interface_homescreen_columns_title">Počet sloupců</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Panel vyhledávání</string> <string name="search_screen_left_unsupported_toast">Pro použití této funkce musíte mít nainstalovanou podporovanou aplikaci vyhledávání a CyanogenMod.</string> <string name="dialog_confirm">Potvrdit</string> + <string name="permission_desc_read_extension_data">Umožnit vyžádat data rozšíření DashClock</string> + <string name="permission_label_read_extension_data">Vyžádat data rozšíření DashClock</string> </resources> diff --git a/res/values-da/cm_caf.xml b/res/values-da/cm_caf.xml new file mode 100644 index 000000000..6c57231dd --- /dev/null +++ b/res/values-da/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopiér dine appikoner</string> + <string name="migration_cling_description">Importere ikoner og mapper fra dine gamle startskærme?</string> + <string name="migration_cling_copy_apps">KOPIÉR IKONER</string> + <string name="migration_cling_use_default">START FORFRA</string> +</resources> diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml index 5d584f8d6..137da842f 100644 --- a/res/values-da/cm_strings.xml +++ b/res/values-da/cm_strings.xml @@ -31,6 +31,7 @@ <string name="grid_size_cozy">Hyggeligt</string> <string name="grid_size_condensed">Sammentrængt</string> <string name="grid_size_custom">Brugerdefineret</string> + <string name="grid_size_custom_and_size">Brugerdefineret (%1$s)</string> <string name="preferences_interface_homescreen_custom">Vælg brugerdefineret størrelse</string> <string name="preferences_interface_homescreen_rows_title">Antal rækker</string> <string name="preferences_interface_homescreen_columns_title">Antal kolonner</string> diff --git a/res/values-de/cm_caf.xml b/res/values-de/cm_caf.xml new file mode 100644 index 000000000..c8b1eb8da --- /dev/null +++ b/res/values-de/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopieren Sie Ihre App-Symbole</string> + <string name="migration_cling_description">Sollen die Ordner und Symbole von Ihren bestehenden Startbildschirmen importiert werden?</string> + <string name="migration_cling_copy_apps">SYMBOLE KOPIEREN</string> + <string name="migration_cling_use_default">NEU ANFANGEN</string> +</resources> diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index 30b1e5fb8..e18ddf99c 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">APP-EINSTELLUNGEN</string> <string name="setting_state_on">AN</string> <string name="setting_state_off">AUS</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Designs</string> <string name="scrolling_page_outlines">Seitenumriss anzeigen</string> <string name="scrolling_fade_adjacent">Seiten einblenden</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Mittel</string> <string name="grid_size_condensed">Klein</string> <string name="grid_size_custom">Benutzerdefiniert</string> + <string name="grid_size_custom_and_size">Benutzerdefiniert (%1$s)</string> <string name="preferences_interface_homescreen_custom">Benutzerdefinierte Größe auswählen</string> <string name="preferences_interface_homescreen_rows_title">Anzahl der Zeilen</string> <string name="preferences_interface_homescreen_columns_title">Anzahl der Spalten</string> @@ -46,7 +49,7 @@ <string name="icon_labels_show">Anzeigen</string> <string name="icon_labels_hide">Verbergen</string> <string name="protected_app_settings">Geschützte Apps</string> - <string name="search_screen_left_text">Google Now</string> - <string name="search_screen_left_unsupported_toast">Um diese Funktion nutzen zu können, müssen Sie CyanogenMod und eine unterstützte Such-App installiert haben.</string> + <string name="search_screen_left_text">Such-Bildschirm</string> + <string name="search_screen_left_unsupported_toast">Um diese Funktion nutzen zu können, muss CyanogenMod und eine unterstützte Such-App installiert sein.</string> <string name="dialog_confirm">Bestätigen</string> </resources> diff --git a/res/values-el/cm_caf.xml b/res/values-el/cm_caf.xml new file mode 100644 index 000000000..01c0552e3 --- /dev/null +++ b/res/values-el/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Αντιγραφή των εικονιδίων εφαρμογών σας</string> + <string name="migration_cling_description">Εισαγωγή εικονιδίων και φακέλων από τις παλιές σας Αρχικές οθόνες;</string> + <string name="migration_cling_copy_apps">ΑΝΤΙΓΡΑΦΗ ΕΙΚΟΝΙΔΙΩΝ</string> + <string name="migration_cling_use_default">ΜΙΑ ΝΕΑ ΑΡΧΗ</string> +</resources> diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml index b21a14baa..b67c26a00 100644 --- a/res/values-el/cm_strings.xml +++ b/res/values-el/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">ΡΥΘΜΙΣΕΙΣ ΕΦΑΡΜΟΓΩΝ</string> <string name="setting_state_on">ΕΝΕΡΓΟ</string> <string name="setting_state_off">ΑΝΕΝΕΡΓΟ</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">Αρχική σελίδα CM</string> <string name="themes_button_text">Θέματα</string> <string name="scrolling_page_outlines">Περίγραμμα σελιδών</string> <string name="scrolling_fade_adjacent">Ξεθώριασμα πλευρικών σελίδων</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Κανονικό</string> <string name="grid_size_condensed">Συμπυκνωμένο</string> <string name="grid_size_custom">Προσαρμοσμένο</string> + <string name="grid_size_custom_and_size">Προσαρμοσμένο (%1$s)</string> <string name="preferences_interface_homescreen_custom">Επιλέξτε προσαρμοσμένο μέγεθος</string> <string name="preferences_interface_homescreen_rows_title">Αριθμός γραμμών</string> <string name="preferences_interface_homescreen_columns_title">Αριθμός στηλών</string> @@ -49,4 +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_desc_read_extension_data">Επιτρέπει την αίτηση δεδομένων επέκτασεων DashClock</string> + <string name="permission_label_read_extension_data">Αίτηση δεδομένων επέκτασεων DashClock</string> </resources> diff --git a/res/values-es-rXA/cm_caf.xml b/res/values-es-rXA/cm_caf.xml new file mode 100644 index 000000000..47fa72e36 --- /dev/null +++ b/res/values-es-rXA/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Copia los tos iconos d\'aplicación</string> + <string name="migration_cling_description">¿Importar los iconos y carpetes de les tos pantalles d\'aniciu vieyes?</string> + <string name="migration_cling_copy_apps">COPIAR ICONOS</string> + <string name="migration_cling_use_default">ANICIAR REFRESCU</string> +</resources> diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml index 8c6a2e4c1..52a998215 100644 --- a/res/values-es-rXA/cm_strings.xml +++ b/res/values-es-rXA/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">AXUSTES D\'APLICACIÓN</string> <string name="setting_state_on">SÍ</string> <string name="setting_state_off">NON</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">Aniciu CM</string> <string name="themes_button_text">Temes</string> <string name="scrolling_page_outlines">Berbesos de pantalla</string> <string name="scrolling_fade_adjacent">Efeutu de dilíu</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Acoyedor</string> <string name="grid_size_condensed">Condensáu</string> <string name="grid_size_custom">Personalizáu</string> + <string name="grid_size_custom_and_size">Personalizáu (%1$s)</string> <string name="preferences_interface_homescreen_custom">Esbilla\'l tamañu personalizáu</string> <string name="preferences_interface_homescreen_rows_title">Númberu de fileres</string> <string name="preferences_interface_homescreen_columns_title">Númberu de columnes</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Panel de gueta</string> <string name="search_screen_left_unsupported_toast">Ye necesario tener una aplicación de gueta y CyanogenMod pa poder usar esta carauterística.</string> <string name="dialog_confirm">Confirmar</string> + <string name="permission_desc_read_extension_data">Permitir que les estensiones de DaskClock soliciten datos</string> + <string name="permission_label_read_extension_data">Solicitar datos d\'estensiones de DashClock</string> </resources> diff --git a/res/values-es/cm_caf.xml b/res/values-es/cm_caf.xml new file mode 100644 index 000000000..14d174992 --- /dev/null +++ b/res/values-es/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Copiar los iconos de tus aplicaciones</string> + <string name="migration_cling_description">¿Importar iconos y carpetas desde tus pantallas anteriores?</string> + <string name="migration_cling_copy_apps">COPIAR ICONOS</string> + <string name="migration_cling_use_default">NUEVO COMIENZO</string> +</resources> diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml index 44727d129..775c15b96 100644 --- a/res/values-es/cm_strings.xml +++ b/res/values-es/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">AJUSTES DE LA APLICACIÓN</string> <string name="setting_state_on">SÍ</string> <string name="setting_state_off">NO</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Temas</string> <string name="scrolling_page_outlines">Bordes de pantalla</string> <string name="scrolling_fade_adjacent">Efecto de fundido</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Cómoda</string> <string name="grid_size_condensed">Comprimida</string> <string name="grid_size_custom">Personalizada</string> + <string name="grid_size_custom_and_size">Personalizado (%1$s)</string> <string name="preferences_interface_homescreen_custom">Selecciona el tamaño personalizado</string> <string name="preferences_interface_homescreen_rows_title">Número de filas</string> <string name="preferences_interface_homescreen_columns_title">Número de columnas</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Panel de búsqueda</string> <string name="search_screen_left_unsupported_toast">Debes tener una aplicación de búsqueda y CyanogenMod para poder utilizar esta característica.</string> <string name="dialog_confirm">Confirmar</string> + <string name="permission_desc_read_extension_data">Permitir que las extensiones de DashClock soliciten datos</string> + <string name="permission_label_read_extension_data">Solicitar datos de extensiones de DashClock</string> </resources> diff --git a/res/values-et/cm_caf.xml b/res/values-et/cm_caf.xml new file mode 100644 index 000000000..4c93ebeee --- /dev/null +++ b/res/values-et/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopeeri sinu rakenduse ikoonid</string> + <string name="migration_cling_description">Impordi ikoonid ja kaustad sinu vanadelt Kodu ekraanidelt?</string> + <string name="migration_cling_copy_apps">KOPEERI IKOONID</string> + <string name="migration_cling_use_default">VÄRSKE START</string> +</resources> diff --git a/res/values-et/cm_strings.xml b/res/values-et/cm_strings.xml index 1b97ec2a1..eef88a4cc 100644 --- a/res/values-et/cm_strings.xml +++ b/res/values-et/cm_strings.xml @@ -31,6 +31,7 @@ <string name="grid_size_cozy">Kodune</string> <string name="grid_size_condensed">Kärbitud</string> <string name="grid_size_custom">Isiklik</string> + <string name="grid_size_custom_and_size">Kohandatud (%1$s)</string> <string name="preferences_interface_homescreen_custom">Vali sobiv suurus</string> <string name="preferences_interface_homescreen_rows_title">Ridade arv</string> <string name="preferences_interface_homescreen_columns_title">Veergude arv</string> diff --git a/res/values-eu/cm_arrays.xml b/res/values-eu/cm_arrays.xml new file mode 100644 index 000000000..e8cfdd5d0 --- /dev/null +++ b/res/values-eu/cm_arrays.xml @@ -0,0 +1,35 @@ +<?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="transition_effect_entries"> + <item>Bat ere ez</item> + <item>Zoom sarkorra</item> + <item>Zoom irtenkorra</item> + <item>Gorantz biratu</item> + <item>Beherantz biratu</item> + <item>Kubiko sarkorra</item> + <item>Kubiko irtenkorra</item> + <item>Pilatu</item> + <item>Akordeoia</item> + <item>Irauli</item> + <item>Zilindro sarkorra</item> + <item>Zilindro irtenkorra</item> + <item>Zaldiko-maldikoa</item> + <item>Perspektiba</item> + </string-array> +</resources> diff --git a/res/values-eu/cm_caf.xml b/res/values-eu/cm_caf.xml new file mode 100644 index 000000000..d0d04a7c6 --- /dev/null +++ b/res/values-eu/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Zure aplikazioen ikonoak kopiatu</string> + <string name="migration_cling_description">Ikono eta karpetak zure hasiera pantaila zaharretatik inportatu?</string> + <string name="migration_cling_copy_apps">IKONOAK KOPIATU</string> + <string name="migration_cling_use_default">HUTSETIK HASI</string> +</resources> diff --git a/res/values-eu/cm_strings.xml b/res/values-eu/cm_strings.xml new file mode 100644 index 000000000..d3dec9f05 --- /dev/null +++ b/res/values-eu/cm_strings.xml @@ -0,0 +1,57 @@ +<?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="launcher_settings">ABIARAZLEAREN EZARPENAK</string> + <string name="home_screen_settings">HASIERA PANTAILAREN EZARPENAK</string> + <string name="drawer_settings">APLIKAZIOEN EZARPENAK</string> + <string name="app_settings">APLIKAZIOAREN EZARPENAK</string> + <string name="setting_state_on">BAI</string> + <string name="setting_state_off">EZ</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> + <string name="themes_button_text">Gaiak</string> + <string name="scrolling_page_outlines">Pantaila ertzak</string> + <string name="scrolling_fade_adjacent">Bat egite efektua</string> + <string name="scrolling_wallpaper">Hormairudia mugitu</string> + <string name="grid_size_text">Sarearen tamaina</string> + <string name="grid_size_comfortable">Arrunta</string> + <string name="grid_size_cozy">Erosoa</string> + <string name="grid_size_condensed">Konprimatua</string> + <string name="grid_size_custom">Pertsonalizatua</string> + <string name="grid_size_custom_and_size">Pertsonalizatua (%1$s)</string> + <string name="preferences_interface_homescreen_custom">Tamaina pertsonalizatua hautatu</string> + <string name="preferences_interface_homescreen_rows_title">Ilara kopurua</string> + <string name="preferences_interface_homescreen_columns_title">Zutabe kopurua</string> + <string name="hidden_apps_title">Aplikazioak izkutatu</string> + <string name="scroll_effect_text">Mugitze efektua</string> + <string name="drawer_sorting_text">Antolatze era</string> + <string name="sort_mode_title">Izena</string> + <string name="sort_mode_launch_count">Zenbat aldiz exekutatua</string> + <string name="sort_mode_install_time">Noiz instalatua</string> + <string name="home_screen_search_text">Bilaketa barra</string> + <string name="larger_icons_text">Ikono handiak</string> + <string name="icon_labels">Ikonoen etiketak</string> + <string name="icon_labels_show">Erakutsi</string> + <string name="icon_labels_hide">izkutatu</string> + <string name="protected_app_settings">Babesturiko aplikazioak</string> + <string name="search_screen_left_text">Bilaketa panela</string> + <string name="search_screen_left_unsupported_toast">Bilaketa aplikazio bat izan behar duzu CyanogenMod-ek ezaugarri hau erabili ahal izateko.</string> + <string name="dialog_confirm">Berretsi</string> + <string name="permission_desc_read_extension_data">DashClock hedapenek datuak eskatzea baimendu</string> + <string name="permission_label_read_extension_data">DashClock hedapenen datuak eskatu</string> +</resources> diff --git a/res/values-fi/cm_caf.xml b/res/values-fi/cm_caf.xml new file mode 100644 index 000000000..6b0bc1c87 --- /dev/null +++ b/res/values-fi/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopioi sovellustesi kuvakkeet</string> + <string name="migration_cling_description">Tuo kuvakkeet ja kansiot vanhoista kotinäytöistäsi?</string> + <string name="migration_cling_copy_apps">KOPIOI KUVAKKEET</string> + <string name="migration_cling_use_default">ALOITA ALUSTA</string> +</resources> diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index a9556788e..2dac37383 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">SOVELLUKSEN ASETUKSET</string> <string name="setting_state_on">PÄÄLLÄ</string> <string name="setting_state_off">POIS</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Koti</string> <string name="themes_button_text">Teemat</string> <string name="scrolling_page_outlines">Sivun ulkoreunat</string> <string name="scrolling_fade_adjacent">Häivytä sivun reunat</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Kodikas</string> <string name="grid_size_condensed">Tiivistetty</string> <string name="grid_size_custom">Muokattu</string> + <string name="grid_size_custom_and_size">Mukautettu (%1$s)</string> <string name="preferences_interface_homescreen_custom">Valitse mukautettu koko</string> <string name="preferences_interface_homescreen_rows_title">Rivien määrä</string> <string name="preferences_interface_homescreen_columns_title">Sarakkeiden määrä</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Hakupaneeli</string> <string name="search_screen_left_unsupported_toast">Sinulla tulee olla tuettu hakusovellus ja CyanogenMod käyttääksesi tätä toimintoa.</string> <string name="dialog_confirm">Vahvista</string> + <string name="permission_desc_read_extension_data">Sallii DashClock-laajennuksen tietojen pyynnöt</string> + <string name="permission_label_read_extension_data">Pyydä DashClock-laajennuksen tiedot</string> </resources> diff --git a/res/values-fr/cm_caf.xml b/res/values-fr/cm_caf.xml new file mode 100644 index 000000000..8eecd03f5 --- /dev/null +++ b/res/values-fr/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Copiez vos icônes d\'applications</string> + <string name="migration_cling_description">Importer les icônes et les dossiers de vos anciens écrans d\'accueil ?</string> + <string name="migration_cling_copy_apps">COPIER LES ICÔNES</string> + <string name="migration_cling_use_default">COMMENCER L\'ACTUALISATION</string> +</resources> diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index 5de215d40..3655ee310 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">PARAMÈTRES DE L\'APPLICATION</string> <string name="setting_state_on">OUI</string> <string name="setting_state_off">NON</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Thèmes</string> <string name="scrolling_page_outlines">Espacement des pages</string> <string name="scrolling_fade_adjacent">Estomper les pages adjacentes</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Cosy</string> <string name="grid_size_condensed">Condensé</string> <string name="grid_size_custom">Personnalisée</string> + <string name="grid_size_custom_and_size">Personnalisée (%1$s)</string> <string name="preferences_interface_homescreen_custom">Sélectionner la taille personnalisée</string> <string name="preferences_interface_homescreen_rows_title">Nombre de lignes</string> <string name="preferences_interface_homescreen_columns_title">Nombre de colonnes</string> @@ -49,4 +52,5 @@ <string name="search_screen_left_text">Panneau de recherche</string> <string name="search_screen_left_unsupported_toast">Vous devez avoir une application de recherche compatible et CyanogenMod pour utiliser cette fonctionnalité.</string> <string name="dialog_confirm">Confirmer</string> + <string name="permission_desc_read_extension_data">Autoriser les demandes de données d\'extension de DashClock</string> </resources> diff --git a/res/values-hu/cm_caf.xml b/res/values-hu/cm_caf.xml new file mode 100644 index 000000000..a6d67260e --- /dev/null +++ b/res/values-hu/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Alkalmazásikonok másolása</string> + <string name="migration_cling_description">Importálja az ikonokat és mappákat a régi kezdőképernyőjéből?</string> + <string name="migration_cling_copy_apps">IKONOK MÁSOLÁSA</string> + <string name="migration_cling_use_default">FRISSÍTÉS INDÍTÁSA</string> +</resources> diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index 4dd032e66..5de1269d4 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">ALKALMAZÁS BEÁLLÍTÁSAI</string> <string name="setting_state_on">BE</string> <string name="setting_state_off">KI</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Kezdőlap</string> <string name="themes_button_text">Témák</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> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Hangulatos</string> <string name="grid_size_condensed">Tömörített</string> <string name="grid_size_custom">Egyéni</string> + <string name="grid_size_custom_and_size">Egyéni (%1$s)</string> <string name="preferences_interface_homescreen_custom">Válassza ki az egyéni méretet</string> <string name="preferences_interface_homescreen_rows_title">Sorok száma</string> <string name="preferences_interface_homescreen_columns_title">Oszlopok száma</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Keresés panel</string> <string name="search_screen_left_unsupported_toast">Rendelkeznie kell egy támogatott kereső alkalmazással és CyanogenMod-dal, hogy használhassa ezt a funkciót.</string> <string name="dialog_confirm">Megerősítés</string> + <string name="permission_desc_read_extension_data">Lehetővé teszi a DashClock bővítmény számára az adat-hozzáférési kérelmet</string> + <string name="permission_label_read_extension_data">A DashClock adathozzáférést kér a bővítmény számára</string> </resources> diff --git a/res/values-in/cm_caf.xml b/res/values-in/cm_caf.xml new file mode 100644 index 000000000..d58f8c797 --- /dev/null +++ b/res/values-in/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Salin ikon aplikasi Anda</string> + <string name="migration_cling_description">Impor ikon dan folder dari layar Home lama Anda?</string> + <string name="migration_cling_copy_apps">SALIN IKON</string> + <string name="migration_cling_use_default">MULAI DARI AWAL</string> +</resources> diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml index 3d9070e40..f93cddd3a 100644 --- a/res/values-in/cm_strings.xml +++ b/res/values-in/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">PENGATURAN APL</string> <string name="setting_state_on">ON</string> <string name="setting_state_off">OFF</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Tema</string> <string name="scrolling_page_outlines">Garis luar halaman</string> <string name="scrolling_fade_adjacent">Fade side pages</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Cozy</string> <string name="grid_size_condensed">Condensed</string> <string name="grid_size_custom">Kustom</string> + <string name="grid_size_custom_and_size">Kustom (%1$s)</string> <string name="preferences_interface_homescreen_custom">Pilih ukuran kustom</string> <string name="preferences_interface_homescreen_rows_title">Jumlah baris</string> <string name="preferences_interface_homescreen_columns_title">Jumlah kolom</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Panel pencarian</string> <string name="search_screen_left_unsupported_toast">Anda harus memiliki apl pencarain yang didukung dan CyanogenMod untuk menggunakan fitur ini.</string> <string name="dialog_confirm">Konfirmasi</string> + <string name="permission_desc_read_extension_data">Izinkan meminta data dari ekstensi DashClock</string> + <string name="permission_label_read_extension_data">Meminta ekstensi data DashClock</string> </resources> diff --git a/res/values-it/cm_caf.xml b/res/values-it/cm_caf.xml new file mode 100644 index 000000000..4840fa589 --- /dev/null +++ b/res/values-it/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Importa icone</string> + <string name="migration_cling_description">Importare icone e cartelle dalla vecchia schermata iniziale?</string> + <string name="migration_cling_copy_apps">COPIA ICONE</string> + <string name="migration_cling_use_default">RIPRISTINA</string> +</resources> diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml index a2dba2e78..e9356b6e5 100644 --- a/res/values-it/cm_strings.xml +++ b/res/values-it/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">IMPOSTAZIONI APP</string> <string name="setting_state_on">ON</string> <string name="setting_state_off">OFF</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Temi</string> <string name="scrolling_page_outlines">Contorni pagina</string> <string name="scrolling_fade_adjacent">Dissolvenza pagine laterali</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Accogliente</string> <string name="grid_size_condensed">Condensato</string> <string name="grid_size_custom">Personalizzata</string> + <string name="grid_size_custom_and_size">Personalizzato (%1$s)</string> <string name="preferences_interface_homescreen_custom">Personalizza dimensione</string> <string name="preferences_interface_homescreen_rows_title">Numero di righe</string> <string name="preferences_interface_homescreen_columns_title">Numero di colonne</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Pannello ricerca</string> <string name="search_screen_left_unsupported_toast">È necessario disporre di un app per la ricerca supportata e CyanogenMod per utilizzare questa funzionalità.</string> <string name="dialog_confirm">Conferma</string> + <string name="permission_desc_read_extension_data">Consenti l\'accesso ai dati delle estensioni DashClock</string> + <string name="permission_label_read_extension_data">Accesso ai dati delle estensioni DashClock</string> </resources> diff --git a/res/values-iw/cm_caf.xml b/res/values-iw/cm_caf.xml new file mode 100644 index 000000000..bff1dc8f6 --- /dev/null +++ b/res/values-iw/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">העתקת סמלי היישומים שלך</string> + <string name="migration_cling_description">האם לייבא סמלים ותיקיות ממסכי הבית הישנים שלך?</string> + <string name="migration_cling_copy_apps">העתק סמלים</string> + <string name="migration_cling_use_default">התחל דף חדש</string> +</resources> diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml index 8bbf211f1..7152bc1a2 100644 --- a/res/values-iw/cm_strings.xml +++ b/res/values-iw/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">הגדרות יישום</string> <string name="setting_state_on">מופעל</string> <string name="setting_state_off">מושבת</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">ערכות עיצוב</string> <string name="scrolling_page_outlines">תיאור דף</string> <string name="scrolling_fade_adjacent">עימום דפים צדדיים</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">נעים</string> <string name="grid_size_condensed">מרוכז</string> <string name="grid_size_custom">מותאם אישית</string> + <string name="grid_size_custom_and_size">מותאם אישית (%1$s)</string> <string name="preferences_interface_homescreen_custom">בחר גודל מותאם אישית</string> <string name="preferences_interface_homescreen_rows_title">מספר שורות</string> <string name="preferences_interface_homescreen_columns_title">מספר עמודות</string> @@ -49,4 +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_desc_read_extension_data">אפשר בקשה לקבלת מידע על הרחבת DashClock</string> + <string name="permission_label_read_extension_data">בקשת מידע על הרחבת DashClock</string> </resources> diff --git a/res/values-ja/cm_caf.xml b/res/values-ja/cm_caf.xml new file mode 100644 index 000000000..52dc8cd00 --- /dev/null +++ b/res/values-ja/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">アプリのアイコンをコピー</string> + <string name="migration_cling_description">以前のホーム画面からアイコンやフォルダをインポートしますか？</string> + <string name="migration_cling_copy_apps">アイコンをコピー</string> + <string name="migration_cling_use_default">新しく始める</string> +</resources> diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index e127daab2..faa498280 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">アプリの設定</string> <string name="setting_state_on">ON</string> <string name="setting_state_off">OFF</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CMホーム</string> <string name="themes_button_text">テーマ</string> <string name="scrolling_page_outlines">ページの外枠を表示</string> <string name="scrolling_fade_adjacent">側面のページをフェード</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Cozy</string> <string name="grid_size_condensed">Condensed</string> <string name="grid_size_custom">カスタム</string> + <string name="grid_size_custom_and_size">カスタム（%1$s）</string> <string name="preferences_interface_homescreen_custom">カスタムのサイズを選択</string> <string name="preferences_interface_homescreen_rows_title">行数</string> <string name="preferences_interface_homescreen_columns_title">列数</string> @@ -44,9 +47,11 @@ <string name="larger_icons_text">大きいアイコン</string> <string name="icon_labels">アイコンラベル</string> <string name="icon_labels_show">表示</string> - <string name="icon_labels_hide">非表示</string> + <string name="icon_labels_hide">表示しない</string> <string name="protected_app_settings">アプリの保護</string> <string name="search_screen_left_text">検索パネル</string> <string name="search_screen_left_unsupported_toast">この機能を利用するには、サポートされている検索アプリとCyanogenModが必要です。</string> <string name="dialog_confirm">確認</string> + <string name="permission_desc_read_extension_data">DashClockエクステンションデータのリクエストを許可します</string> + <string name="permission_label_read_extension_data">DashClockエクステンションデータのリクエスト</string> </resources> diff --git a/res/values-ko/cm_arrays.xml b/res/values-ko/cm_arrays.xml new file mode 100644 index 000000000..634c0468e --- /dev/null +++ b/res/values-ko/cm_arrays.xml @@ -0,0 +1,35 @@ +<?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="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-ko/cm_caf.xml b/res/values-ko/cm_caf.xml new file mode 100644 index 000000000..20654d12b --- /dev/null +++ b/res/values-ko/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">앱 아이콘 복사</string> + <string name="migration_cling_description">이전 홈 화면에서 아이콘과 폴더를 가져올까요?</string> + <string name="migration_cling_copy_apps">아이콘 복사</string> + <string name="migration_cling_use_default">새로 시작</string> +</resources> diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml new file mode 100644 index 000000000..47db99291 --- /dev/null +++ b/res/values-ko/cm_strings.xml @@ -0,0 +1,57 @@ +<?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="launcher_settings">런처 설정</string> + <string name="home_screen_settings">홈 화면 설정</string> + <string name="drawer_settings">서랍 설정</string> + <string name="app_settings">애플리케이션 설정</string> + <string name="setting_state_on">켜짐</string> + <string name="setting_state_off">꺼짐</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM 홈</string> + <string name="themes_button_text">테마</string> + <string name="scrolling_page_outlines">페이지 외곽선</string> + <string name="scrolling_fade_adjacent">옆 페이지를 페이드</string> + <string name="scrolling_wallpaper">배경 스크롤</string> + <string name="grid_size_text">격자 크기</string> + <string name="grid_size_comfortable">느슨하게</string> + <string name="grid_size_cozy">적당히</string> + <string name="grid_size_condensed">빽빽하게</string> + <string name="grid_size_custom">사용자 정의</string> + <string name="grid_size_custom_and_size">사용자 정의 (%1$s)</string> + <string name="preferences_interface_homescreen_custom">사용자 정의 크기 선택</string> + <string name="preferences_interface_homescreen_rows_title">행 수</string> + <string name="preferences_interface_homescreen_columns_title">열 수</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> + <string name="protected_app_settings">보호된 앱</string> + <string name="search_screen_left_text">검색 패널</string> + <string name="search_screen_left_unsupported_toast">이 기능을 사용하려면 지원되는 검색 앱과 CyanogenMod가 필요합니다.</string> + <string name="dialog_confirm">확인</string> + <string name="permission_desc_read_extension_data">DashClock의 확장 프로그램 데이터를 요청할 수 있도록 허용</string> + <string name="permission_label_read_extension_data">DashClock 확장 프로그램 데이터 요청</string> +</resources> diff --git a/res/values-ku/cm_caf.xml b/res/values-ku/cm_caf.xml new file mode 100644 index 000000000..78f974ca2 --- /dev/null +++ b/res/values-ku/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">لهبهرگرتنهوهی وێنۆچکهی بهرنامهکهت</string> + <string name="migration_cling_description">تێکردنی وێنۆچکه و بوخچه له شاشهی پێشوت؟</string> + <string name="migration_cling_copy_apps">لهبهرگرتنهوهی وێنۆچکه</string> + <string name="migration_cling_use_default">دهستپێکردنی نوێ</string> +</resources> diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml index 449353f02..020b06831 100644 --- a/res/values-ku/cm_strings.xml +++ b/res/values-ku/cm_strings.xml @@ -16,21 +16,42 @@ limitations under the License. --> <resources> - <string name="home_screen_settings">رێکخستنی شاشەی سەرەکی</string> + <string name="launcher_settings">ڕێکخستنی دهستپێکهر</string> + <string name="home_screen_settings">رێکخستنی ڕوونمای سەرەکی</string> + <string name="drawer_settings">ڕێکخستنی کێشان</string> + <string name="app_settings">ڕێکخستنەکانی بەرنامە</string> <string name="setting_state_on">هەڵگیرساو</string> <string name="setting_state_off">کووژاوە</string> + <string name="search_panel_gel">ئێستا گووگڵ</string> + <string name="search_panel_custom_home">ماڵهوهی ساینهجینمۆد</string> <string name="themes_button_text">رووکارەکان</string> + <string name="scrolling_page_outlines">دهرهێڵی لاپهڕه</string> + <string name="scrolling_fade_adjacent">کاڵبوونهوهی لاپهڕه هێڵ</string> + <string name="scrolling_wallpaper">بابۆڵهکردنی سهرشاشه</string> + <string name="grid_size_text">قهبارهی تۆڕ</string> + <string name="grid_size_comfortable">ئاسووده</string> + <string name="grid_size_cozy">پێدانی ئاسودهیی</string> + <string name="grid_size_condensed">خهستکراو</string> <string name="grid_size_custom">دروستکراو</string> + <string name="grid_size_custom_and_size">خوازراو (%1$s)</string> + <string name="preferences_interface_homescreen_custom">دیاریکردنی قهبارهی خوازراو</string> + <string name="preferences_interface_homescreen_rows_title">ژمارهی ئاسۆییهکان</string> + <string name="preferences_interface_homescreen_columns_title">ژمارهی ستوونهکان</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> <string name="protected_app_settings">بەرنامە پارێزراوەکان</string> <string name="search_screen_left_text">پەرەی گەران</string> + <string name="search_screen_left_unsupported_toast">پێویسته بهرنامهیهکی گهڕانی گونجاوت ههبێ بۆ بهکارهێنانی ساینهجین مۆد لهم خزمهتگوزارییه.</string> <string name="dialog_confirm">دلنیاکردنەوە</string> + <string name="permission_desc_read_extension_data">ڕێگهدان به داواکردنی کاژێرهداش بۆ داتای گهیاندن</string> + <string name="permission_label_read_extension_data">داواکردنی کاژێرداش بۆ داتای گهیاندن</string> </resources> diff --git a/res/values-lt/cm_caf.xml b/res/values-lt/cm_caf.xml new file mode 100644 index 000000000..197d67215 --- /dev/null +++ b/res/values-lt/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Nukopijuoti programų piktogramas</string> + <string name="migration_cling_description">Importuoti piktogramas ir aplankus iš senų pagrindinių ekranų?</string> + <string name="migration_cling_copy_apps">KOPIJUOTI PIKTOGRAMAS</string> + <string name="migration_cling_use_default">PRADĖTI IŠ NAUJO</string> +</resources> diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index 271c9a6da..da6c88510 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">PROGRAMOS NUSTATYMAI</string> <string name="setting_state_on">ĮJUNGTA</string> <string name="setting_state_off">IŠJUNGTA</string> + <string name="search_panel_gel">„Google“ Dabar</string> + <string name="search_panel_custom_home">CM pagrindinis</string> <string name="themes_button_text">Temos</string> <string name="scrolling_page_outlines">Puslapio kontūrai</string> <string name="scrolling_fade_adjacent">Išblukinti šoninius puslapius</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Jaukus</string> <string name="grid_size_condensed">Suglaustas</string> <string name="grid_size_custom">Individualus</string> + <string name="grid_size_custom_and_size">Individualus (%1$s)</string> <string name="preferences_interface_homescreen_custom">Pasirinkite individualų dydį</string> <string name="preferences_interface_homescreen_rows_title">Eilučių skaičius</string> <string name="preferences_interface_homescreen_columns_title">Stulpelių skaičius</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Paieškos panėlė</string> <string name="search_screen_left_unsupported_toast">Jūs privalote turėti palaikomą paieškos programą ir „CyanogenMod“ norėdami naudotis šia funkcija.</string> <string name="dialog_confirm">Patvirtinti</string> + <string name="permission_desc_read_extension_data">Leidžia prašyti „DashClock“ papildomų duomenų</string> + <string name="permission_label_read_extension_data">Prašyti „DashClock“ papildomų duomenų</string> </resources> diff --git a/res/values-nb/cm_caf.xml b/res/values-nb/cm_caf.xml new file mode 100644 index 000000000..9fbbd6398 --- /dev/null +++ b/res/values-nb/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopier app ikoner</string> + <string name="migration_cling_description">Importere ikoner og mapper fra gamle Hjem skjermer?</string> + <string name="migration_cling_copy_apps">KOPIER IKONER</string> + <string name="migration_cling_use_default">START FRISKT</string> +</resources> diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml index 7078b4992..2e2fdce64 100644 --- a/res/values-nb/cm_strings.xml +++ b/res/values-nb/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">APP-INNSTILLINGER</string> <string name="setting_state_on">PÅ</string> <string name="setting_state_off">AV</string> + <string name="search_panel_gel">Google nå</string> + <string name="search_panel_custom_home">CM hjem</string> <string name="themes_button_text">Temaer</string> <string name="scrolling_page_outlines">Skjermkontur</string> <string name="scrolling_fade_adjacent">Fade skjermsider</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Koselig</string> <string name="grid_size_condensed">Kondensert</string> <string name="grid_size_custom">Egendefinert</string> + <string name="grid_size_custom_and_size">Egendefinert (%1$s)</string> <string name="preferences_interface_homescreen_custom">Velg egendefinert størrelse</string> <string name="preferences_interface_homescreen_rows_title">Antall rader</string> <string name="preferences_interface_homescreen_columns_title">Antall kolonner</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Søke-panelet</string> <string name="search_screen_left_unsupported_toast">Du må ha en støttet søke app og CyanogenMod for å bruke denne funksjonen.</string> <string name="dialog_confirm">Bekreft</string> + <string name="permission_desc_read_extension_data">Tillater DashClock å be om utvidelsesdata</string> + <string name="permission_label_read_extension_data">Be om DashClock utvidelsesdata</string> </resources> diff --git a/res/values-nl/cm_caf.xml b/res/values-nl/cm_caf.xml new file mode 100644 index 000000000..63a537f0b --- /dev/null +++ b/res/values-nl/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Pictogrammen kopiëren</string> + <string name="migration_cling_description">Pictogrammen en mappen van uw oude thuisschermen importeren?</string> + <string name="migration_cling_copy_apps">PICTOGRAMMEN KOPIËREN</string> + <string name="migration_cling_use_default">SCHOON BEGINNEN</string> +</resources> diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index cdf3e7e4e..ba6f140b8 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">INSTELLINGEN APPS</string> <string name="setting_state_on">AAN</string> <string name="setting_state_off">UIT</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM-Home</string> <string name="themes_button_text">Thema\'s</string> <string name="scrolling_page_outlines">Paginacontouren</string> <string name="scrolling_fade_adjacent">Zijkant pagina\'s vervagen</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Knus</string> <string name="grid_size_condensed">Smal</string> <string name="grid_size_custom">Aangepast</string> + <string name="grid_size_custom_and_size">Aangepast (%1$s)</string> <string name="preferences_interface_homescreen_custom">Aangepaste grootte</string> <string name="preferences_interface_homescreen_rows_title">Aantal rijen</string> <string name="preferences_interface_homescreen_columns_title">Aantal kolommen</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Zoekscherm</string> <string name="search_screen_left_unsupported_toast">Een ondersteunde zoek-app en CyanogenMod zijn vereist om deze functie te gebruiken.</string> <string name="dialog_confirm">Bevestig</string> + <string name="permission_desc_read_extension_data">Hiermee kan de app gegevens van DashClock-extensies opvragen</string> + <string name="permission_label_read_extension_data">gegevens van DashClock-extensie opvragen</string> </resources> diff --git a/res/values-pl/cm_caf.xml b/res/values-pl/cm_caf.xml new file mode 100644 index 000000000..f4159f84f --- /dev/null +++ b/res/values-pl/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopiowanie ikon aplikacji</string> + <string name="migration_cling_description">Zaimportować ikony i foldery z wcześniej używanego ekranu głównego?</string> + <string name="migration_cling_copy_apps">SKOPIUJ IKONY</string> + <string name="migration_cling_use_default">ŚWIEŻY START</string> +</resources> diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml index 31541d7a7..ad2f3a5cc 100644 --- a/res/values-pl/cm_strings.xml +++ b/res/values-pl/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">USTAWIENIA APLIKACJI</string> <string name="setting_state_on">WŁĄCZONE</string> <string name="setting_state_off">WYŁĄCZONE</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Motywy</string> <string name="scrolling_page_outlines">Kontury strony</string> <string name="scrolling_fade_adjacent">Przenikaj strony boczne</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Luźny</string> <string name="grid_size_condensed">Zagęszczony</string> <string name="grid_size_custom">Własny</string> + <string name="grid_size_custom_and_size">Niestandardowy (%1$s)</string> <string name="preferences_interface_homescreen_custom">Wybierz własny rozmiar</string> <string name="preferences_interface_homescreen_rows_title">Liczba wierszy</string> <string name="preferences_interface_homescreen_columns_title">Liczba kolumn</string> @@ -46,7 +49,9 @@ <string name="icon_labels_show">Pokaż</string> <string name="icon_labels_hide">Ukryj</string> <string name="protected_app_settings">Chronione aplikacje</string> - <string name="search_screen_left_text">Pasek wyszukiwania</string> + <string name="search_screen_left_text">Panel wyszukiwania</string> <string name="search_screen_left_unsupported_toast">Musisz posiadać aplikację wyszukiwania wspieraną przez CyanogenMod by używać tej funkcji.</string> <string name="dialog_confirm">Potwierdź</string> + <string name="permission_desc_read_extension_data">Pozwala na żądanie dostępu do danych rozszerzenia DashClock</string> + <string name="permission_label_read_extension_data">Żądanie dostępu do danych rozszerzenia DashClock</string> </resources> diff --git a/res/values-pt-rBR/cm_caf.xml b/res/values-pt-rBR/cm_caf.xml new file mode 100644 index 000000000..fd61e0b63 --- /dev/null +++ b/res/values-pt-rBR/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Copie seus ícones de aplicativos</string> + <string name="migration_cling_description">Importar ícones e pastas das suas telas iniciais anteriores?</string> + <string name="migration_cling_copy_apps">COPIAR ÍCONES</string> + <string name="migration_cling_use_default">COMEÇAR DE NOVO</string> +</resources> diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml index af903e032..f7cb80ad4 100644 --- a/res/values-pt-rBR/cm_strings.xml +++ b/res/values-pt-rBR/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">CONFIGURAÇÕES DE APLICATIVO</string> <string name="setting_state_on">LIG</string> <string name="setting_state_off">DESL</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Temas</string> <string name="scrolling_page_outlines">Contorno de página</string> <string name="scrolling_fade_adjacent">Esmaecer páginas laterais</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Aconchegante</string> <string name="grid_size_condensed">Condensado</string> <string name="grid_size_custom">Personalizado</string> + <string name="grid_size_custom_and_size">Personalizado (%1$s)</string> <string name="preferences_interface_homescreen_custom">Selecione tamanho personalizado</string> <string name="preferences_interface_homescreen_rows_title">Número de linhas</string> <string name="preferences_interface_homescreen_columns_title">Número de colunas</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Painel de pesquisa</string> <string name="search_screen_left_unsupported_toast">Você precisa ter instalado um aplicativo de pesquisa suportado e o CyanogenMod para utilizar este recurso.</string> <string name="dialog_confirm">Confirmar</string> + <string name="permission_desc_read_extension_data">Permite a solicitação de dados da extensão DashClock</string> + <string name="permission_label_read_extension_data">Solicitar dados da extensão DashClock</string> </resources> diff --git a/res/values-pt-rPT/cm_caf.xml b/res/values-pt-rPT/cm_caf.xml new file mode 100644 index 000000000..c5def3f09 --- /dev/null +++ b/res/values-pt-rPT/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Copiar os ícones das aplicações</string> + <string name="migration_cling_description">Importar ícones e pastas dos seus ecrãs iniciais anteriores?</string> + <string name="migration_cling_copy_apps">COPIAR ÍCONES</string> + <string name="migration_cling_use_default">COMEÇAR DE NOVO</string> +</resources> diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml index 79311bdaa..cbd064c51 100644 --- a/res/values-pt-rPT/cm_strings.xml +++ b/res/values-pt-rPT/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">DEFINIÇÕES DA APLICAÇÃO</string> <string name="setting_state_on">LIG.</string> <string name="setting_state_off">DESL.</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Temas</string> <string name="scrolling_page_outlines">Contorno das páginas</string> <string name="scrolling_fade_adjacent">Desvanecer as páginas laterais</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Cómodo</string> <string name="grid_size_condensed">Condensado</string> <string name="grid_size_custom">Personalizado</string> + <string name="grid_size_custom_and_size">Personalizado (%1$s)</string> <string name="preferences_interface_homescreen_custom">Selecionar o tamanho personalizado</string> <string name="preferences_interface_homescreen_rows_title">Número de linhas</string> <string name="preferences_interface_homescreen_columns_title">Número de colunas</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Painel de pesquisa</string> <string name="search_screen_left_unsupported_toast">Deve ter instalada uma aplicação de pesquisa suportada e a CyanogenMod para utilizar este recurso.</string> <string name="dialog_confirm">Confirmar</string> + <string name="permission_desc_read_extension_data">Permite a solicitação de dados da extensão DashClock</string> + <string name="permission_label_read_extension_data">Solicitar dados da extensão DashClock</string> </resources> diff --git a/res/values-ro/cm_caf.xml b/res/values-ro/cm_caf.xml new file mode 100644 index 000000000..4d963dbcc --- /dev/null +++ b/res/values-ro/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Copiază pictogramele aplicațiilor dumneavoastră</string> + <string name="migration_cling_description">Import pictogramele și dosarele de pe vechiul ecran principal?</string> + <string name="migration_cling_copy_apps">COPIAZĂ PICTOGRAME</string> + <string name="migration_cling_use_default">PORNIRE ÎN STARE PROASPĂTĂ</string> +</resources> diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml index a38b471b2..24ce2f92c 100644 --- a/res/values-ro/cm_strings.xml +++ b/res/values-ro/cm_strings.xml @@ -31,6 +31,7 @@ <string name="grid_size_cozy">Comod</string> <string name="grid_size_condensed">Condensat</string> <string name="grid_size_custom">Particularizat</string> + <string name="grid_size_custom_and_size">Particularizat (%1$s)</string> <string name="preferences_interface_homescreen_custom">Selectare dimensiune particularizată</string> <string name="preferences_interface_homescreen_rows_title">Numărul de rânduri</string> <string name="preferences_interface_homescreen_columns_title">Numărul de coloane</string> diff --git a/res/values-ru/cm_caf.xml b/res/values-ru/cm_caf.xml new file mode 100644 index 000000000..11431ce18 --- /dev/null +++ b/res/values-ru/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Скопируйте значки ваших приложений</string> + <string name="migration_cling_description">Импортировать ярлыки и папки с вашего старого домашнего экрана?</string> + <string name="migration_cling_copy_apps">СКОПИРОВАТЬ</string> + <string name="migration_cling_use_default">С ЧИСТОГО ЛИСТА</string> +</resources> diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml index be4dcdc16..60e3dc95d 100644 --- a/res/values-ru/cm_strings.xml +++ b/res/values-ru/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">НАСТРОЙКИ ПРИЛОЖЕНИЯ</string> <string name="setting_state_on">ВКЛ.</string> <string name="setting_state_off">ВЫКЛ.</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">Дом. экран CM</string> <string name="themes_button_text">Темы</string> <string name="scrolling_page_outlines">Границы страниц</string> <string name="scrolling_fade_adjacent">Затемнять края при переходе</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Удобная</string> <string name="grid_size_condensed">Сжатая</string> <string name="grid_size_custom">Настраиваемая</string> + <string name="grid_size_custom_and_size">Настраиваемая (%1$s)</string> <string name="preferences_interface_homescreen_custom">Выберите размер сетки</string> <string name="preferences_interface_homescreen_rows_title">Количество строк</string> <string name="preferences_interface_homescreen_columns_title">Количество столбцов</string> @@ -49,4 +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_desc_read_extension_data">Приложение сможет запрашивать данные расширений DashClock.</string> + <string name="permission_label_read_extension_data">Запрос данных расширений DashClock</string> </resources> diff --git a/res/values-si/cm_caf.xml b/res/values-si/cm_caf.xml new file mode 100644 index 000000000..44d558ae6 --- /dev/null +++ b/res/values-si/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">ඔබගේ යෙදුම් අයිකන පිටපත් කරන්න</string> + <string name="migration_cling_description">අයිකන සහ ෆෝල්ඩර ඔබගේ පැරැණි මුල් තිරයන් ගෙන් ආනයනය කරන්නද?</string> + <string name="migration_cling_copy_apps">අයිකන පිටපත් කරන්න</string> + <string name="migration_cling_use_default">අලුතින් අරඹන්න</string> +</resources> diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml index 49ad20a95..3b9d9c8ae 100644 --- a/res/values-si/cm_strings.xml +++ b/res/values-si/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">යෙදුම් සැකසීම්</string> <string name="setting_state_on">සක්රීයයි</string> <string name="setting_state_off">අක්රීයයි</string> + <string name="search_panel_gel">ගූගල් දැන්</string> + <string name="search_panel_custom_home">CM නිවස</string> <string name="themes_button_text">තේමා</string> <string name="scrolling_page_outlines">පිටුවේ පිට මායිම්</string> <string name="scrolling_fade_adjacent">පැති පිටු අවපැහැ කරන්න</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">ප්රියජනක</string> <string name="grid_size_condensed">ඝනීභූත</string> <string name="grid_size_custom">රිසිවූ</string> + <string name="grid_size_custom_and_size">රිසිවූ (%1$s)</string> <string name="preferences_interface_homescreen_custom">රිසිකළ ප්රමාණය තෝරන්න</string> <string name="preferences_interface_homescreen_rows_title">පේළි ගණන</string> <string name="preferences_interface_homescreen_columns_title">තීරු ගණන</string> @@ -49,4 +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_desc_read_extension_data">DashClock දිගුවේ දත්ත ඉල්ලුම් කිරීම අනුමත කරන්න</string> + <string name="permission_label_read_extension_data">DashClock දිගුවේ දත්ත ඉල්ලුම් කරන්න</string> </resources> diff --git a/res/values-sk/cm_caf.xml b/res/values-sk/cm_caf.xml new file mode 100644 index 000000000..1127723b4 --- /dev/null +++ b/res/values-sk/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopírovať ikony vašich aplikácií</string> + <string name="migration_cling_description">Importovať ikony a priečinky z vašich starých domovských obrazoviek?</string> + <string name="migration_cling_copy_apps">KÓPÍROVAŤ IKONY</string> + <string name="migration_cling_use_default">ZAČAŤ OD ZAČIATKU </string> +</resources> diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml index cbfff3a91..9020929ea 100644 --- a/res/values-sk/cm_strings.xml +++ b/res/values-sk/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">NASTAVENIA APLIKÁCIÍ</string> <string name="setting_state_on">Zapnuté</string> <string name="setting_state_off">VYPNUTÉ</string> + <string name="search_panel_gel">Asistent Google</string> + <string name="search_panel_custom_home">Domov CM</string> <string name="themes_button_text">Témy</string> <string name="scrolling_page_outlines">Obrysy stránky</string> <string name="scrolling_fade_adjacent">Stmavnuté bočné strany</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Útulná</string> <string name="grid_size_condensed">Zhustená</string> <string name="grid_size_custom">Vlastná</string> + <string name="grid_size_custom_and_size">Vlastná (%1$s)</string> <string name="preferences_interface_homescreen_custom">Vyberte vlastnú veľkosť</string> <string name="preferences_interface_homescreen_rows_title">Počet riadkov</string> <string name="preferences_interface_homescreen_columns_title">Počet stĺpcov</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Panel vyhľadávania</string> <string name="search_screen_left_unsupported_toast">Musíte mať podporovaný vyhľadávač a CyanogenMod pre použitie tejto funkcie.</string> <string name="dialog_confirm">Potvrdiť</string> + <string name="permission_desc_read_extension_data">Umožňuje požadovanie údajov DashClock rozšírení</string> + <string name="permission_label_read_extension_data">Požadovať údaje DashClock rozšírení</string> </resources> diff --git a/res/values-sr/cm_caf.xml b/res/values-sr/cm_caf.xml new file mode 100644 index 000000000..10a0542f7 --- /dev/null +++ b/res/values-sr/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Копирај твоје иконе апликација</string> + <string name="migration_cling_description">Увези иконе и фолдере са твог старог Почетног екрана?</string> + <string name="migration_cling_copy_apps">КОПИРАЈ ИКОНЕ</string> + <string name="migration_cling_use_default">ПОЧНИ ИЗНОВА</string> +</resources> diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml index 6d22910fd..c246f0d42 100644 --- a/res/values-sr/cm_strings.xml +++ b/res/values-sr/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">ПОДЕШАВАЊА АПЛИКАЦИЈА</string> <string name="setting_state_on">ДА</string> <string name="setting_state_off">НЕ</string> + <string name="search_panel_gel">Google Тренутно</string> + <string name="search_panel_custom_home">CM Почетна</string> <string name="themes_button_text">Теме</string> <string name="scrolling_page_outlines">Контура странице</string> <string name="scrolling_fade_adjacent">Замагљени крајеви страница</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Удобно</string> <string name="grid_size_condensed">Кондензовано</string> <string name="grid_size_custom">Прилагођено</string> + <string name="grid_size_custom_and_size">Прилагођено (%1$s)</string> <string name="preferences_interface_homescreen_custom">Изабери прилагођену величину</string> <string name="preferences_interface_homescreen_rows_title">Број редова</string> <string name="preferences_interface_homescreen_columns_title">Број колона</string> @@ -49,4 +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_desc_read_extension_data">Омогућава захтевање података DashClock додатка</string> + <string name="permission_label_read_extension_data">Захтев података DashClock додатка</string> </resources> diff --git a/res/values-sv/cm_caf.xml b/res/values-sv/cm_caf.xml new file mode 100644 index 000000000..fc95df1a6 --- /dev/null +++ b/res/values-sv/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Kopiera dina appikoner</string> + <string name="migration_cling_description">Importera ikoner och mappar från dina gamla hemskärmar?</string> + <string name="migration_cling_copy_apps">KOPIERA IKONER</string> + <string name="migration_cling_use_default">STARTA PÅ NYTT</string> +</resources> diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml index 417a2d842..f0b5734a2 100644 --- a/res/values-sv/cm_strings.xml +++ b/res/values-sv/cm_strings.xml @@ -19,12 +19,22 @@ <string name="launcher_settings">LAUNCHERINSTÄLLNINGAR</string> <string name="home_screen_settings">HEMSKÄRMSINSTÄLLNINGAR</string> <string name="drawer_settings">APPMENYINSTÄLLNINGAR</string> + <string name="app_settings">APPINSTÄLLNINGAR</string> <string name="setting_state_on">PÅ</string> <string name="setting_state_off">AV</string> <string name="themes_button_text">Teman</string> <string name="scrolling_page_outlines">Skärmkonturer</string> <string name="scrolling_fade_adjacent">Tona skärmsidor</string> <string name="scrolling_wallpaper">Rulla bakgrundsbild</string> + <string name="grid_size_text">Rutnätsstorlek</string> + <string name="grid_size_comfortable">Komfortabel</string> + <string name="grid_size_cozy">Mysig</string> + <string name="grid_size_condensed">Kondenserad</string> + <string name="grid_size_custom">Anpassad</string> + <string name="grid_size_custom_and_size">Anpassad (%1$s)</string> + <string name="preferences_interface_homescreen_custom">Välj anpassad storlek</string> + <string name="preferences_interface_homescreen_rows_title">Antal rader</string> + <string name="preferences_interface_homescreen_columns_title">Antal kolumner</string> <string name="hidden_apps_title">Gömda appar</string> <string name="scroll_effect_text">Rullningseffekt</string> <string name="drawer_sorting_text">Sorteringsläge</string> @@ -33,7 +43,11 @@ <string name="sort_mode_install_time">Installationstillfälle</string> <string name="home_screen_search_text">Sökfält</string> <string name="larger_icons_text">Större ikoner</string> + <string name="icon_labels">Ikonetiketter</string> + <string name="icon_labels_show">Visa</string> + <string name="icon_labels_hide">Dölj</string> <string name="protected_app_settings">Skyddade appar</string> <string name="search_screen_left_text">Sökpanel</string> <string name="search_screen_left_unsupported_toast">Du måste ha en stödd sökapp och CyanogenMod för att använda denna funktion.</string> + <string name="dialog_confirm">Bekräfta</string> </resources> diff --git a/res/values-th/cm_caf.xml b/res/values-th/cm_caf.xml new file mode 100644 index 000000000..4a0d3d1f5 --- /dev/null +++ b/res/values-th/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">คัดลอกแอปไอคอนของคุณ</string> + <string name="migration_cling_description">นำเข้าไอคอนและโฟลเดอร์จากหน้าจอหลักเก่าของคุณ?</string> + <string name="migration_cling_copy_apps">คัดลอกไอคอน</string> + <string name="migration_cling_use_default">เริ่มใหม่</string> +</resources> diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml index a3ecfdf3c..df312104f 100644 --- a/res/values-th/cm_strings.xml +++ b/res/values-th/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">ตั้งค่าแอป</string> <string name="setting_state_on">เปิด</string> <string name="setting_state_off">ปิด</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">ชุดรูปแบบ</string> <string name="scrolling_page_outlines">โครงร่างหน้า</string> <string name="scrolling_fade_adjacent">จากหน้าด้านข้าง</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">โคซี่</string> <string name="grid_size_condensed">บีบ</string> <string name="grid_size_custom">กำหนดเอง</string> + <string name="grid_size_custom_and_size">กำหนดเอง (%1$s)</string> <string name="preferences_interface_homescreen_custom">เลือกขนาดกำหนดเอง</string> <string name="preferences_interface_homescreen_rows_title">จำนวนแถว</string> <string name="preferences_interface_homescreen_columns_title">จำนวนคอลัมน์</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">แผงค้นหา</string> <string name="search_screen_left_unsupported_toast">คุณต้องมีแอปที่รองรับการค้นหากับ CyanogenMod เพื่อใช้ความสามารถนี้</string> <string name="dialog_confirm">Google</string> + <string name="permission_desc_read_extension_data">อนุญาตการร้องขอข้อมูลส่วนขยาย DashClock</string> + <string name="permission_label_read_extension_data">ร้องขอข้อมูลส่วนขยาย DashClock</string> </resources> diff --git a/res/values-tr/cm_caf.xml b/res/values-tr/cm_caf.xml new file mode 100644 index 000000000..56335c2ab --- /dev/null +++ b/res/values-tr/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Uyg. simgelerini kopyala</string> + <string name="migration_cling_description">Önceki Ana ekran ayarlarından simge ve klasörler içe aktarılsın mı?</string> + <string name="migration_cling_copy_apps">SİMGELERİ KOPYALA</string> + <string name="migration_cling_use_default">SIFIRDAN BAŞLA</string> +</resources> diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml index 4a7db9ca2..b86681dea 100644 --- a/res/values-tr/cm_strings.xml +++ b/res/values-tr/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">UYGULAMA AYARLARI</string> <string name="setting_state_on">AÇIK</string> <string name="setting_state_off">KAPALI</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> <string name="themes_button_text">Temalar</string> <string name="scrolling_page_outlines">Sayfa anahatları</string> <string name="scrolling_fade_adjacent">Yan sayfaları soldur</string> @@ -31,6 +33,7 @@ <string name="grid_size_cozy">Rahat</string> <string name="grid_size_condensed">Kalın</string> <string name="grid_size_custom">Özel</string> + <string name="grid_size_custom_and_size">Özel (%1$s)</string> <string name="preferences_interface_homescreen_custom">Özel boyut seçin</string> <string name="preferences_interface_homescreen_rows_title">Satır sayısı</string> <string name="preferences_interface_homescreen_columns_title">Sütun sayısı</string> @@ -49,4 +52,6 @@ <string name="search_screen_left_text">Arama paneli</string> <string name="search_screen_left_unsupported_toast">Bu özelliği kullanabilmeniz için desteklenen bir arama uygulaması ve CyanogenMod\'a sahip olmanız gerekiyor.</string> <string name="dialog_confirm">Onayla</string> + <string name="permission_desc_read_extension_data">DashClock eklenti verisini istemeyi etkinleştirir</string> + <string name="permission_label_read_extension_data">DashClock eklenti verisini iste</string> </resources> diff --git a/res/values-uk/cm_arrays.xml b/res/values-uk/cm_arrays.xml index 63cab2291..c078276eb 100644 --- a/res/values-uk/cm_arrays.xml +++ b/res/values-uk/cm_arrays.xml @@ -18,17 +18,17 @@ <resources> <string-array name="transition_effect_entries"> <item>Немає</item> - <item>Zoom in</item> - <item>Zoom out</item> - <item>Rotate up</item> - <item>Rotate down</item> - <item>Cube in</item> - <item>Cube out</item> + <item>Збільшення</item> + <item>Зменшення</item> + <item>Поворот угору</item> + <item>Поворот униз</item> + <item>Всередині куба</item> + <item>Зовні куба</item> <item>Стек</item> <item>Гармошка</item> <item>Переворот</item> - <item>Cylinder in</item> - <item>Cylinder out</item> + <item>Всередині циліндра</item> + <item>Зовні циліндра</item> <item>Карусель</item> <item>Огляд</item> </string-array> diff --git a/res/values-uk/cm_caf.xml b/res/values-uk/cm_caf.xml new file mode 100644 index 000000000..57b7a889d --- /dev/null +++ b/res/values-uk/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">Копіюйте іконки ваших програм</string> + <string name="migration_cling_description">Імпортувати іконки та папки з вашого старого домашнього екрану?</string> + <string name="migration_cling_copy_apps">КОПІЮВАТИ ІКОНКИ</string> + <string name="migration_cling_use_default">ПОЧАТИ ЗАНОВО</string> +</resources> diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml index 1c975b681..fe0c7a8b7 100644 --- a/res/values-uk/cm_strings.xml +++ b/res/values-uk/cm_strings.xml @@ -16,10 +16,42 @@ limitations under the License. --> <resources> + <string name="launcher_settings">НАЛАШТУВАННЯ ЛАУНЧЕРА</string> + <string name="home_screen_settings">НАЛАШТУВАННЯ ДОМІВКИ</string> + <string name="drawer_settings">МЕНЮ ПРОГРАМ</string> + <string name="app_settings">НАЛАШТУВАННЯ ПРОГРАМ</string> + <string name="setting_state_on">УВІМК</string> + <string name="setting_state_off">ВИМК</string> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">Головна CM</string> + <string name="themes_button_text">Теми</string> <string name="scrolling_page_outlines">Межі сторінок</string> <string name="scrolling_fade_adjacent">Затемняти краї при гортанні</string> + <string name="scrolling_wallpaper">Прокручувати шпалери</string> + <string name="grid_size_text">Розмір сітки</string> + <string name="grid_size_comfortable">Комфортна</string> + <string name="grid_size_cozy">Зручна</string> + <string name="grid_size_condensed">Стиснута</string> + <string name="grid_size_custom">Користувацька</string> + <string name="grid_size_custom_and_size">Власна (%1$s)</string> + <string name="preferences_interface_homescreen_custom">Виберіть розмір сітки</string> + <string name="preferences_interface_homescreen_rows_title">Кількість рядків</string> + <string name="preferences_interface_homescreen_columns_title">Кількість стовпчиків</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> + <string name="protected_app_settings">Заблоковані програми</string> + <string name="search_screen_left_text">Панель пошуку</string> + <string name="search_screen_left_unsupported_toast">Ви повинні мати програму пошуку яка підтримується CyanogenMod для використання цієї функції.</string> + <string name="dialog_confirm">Підтвердити</string> + <string name="permission_desc_read_extension_data">Дозволяє запитувати дані розширення DashClock</string> + <string name="permission_label_read_extension_data">Запитувати дані розширення DashClock</string> </resources> diff --git a/res/values-zh-rCN/cm_caf.xml b/res/values-zh-rCN/cm_caf.xml new file mode 100644 index 000000000..82c3786d2 --- /dev/null +++ b/res/values-zh-rCN/cm_caf.xml @@ -0,0 +1,23 @@ +<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="migration_cling_title">复制您的应用图标</string> + <string name="migration_cling_description">从您的旧主屏幕导入图标和文件夹吗？</string> + <string name="migration_cling_copy_apps">复制图标</string> + <string name="migration_cling_use_default">重新开始</string> +</resources> diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml index 2c617d8e2..a9dae6a31 100644 --- a/res/values-zh-rCN/cm_strings.xml +++ b/res/values-zh-rCN/cm_strings.xml @@ -22,6 +22,8 @@ <string name="app_settings">应用设置</string> <string name="setting_state_on">打开</string> <string name="setting_state_off">关闭</string> + <string name="search_panel_gel">Google 即时</string> + <string name="search_panel_custom_home">CM 桌面</string> <string name="themes_button_text">主题</string> <string name="scrolling_page_outlines">页概述</string> <string name="scrolling_fade_adjacent">边页淡出</string> @@ -32,6 +34,7 @@ <string name="grid_size_condensed">紧凑</string> <string name="grid_size_custom">自定义 </string> + <string name="grid_size_custom_and_size">自定义（%1$s）</string> <string name="preferences_interface_homescreen_custom">选择自定义尺寸</string> <string name="preferences_interface_homescreen_rows_title">行数</string> <string name="preferences_interface_homescreen_columns_title">列数</string> @@ -50,4 +53,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_desc_read_extension_data">允许读取 DashClock 扩展数据</string> + <string name="permission_label_read_extension_data">读取 DashClock 扩展数据</string> </resources> diff --git a/res/values/cm_extra.xml b/res/values/cm_extra.xml index 1290c7ce5..9784b7de7 100644 --- a/res/values/cm_extra.xml +++ b/res/values/cm_extra.xml @@ -15,16 +15,13 @@ 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> + <!-- Dummy strings to prevent aapt warnings --> + <string name="all_apps_cling_add_item"></string> + <string name="all_apps_cling_title"></string> + <string name="custom_workspace_cling_description_1"></string> + <string name="custom_workspace_cling_description_2"></string> + <string name="custom_workspace_cling_title_1"></string> + <string name="custom_workspace_cling_title_2"></string> + <!-- Dummy strings required by old Launcher3 code --> + <string name="group_wallpapers" translatable="false"></string> </resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index b924922fb..5d8fe115a 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -29,6 +29,10 @@ <string name="setting_state_on">ON</string> <string name="setting_state_off">OFF</string> + <!-- Search Panel states --> + <string name="search_panel_gel">Google Now</string> + <string name="search_panel_custom_home">CM Home</string> + <!-- Themes button --> <string name="themes_button_text">Themes</string> @@ -44,6 +48,7 @@ <string name="grid_size_cozy">Cozy</string> <string name="grid_size_condensed">Condensed</string> <string name="grid_size_custom">Custom</string> + <string name="grid_size_custom_and_size">Custom (%1$s)</string> <string name="preferences_interface_homescreen_custom">Select custom size</string> <string name="preferences_interface_homescreen_rows_title">Number of rows</string> <string name="preferences_interface_homescreen_columns_title">Number of columns</string> @@ -87,4 +92,7 @@ <!-- Dialog --> <string name="dialog_confirm">Confirm</string> + <!-- Dashclock permission info (for CMHome) --> + <string name="permission_label_read_extension_data">request DashClock extension data</string> + <string name="permission_desc_read_extension_data">Allows the app to request DashClock extension data</string> </resources> diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index 64d904a0f..a3b835dc6 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <bool name="preferences_interface_homescreen_search_default">true</bool> - <bool name="preferences_interface_homescreen_search_screen_left_default">false</bool> <string name="preferences_interface_homescreen_scrolling_transition_effect">none</string> <bool name="preferences_interface_homescreen_scrolling_wallpaper_scroll_default">true</bool> <bool name="preferences_interface_homescreen_scrolling_page_outlines_default">@bool/config_workspaceDefaultShowOutlines</bool> diff --git a/src/com/android/launcher/home/Home.java b/src/com/android/launcher/home/Home.java index 5dce71e86..e6fedc8db 100644 --- a/src/com/android/launcher/home/Home.java +++ b/src/com/android/launcher/home/Home.java @@ -65,7 +65,7 @@ public interface Home { * </pre><br/> * DO NOT MODIFY! */ - public static final String SIGNATURE = "5/A6Mxkz8gHHzzVf4qZR+hiSOAw="; + public static final String SIGNATURE = "sZFp8JclUBYdIw0QaJZDosZ8SWM="; /** * Defines the name of the metadata used to declared the full qualified Home stub class @@ -98,6 +98,14 @@ public interface Home { public static final int MODE_SEARCH_VOICE = 0x0001; /** + * Invoked when creating the Home object to set + * a reference to the host Activity that will + * contain this instance. + * @param context The Activity Context of the host activity. + */ + void setHostActivityContext(Context context); + + /** * Invoked the first time the <code>Home</code> app is created.<br/> * This method should be used by implementors classes of this protocol to load the needed * resources. @@ -106,6 +114,13 @@ public interface Home { void onStart(Context context); /** + * Load and show the content of this home app if true, + * hide and remove providers if false. + * @param showContent Should content be shown + */ + void setShowContent(boolean showContent); + + /** * Invoked when the <code>Home</code> app should be destroy.<br/> * This method should be used by implementors classes of this protocol to unload all unneeded * resources. diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 9be377e8e..d426ce982 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -70,12 +70,12 @@ public class DynamicGrid { 275, 420, 3, 4, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 5), (useLargeIcons ? 54 : 48))); deviceProfiles.add(new DeviceProfile("Stubby", 255, 450, 3, 4, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 5), (useLargeIcons ? 54 : 48))); + deviceProfiles.add(new DeviceProfile("Nexus S", + 296, 491.33f, 4, 4, (useLargeIcons ? 56 : 48), 13, (hasAA ? 5 : 5), (useLargeIcons ? 56 : 48))); + deviceProfiles.add(new DeviceProfile("Nexus 4", + 335, 567, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 56), 13, (hasAA ? 5 : 5), (useLargeIcons ? 56 : 48))); deviceProfiles.add(new DeviceProfile("Nexus 5", 359, 567, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 56), 13, (hasAA ? 5 : 5), 56)); - deviceProfiles.add(new DeviceProfile("Nexus 4", - 359, 518, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 52), 13, (hasAA ? 5 : 5), (useLargeIcons ? 56 : 48))); - deviceProfiles.add(new DeviceProfile("Large Phone", - 335, 567, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 56), 13, (hasAA ? 5 : 5), 56)); deviceProfiles.add(new DeviceProfile("Large Phone", 406, 694, 5, 5, (useLargeIcons ? 64 : 56), 14.4f, 5, 56)); // The tablet profile is odd in that the landscape orientation diff --git a/src/com/android/launcher3/DynamicGridSizeFragment.java b/src/com/android/launcher3/DynamicGridSizeFragment.java index 586c2bd49..490335ddf 100644 --- a/src/com/android/launcher3/DynamicGridSizeFragment.java +++ b/src/com/android/launcher3/DynamicGridSizeFragment.java @@ -313,14 +313,13 @@ public class DynamicGridSizeFragment extends Fragment implements NumberPicker.On LauncherAppState app = LauncherAppState.getInstance(); DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); - String state = mTitles[position]; int rows = SettingsProvider.getIntCustomDefault(getActivity(), SettingsProvider.SETTINGS_UI_HOMESCREEN_ROWS, grid.numRowsBase); int columns = SettingsProvider.getIntCustomDefault(getActivity(), SettingsProvider.SETTINGS_UI_HOMESCREEN_COLUMNS, grid.numColumnsBase); - state += " " + "(" + rows + " " + "\u00d7" + " " + columns + ")"; + String gridSize = rows + " " + "\u00d7" + " " + columns; - textView.setText(state); + textView.setText(getString(R.string.grid_size_custom_and_size, gridSize)); } convertView.setOnClickListener(mSettingsItemListener); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 54cd64074..fbb3189f9 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -56,7 +56,6 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Point; import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -243,8 +242,6 @@ public class Launcher extends Activity private static int NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS = 5; private static int NEW_APPS_ANIMATION_DELAY = 500; - private boolean mGelIntegrationEnabled = false; - private final BroadcastReceiver mCloseSystemDialogsReceiver = new CloseSystemDialogsIntentReceiver(); private final ContentObserver mWidgetObserver = new AppWidgetResetObserver(); @@ -380,6 +377,34 @@ public class Launcher extends Activity private BubbleTextView mWaitingForResume; + public enum CustomContentMode { + DISABLED(0), + GEL(1), + CUSTOM_HOME(2); + + private final int mValue; + private CustomContentMode(int value) { + mValue = value; + } + + public int getValue() { + return mValue; + } + + public static CustomContentMode getModeForValue(int value) { + switch (value) { + case 0: + return DISABLED; + case 1: + return GEL; + default : + return CUSTOM_HOME; + } + } + } + + private CustomContentMode mCustomContentMode = CustomContentMode.CUSTOM_HOME; + // Preferences private boolean mHideIconLabels; @@ -492,7 +517,7 @@ public class Launcher extends Activity mSavedState = savedInstanceState; restoreState(mSavedState); - restoreGelSetting(); + restoreCustomContentMode(); if (PROFILE_STARTUP) { android.os.Debug.stopMethodTracing(); @@ -541,10 +566,11 @@ public class Launcher extends Activity "cyanogenmod.permission.PROTECTED_APP", null); } - public void restoreGelSetting() { - mGelIntegrationEnabled = SettingsProvider.getBoolean(this, - SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT, - R.bool.preferences_interface_homescreen_search_screen_left_default); + public void restoreCustomContentMode() { + mCustomContentMode = CustomContentMode.getModeForValue( + SettingsProvider.getIntCustomDefault(this, + SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_PANEL_LEFT, + CustomContentMode.DISABLED.getValue())); } void initializeDynamicGrid() { @@ -555,7 +581,7 @@ public class Launcher extends Activity SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS, R.bool.preferences_interface_homescreen_hide_icon_labels_default); - restoreGelSetting(); + restoreCustomContentMode(); // Determine the dynamic grid properties Point smallestSize = new Point(); @@ -589,7 +615,23 @@ public class Launcher extends Activity } protected boolean hasCustomContentToLeft() { - return isGelIntegrationSupported() && isGelIntegrationEnabled(); + switch(getCustomContentMode()) { + case GEL: + return isGelIntegrationSupported(); + case CUSTOM_HOME: + return isCustomHomeActive(); + default: + return false; + } + } + + /** + * Returns true if the custom home application is initialized and ready + * for the user to scroll to it. To be implemented by subclasses. + * @return True if the custom home view is initialized. + */ + protected boolean isCustomHomeActive() { + return false; } public boolean isGelIntegrationSupported() { @@ -602,12 +644,16 @@ public class Launcher extends Activity return globalSearchActivity != null && isCM(); } - public boolean isGelIntegrationEnabled() { - return mGelIntegrationEnabled; + public CustomContentMode getCustomContentMode() { + return mCustomContentMode; + } + + public void setCustomContentMode(CustomContentMode customContentMode) { + mCustomContentMode = customContentMode; } public void onCustomContentLaunch() { - if(isGelIntegrationEnabled() && isGelIntegrationSupported()) { + if(isCustomContentModeGel() && isGelIntegrationSupported()) { GelIntegrationHelper.getInstance().registerSwipeBackGestureListenerAndStartGel(this, mWorkspace.isLayoutRtl()); } } @@ -1060,10 +1106,9 @@ public class Launcher extends Activity } super.onResume(); - updateGridIfNeeded(); - if(isGelIntegrationEnabled() && isGelIntegrationSupported()) { + if(isCustomContentModeGel() && isGelIntegrationSupported()) { GelIntegrationHelper.getInstance().handleGelResume(); } @@ -1221,6 +1266,10 @@ public class Launcher extends Activity } } + protected boolean isCustomContentModeGel() { + return mCustomContentMode == CustomContentMode.GEL; + } + public interface CustomContentCallbacks { // Custom content is completely shown public void onShow(); @@ -2607,7 +2656,7 @@ public class Launcher extends Activity } protected ComponentName getWallpaperPickerComponent() { - return new ComponentName(getPackageName(), LauncherWallpaperPickerActivity.class.getName()); + return new ComponentName(WALLPAPER_PICKER_PACKAGE, WALLPAPER_PICKER_ACTIVITY); } /** diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java index d7994f3c3..e14b78942 100644 --- a/src/com/android/launcher3/OverviewSettingsPanel.java +++ b/src/com/android/launcher3/OverviewSettingsPanel.java @@ -43,25 +43,13 @@ public class OverviewSettingsPanel { res.getString(R.string.drawer_settings), res.getString(R.string.app_settings)}; - String[] values; - if(mLauncher.isGelIntegrationSupported()) { - values = new String[]{ - res.getString(R.string.home_screen_search_text), - res.getString(R.string.search_screen_left_text), - res.getString(R.string.scroll_effect_text), - res.getString(R.string.icon_labels), - res.getString(R.string.scrolling_wallpaper), - res.getString(R.string.grid_size_text)}; - } else { - values = new String[]{ - res.getString(R.string.home_screen_search_text), - res.getString(R.string.scroll_effect_text), - res.getString(R.string.icon_labels), - res.getString(R.string.scrolling_wallpaper), - res.getString(R.string.grid_size_text)}; - } - - mValues = values; + mValues = new String[]{ + res.getString(R.string.home_screen_search_text), + res.getString(R.string.search_screen_left_text), + res.getString(R.string.scroll_effect_text), + res.getString(R.string.icon_labels), + res.getString(R.string.scrolling_wallpaper), + res.getString(R.string.grid_size_text)}; String[] valuesDrawer = new String[] { res.getString(R.string.scroll_effect_text), @@ -80,7 +68,7 @@ public class OverviewSettingsPanel { mSettingsAdapter.addPartition(false, true); mSettingsAdapter.mPinnedHeaderCount = headers.length; - mSettingsAdapter.changeCursor(0, createCursor(headers[0], values)); + mSettingsAdapter.changeCursor(0, createCursor(headers[0], mValues)); mSettingsAdapter.changeCursor(1, createCursor(headers[1], valuesDrawer)); mSettingsAdapter.changeCursor(2, createCursor(headers[2], valuesApp)); mListView.setAdapter(mSettingsAdapter); @@ -221,7 +209,7 @@ public class OverviewSettingsPanel { if (mLauncher.updateGridIfNeeded()) { mLauncher.getWorkspace().showOutlines(); - mLauncher.mSearchDropTargetBar.showSearchBar(false); + mLauncher.mSearchDropTargetBar.hideSearchBar(false); } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index eabf51b34..7501dbf7d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -55,7 +55,9 @@ import android.view.Display; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.ViewPropertyAnimator; import android.view.accessibility.AccessibilityManager; +import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.view.animation.DecelerateInterpolator; @@ -1307,8 +1309,6 @@ public class Workspace extends SmoothPagedView int customPageIndex = getPageIndexForScreenId(CUSTOM_CONTENT_SCREEN_ID); if (hasCustomContent() && whichPage == customPageIndex && !mCustomContentShowing) { if(!isInOverviewMode()) { - mCustomContentShowing = true; - // Start Google Now and register the gesture to return to Trebuchet mLauncher.onCustomContentLaunch(); } } @@ -1339,6 +1339,7 @@ public class Workspace extends SmoothPagedView // Don't use all the wallpaper for parallax until you have at least this many pages private final int MIN_PARALLAX_PAGE_SPAN = 3; int mNumScreens; + boolean mCompletedInitialOffset; public WallpaperOffsetInterpolator() { mChoreographer = Choreographer.getInstance(); @@ -1353,7 +1354,8 @@ public class Workspace extends SmoothPagedView private void updateOffset(boolean force) { if (mWaitingForUpdate || force) { mWaitingForUpdate = false; - if (computeScrollOffset() && mWindowToken != null) { + if ((!mCompletedInitialOffset || computeScrollOffset()) && mWindowToken != null) { + mCompletedInitialOffset = true; try { mWallpaperManager.setWallpaperOffsets(mWindowToken, mWallpaperOffset.getCurrX(), 0.5f); @@ -1829,10 +1831,14 @@ public class Workspace extends SmoothPagedView int customPageIndex = getPageIndexForScreenId(CUSTOM_CONTENT_SCREEN_ID); // mCustomContentShowing can be lost if the Activity is recreated, // So make sure it is set to the right value. + boolean restoreCustomContentShowing = ((customPageIndex == getCurrentPage()) + || (customPageIndex == getNextPage())) + && hasCustomContent(); mCustomContentShowing = mCustomContentShowing - || (customPageIndex == getCurrentPage() - && hasCustomContent()); - if (mCustomContentShowing && mLauncher.isGelIntegrationEnabled()) { + || restoreCustomContentShowing; + if (mCustomContentShowing + && (mLauncher.getCustomContentMode() == Launcher.CustomContentMode.GEL) + && !isInOverviewMode()) { moveToScreen((customPageIndex + 1), true); } } @@ -2319,14 +2325,14 @@ public class Workspace extends SmoothPagedView float finalBackgroundAlpha = (stateIsSpringLoaded || stateIsOverview) ? 1.0f : 0f; float finalBackgroundAlphaMultiplier = (stateIsSpringLoaded || stateIsOverview || mShowOutlines) ? 1.0f : 0f; float finalHotseatAndPageIndicatorAlpha = (stateIsOverview || stateIsSmall) ? 0f : 1f; - float finalOverviewPanelAlpha = stateIsOverview ? 1f : 0f; + final float finalOverviewPanelAlpha = stateIsOverview ? 1f : 0f; float finalSearchBarAlpha = !stateIsNormal ? 0f : 1f; float finalWorkspaceTranslationY = stateIsOverview ? getOverviewModeTranslationY() : 0; boolean workspaceToAllApps = (oldStateIsNormal && stateIsSmall); boolean allAppsToWorkspace = (oldStateIsSmall && stateIsNormal); - boolean workspaceToOverview = (oldStateIsNormal && stateIsOverview); - boolean overviewToWorkspace = (oldStateIsOverview && stateIsNormal); + final boolean workspaceToOverview = (oldStateIsNormal && stateIsOverview); + final boolean overviewToWorkspace = (oldStateIsOverview && stateIsNormal); mNewScale = 1.0f; @@ -2484,26 +2490,59 @@ public class Workspace extends SmoothPagedView .alpha(finalSearchBarAlpha).withLayer(); if (mShowSearchBar) searchBarAlpha.addListener(new AlphaUpdateListener(searchBar)); - Animator overviewPanelAlpha = new LauncherViewPropertyAnimator(overviewPanel) - .alpha(finalOverviewPanelAlpha).withLayer(); - overviewPanelAlpha.addListener(new AlphaUpdateListener(overviewPanel)); - if (workspaceToOverview) { pageIndicatorAlpha.setInterpolator(new DecelerateInterpolator(2)); hotseatAlpha.setInterpolator(new DecelerateInterpolator(2)); - overviewPanelAlpha.setInterpolator(null); } else if (overviewToWorkspace) { pageIndicatorAlpha.setInterpolator(null); hotseatAlpha.setInterpolator(null); - overviewPanelAlpha.setInterpolator(new DecelerateInterpolator(2)); } searchBarAlpha.setInterpolator(null); - - overviewPanel.setAlpha(finalOverviewPanelAlpha); - AlphaUpdateListener.updateVisibility(overviewPanel); - Animation animation = AnimationUtils.loadAnimation(mLauncher, R.anim.drop_down); - overviewPanel.startAnimation(animation); anim.play(hotseatAlpha); + + float mOverviewPanelSlideScale = 1.0f; + + if (overviewToWorkspace || stateIsNormal) { + ((SlidingUpPanelLayout) overviewPanel).collapsePane(); + overviewPanel.setScaleY(1.0f); + mOverviewPanelSlideScale = 3.0f; + } else if (workspaceToOverview || stateIsOverview) { + overviewPanel.setScaleY(3.0f); + mOverviewPanelSlideScale = 1.0f; + } + + final ViewPropertyAnimator overviewPanelScale = overviewPanel.animate(); + overviewPanelScale.scaleY(mOverviewPanelSlideScale) + .alpha(finalOverviewPanelAlpha) + .setInterpolator(new AccelerateDecelerateInterpolator()); + overviewPanelScale.setListener(new AnimatorListener() { + @Override + public void onAnimationStart(Animator animation) { + if (workspaceToOverview || stateIsOverview) { + overviewPanel.setAlpha(finalOverviewPanelAlpha); + AlphaUpdateListener.updateVisibility(overviewPanel); + } + } + + @Override + public void onAnimationEnd(Animator animation) { + if (overviewToWorkspace || stateIsNormal) { + overviewPanel.setAlpha(finalOverviewPanelAlpha); + AlphaUpdateListener.updateVisibility(overviewPanel); + } + overviewPanelScale.setListener(null); + } + + @Override + public void onAnimationCancel(Animator animation) { + overviewPanel.setAlpha(finalOverviewPanelAlpha); + AlphaUpdateListener.updateVisibility(overviewPanel); + overviewPanelScale.setListener(null); + } + @Override + public void onAnimationRepeat(Animator animation) {} + }); + if (mShowSearchBar) anim.play(searchBarAlpha); anim.play(pageIndicatorAlpha); anim.setStartDelay(delay); @@ -4894,7 +4933,7 @@ public class Workspace extends SmoothPagedView int idx = getPageIndexForScreenId(mDefaultScreenId); int ccIndex = getPageIndexForScreenId(CUSTOM_CONTENT_SCREEN_ID); if(hasCustomContent() && (idx == ccIndex || idx == -1) - && mLauncher.isGelIntegrationEnabled()) { + && !isInOverviewMode()) { idx = 1; } moveToScreen(idx, animate); diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java index 7fb15fc12..a4a68fb85 100644 --- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java +++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java @@ -124,15 +124,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { ((TextView) v.findViewById(R.id.item_state)).setText(state); } else if (title.equals(res .getString(R.string.search_screen_left_text))) { - boolean current = SettingsProvider - .getBoolean( - mContext, - SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT, - R.bool.preferences_interface_homescreen_search_screen_left_default); - String state = current ? res.getString( - R.string.setting_state_on) : res.getString( - R.string.setting_state_off); - ((TextView) v.findViewById(R.id.item_state)).setText(state); + updateSearchPanelItem(v); } else if (title.equals(res.getString(R.string.scrolling_wallpaper))) { boolean current = SettingsProvider .getBoolean( @@ -186,6 +178,24 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { ((TextView) v.findViewById(R.id.item_state)).setText(state); } + public void updateSearchPanelItem(View v) { + String state = ""; + switch (mLauncher.getCustomContentMode()) { + case DISABLED: + state = mLauncher.getResources().getString( + R.string.setting_state_off); + break; + case GEL: + state = mLauncher.getResources().getString(R.string.search_panel_gel); + break; + default: + state = mLauncher.getResources().getString( + R.string.search_panel_custom_home); + break; + } + ((TextView) v.findViewById(R.id.item_state)).setText(state); + } + public void updateDynamicGridSizeSettingsItem(View v) { DeviceProfile.GridSize gridSize = DeviceProfile.GridSize.getModeForValue( SettingsProvider.getIntCustomDefault(mLauncher, @@ -293,25 +303,11 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { } else if (value.equals(res .getString(R.string.search_screen_left_text)) && ((Integer)v.getTag() == OverviewSettingsPanel.HOME_SETTINGS_POSITION)) { - - boolean current = SettingsProvider.getBoolean(mContext, - SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT, - R.bool.preferences_interface_homescreen_search_screen_left_default); - - // If GEL integration is not supported, do not allow the user to turn it on. - if(!current && !mLauncher.isGelIntegrationSupported()) { - Toast.makeText(mLauncher.getApplicationContext(), - res.getString(R.string.search_screen_left_unsupported_toast), - Toast.LENGTH_SHORT).show(); - } else { - onSettingsBooleanChanged( - v, - SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT, - R.bool.preferences_interface_homescreen_search_screen_left_default); - mLauncher.restoreGelSetting(); - mLauncher.getWorkspace().updatePageScrollForCustomPage(!current); - mLauncher.setUpdateDynamicGrid(); - } + onClickSearchPanelButton(); + boolean customContentEnabled = + mLauncher.getCustomContentMode() != Launcher.CustomContentMode.DISABLED; + mLauncher.getWorkspace().updatePageScrollForCustomPage(customContentEnabled); + mLauncher.setUpdateDynamicGrid(); } else if (value.equals(res .getString(R.string.grid_size_text))) { mLauncher.onClickDynamicGridSizeButton(); @@ -370,4 +366,26 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { notifyDataSetChanged(); } + + private void onClickSearchPanelButton() { + int searchPanelVal = SettingsProvider.getIntCustomDefault(mLauncher, + SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_PANEL_LEFT, + Launcher.CustomContentMode.DISABLED.getValue()); + + Launcher.CustomContentMode nextCCMode = + Launcher.CustomContentMode.getModeForValue(searchPanelVal + 1); + if(nextCCMode == Launcher.CustomContentMode.GEL && !mLauncher.isGelIntegrationSupported()) { + // GEL is not supported, skip that option + searchPanelVal++; + } + + searchPanelVal = (searchPanelVal + 1) % Launcher.CustomContentMode.values().length; + mLauncher.setCustomContentMode(Launcher.CustomContentMode.getModeForValue(searchPanelVal)); + + SettingsProvider.putInt(mLauncher, + SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH_PANEL_LEFT, + searchPanelVal); + + notifyDataSetChanged(); + } } diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java index 32329ab83..8cde92555 100644 --- a/src/com/android/launcher3/settings/SettingsProvider.java +++ b/src/com/android/launcher3/settings/SettingsProvider.java @@ -26,7 +26,7 @@ public final class SettingsProvider { public static final String SETTINGS_UI_HOMESCREEN_DEFAULT_SCREEN_ID = "ui_homescreen_default_screen_id"; public static final String SETTINGS_UI_HOMESCREEN_SEARCH = "ui_homescreen_search"; - public static final String SETTINGS_UI_HOMESCREEN_SEARCH_SCREEN_LEFT = "ui_homescreen_search_screen_left"; + public static final String SETTINGS_UI_HOMESCREEN_SEARCH_PANEL_LEFT = "ui_homescreen_search_panel_left"; public static final String SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS = "ui_homescreen_general_hide_icon_labels"; public static final String SETTINGS_UI_HOMESCREEN_SCROLLING_TRANSITION_EFFECT = "ui_homescreen_scrolling_transition_effect"; public static final String SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL = "ui_homescreen_scrolling_wallpaper_scroll"; diff --git a/src/org/cyanogenmod/trebuchet/TrebuchetLauncher.java b/src/org/cyanogenmod/trebuchet/CustomHomeLauncher.java index 3c5e6a70b..47c9c3b2c 100644 --- a/src/org/cyanogenmod/trebuchet/TrebuchetLauncher.java +++ b/src/org/cyanogenmod/trebuchet/CustomHomeLauncher.java @@ -40,9 +40,9 @@ import org.cyanogenmod.trebuchet.home.HomeWrapper; import java.lang.Override; -public class TrebuchetLauncher extends Launcher { +public class CustomHomeLauncher extends Launcher { - private static final String TAG = "TrebuchetLauncher"; + private static final String TAG = "CustomHomeLauncher"; private static final boolean DEBUG = false; private static final float MIN_PROGRESS = 0; @@ -54,7 +54,8 @@ public class TrebuchetLauncher extends Launcher { private final ComponentName mComponentName; private final HomeWrapper mInstance; - private HomeAppStub(int uid, ComponentName componentName, Context context) + private HomeAppStub(int uid, ComponentName componentName, + Context context, Context homeActivityContext) throws SecurityException, ReflectiveOperationException { super(); mUid = uid; @@ -64,7 +65,8 @@ public class TrebuchetLauncher extends Launcher { ClassLoader classloader = context.getClassLoader(); Class<?> homeInterface = classloader.loadClass(Home.class.getName()); Class<?> homeClazz = classloader.loadClass(mComponentName.getClassName()); - mInstance = new HomeWrapper(context, homeInterface, homeClazz.newInstance()); + mInstance = new HomeWrapper(context, homeInterface, + homeClazz.newInstance(), homeActivityContext); } @Override @@ -197,8 +199,8 @@ public class TrebuchetLauncher extends Launcher { } @Override - protected boolean hasCustomContentToLeft() { - return mCurrentHomeApp != null && super.hasCustomContentToLeft(); + protected boolean isCustomHomeActive() { + return mCurrentHomeApp != null; } @Override @@ -212,6 +214,10 @@ public class TrebuchetLauncher extends Launcher { if (mCurrentHomeApp != null) { mQsbScroller = addToCustomContentPage(mCurrentHomeApp.mInstance.createCustomView(), mCustomContentCallbacks, mCurrentHomeApp.mInstance.getName()); + + if (!isCustomContentModeGel()) { + mCurrentHomeApp.mInstance.setShowContent(true); + } } } @@ -229,6 +235,18 @@ public class TrebuchetLauncher extends Launcher { mCurrentHomeApp.mInstance.onRequestSearch(mode); } + @Override + public void updateDynamicGrid() { + super.updateDynamicGrid(); + + if (isCustomContentModeGel() && mCurrentHomeApp != null) { + mCurrentHomeApp.mInstance.setShowContent(false); + } else if (getCustomContentMode() == CustomContentMode.CUSTOM_HOME + && mCurrentHomeApp != null) { + mCurrentHomeApp.mInstance.setShowContent(true); + } + } + private synchronized void obtainCurrentHomeAppStubLocked(boolean invalidate) { if (DEBUG) Log.d(TAG, "obtainCurrentHomeAppStubLocked called (" + invalidate + ")"); @@ -254,7 +272,7 @@ public class TrebuchetLauncher extends Launcher { continue; } try { - mCurrentHomeApp = new HomeAppStub(key, pkg, ctx); + mCurrentHomeApp = new HomeAppStub(key, pkg, ctx, this); } catch (ReflectiveOperationException ex) { if (!DEBUG) { Log.w(TAG, "Cannot instantiate home package: " + qualifiedPkg + ". Ignored."); diff --git a/src/org/cyanogenmod/trebuchet/home/HomeWrapper.java b/src/org/cyanogenmod/trebuchet/home/HomeWrapper.java index df8b6cae6..1c7dfda66 100644 --- a/src/org/cyanogenmod/trebuchet/home/HomeWrapper.java +++ b/src/org/cyanogenmod/trebuchet/home/HomeWrapper.java @@ -18,6 +18,7 @@ package org.cyanogenmod.trebuchet.home; import android.content.Context; import android.util.Base64; +import android.util.Log; import android.util.SparseArray; import android.view.View; @@ -45,6 +46,7 @@ public class HomeWrapper { private static final int M_LAST_ID = M_ID_GETOPERATIONFLAGS + 1; private final Context mContext; + private final Context mHostActivityContext; private final Class<?> mClass; private final Object mInstance; @@ -53,12 +55,16 @@ public class HomeWrapper { private final int mNotificationFlags; private final int mOperationFlags; - public HomeWrapper(Context context, Class<?> cls, Object instance) throws SecurityException { + public HomeWrapper(Context context, Class<?> cls, + Object instance, + Context hostActivityContext) throws SecurityException { super(); mContext = context; + mHostActivityContext = hostActivityContext; mClass = cls; mInstance = instance; cachedMethods = new SparseArray<Method>(M_LAST_ID); + setHostActivityContext(); final String sha1 = createDigest(cls); if (!sha1.equals(Home.SIGNATURE)) { @@ -71,11 +77,35 @@ public class HomeWrapper { mOperationFlags = getOperationFlags(); } + /** @see Home#setHostActivityContext(Context) **/ + private void setHostActivityContext() { + try { + Method method = mClass.getMethod("setHostActivityContext", Context.class); + method.invoke(mInstance, mHostActivityContext); + } catch (ReflectiveOperationException ex) { + throw new SecurityException(ex); + } + } + /** @see Home#onStart(Context) **/ public void onStart() { invokeVoidContextMethod(M_ID_ONSTART, "onStart"); } + /** + * Load and show the content of this home app if true, + * hide and remove providers if false. + * @param showContent Should content be shown + */ + public void setShowContent(boolean showContent) { + try { + Method method = mClass.getMethod("setShowContent", Context.class, boolean.class); + method.invoke(mInstance, mContext, showContent); + } catch (ReflectiveOperationException ex) { + throw new SecurityException(ex); + } + } + /** @see Home#onDestroy(Context) **/ public void onDestroy() { invokeVoidContextMethod(M_ID_ONDESTROY, "onDestroy"); |