summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml8
-rwxr-xr-xres/layout/double_number_picker_dialog.xml64
-rw-r--r--res/layout/user_folder.xml2
-rw-r--r--res/values-af-land/strings.xml25
-rw-r--r--res/values-am-land/strings.xml25
-rw-r--r--res/values-ar-land/strings.xml25
-rw-r--r--res/values-bg-land/strings.xml25
-rw-r--r--res/values-ca-land/strings.xml25
-rw-r--r--res/values-cs-land/strings.xml25
-rw-r--r--res/values-da-land/strings.xml25
-rw-r--r--res/values-de-land/strings.xml25
-rw-r--r--res/values-de/strings.xml72
-rw-r--r--res/values-el-land/strings.xml25
-rw-r--r--res/values-en-rGB-land/strings.xml25
-rw-r--r--res/values-es-land/strings.xml25
-rw-r--r--res/values-es-rUS-land/strings.xml25
-rwxr-xr-xres/values-es/arrays.xml65
-rw-r--r--res/values-es/strings.xml80
-rw-r--r--res/values-fa-land/strings.xml25
-rw-r--r--res/values-fi-land/strings.xml25
-rw-r--r--res/values-fr-land/strings.xml25
-rw-r--r--res/values-fr/strings.xml33
-rw-r--r--res/values-hr-land/strings.xml25
-rw-r--r--res/values-hu-land/strings.xml25
-rw-r--r--res/values-hu/strings.xml79
-rw-r--r--res/values-in-land/strings.xml25
-rw-r--r--res/values-it-land/strings.xml25
-rw-r--r--res/values-it/arrays.xml43
-rw-r--r--res/values-it/strings.xml64
-rw-r--r--res/values-iw-land/strings.xml25
-rw-r--r--res/values-iw/strings.xml86
-rw-r--r--res/values-ja-land/strings.xml25
-rw-r--r--res/values-ko-land/strings.xml25
-rw-r--r--res/values-lt-land/strings.xml25
-rw-r--r--res/values-lv-land/strings.xml25
-rw-r--r--res/values-ms-land/strings.xml25
-rw-r--r--res/values-nb-land/strings.xml25
-rw-r--r--res/values-nl-land/strings.xml25
-rw-r--r--res/values-nl/arrays.xml40
-rw-r--r--res/values-nl/strings.xml86
-rw-r--r--res/values-pl-land/strings.xml25
-rw-r--r--res/values-pl/strings.xml10
-rw-r--r--res/values-pt-land/strings.xml25
-rw-r--r--res/values-pt-rPT-land/strings.xml25
-rw-r--r--res/values-pt/arrays.xml43
-rwxr-xr-x[-rw-r--r--]res/values-pt/strings.xml291
-rw-r--r--res/values-rm-land/strings.xml25
-rw-r--r--res/values-ro-land/strings.xml25
-rw-r--r--res/values-ru-land/strings.xml25
-rw-r--r--res/values-ru/arrays.xml43
-rw-r--r--res/values-ru/strings.xml81
-rw-r--r--res/values-sk-land/strings.xml25
-rw-r--r--res/values-sl-land/strings.xml25
-rw-r--r--res/values-sr-land/strings.xml25
-rw-r--r--res/values-sv-land/strings.xml25
-rw-r--r--res/values-sw-land/strings.xml25
-rw-r--r--res/values-sw340dp-land/dimens.xml8
-rw-r--r--res/values-sw340dp-port/dimens.xml8
-rw-r--r--res/values-th-land/strings.xml25
-rw-r--r--res/values-tl-land/strings.xml25
-rw-r--r--res/values-tr-land/strings.xml25
-rw-r--r--res/values-uk-land/strings.xml25
-rw-r--r--res/values-vi-land/strings.xml25
-rw-r--r--res/values-zh-rCN-land/strings.xml25
-rw-r--r--res/values-zh-rTW-land/strings.xml25
-rw-r--r--res/values-zu-land/strings.xml25
-rw-r--r--res/values/arrays.xml4
-rw-r--r--res/values/attrs.xml15
-rw-r--r--res/values/config.xml4
-rw-r--r--res/values/strings.xml42
-rw-r--r--res/xml/preferences.xml40
-rw-r--r--src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java4
-rw-r--r--src/com/cyanogenmod/trebuchet/BubbleTextView.java14
-rw-r--r--src/com/cyanogenmod/trebuchet/CellLayout.java8
-rw-r--r--src/com/cyanogenmod/trebuchet/DeleteDropTarget.java17
-rw-r--r--src/com/cyanogenmod/trebuchet/Folder.java10
-rw-r--r--src/com/cyanogenmod/trebuchet/FolderIcon.java2
-rw-r--r--src/com/cyanogenmod/trebuchet/Hotseat.java7
-rw-r--r--src/com/cyanogenmod/trebuchet/Launcher.java28
-rw-r--r--src/com/cyanogenmod/trebuchet/LauncherApplication.java5
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java113
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/DoubleNumberPickerPreference.java186
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java30
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/Preferences.java18
-rw-r--r--src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java33
85 files changed, 1509 insertions, 1427 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad5bdad..7553b62 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -105,8 +105,12 @@
</activity>
<activity android:name="com.cyanogenmod.trebuchet.preference.Preferences"
- android:label="@string/preferences_title" />
-
+ android:label="@string/preferences_title">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.cyanogenmod.category.LAUNCHER_PREFERENCES" />
+ </intent-filter>
+ </activity>
<!-- Intent received used to install shortcuts from other applications -->
<receiver
android:name="com.cyanogenmod.trebuchet.InstallShortcutReceiver"
diff --git a/res/layout/double_number_picker_dialog.xml b/res/layout/double_number_picker_dialog.xml
new file mode 100755
index 0000000..8c9fb8e
--- /dev/null
+++ b/res/layout/double_number_picker_dialog.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <LinearLayout
+ android:gravity="center"
+ android:orientation="vertical"
+ android:layout_height="fill_parent"
+ android:layout_width="0dp"
+ android:layout_weight="1">
+
+ <TextView
+ android:id="@+id/picker_title_1"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <NumberPicker
+ android:id="@+id/number_picker_1"
+ android:layout_centerInParent="true"
+ android:layout_width="50dip"
+ android:layout_height="match_parent" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:gravity="center"
+ android:orientation="vertical"
+ android:layout_height="fill_parent"
+ android:layout_width="0dp"
+ android:layout_weight="1">
+
+ <TextView
+ android:id="@+id/picker_title_2"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <NumberPicker
+ android:id="@+id/number_picker_2"
+ android:layout_centerInParent="true"
+ android:layout_width="50dip"
+ android:layout_height="match_parent" />
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index cd63b19..80de2a5 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -47,7 +47,7 @@
android:background="#00000000"
android:hint="@string/folder_hint_text"
android:textSize="14sp"
- android:textColor="#ff33b5e5"
+ android:textColor="@android:color/holo_blue_light"
android:textColorHighlight="#ff333333"
android:gravity="center_horizontal"
android:singleLine="true"
diff --git a/res/values-af-land/strings.xml b/res/values-af-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-af-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-am-land/strings.xml b/res/values-am-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-am-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-ar-land/strings.xml b/res/values-ar-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-ar-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-bg-land/strings.xml b/res/values-bg-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-bg-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-ca-land/strings.xml b/res/values-ca-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-ca-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-cs-land/strings.xml b/res/values-cs-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-cs-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-da-land/strings.xml b/res/values-da-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-da-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-de-land/strings.xml b/res/values-de-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-de-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e601606..bc95a1f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -102,4 +102,76 @@
<string name="folder_closed" msgid="3130534551370511932">"Ordner wurde geschlossen"</string>
<string name="folder_renamed" msgid="781234745487414781">"Ordner umbenannt in %1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"Ordner: %1$s"</string>
+
+ <!-- -->
+ <!-- Preferences -->
+ <!-- -->
+ <string name="preferences_title">Launcher-Einstellungen</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Oberfläche</string>
+ <!-- Application -->
+ <string name="preferences_application_title">Launcher-Version</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <string name="preferences_interface_homescreen_title">Seiten</string>
+ <string name="preferences_interface_homescreen_general_category">Allgemein</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Seitenzahl</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Anzahl der verwendbaren und wechselbaren Seiten für Icons und Widgets</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Standardseite</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Aktive Seite nach Neustart des Geräts</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Rastergröße</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Anzahl der für Icons verfügbaren Reihen / Spalten</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Reihen</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Spalten</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Vertikaler Seitenrand</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Einige Pixel Rand oben und unten auf jeder Seite</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Horizontaler Seitenrand</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Einige Pixel Rand rechts und links auf jeder Seite</string>
+ <string name="preferences_interface_homescreen_general_search_title">Suchleiste</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Dauerhafte Anzeige der Suchleiste</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Größe aller Widgets anpassbar</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Größe statischer Widgets auch anpassbar machen</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Scrollen</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Übergangseffekt</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Animation bei Seitenwechsel</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Verblassen</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Seiten verblassen bei Seitenwechsel</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Hintergrundbild scrollen</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Hintergrundbild bei Seitenwechsel scrollen</string>
+ <string name="preferences_interface_homescreen_indicator_category">Seitenindikator</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Anzeigen</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Seitenindikator anzeigen</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Automatisch ausblenden</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Indikator nach Seitenwechsel ausblenden</string>
+
+ <!-- Drawer -->
+ <string name="preferences_interface_drawer_title">Apps</string>
+ <string name="preferences_interface_drawer_widgets_category">Widget-Seiten</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Mit App-Seiten verbinden</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Blättern auch zwischen App- und Widget-Seiten</string>
+ <string name="preferences_interface_drawer_scrolling_category">Scrollen</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Übergangseffekt</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Animation bei Seitenwechsel</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Verblassen</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Seiten verblassen bei Seitenwechsel</string>
+ <string name="preferences_interface_drawer_indicator_category">Seitenindikator</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Anzeigen</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Seitenindikator anzeigen</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Automatisch ausblenden</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Indikator nach Seitenwechsel ausblenden</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Dock</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Dock-Abtrennung anzeigen</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Linie über dem Dock zeichnen</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Icons</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Beschriftung nicht anzeigen</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Beschriftung unterhalb der Icons nicht anzeigen</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">Allgemein</string>
+ <string name="preferences_interface_general_orientation_title">Automatische Seitenausrichtung</string>
</resources>
diff --git a/res/values-el-land/strings.xml b/res/values-el-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-el-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-en-rGB-land/strings.xml b/res/values-en-rGB-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-en-rGB-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-es-land/strings.xml b/res/values-es-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-es-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-es-rUS-land/strings.xml b/res/values-es-rUS-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-es-rUS-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
new file mode 100755
index 0000000..af3bc1b
--- /dev/null
+++ b/res/values-es/arrays.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source 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-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
+ <item>Estándar</item>
+ <item>Tableta</item>
+ <item>Acercar</item>
+ <item>Alejar</item>
+ <item>Girar (Arriba)</item>
+ <item>Girar (Abajo)</item>
+ <item>Cubo (Entrada)</item>
+ <item>Cube (Salida)</item>
+ <item>Apilar</item>
+ </string-array>
+ <string-array name="preferences_interface_homescreen_scrolling_transition_effect_values">
+ <item>Estándar</item>
+ <item>Tableta</item>
+ <item>Acercar</item>
+ <item>Alejar</item>
+ <item>Girar (Arriba)</item>
+ <item>Girar (Abajo)</item>
+ <item>Cubo (Entrada)</item>
+ <item>Cube (Salida)</item>
+ <item>Apilar</item>
+ </string-array>
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_entries">
+ <item>Estándar</item>
+ <item>Tableta</item>
+ <item>Acercar</item>
+ <item>Alejar</item>
+ <item>Girar (Arriba)</item>
+ <item>Girar (Abajo)</item>
+ <item>Cubo (Entrada)</item>
+ <item>Cube (Salida)</item>
+ <item>Apilar</item>
+ </string-array>
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_values">
+ <item>Estándar</item>
+ <item>Tableta</item>
+ <item>Acercar</item>
+ <item>Alejar</item>
+ <item>Girar (Arriba)</item>
+ <item>Girar (Abajo)</item>
+ <item>Cubo (Entrada)</item>
+ <item>Cube (Salida)</item>
+ <item>Apilar</item>
+ </string-array>
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b47cd2e..3a6d1ca 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -28,6 +28,7 @@
<string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Mantén pulsado el widget que quieras seleccionar."</string>
<string name="market" msgid="2652226429823445833">"Tienda"</string>
+ <string name="menu">"Menú"</string>
<string name="external_drop_widget_error" msgid="127440783198670829">"No se ha podido añadir el elemento en este escritorio."</string>
<string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Selecciona el widget que quieres añadir"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
@@ -51,6 +52,7 @@
<string name="delete_zone_label_workspace" msgid="7153615831493049150">"Eliminar del escritorio"</string>
<string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalar"</string>
<string name="delete_target_label" msgid="665300185123139530">"Eliminar"</string>
+ <string name="cancel_target_label">"Cancelar"</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalar"</string>
<string name="info_target_label" msgid="4019495079517426980">"Información de la aplicación"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Buscar"</string>
@@ -64,7 +66,10 @@
<string name="menu_search" msgid="4826514464423239041">"Buscar"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
<string name="menu_settings" msgid="3946232973327980394">"Ajustes del sistema"</string>
+ <string name="menu_preferences">"Ajustes Trebuchet"</string>
<string name="menu_help" msgid="4901160661634590633">"Ayuda"</string>
+ <string name="menu_apps_sort_title">"Nombre"</string>
+ <string name="menu_apps_sort_install_date">"Fecha Instalación"</string>
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Desinstalar la aplicación"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"Información de la aplicación"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"1 aplicación seleccionada"</string>
@@ -92,6 +97,8 @@
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todas las aplicaciones, toca el círculo."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Selecciona algunas aplicaciones"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Para añadir una aplicación al escritorio, solo tienes que mantenerla pulsada."</string>
+ <string name="all_apps_sort_cling_title">"Ordena tus aplicaciones"</string>
+ <string name="all_apps_sort_cling_add_item">"Mantén pulsada la pestaña Aplicaciones para escoger el modo de ordenación"</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Organiza tus aplicaciones en carpetas"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Para mover una aplicación, solo tienes que mantenerla pulsada."</string>
<string name="folder_cling_create_folder" msgid="8352867485656129478">"Para crear una carpeta nueva en el escritorio, coloca una aplicación encima de otra."</string>
@@ -102,4 +109,77 @@
<string name="folder_closed" msgid="3130534551370511932">"Carpeta cerrada"</string>
<string name="folder_renamed" msgid="781234745487414781">"Se ha cambiado el nombre de la carpeta a %1$s."</string>
<string name="folder_name_format" msgid="4513766553514769310">"Carpeta: %1$s"</string>
+
+ <!-- -->
+ <!-- Preferences -->
+ <!-- -->
+ <string name="preferences_title">"Preferencias"</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">"Interfaz"</string>
+ <!-- Application -->
+ <string name="preferences_application_title">"Aplicación"</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <string name="preferences_interface_homescreen_title">"Pantalla de Inicio"</string>
+ <string name="preferences_interface_homescreen_general_category">"General"</string>
+ <string name="preferences_interface_homescreen_general_screens_title">"Pantallas de inicio"</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">"Número de pantallas de inicio a mostrar"</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">"Pantalla por defecto"</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">"Escoje la pantalla de inicio por defecto"</string>
+ <string name="preferences_interface_homescreen_general_grid_title">"Filas/Columnas"</string> <!-- Revisar -->
+ <string name="preferences_interface_homescreen_general_grid_summary">"Elije el número de filas/columnas a mostrar en la pantalla de inicio</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">"Filas"</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">"Columnas"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">"Espaciado vertical"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">"Espaciado vertical adicional en la pantalla de inicio"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">"Espaciado horizontal"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">"Espaciado horizontal adicional en la pantalla de inicio"</string>
+ <string name="preferences_interface_homescreen_general_search_title">"Barra de búsqueda"</string>
+ <string name="preferences_interface_homescreen_general_search_summary">"Habilitar barra de búsqueda permanente"</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">"Redimensionar widgets"</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">"Permitir redimensionar los widgets que normalmente no son redimensionables"</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">"Ocultar etiquetas iconos"</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">"Ocultar las etiquetas de los iconos de la pantalla de inicio"</string>
+ <string name="preferences_interface_homescreen_scrolling_category">"Desplazamiento"</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">"Efecto transición"</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">"Escojer el efecto de transicción al desplazarse entre las pantallas de inicio"</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">"Efecto fundido"</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">"Activar efecto fundido de las páginas contiguas al desplazarse entre las pantallas de inicio"</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">"Desplazar fondo"</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">"Desplazar fondo de escritorio al desplazar las pantallas de inicio"</string>
+ <string name="preferences_interface_homescreen_indicator_category">"Indicador"</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">"Mostrar el indicador de página"</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">"Mostrar indicador de página actual en la parte inferior de la pantalla"</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">"Efecto fundido"</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">"Activar efecto de fundido del indicador de página después de un cambio de pantalla de inicio"</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">"Separador"</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">"Mostrar una barra de separación debajo del indicador de página"</string>
+
+ <!-- Drawer -->
+ <string name="preferences_interface_drawer_title">"Aplicaciones/Widgets"</string>
+ <string name="preferences_interface_drawer_widgets_category">"Widgets"</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">"Transición pestañas"</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">"Pasar de pestañas aplicaciones a pestañas de widgets sin necesidad de cambiar explícitamente de pestaña"</string>
+ <string name="preferences_interface_drawer_scrolling_category">"Desplazamiento"</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">"Efecto transición"</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">"Escojer el efecto de transicción al desplazarse entre pantallas"</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">"Efecto fundido"</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">"Activar efecto fundido de las páginas contiguas al desplazarse entre pantallas"</string>
+ <string name="preferences_interface_drawer_indicator_category">"Indicador"</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">"Mostrar el indicador de página"</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">"Mostrar indicador de página actual en la parte inferior de la pantalla"</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">"Efecto fundido"</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">"Activar efecto de fundido del indicador de página después de un cambio de pantalla"</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">"Barra Aplicaciones"</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">"Iconos"</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">"General"</string>
+ <string name="preferences_interface_general_orientation_title">"Rotación automática pantalla"</string>
+
</resources>
diff --git a/res/values-fa-land/strings.xml b/res/values-fa-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-fa-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-fi-land/strings.xml b/res/values-fi-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-fi-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-fr-land/strings.xml b/res/values-fr-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-fr-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 29f46de..ecdadea 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -103,6 +103,9 @@
<string name="folder_renamed" msgid="781234745487414781">"Nouveau nom du dossier : %1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"Dossier : %1$s"</string>
+ <!-- Trebuchet -->
+ <string name="cancel_target_label">Annuler</string>
+
<!-- -->
<!-- Preferences -->
<!-- -->
@@ -122,10 +125,21 @@
<string name="preferences_interface_homescreen_general_screens_summary">Nombre de pages sur l\'écran d\'accueil</string>
<string name="preferences_interface_homescreen_general_default_screen_title">Ecran par défaut</string>
<string name="preferences_interface_homescreen_general_default_screen_summary">Sélectionnez l\'écran par défaut</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Padding vertical</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Espacement supplémentaire vertical</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Padding horizontal</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Espacement supplémentaire horizontal</string>
<string name="preferences_interface_homescreen_general_search_title">Barre de recherche</string>
<string name="preferences_interface_homescreen_general_search_summary">Activer la barre de recherche persistante</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_title">Redimensionner les widgets</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permettre de redimensionner les widgets qui normalement n\'en sont pas capables</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Défilement</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Effet de transition</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Style de transition entre les écrans</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Fondu entre les écrans</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Effet de fondu entre deux écrans adjacents</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Défilement du fond d\'écran</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Faire glisser le fond d\'écran avec les écrans</string>
<string name="preferences_interface_homescreen_indicator_category">Indicateur</string>
<string name="preferences_interface_homescreen_indicator_enable_title">Indicateur de page</string>
<string name="preferences_interface_homescreen_indicator_enable_summary">Afficher l\'indicateur en bas de l\'écran</string>
@@ -136,7 +150,12 @@
<string name="preferences_interface_drawer_title">Applications</string>
<string name="preferences_interface_drawer_widgets_category">Widgets</string>
<string name="preferences_interface_drawer_widgets_join_apps_title">Inclure dans les applications</string>
- <string name="preferences_interface_drawer_widgets_join_apps_summary">Sauter des applications aux widgets sans changer d\'onglet (swipe)</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Sauter des applications aux widgets sans changer d\'onglet</string>
+ <string name="preferences_interface_drawer_scrolling_category">Défilement</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Effet de transition</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Style de transition entre les pages</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Fondu entre les pages</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Effet de fondu entre les pages lors du défilement</string>
<string name="preferences_interface_drawer_indicator_category">Indicateur</string>
<string name="preferences_interface_drawer_indicator_enable_title">Indicateur de page</string>
<string name="preferences_interface_drawer_indicator_enable_summary">Afficher l\'indicateur en bas de l\'écran</string>
@@ -145,11 +164,23 @@
<!-- Dock -->
<string name="preferences_interface_dock_title">Barre de Dock</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Séparateur horizontal</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Afficher la ligne entre la barre de dock et l\'écran d\'accueil</string>
<!-- Icons -->
<string name="preferences_interface_icons_title">Icônes</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Sans libellés</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Cacher le libellé des icônes de l\'écran d\'accueil</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Taille de la grille</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Définir le nombre de rangées et de colonnes sur l\'écran d\'accueil</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Rangées</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Colonnes</string>
<!-- General -->
<string name="preferences_interface_general_title">Autres options</string>
<string name="preferences_interface_general_orientation_title">Auto-rotation</string>
+
+ <!-- menu item used to sort apps -->
+ <string name="menu_apps_sort_title">Nom</string>
+ <string name="menu_apps_sort_install_date">Date d\'installation</string>
</resources>
diff --git a/res/values-hr-land/strings.xml b/res/values-hr-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-hr-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-hu-land/strings.xml b/res/values-hu-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-hu-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0373bfc..f9ad871 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -28,18 +28,19 @@
<string name="widgets_tab_label" msgid="9145860100000983599">"Modulok"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Modul felvételéhez érintse meg, és tartsa lenyomva"</string>
<string name="market" msgid="2652226429823445833">"Bolt"</string>
- <string name="external_drop_widget_error" msgid="127440783198670829">"Nem lehet elemeket dobni erre a Kezdőképernyőre."</string>
+ <string name="menu">Menü</string>
+ <string name="external_drop_widget_error" msgid="127440783198670829">"Nem lehet elemeket dobni erre a kezdőképernyőre."</string>
<string name="external_drop_widget_pick_title" msgid="7040647073452295370">"A létrehozáshoz válasszon modult"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Mappa neve"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Mappa átnevezése"</string>
<string name="rename_action" msgid="6016003384693240896">"OK"</string>
<string name="cancel_action" msgid="3811860427489435048">"Mégse"</string>
- <string name="menu_item_add_item" msgid="6233177331075781114">"Hozzáadás a főoldalhoz"</string>
+ <string name="menu_item_add_item" msgid="6233177331075781114">"Hozzáadás a kezdőképernyőhöz"</string>
<string name="group_applications" msgid="2103752818818161976">"Alkalmazások"</string>
<string name="group_shortcuts" msgid="9133529424900391877">"Parancsikonok"</string>
<string name="group_widgets" msgid="6704978494073105844">"Modulok"</string>
<string name="group_wallpapers" msgid="1568191644272224858">"Háttérképek"</string>
- <string name="out_of_space" msgid="8365249326091984698">"Nincs több hely ezen a főoldalon."</string>
+ <string name="out_of_space" msgid="8365249326091984698">"Nincs több hely ezen a képernyőn."</string>
<string name="invalid_hotseat_item" msgid="6545340627805449250">"Ez a modul túl nagy a hotseat számára."</string>
<string name="shortcut_installed" msgid="7071557296331322355">"\"<xliff:g id="NAME">%s</xliff:g>\" parancsikon létrehozva."</string>
<string name="shortcut_uninstalled" msgid="2129499669449749995">"A(z) \"<xliff:g id="NAME">%s</xliff:g>\" parancsikon eltávolításra került."</string>
@@ -51,6 +52,7 @@
<string name="delete_zone_label_workspace" msgid="7153615831493049150">"Eltávolítás"</string>
<string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Eltávolítás"</string>
<string name="delete_target_label" msgid="665300185123139530">"Eltávolítás"</string>
+ <string name="cancel_target_label">Mégsem</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Eltávolítás"</string>
<string name="info_target_label" msgid="4019495079517426980">"Alkalmazásinformáció"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Keresés"</string>
@@ -60,11 +62,15 @@
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Eltávolítja a frissítést"</string>
<string name="menu_add" msgid="3065046628354640854">"Hozzáadás"</string>
<string name="menu_manage_apps" msgid="2308685199463588895">"Alkalmazások kezelése"</string>
+ <string name="menu_market">Alkalmazásbolt</string>
<string name="menu_wallpaper" msgid="5837429080911269832">"Háttérkép"</string>
<string name="menu_search" msgid="4826514464423239041">"Keresés"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Értesítések"</string>
<string name="menu_settings" msgid="3946232973327980394">"Rendszerbeállítások"</string>
+ <string name="menu_preferences">Trebuchet beállítások</string>
<string name="menu_help" msgid="4901160661634590633">"Súgó"</string>
+ <string name="menu_apps_sort_title">Név</string>
+ <string name="menu_apps_sort_install_date">Telepítés ideje</string>
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Alkalmazás eltávolítása"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"Az alkalmazás adatai"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"1 kiválasztott alkalmazás"</string>
@@ -75,10 +81,10 @@
<string name="permdesc_install_shortcut" msgid="8634424803272077038">"Lehetővé teszi egy alkalmazás számára, hogy felhasználói beavatkozás nélkül adjon hozzá parancsikonokat."</string>
<string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"parancsikonok eltávolítása"</string>
<string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Lehetővé teszi egy alkalmazás számára, hogy felhasználói beavatkozás nélkül távolítson el parancsikonokat."</string>
- <string name="permlab_read_settings" msgid="3452408290738106747">"Főoldal beállításainak és parancsikonjainak beolvasása"</string>
- <string name="permdesc_read_settings" msgid="1836104524215167383">"Lehetővé teszi egy alkalmazás számára, hogy beolvassa a Kezdőképernyő beállításait és parancsikonjait."</string>
- <string name="permlab_write_settings" msgid="1360567537236705628">"Főoldal beállításainak és parancsikonjainak írása"</string>
- <string name="permdesc_write_settings" msgid="6763846563231494591">"Lehetővé teszi egy alkalmazás számára, hogy módosítsa a Kezdőképernyő beállításait és parancsikonjait."</string>
+ <string name="permlab_read_settings" msgid="3452408290738106747">"Kezdőképernyő beállításainak és parancsikonjainak beolvasása"</string>
+ <string name="permdesc_read_settings" msgid="1836104524215167383">"Lehetővé teszi egy alkalmazás számára, hogy beolvassa a kezdőképernyő beállításait és parancsikonjait."</string>
+ <string name="permlab_write_settings" msgid="1360567537236705628">"Kezdőképernyő beállításainak és parancsikonjainak írása"</string>
+ <string name="permdesc_write_settings" msgid="6763846563231494591">"Lehetővé teszi egy alkalmazás számára, hogy módosítsa a kezdőképernyő beállításait és parancsikonjait."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Probléma történt a modul betöltésekor"</string>
<string name="uninstall_system_app_text" msgid="6429814133777046491">"Ez egy rendszeralkalmazás, és nem lehet eltávolítani."</string>
<string name="dream_name" msgid="2847171357608437154">"Aknavető"</string>
@@ -92,6 +98,8 @@
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Az összes saját alkalmazás megtekintéséhez érintse meg a kört."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Válasszon ki néhány alkalmazást"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ha egy alkalmazást el szeretne helyezni a kezdőképernyőn, érintse meg, és tartsa lenyomva."</string>
+ <string name="all_apps_sort_cling_title">Rendezze sorba alkalmazásait</string>
+ <string name="all_apps_sort_cling_add_item">"Ha sorba szeretné rendezni alkalmazásait, érintse meg, és tartsa lenyomva az Alkalmazások lapfület."</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Rendezze alkalmazásait mappákba"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Ha egy alkalmazást át szeretne helyezni, érintse meg, és tartsa lenyomva."</string>
<string name="folder_cling_create_folder" msgid="8352867485656129478">"Ha egy új mappát szeretne létrehozni a kezdőképernyőn, helyezzen egymásra két alkalmazást."</string>
@@ -102,4 +110,59 @@
<string name="folder_closed" msgid="3130534551370511932">"Mappa lezárva"</string>
<string name="folder_renamed" msgid="781234745487414781">"Mappa átnevezve a következőre: %1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"Mappa: %1$s"</string>
-</resources>
+ <string name="preferences_title">Beállítások</string>
+ <string name="preferences_interface_title">Felület</string>
+ <string name="preferences_application_title">Alkalmazás</string>
+ <string name="preferences_interface_homescreen_title">Kezdőképernyő</string>
+ <string name="preferences_interface_homescreen_general_category">Általános</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Kezdőképernyők</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Képernyők száma a kezdőképernyőn</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Alapértelmezett kezdőképernyő</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Válasszon képernyőt</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Rács méret</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Válassza ki hány sor/oszlop legyen a kezdőképernyőn</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Sor</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Oszlop</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Függőleges kitöltés</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Extra függőleges helykitöltés a kezdőképernyőn</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Vízszintes kitöltés</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Extra vízszintes helykitöltés a kezdőképernyőn</string>
+ <string name="preferences_interface_homescreen_general_search_title">Keresősáv</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Állandó keresősáv engedélyezése</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Átméretezhető modulok</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Modulok átméretezésének engedélyezése a kezdőképernyőn</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Ikon feliratok elrejtése</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Elrejti a kezdőképernyőn lévő ikonok nevét</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Kinézet</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Lapozás</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Válassza ki, milyen effekttel váltson a kezdőképernyők közt</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Elhalványuló váltás</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Váltáskor elhalványulnak az egymás melletti kezdőképernyők</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Háttérkép görgetése</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Háttérkép görgetése a kezdőképernyők közti váltások során</string>
+ <string name="preferences_interface_homescreen_indicator_category">Értesítések</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Aktuális képernyő</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Aktuális képernyő jelzése a oldal alján</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Képernyőjelölő</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Csak képernyőváltáskor látszik</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Tálca elválasztó</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Tálca és a képernyő közti elválasztó vonal</string>
+ <string name="preferences_interface_drawer_title">Alkalmazás képernyők</string>
+ <string name="preferences_interface_drawer_widgets_category">Általános</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Folyamatos lapozás</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Alkalmazások és modulok között folyamatos lapozással való váltás</string>
+ <string name="preferences_interface_drawer_scrolling_category">Kinézet</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Lapozás</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Válassza ki, milyen effekttel váltson az alkalmazás képernyők közt</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Elhalványuló váltás</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Váltáskor elhalványulnak az egymás melletti alkalmazás képernyők</string>
+ <string name="preferences_interface_drawer_indicator_category">Értesítések</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Aktuális oldal</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Aktuális oldal jelölése a lap alján</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Képernyőjelölő</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Csak képernyőváltáskor látszik</string>
+ <string name="preferences_interface_dock_title">Tálca</string>
+ <string name="preferences_interface_icons_title">Ikonok</string>
+ <string name="preferences_interface_general_title">Általános</string>
+ <string name="preferences_interface_general_orientation_title">Automatikus elforgatás</string>
+</resources> \ No newline at end of file
diff --git a/res/values-in-land/strings.xml b/res/values-in-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-in-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-it-land/strings.xml b/res/values-it-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-it-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
new file mode 100644
index 0000000..2f281e4
--- /dev/null
+++ b/res/values-it/arrays.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source 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-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
+ <item>Standard</item>
+ <item>Tablet</item>
+ <item>Riduci</item>
+ <item>Ingrandisci</item>
+ <item>Ruota su</item>
+ <item>Ruota giù</item>
+ <item>Cubo interno</item>
+ <item>Cubo esterno</item>
+ <item>Pila</item>
+ </string-array>
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_entries">
+ <item>Standard</item>
+ <item>Tablet</item>
+ <item>Riduci</item>
+ <item>Ingrandisci</item>
+ <item>Ruota su</item>
+ <item>Ruota giù</item>
+ <item>Cubo interno</item>
+ <item>Cubo esterno</item>
+ <item>Pila</item>
+ </string-array>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a8f76b4..b81ef93 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-->
-
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
@@ -28,6 +27,7 @@
<string name="widgets_tab_label" msgid="9145860100000983599">"Widget"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Tocca e tieni premuto per scegliere un widget."</string>
<string name="market" msgid="2652226429823445833">"Acquista"</string>
+ <string name="menu">Menù</string>
<string name="external_drop_widget_error" msgid="127440783198670829">"Rilascio elemento in schermata Home non riuscito."</string>
<string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Scegli il widget da creare"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nome cartella"</string>
@@ -51,6 +51,7 @@
<string name="delete_zone_label_workspace" msgid="7153615831493049150">"Rimuovi"</string>
<string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Disinstalla"</string>
<string name="delete_target_label" msgid="665300185123139530">"Rimuovi"</string>
+ <string name="cancel_target_label">Cancella</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Disinstalla"</string>
<string name="info_target_label" msgid="4019495079517426980">"Informazioni applicazione"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Cerca"</string>
@@ -60,11 +61,15 @@
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Disinstalla aggiornamento"</string>
<string name="menu_add" msgid="3065046628354640854">"Aggiungi"</string>
<string name="menu_manage_apps" msgid="2308685199463588895">"Gestisci applicazioni"</string>
+ <string name="menu_market">Market</string>
<string name="menu_wallpaper" msgid="5837429080911269832">"Sfondo"</string>
<string name="menu_search" msgid="4826514464423239041">"Cerca"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notifiche"</string>
<string name="menu_settings" msgid="3946232973327980394">"Impostazioni sistema"</string>
+ <string name="menu_preferences">Impostazioni Trebuchet</string>
<string name="menu_help" msgid="4901160661634590633">"Guida"</string>
+ <string name="menu_apps_sort_title">Nome</string>
+ <string name="menu_apps_sort_install_date">Data Installazione</string>
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Disinstalla applicazione"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"Dettagli applicazione"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"1 applicazione selezionata"</string>
@@ -92,6 +97,8 @@
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Per visualizzare tutte le tue applicazioni, tocca il cerchio."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Scegli alcune applicazioni"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Per aggiungere un\'applicazione alla schermata Home, tocca e tieni premuto."</string>
+ <string name="all_apps_sort_cling_title">Ordina applicazioni</string>
+ <string name="all_apps_sort_cling_add_item">Tocca e tieni premuta la scheda delle applicazioni per selezionare come ordinare le applicazioni</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Organizza le tue applicazioni in cartelle"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Per spostare un\'applicazione, tocca e tieni premuto."</string>
<string name="folder_cling_create_folder" msgid="8352867485656129478">"Per creare una nuova cartella sulla schermata Home, impila un\'applicazione su un\'altra."</string>
@@ -102,4 +109,59 @@
<string name="folder_closed" msgid="3130534551370511932">"Cartella chiusa"</string>
<string name="folder_renamed" msgid="781234745487414781">"Nome della cartella sostituito con %1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"Cartella: %1$s"</string>
+ <string name="preferences_title">Preferenze</string>
+ <string name="preferences_interface_title">Interfaccia</string>
+ <string name="preferences_application_title">Applicazione</string>
+ <string name="preferences_interface_homescreen_title">Schermata Home</string>
+ <string name="preferences_interface_homescreen_general_category">Generale</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Schermate Home</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Numero di schermate nella Home</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Schermata predefinita</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Scegli la schermata predefinita nella Home</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Dimensioni Griglia</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Scegli il numero di righe/colonne nella schermata Home</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Righe</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Colonne</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Spaziatura verticale</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Aumenta la spaziatura verticale nella Home</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Spaziatura orizzontale</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Aumenta la spaziatura orizzontale nella Home</string>
+ <string name="preferences_interface_homescreen_general_search_title">Barra di ricerca</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Abilita la barra di ricerca persistente</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Ridimensiona tutti i widget</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permette di ridimensionare i widget che normalmente non lo sarebbero</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Nascondi etichette</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Nascondi le etichette delle icone nella Home</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Scorrimento</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Effetti di transizione</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Effetti di transizione quando scorri nella Home</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Dissolvenza pagine laterali</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Dissolvi le pagine laterali quando scorri nella Home</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Scorrimento sfondo</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Muovi lo sfondo quando scorri nella Home</string>
+ <string name="preferences_interface_homescreen_indicator_category">Indicatore</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Indicatore pagina</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Mostra l\'indicatore della pagina corrente nella parte inferiore dello schermo</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Dissolvenza indicatore</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Dissolvi l\'indicatore dopo aver cambiato Home</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Mostra divisore dock</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Mostra lo sfondo dietro l\'indicatore</string>
+ <string name="preferences_interface_drawer_title">Drawer</string>
+ <string name="preferences_interface_drawer_widgets_category">Widget</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Unisci alle applicazioni</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Scorri dalla schermata applicazioni a quella dei widget senza cambiare scheda</string>
+ <string name="preferences_interface_drawer_scrolling_category">Scorrimento</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Effetti di transizione</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Effetti di scorrimento quando scorri nelle schermate</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Dissolvenza pagine laterali</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Dissolvi le pagine laterali quando scorri nelle schermate</string>
+ <string name="preferences_interface_drawer_indicator_category">Indicatore</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Mostra indicatore pagina</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Mostra l\'indicatore della pagina corrente nella parte inferiore dello schermo</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Dissolvenza indicatore</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Dissolvi l\'indicatore dopo aver cambiato pagina</string>
+ <string name="preferences_interface_dock_title">Dock</string>
+ <string name="preferences_interface_icons_title">Icone</string>
+ <string name="preferences_interface_general_title">Generale</string>
+ <string name="preferences_interface_general_orientation_title">Rotazione schermo</string>
</resources>
diff --git a/res/values-iw-land/strings.xml b/res/values-iw-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-iw-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b16ed3d..94166d6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -102,4 +102,90 @@
<string name="folder_closed" msgid="3130534551370511932">"התיקייה נסגרה"</string>
<string name="folder_renamed" msgid="781234745487414781">"שם התיקייה שונה ל-%1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"תיקייה: %1$s"</string>
+ <string-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
+ <item>רגיל</item>
+ <item>טאבלט</item>
+ <item>זום פנימה</item>
+ <item>זום החוצה</item>
+ <item>סיבוב מעלה</item>
+ <item>סיבוב מטה</item>
+ <item>קוביה פנימה</item>
+ <item>קוביה החוצה</item>
+ <item>ערימה</item>
+ </string-array>
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_entries">
+ <item>רגיל</item>
+ <item>טאבלט</item>
+ <item>זום פנימה</item>
+ <item>זום החוצה</item>
+ <item>סיבוב מעלה</item>
+ <item>סיבוב מטה</item>
+ <item>קוביה פנימה</item>
+ <item>קוביה החוצה</item>
+ <item>ערימה</item>
+ </string-array>
+ <string name="all_apps_sort_cling_add_item">"גע והחזק בטאב היישומים כדי לבחור את צורת הסידור"</string>
+ <string name="all_apps_sort_cling_title">"סדר את היישומים"</string>
+ <string name="cancel_target_label">"ביטול"</string>
+ <string name="menu">"תפריט"</string>
+ <string name="menu_apps_sort_install_date">תאריך התקנה</string>
+ <string name="menu_apps_sort_title">שם</string>
+ <string name="menu_market">חנות</string>
+ <string name="menu_preferences">"הגדרות הלאנצ'ר"</string>
+ <string name="preferences_application_title">יישום</string>
+ <string name="preferences_interface_dock_title">עגינה</string>
+ <string name="preferences_interface_drawer_indicator_category">סמן</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">הראה סמן של עמוד נוכחי בתחתית המסך</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">הראה סמן עמוד</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">אפשר דהייה של הסמן אחרי שהעמוד התחלף</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">דהיית סמן</string>
+ <string name="preferences_interface_drawer_scrolling_category">גלילה</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">אפשר דהייה של צידי העמודים כשגוללים בין מסכים</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">דהיית צידי עמודים</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">אפקט גלילה בין מסכים</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">אפקט מעבר</string>
+ <string name="preferences_interface_drawer_widgets_category">"ווידג'טים"</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">"דפדף בין היישומים לווידג'טים בלי לשנות טאבים"</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">צרף ליישומים</string>
+ <string name="preferences_interface_general_orientation_title">סיבוב מסך אוטומטי</string>
+ <string name="preferences_interface_general_title">כללי</string>
+ <string name="preferences_interface_homescreen_general_category">כללי</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">בחר את מסך הבית כברירת מחדל</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">מסך ברירת חדל</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">עמודות</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">שורות</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">בחר את מספר העמודות/שורות שבמסך הבית</string>
+ <string name="preferences_interface_homescreen_general_grid_title">"גודל הרשת"</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">הסתר תוויות סמלים במסך הבית</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">הסתר תווים סמלים</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">"אפשר שינוי גודל של ווידג'טים שבדרך כלל לא ניתנים לשינוי"</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">"שנה גודל לכל ווידג'ט"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">מרווח אופקי נוסף במסך הבית</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">מרווח אופקי</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">מרווח אנכי נוסף במסך הבית</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">מרווח אנכי</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">מספר מסכים במסך הבית</string>
+ <string name="preferences_interface_homescreen_general_screens_title">מסכי בית</string>
+ <string name="preferences_interface_homescreen_general_search_summary">אפשר שורת חיפוש קבועה</string>
+ <string name="preferences_interface_homescreen_general_search_title">שורת חיפוש</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">הראה את הרקע מאחורי הסמן</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">הראה מפריד בעגינה</string>
+ <string name="preferences_interface_homescreen_indicator_category">סמן</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">הראה סמן של עמוד נוכחי בתחתית העמוד</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">הראה סמן עמוד</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">אפשר דהיית סמן לאחר שהמסך השתנה</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">דהיית סמן</string>
+ <string name="preferences_interface_homescreen_scrolling_category">גלילה</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">אפשר דהייה של צידי העמודים כשגוללים בין מסכים</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">דהיית צידי עמודים</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">גלול את הרקע בגלילת מסכי בית</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">גלול רקע</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">אפקט גלילה בין מסכים</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">אפקט מעבר</string>
+ <string name="preferences_interface_homescreen_title">מסך בית</string>
+ <string name="preferences_interface_icons_title">סמלים</string>
+ <string name="preferences_interface_title">ממשק</string>
+ <string name="preferences_title">העדפות</string>
+ <string name="preferences_interface_drawer_title">מגירת יישומים</string>
+ <string name="application_copyright">"כל הזכויות שמורות \u00A9 CyanogenMod 2012"</string>
</resources>
diff --git a/res/values-ja-land/strings.xml b/res/values-ja-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-ja-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-ko-land/strings.xml b/res/values-ko-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-ko-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-lt-land/strings.xml b/res/values-lt-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-lt-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-lv-land/strings.xml b/res/values-lv-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-lv-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-ms-land/strings.xml b/res/values-ms-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-ms-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-nb-land/strings.xml b/res/values-nb-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-nb-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-nl-land/strings.xml b/res/values-nl-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-nl-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
new file mode 100644
index 0000000..f739d92
--- /dev/null
+++ b/res/values-nl/arrays.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+ Copyright (C) 2012 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-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
+ <item>Standaard</item>
+ <item>Tablet</item>
+ <item>Inzoomen</item>
+ <item>Uitzoomen</item>
+ <item>Naar boven draaien</item>
+ <item>Naar beneden draaien</item>
+ <item>Inkubussen</item>
+ <item>Uitkubussen</item>
+ <item>Stapel</item>
+ </string-array>
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_entries">
+ <item>Standaard</item>
+ <item>Tablet</item>
+ <item>Inzoomen</item>
+ <item>Uitzoomen</item>
+ <item>Naar boven draaien</item>
+ <item>Naar beneden draaien</item>
+ <item>Inkubussen</item>
+ <item>Uitkubussen</item>
+ <item>Stapel</item>
+ </string-array>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ed28c16..98e5e5e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2008 The Android Open Source 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.
-*/
- -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+ Copyright (C) 2012 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:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="uid_name" msgid="3371120195364560632">"Android-kerntoepassingen"</string>
@@ -102,4 +99,57 @@
<string name="folder_closed" msgid="3130534551370511932">"Map gesloten"</string>
<string name="folder_renamed" msgid="781234745487414781">"De naam van de map is gewijzigd in %1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"Map: %1$s"</string>
+
+ <string name="preferences_title">Voorkeuren</string>
+ <string name="preferences_interface_title">Uiterlijk</string>
+ <string name="preferences_application_title">Applicatie</string>
+
+ <string name="preferences_interface_homescreen_title">Startscherm</string>
+ <string name="preferences_interface_homescreen_general_category">Algemeen</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Startschermen</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Aantal startschermen</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Standaardscherm</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Kies het standaard startscherm</string>
+ <string name="preferences_interface_homescreen_general_search_title">Zoekbalk</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Schakel blijvende zoekbalk in</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Verander grootte van elke widget</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Staat toe om de grootte van alle widgets te veranderen</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Scrollen</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Overgangseffect</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Scrolleffect bij het scrollen door startschermen</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Vervaag paginagrenzen</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Vervaag paginagrenzen bij het scrollen door startschermen</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Achtergrond scrollen</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Achtergrond scrolt mee bij het scrollen door startschermen</string>
+ <string name="preferences_interface_homescreen_indicator_category">Indicator</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Toon pagina-indicator</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Toon huidige pagina-indicator onderin het scherm</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Vervaag indicator</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Vervaag de indicator nadat het startscherm veranderd is</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Toon dockverdeler</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Toon achtergrond achter de indicator</string>
+
+ <!-- Drawer -->
+ <string name="preferences_interface_drawer_title">Appdrawer</string>
+ <string name="preferences_interface_drawer_widgets_category">Widgets</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Automatisch overgaan</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Ga van apps direct over naar widgets zonder van tabblad te wisselen</string>
+ <string name="preferences_interface_drawer_scrolling_category">Scrollen</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Overgangseffect</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Scrolleffect bij het scrollen door schermen</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Vervaag paginagrenzen</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Vervaag paginagrenzen bij het scrollen door schermen</string>
+ <string name="preferences_interface_drawer_indicator_category">Indicator</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Toon pagina-indicator</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Toon huidige pagina-indicator onderin het scherm</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Vervaag indicator</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Vervaag de indicator nadat de pagina veranderd is</string>
+
+ <string name="preferences_interface_dock_title">Dock</string>
+
+ <string name="preferences_interface_icons_title">Iconen</string>
+
+ <string name="preferences_interface_general_title">Algemeen</string>
+ <string name="preferences_interface_general_orientation_title">Automatische schermoriëntatie</string>
+
</resources>
diff --git a/res/values-pl-land/strings.xml b/res/values-pl-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-pl-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index abc67f6..b173889 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -133,10 +133,20 @@
<string name="preferences_interface_homescreen_general_screens_summary">Wybierz liczbę ekranów</string>
<string name="preferences_interface_homescreen_general_default_screen_title">Ekran domyślny</string>
<string name="preferences_interface_homescreen_general_default_screen_summary">Wybierz ekran domyślny</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Rozmiar siatki</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Wybierz liczbę wierszy i kolumn na ekranie głównym</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Wiersze</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Kolumny</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Margines pionowy</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Dodatkowy odstęp pionowy na ekranie głównym</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Margines poziomy</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Dodatkowy odstęp poziomy na ekranie głównym</string>
<string name="preferences_interface_homescreen_general_search_title">Pasek wyszukiwania</string>
<string name="preferences_interface_homescreen_general_search_summary">Włącz pasek wyszukiwania na wszystkich ekranach</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_title">Rozmiar wszystkich widżetów</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_summary">Zmień rozmiar widżetów, które normalnie na to nie pozwalają</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Ukryj etykiety ikon</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Ukrywa etykiety ikon na ekranie głównym</string>
<string name="preferences_interface_homescreen_scrolling_category">Przewijanie</string>
<string name="preferences_interface_homescreen_scrolling_transition_effect_title">Efekt przejścia</string>
<string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Zmień efekt podczas zmiany ekranu</string>
diff --git a/res/values-pt-land/strings.xml b/res/values-pt-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-pt-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-pt-rPT-land/strings.xml b/res/values-pt-rPT-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-pt-rPT-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
new file mode 100644
index 0000000..d963c71
--- /dev/null
+++ b/res/values-pt/arrays.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source 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-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
+ <item>Padrão</item>
+ <item>Tablet</item>
+ <item>Aumentar</item>
+ <item>Diminuir</item>
+ <item>Girar para cima</item>
+ <item>Girar para baixo</item>
+ <item>Dentro do cubo</item>
+ <item>Fora do cubo</item>
+ <item>Pilha</item>
+ </string-array>
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_entries">
+ <item>Padrão</item>
+ <item>Tablet</item>
+ <item>Aumentar</item>
+ <item>Diminuir</item>
+ <item>Girar para cima</item>
+ <item>Girar para baixo</item>
+ <item>Dentro do cubo</item>
+ <item>Fora do cubo</item>
+ <item>Pilha</item>
+ </string-array>
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6600923..f1748a7 100644..100755
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright (C) 2008 The Android Open Source Project
@@ -15,138 +15,157 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="uid_name" msgid="3371120195364560632">"Principais aplicativos do Android"</string>
- <string name="folder_name" msgid="8551881338202938211"></string>
- <string name="chooser_wallpaper" msgid="6063168087625352235">"Selecionar plano de fundo de"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir plano de fundo"</string>
- <string name="pick_wallpaper" msgid="5630222540525626723">"Papéis de parede"</string>
- <string name="activity_not_found" msgid="217823393239365967">"O aplicativo não está instalado."</string>
- <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
- <string name="long_press_widget_to_add" msgid="7395697462851217506">"Toque e pressione para selecionar um widget."</string>
- <string name="market" msgid="2652226429823445833">"Comprar"</string>
- <string name="external_drop_widget_error" msgid="127440783198670829">"Não foi possível soltar este item na tela inicial."</string>
- <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Selecione um widget para criar"</string>
- <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
- <string name="rename_folder_title" msgid="4544573104191526550">"Renomear pasta"</string>
- <string name="rename_action" msgid="6016003384693240896">"OK"</string>
- <string name="cancel_action" msgid="3811860427489435048">"Cancelar"</string>
- <string name="menu_item_add_item" msgid="6233177331075781114">"Adicionar à tela inicial"</string>
- <string name="group_applications" msgid="2103752818818161976">"Aplicativos"</string>
- <string name="group_shortcuts" msgid="9133529424900391877">"Atalhos"</string>
- <string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
- <string name="group_wallpapers" msgid="1568191644272224858">"Papéis de parede"</string>
- <string name="out_of_space" msgid="8365249326091984698">"Não há mais espaço nesta tela da Página inicial."</string>
- <string name="invalid_hotseat_item" msgid="6545340627805449250">"Este widget é muito grande para o hotseat."</string>
- <string name="shortcut_installed" msgid="7071557296331322355">"Atalho \"<xliff:g id="NAME">%s</xliff:g>\" criado."</string>
- <string name="shortcut_uninstalled" msgid="2129499669449749995">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
- <string name="shortcut_duplicate" msgid="4757756326465060694">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
- <string name="title_select_shortcut" msgid="2858897527672831763">"Selecionar atalho"</string>
- <string name="title_select_application" msgid="1793455815754848652">"Selecione um aplicativo"</string>
- <string name="all_apps_button_label" msgid="2578400570124163469">"Aplicativos"</string>
- <string name="all_apps_home_button_label" msgid="1022222300329398558">"Página inicial"</string>
- <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Remover"</string>
- <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalar"</string>
- <string name="delete_target_label" msgid="665300185123139530">"Remover"</string>
- <string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalar"</string>
- <string name="info_target_label" msgid="4019495079517426980">"Informações do aplicativo"</string>
- <string name="accessibility_search_button" msgid="816822994629942611">"Pesquisar"</string>
- <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Pesquisa por voz"</string>
- <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Aplicativos"</string>
- <string name="accessibility_delete_button" msgid="3628162007991023603">"Remover"</string>
- <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Desinstalar atualização"</string>
- <string name="menu_add" msgid="3065046628354640854">"Adicionar"</string>
- <string name="menu_manage_apps" msgid="2308685199463588895">"Gerenciar aplicativos"</string>
- <string name="menu_wallpaper" msgid="5837429080911269832">"Plano de fundo"</string>
- <string name="menu_search" msgid="4826514464423239041">"Pesquisa"</string>
- <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
- <string name="menu_settings" msgid="3946232973327980394">"Configurações do sistema"</string>
- <string name="menu_help" msgid="4901160661634590633">"Ajuda"</string>
- <string name="cab_menu_delete_app" msgid="4089398025537640349">"Desinstalar aplicativo"</string>
- <string name="cab_menu_app_info" msgid="914548323652698884">"Detalhes do aplicativo"</string>
- <string name="cab_app_selection_text" msgid="6378522164293415735">"Um aplicativo selecionado"</string>
- <string name="cab_widget_selection_text" msgid="962527270506951955">"Um widget selecionado"</string>
- <string name="cab_folder_selection_text" msgid="8916111874189565067">"Uma pasta selecionada"</string>
- <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Um atalho selecionado"</string>
- <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar atalhos"</string>
- <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Permite que um aplicativo adicione atalhos sem intervenção do usuário."</string>
- <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar atalhos"</string>
- <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Permite que um aplicativo remova os atalhos sem a intervenção do usuário."</string>
- <string name="permlab_read_settings" msgid="3452408290738106747">"ler configurações e atalhos da Página inicial"</string>
- <string name="permdesc_read_settings" msgid="1836104524215167383">"Permite que um aplicativo leia as configurações e os atalhos na Página inicial."</string>
- <string name="permlab_write_settings" msgid="1360567537236705628">"gravar configurações e atalhos da Página inicial"</string>
- <string name="permdesc_write_settings" msgid="6763846563231494591">"Permite que um aplicativo altere as configurações e os atalhos na Página inicial."</string>
- <string name="gadget_error_text" msgid="8359351016167075858">"Problema ao carregar o widget"</string>
- <string name="uninstall_system_app_text" msgid="6429814133777046491">"Este é um aplicativo do sistema e não pode ser desinstalado."</string>
- <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
- <string name="folder_hint_text" msgid="8633351560105748141">"Pasta sem nome"</string>
- <string name="default_scroll_format" msgid="4057140866420001240">"Página %1$d de %2$d"</string>
- <string name="workspace_scroll_format" msgid="7911126267695001437">"Espaço de trabalho %1$d de %2$d"</string>
- <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Página de aplicativos, %1$d de %2$d"</string>
- <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Página de widgets, %1$d de %2$d"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"Sinta-se em casa"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Você pode colocar seus aplicativos favoritos aqui."</string>
- <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todos os seus aplicativos, toque no círculo."</string>
- <string name="all_apps_cling_title" msgid="2559734712581447107">"Escolha alguns aplicativos"</string>
- <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Para adicionar um aplicativo a sua tela inicial, toque e mantenha-o pressionado."</string>
- <string name="folder_cling_title" msgid="4308949882377840953">"Organize seus aplicativos com pastas"</string>
- <string name="folder_cling_move_item" msgid="270598675060435169">"Para mover um aplicativo, toque e mantenha-o pressionado."</string>
- <string name="folder_cling_create_folder" msgid="8352867485656129478">"Para criar uma nova pasta em sua tela inicial, coloque um aplicativo em cima do outro."</string>
- <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
- <string name="folder_opened" msgid="4129072635480822768">"Pasta aberta, %1$d por %2$d"</string>
- <string name="folder_tap_to_close" msgid="4076794242530255812">"Toque para fechar a pasta"</string>
- <string name="folder_tap_to_rename" msgid="2125528923948315223">"Toque para confirmar renomeação"</string>
- <string name="folder_closed" msgid="3130534551370511932">"Pasta fechada"</string>
- <string name="folder_renamed" msgid="781234745487414781">"Pasta renomeada para %1$s"</string>
- <string name="folder_name_format" msgid="4513766553514769310">"Pasta: %1$s"</string>
- <string name="preferences_title">Preferências</string>
- <!-- UI -->
- <string name="preferences_interface_title">Interface</string>
- <!-- Application -->
- <string name="preferences_application_title">Aplicação</string>
-
- <!-- UI -->
- <!-- Homescreen -->
- <string name="preferences_interface_homescreen_title">Tela Inicial</string>
- <string name="preferences_interface_homescreen_general_category">Geral</string>
- <string name="preferences_interface_homescreen_general_screens_title">Telas Iniciais</string>
- <string name="preferences_interface_homescreen_general_screens_summary">Número de telas na Tela Inicial</string>
- <string name="preferences_interface_homescreen_general_default_screen_title">Tela Padrão</string>
- <string name="preferences_interface_homescreen_general_default_screen_summary">Escolha a tela padrão</string>
- <string name="preferences_interface_homescreen_general_search_title">Barra de Pesquisa</string>
- <string name="preferences_interface_homescreen_general_search_summary">Ativar Barra de Pesquisa persistente</string>
- <string name="preferences_interface_homescreen_general_resize_any_widget_title">Redimensionar Widgets</string>
- <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permite redimensionamento de Widgets que normalmente não são redimensionáveis</string>
- <string name="preferences_interface_homescreen_scrolling_category">Rolagem</string>
- <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Rolar Papel de Parede</string>
- <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Rola o Papel de Parede na mudança de telas</string>
- <string name="preferences_interface_homescreen_indicator_category">Indicador</string>
- <string name="preferences_interface_homescreen_indicator_enable_title">Mostrar Indicador de Página</string>
- <string name="preferences_interface_homescreen_indicator_enable_summary">Mostra o indicador da página atual no final da tela</string>
- <string name="preferences_interface_homescreen_indicator_fade_title">Esmaecer Indicador</string>
- <string name="preferences_interface_homescreen_indicator_fade_summary">Esmaece o indicador após a troca da tela inicial</string>
-
- <!-- Drawer -->
- <string name="preferences_interface_drawer_title">Grade de Apps</string>
- <string name="preferences_interface_drawer_widgets_category">Widgets</string>
- <string name="preferences_interface_drawer_widgets_join_apps_title">Unir com Apps</string>
- <string name="preferences_interface_drawer_widgets_join_apps_summary">Deslize da Grade de Apps para os Widgets sem trocar de abas</string>
- <string name="preferences_interface_drawer_indicator_category">Indicador</string>
- <string name="preferences_interface_drawer_indicator_enable_title">Mostrar Indicador de Página</string>
- <string name="preferences_interface_drawer_indicator_enable_summary">Mostra o indicador da página atual no final da tela</string>
- <string name="preferences_interface_drawer_indicator_fade_title">Esmaecer Indicador</string>
- <string name="preferences_interface_drawer_indicator_fade_summary">Esmaece o indicador após a troca da tela inicial</string>
-
- <!-- Dock -->
- <string name="preferences_interface_dock_title">Dock</string>
-
- <!-- Icons -->
- <string name="preferences_interface_icons_title">Ícones</string>
-
- <!-- General -->
- <string name="preferences_interface_general_title">Geral</string>
- <string name="preferences_interface_general_orientation_title">Auto Rotacionar Tela</string>
-</resources>
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="uid_name" msgid="3371120195364560632">"Principais aplicativos do Android"</string>
+ <string name="chooser_wallpaper" msgid="6063168087625352235">"Selecionar plano de fundo de"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir plano de fundo"</string>
+ <string name="pick_wallpaper" msgid="5630222540525626723">"Papéis de parede"</string>
+ <string name="activity_not_found" msgid="217823393239365967">"O aplicativo não está instalado."</string>
+ <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
+ <string name="long_press_widget_to_add" msgid="7395697462851217506">"Toque e pressione para selecionar um widget."</string>
+ <string name="market" msgid="2652226429823445833">"Comprar"</string>
+ <string name="external_drop_widget_error" msgid="127440783198670829">"Não foi possível soltar este item na tela inicial."</string>
+ <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Selecione um widget para criar"</string>
+ <string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
+ <string name="rename_folder_title" msgid="4544573104191526550">"Renomear pasta"</string>
+ <string name="rename_action" msgid="6016003384693240896">"OK"</string>
+ <string name="cancel_action" msgid="3811860427489435048">"Cancelar"</string>
+ <string name="menu_item_add_item" msgid="6233177331075781114">"Adicionar à tela inicial"</string>
+ <string name="group_applications" msgid="2103752818818161976">"Aplicativos"</string>
+ <string name="group_shortcuts" msgid="9133529424900391877">"Atalhos"</string>
+ <string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
+ <string name="group_wallpapers" msgid="1568191644272224858">"Papéis de parede"</string>
+ <string name="out_of_space" msgid="8365249326091984698">"Não há mais espaço nesta tela da Página inicial."</string>
+ <string name="invalid_hotseat_item" msgid="6545340627805449250">"Este widget é muito grande para o hotseat."</string>
+ <string name="shortcut_installed" msgid="7071557296331322355">"Atalho \"<xliff:g id="NAME">%s</xliff:g>\" criado."</string>
+ <string name="shortcut_uninstalled" msgid="2129499669449749995">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" foi removido."</string>
+ <string name="shortcut_duplicate" msgid="4757756326465060694">"O atalho \"<xliff:g id="NAME">%s</xliff:g>\" já existe."</string>
+ <string name="title_select_shortcut" msgid="2858897527672831763">"Selecionar atalho"</string>
+ <string name="title_select_application" msgid="1793455815754848652">"Selecione um aplicativo"</string>
+ <string name="all_apps_button_label" msgid="2578400570124163469">"Aplicativos"</string>
+ <string name="all_apps_home_button_label" msgid="1022222300329398558">"Página inicial"</string>
+ <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Remover"</string>
+ <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalar"</string>
+ <string name="delete_target_label" msgid="665300185123139530">"Remover"</string>
+ <string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalar"</string>
+ <string name="info_target_label" msgid="4019495079517426980">"Informações do aplicativo"</string>
+ <string name="cancel_target_label">Cancelar</string>
+ <string name="accessibility_search_button" msgid="816822994629942611">"Pesquisar"</string>
+ <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Pesquisa por voz"</string>
+ <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Aplicativos"</string>
+ <string name="accessibility_delete_button" msgid="3628162007991023603">"Remover"</string>
+ <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Desinstalar atualização"</string>
+ <string name="menu_add" msgid="3065046628354640854">"Adicionar"</string>
+ <string name="menu_manage_apps" msgid="2308685199463588895">"Gerenciar aplicativos"</string>
+ <string name="menu_wallpaper" msgid="5837429080911269832">"Plano de fundo"</string>
+ <string name="menu_search" msgid="4826514464423239041">"Pesquisa"</string>
+ <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
+ <string name="menu_settings" msgid="3946232973327980394">"Configurações do sistema"</string>
+ <string name="menu_help" msgid="4901160661634590633">"Ajuda"</string>
+ <string name="cab_menu_delete_app" msgid="4089398025537640349">"Desinstalar aplicativo"</string>
+ <string name="cab_menu_app_info" msgid="914548323652698884">"Detalhes do aplicativo"</string>
+ <string name="cab_app_selection_text" msgid="6378522164293415735">"Um aplicativo selecionado"</string>
+ <string name="cab_widget_selection_text" msgid="962527270506951955">"Um widget selecionado"</string>
+ <string name="cab_folder_selection_text" msgid="8916111874189565067">"Uma pasta selecionada"</string>
+ <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"Um atalho selecionado"</string>
+ <string name="permlab_install_shortcut" msgid="1201690825493376489">"instalar atalhos"</string>
+ <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Permite que um aplicativo adicione atalhos sem intervenção do usuário."</string>
+ <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"desinstalar atalhos"</string>
+ <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Permite que um aplicativo remova os atalhos sem a intervenção do usuário."</string>
+ <string name="permlab_read_settings" msgid="3452408290738106747">"ler configurações e atalhos da Página inicial"</string>
+ <string name="permdesc_read_settings" msgid="1836104524215167383">"Permite que um aplicativo leia as configurações e os atalhos na Página inicial."</string>
+ <string name="permlab_write_settings" msgid="1360567537236705628">"gravar configurações e atalhos da Página inicial"</string>
+ <string name="permdesc_write_settings" msgid="6763846563231494591">"Permite que um aplicativo altere as configurações e os atalhos na Página inicial."</string>
+ <string name="gadget_error_text" msgid="8359351016167075858">"Problema ao carregar o widget"</string>
+ <string name="uninstall_system_app_text" msgid="6429814133777046491">"Este é um aplicativo do sistema e não pode ser desinstalado."</string>
+ <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+ <string name="folder_hint_text" msgid="8633351560105748141">"Pasta sem nome"</string>
+ <string name="default_scroll_format" msgid="4057140866420001240">"Página %1$d de %2$d"</string>
+ <string name="workspace_scroll_format" msgid="7911126267695001437">"Espaço de trabalho %1$d de %2$d"</string>
+ <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Página de aplicativos, %1$d de %2$d"</string>
+ <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Página de widgets, %1$d de %2$d"</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"Sinta-se em casa"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Você pode colocar seus aplicativos favoritos aqui."</string>
+ <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todos os seus aplicativos, toque no círculo."</string>
+ <string name="all_apps_cling_title" msgid="2559734712581447107">"Escolha alguns aplicativos"</string>
+ <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Para adicionar um aplicativo a sua tela inicial, toque e mantenha-o pressionado."</string>
+ <string name="folder_cling_title" msgid="4308949882377840953">"Organize seus aplicativos com pastas"</string>
+ <string name="folder_cling_move_item" msgid="270598675060435169">"Para mover um aplicativo, toque e mantenha-o pressionado."</string>
+ <string name="folder_cling_create_folder" msgid="8352867485656129478">"Para criar uma nova pasta em sua tela inicial, coloque um aplicativo em cima do outro."</string>
+ <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
+ <string name="folder_opened" msgid="4129072635480822768">"Pasta aberta, %1$d por %2$d"</string>
+ <string name="folder_tap_to_close" msgid="4076794242530255812">"Toque para fechar a pasta"</string>
+ <string name="folder_tap_to_rename" msgid="2125528923948315223">"Toque para confirmar renomeação"</string>
+ <string name="folder_closed" msgid="3130534551370511932">"Pasta fechada"</string>
+ <string name="folder_renamed" msgid="781234745487414781">"Pasta renomeada para %1$s"</string>
+ <string name="folder_name_format" msgid="4513766553514769310">"Pasta: %1$s"</string>
+ <string name="preferences_title">Preferências</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Interface</string>
+ <!-- Application -->
+ <string name="preferences_application_title">Aplicação</string>
+ <!-- UI -->
+ <!-- Homescreen -->
+ <string name="preferences_interface_homescreen_title">Tela Inicial</string>
+ <string name="preferences_interface_homescreen_general_category">Geral</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Telas Iniciais</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Número de telas na Tela Inicial</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Tela Padrão</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Escolha a tela padrão</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Tamanho da grade</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Escolha o numero de linhas/colunas na tela inicial</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Linhas</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Colunas</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Preenchimento vertical</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Espaçamento vertical extra na tela inicial</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Preenchimento horizontal</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Espaçamento horizontal extra na tela inicial</string>
+ <string name="preferences_interface_homescreen_general_search_title">Barra de Pesquisa</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Ativar Barra de Pesquisa persistente</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Redimensionar Widgets</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permite redimensionamento de Widgets que normalmente não são redimensionáveis</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Ocultar rótulos dos icones</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Ocultar rótulos dos ícones na tela inicial</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Rolagem</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Rolar Papel de Parede</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Rola o Papel de Parede na mudança de telas</string>
+ <string name="preferences_interface_homescreen_indicator_category">Indicador</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Mostrar Indicador de Página</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Mostra o indicador da página atual no final da tela</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Esmaecer Indicador</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Esmaece o indicador após a troca da tela inicial</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Mostrar divisor do dock</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Mostrar a linha de fundo do indicador</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Efeito de transição</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Efeito de rolagem da tela inicial</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Esmaecer páginas laterais</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Esmaecer páginas laterais quando rolar tela inicial</string>
+ <!-- Drawer -->
+ <string name="preferences_interface_drawer_title">Grade de Apps</string>
+ <string name="preferences_interface_drawer_widgets_category">Widgets</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Unir com Apps</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Deslize da Grade de Apps para os Widgets sem trocar de abas</string>
+ <string name="preferences_interface_drawer_indicator_category">Indicador</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Mostrar Indicador de Página</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Mostra o indicador da página atual no final da tela</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Esmaecer Indicador</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Esmaece o indicador após a troca da tela inicial</string>
+ <string name="preferences_interface_drawer_scrolling_category">Rolagem</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Efeito de transição</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Efeito de rolagem ao mudar tela</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Esmaecer páginas laterais</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Esmaecer páginas laterais quando rolar tela</string>
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Dock</string>
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Ícones</string>
+ <!-- General -->
+ <string name="preferences_interface_general_title">Geral</string>
+ <string name="preferences_interface_general_orientation_title">Auto Rotacionar Tela</string>
+ <string name="menu_preferences">Configurações Trebuchet</string>
+ <string name="menu_apps_sort_title">Nome</string>
+ <string name="menu_apps_sort_install_date">Dia de Instalação</string>
+ <string name="all_apps_sort_cling_title">Ordenar seus aplicativos</string>
+ <string name="all_apps_sort_cling_add_item">Toque &amp; segure a aba Aplicativos para selecionar o modo de ordenação</string>
+</resources> \ No newline at end of file
diff --git a/res/values-rm-land/strings.xml b/res/values-rm-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-rm-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-ro-land/strings.xml b/res/values-ro-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-ro-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-ru-land/strings.xml b/res/values-ru-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-ru-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
new file mode 100644
index 0000000..809dfc8
--- /dev/null
+++ b/res/values-ru/arrays.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source 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-array name="preferences_interface_homescreen_scrolling_transition_effect_entries">
+ <item>Стандартный</item>
+ <item>Планшетный</item>
+ <item>Увеличение</item>
+ <item>Уменьшение</item>
+ <item>Вращение вверх</item>
+ <item>Вращение вниз</item>
+ <item>В кубе</item>
+ <item>Из куба</item>
+ <item>Друг на друга</item>
+ </string-array>
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_entries">
+ <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-ru/strings.xml b/res/values-ru/strings.xml
index 2a549e9..cf3ba62 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -28,6 +28,7 @@
<string name="widgets_tab_label" msgid="9145860100000983599">"Виджеты"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Чтобы выбрать виджет, нажмите на значок и удерживайте его."</string>
<string name="market" msgid="2652226429823445833">"Маркет"</string>
+ <string name="menu">Меню</string>
<string name="external_drop_widget_error" msgid="127440783198670829">"Не удалось добавить элемент на главный экран."</string>
<string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Выберите виджет"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Название папки"</string>
@@ -51,6 +52,7 @@
<string name="delete_zone_label_workspace" msgid="7153615831493049150">"Удалить"</string>
<string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Удалить"</string>
<string name="delete_target_label" msgid="665300185123139530">"Удалить"</string>
+ <string name="cancel_target_label">Отменить</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Удалить"</string>
<string name="info_target_label" msgid="4019495079517426980">"Сведения о приложении"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Поиск"</string>
@@ -60,11 +62,15 @@
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Удалить обновление"</string>
<string name="menu_add" msgid="3065046628354640854">"Добавить"</string>
<string name="menu_manage_apps" msgid="2308685199463588895">"Приложения"</string>
+ <string name="menu_market">Маркет</string>
<string name="menu_wallpaper" msgid="5837429080911269832">"Обои"</string>
<string name="menu_search" msgid="4826514464423239041">"Поиск"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
<string name="menu_settings" msgid="3946232973327980394">"Настройки"</string>
+ <string name="menu_preferences">Настройки Trebuchet</string>
<string name="menu_help" msgid="4901160661634590633">"Справка"</string>
+ <string name="menu_apps_sort_title">Имя</string>
+ <string name="menu_apps_sort_install_date">Дата установки</string>
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Удалить"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"О приложении"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"Выбрано 1 приложение"</string>
@@ -92,6 +98,8 @@
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Чтобы открыть список приложений, нажмите на круг."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Выберите приложения"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Чтобы добавить приложение на главный экран, нажмите на значок и удерживайте его."</string>
+ <string name="all_apps_sort_cling_title">Сортировка приложений</string>
+ <string name="all_apps_sort_cling_add_item">Нажмите и удерживайте вкладку Приложения, чтобы выбрать режим сортировки</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Разложите все по папкам"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Чтобы переместить значок приложения, нажмите на него и удерживайте."</string>
<string name="folder_cling_create_folder" msgid="8352867485656129478">"Чтобы создать папку на главном экране, перенесите одно приложение на другое."</string>
@@ -102,4 +110,77 @@
<string name="folder_closed" msgid="3130534551370511932">"Папка закрыта"</string>
<string name="folder_renamed" msgid="781234745487414781">"Новое название папки: %1$s"</string>
<string name="folder_name_format" msgid="4513766553514769310">"Папка: %1$s"</string>
+
+ <!-- -->
+ <!-- Preferences -->
+ <!-- -->
+ <string name="preferences_title">Настройки</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Интерфейс</string>
+ <!-- Application -->
+ <string name="preferences_application_title">Приложение</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <string name="preferences_interface_homescreen_title">Домашний экран</string>
+ <string name="preferences_interface_homescreen_general_category">Основные</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Домашние экраны</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Количество экранов на рабочем столе</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Экран по умолчанию</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Выбор рабочего стола по умолчанию</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Размер сетки</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Выбор числа строк/столбцов на рабочем столе</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Строки</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Столбцы</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Вертикальное растягивание</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Дополнительно пространство по вертикали на рабочем столе</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Горизонтальное растягивание</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Дополнительное пространство по горизонтали на рабочем столе</string>
+ <string name="preferences_interface_homescreen_general_search_title">Строка поиска</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Включить постоянную строку поиска</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Изменение размера любого виджета</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Изменение размера виджетов, которые изначально не изменяемые</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Скрыть названия иконок</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Скрывать названия иконок на рабочем столе</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Прокрутка</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Эффект перехода</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Эффект перехода при перелистывании рабочих экранов</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Затухание страниц</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Затухание страниц при перелистывании рабочих экранов</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Прокрутка обоев</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Прокрутка обоев при перелистывании рабочих экранов</string>
+ <string name="preferences_interface_homescreen_indicator_category">Индикатор</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Показывать индикатор страниц</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Показывать индикатор текущей страницы в нижней части экрана</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Скрыть индикатор</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Скрыть индикатор после смены рабочих экранов</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Показывать разделитель</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Показывать фон за индикатором</string>
+
+ <!-- Drawer -->
+ <string name="preferences_interface_drawer_title">Главное меню</string>
+ <string name="preferences_interface_drawer_widgets_category">Виджеты</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Объединить с приложениями</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Пролистывать из главного меню в меню виджетов без смены вкладок</string>
+ <string name="preferences_interface_drawer_scrolling_category">Прокрутка</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Эффект перехода</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_summary">Эффект перехода при пролистывании экранов</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Затухание страниц</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Затухание страниц при пролистывании экранов</string>
+ <string name="preferences_interface_drawer_indicator_category">Индикатор</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Показывать индикатор страниц</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Показывать индикатор текущей страницы в нижней части экрана</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Скрыть индикатор</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Скрыть индикатор после смены страниц</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Нижняя панель</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Иконки</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">Основные</string>
+ <string name="preferences_interface_general_orientation_title">Авто-поворот экрана</string>
+
</resources>
diff --git a/res/values-sk-land/strings.xml b/res/values-sk-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-sk-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-sl-land/strings.xml b/res/values-sl-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-sl-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-sr-land/strings.xml b/res/values-sr-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-sr-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-sv-land/strings.xml b/res/values-sv-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-sv-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-sw-land/strings.xml b/res/values-sw-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-sw-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-sw340dp-land/dimens.xml b/res/values-sw340dp-land/dimens.xml
index b469ac0..6994a30 100644
--- a/res/values-sw340dp-land/dimens.xml
+++ b/res/values-sw340dp-land/dimens.xml
@@ -37,12 +37,12 @@
<dimen name="qsb_bar_height">48dp</dimen>
<!-- height of the bottom row of controls -->
- <dimen name="button_bar_height">80dip</dimen>
+ <dimen name="button_bar_height">64dip</dimen>
<!-- Because portal animations go beyond the bounds of an icon, we need
to make the dock layout slightly larger than the button_bar_height -->
- <dimen name="button_bar_height_top_padding">8dp</dimen>
- <dimen name="button_bar_height_bottom_padding">8dp</dimen>
+ <dimen name="button_bar_height_top_padding">0dp</dimen>
+ <dimen name="button_bar_height_bottom_padding">0dp</dimen>
<dimen name="button_bar_width_left_padding">8dp</dimen>
<dimen name="button_bar_width_right_padding">8dp</dimen>
- <dimen name="button_bar_height_plus_padding">80dp</dimen>
+ <dimen name="button_bar_height_plus_padding">64dp</dimen>
</resources>
diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml
index bf7ebc3..ec608c2 100644
--- a/res/values-sw340dp-port/dimens.xml
+++ b/res/values-sw340dp-port/dimens.xml
@@ -43,14 +43,14 @@
<dimen name="qsb_padding_right">6dp</dimen>
<dimen name="search_bar_height">48dp</dimen>
<!-- height of the bottom row of controls -->
- <dimen name="button_bar_height">80dip</dimen>
+ <dimen name="button_bar_height">64dip</dimen>
<!-- Because portal animations go beyond the bounds of an icon, we need
to make the dock layout slightly larger than the button_bar_height -->
- <dimen name="button_bar_height_top_padding">8dp</dimen>
- <dimen name="button_bar_height_bottom_padding">8dp</dimen>
+ <dimen name="button_bar_height_top_padding">0dp</dimen>
+ <dimen name="button_bar_height_bottom_padding">0dp</dimen>
<dimen name="button_bar_width_left_padding">8dp</dimen>
<dimen name="button_bar_width_right_padding">8dp</dimen>
- <dimen name="button_bar_height_plus_padding">80dp</dimen>
+ <dimen name="button_bar_height_plus_padding">64dp</dimen>
<!-- AppsCustomize -->
<dimen name="apps_customize_pageLayoutPaddingTop">16dp</dimen>
diff --git a/res/values-th-land/strings.xml b/res/values-th-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-th-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-tl-land/strings.xml b/res/values-tl-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-tl-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-tr-land/strings.xml b/res/values-tr-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-tr-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-uk-land/strings.xml b/res/values-uk-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-uk-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-vi-land/strings.xml b/res/values-vi-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-vi-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-zh-rCN-land/strings.xml b/res/values-zh-rCN-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-zh-rCN-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-zh-rTW-land/strings.xml b/res/values-zh-rTW-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-zh-rTW-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values-zu-land/strings.xml b/res/values-zu-land/strings.xml
deleted file mode 100644
index b976926..0000000
--- a/res/values-zu-land/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-* Copyright (C) 2011 The Android Open Source 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:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="delete_target_label" msgid="4155210680095864979"></string>
- <string name="delete_target_uninstall_label" msgid="1839407506844917298"></string>
- <string name="info_target_label" msgid="1424400595004570393"></string>
-</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 472ff31..e015477 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -29,7 +29,7 @@
<item>Cube Out</item>
<item>Stack</item>
</string-array>
- <string-array name="preferences_interface_homescreen_scrolling_transition_effect_values">
+ <string-array name="preferences_interface_homescreen_scrolling_transition_effect_values" translatable="false">
<item>Standard</item>
<item>Tablet</item>
<item>ZoomIn</item>
@@ -51,7 +51,7 @@
<item>Cube Out</item>
<item>Stack</item>
</string-array>
- <string-array name="preferences_interface_drawer_scrolling_transition_effect_values">
+ <string-array name="preferences_interface_drawer_scrolling_transition_effect_values" translatable="false">
<item>Standard</item>
<item>Tablet</item>
<item>ZoomIn</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 252d04b..0e2f171 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -142,4 +142,19 @@
<attr name="maxExternal" format="string" />
<attr name="minExternal" format="string" />
</declare-styleable>
+
+ <declare-styleable name="DoubleNumberPickerPreference">
+ <attr name="defaultValue1" format="integer" />
+ <attr name="defaultValue2" format="integer" />
+ <attr name="max1" format="integer" />
+ <attr name="min1" format="integer" />
+ <attr name="max2" format="integer" />
+ <attr name="min2" format="integer" />
+ <attr name="maxExternal1" format="string" />
+ <attr name="minExternal1" format="string" />
+ <attr name="maxExternal2" format="string" />
+ <attr name="minExternal2" format="string" />
+ <attr name="pickerTitle1" format="string" />
+ <attr name="pickerTitle2" format="string" />
+ </declare-styleable>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 8af0779..650f2f1 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -93,4 +93,8 @@
<integer name="folder_max_count_x">4</integer>
<integer name="folder_max_count_y">4</integer>
<integer name="folder_max_num_items">16</integer>
+
+ <!-- Workspace grid size -->
+ <integer name="config_workspaceRows">4</integer>
+ <integer name="config_workspaceColumns">4</integer>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7d873a6..bc93543 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,7 +45,7 @@
<!-- AppsCustomize pane -->
<!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
<string name="long_press_widget_to_add">Touch &amp; hold to pick up a widget.</string>
- <!-- Market button text. The market button text is removed in Launcher.java
+ <!-- Market button text. The market button text is removed in Launcher.java
in the Phone UI. [CHAR LIMIT=32] -->
<string name="market">Shop</string>
<!-- Menu button text. -->
@@ -118,6 +118,8 @@ s -->
<!-- Label for delete drop target. [CHAR_LIMIT=30] -->
<string name="delete_target_label">Remove</string>
+ <!-- Label for cancel drop target. [CHAR_LIMIT=30] -->
+ <string name="cancel_target_label">Cancel</string>
<!-- Label for uninstall drop target. [CHAR_LIMIT=30]-->
<string name="delete_target_uninstall_label">Uninstall</string>
<!-- Label for the info icon. [CHAR_LIMIT=30] -->
@@ -206,7 +208,7 @@ s -->
shortcuts in Home.</string>
<!-- Widgets: -->
- <skip />
+ <skip />
<!-- Text to show user in place of a gadget when we can't display it properly -->
<string name="gadget_error_text">Problem loading widget</string>
@@ -287,41 +289,51 @@ s -->
<string name="preferences_interface_homescreen_general_category">General</string>
<string name="preferences_interface_homescreen_general_screens_title">Homescreens</string>
<string name="preferences_interface_homescreen_general_screens_summary">Number of screens on the homescreen</string>
- <string name="preferences_interface_homescreen_general_default_screen_title">Default Screen</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Default screen</string>
<string name="preferences_interface_homescreen_general_default_screen_summary">Choose the default homescreen</string>
- <string name="preferences_interface_homescreen_general_search_title">Search Bar</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Grid Size</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Choose the number of rows/columns on the homescreen</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Rows</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Columns</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Vertical Padding</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Extra vertical spacing on the homescreen</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Horizontal Padding</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Extra horizontal spacing on the homescreen</string>
+ <string name="preferences_interface_homescreen_general_search_title">Search bar</string>
<string name="preferences_interface_homescreen_general_search_summary">Enable persistent search bar</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_title">Resize any widget</string>
<string name="preferences_interface_homescreen_general_resize_any_widget_summary">Allow resizing of widgets that normally aren\'t resizeable</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Hide icon labels</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Hide homescreen icon labels</string>
<string name="preferences_interface_homescreen_scrolling_category">Scrolling</string>
- <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Transition Effect</string>
+ <string name="preferences_interface_homescreen_scrolling_transition_effect_title">Transition effect</string>
<string name="preferences_interface_homescreen_scrolling_transition_effect_summary">Scrolling effect when scrolling homescreens</string>
- <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Fade Side Pages</string>
+ <string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_title">Fade side pages</string>
<string name="preferences_interface_homescreen_scrolling_fade_adjacent_screens_summary">Fade the side pages when scrolling homescreens</string>
- <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Scroll Wallpaper</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Scroll wallpaper</string>
<string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Scroll wallpaper when scrolling homescreens</string>
<string name="preferences_interface_homescreen_indicator_category">Indicator</string>
- <string name="preferences_interface_homescreen_indicator_enable_title">Show Page Indicator</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Show page indicator</string>
<string name="preferences_interface_homescreen_indicator_enable_summary">Show current page indicator at the bottom of the screen</string>
- <string name="preferences_interface_homescreen_indicator_fade_title">Fade Indicator</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Fade indicator</string>
<string name="preferences_interface_homescreen_indicator_fade_summary">Fade the indicator after the homescreen has changed</string>
- <string name="preferences_interface_homescreen_indicator_background_title">Show Dock Divider</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Show dock divider</string>
<string name="preferences_interface_homescreen_indicator_background_summary">Show the background behind the indicator</string>
<!-- Drawer -->
<string name="preferences_interface_drawer_title">Drawer</string>
<string name="preferences_interface_drawer_widgets_category">Widgets</string>
- <string name="preferences_interface_drawer_widgets_join_apps_title">Join with Apps</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Join with apps</string>
<string name="preferences_interface_drawer_widgets_join_apps_summary">Swipe from apps drawer to widgets drawer without changing tabs</string>
<string name="preferences_interface_drawer_scrolling_category">Scrolling</string>
- <string name="preferences_interface_drawer_scrolling_transition_effect_title">Transition Effect</string>
+ <string name="preferences_interface_drawer_scrolling_transition_effect_title">Transition effect</string>
<string name="preferences_interface_drawer_scrolling_transition_effect_summary">Scrolling effect when scrolling screens</string>
- <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Fade Side Pages</string>
+ <string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_title">Fade side pages</string>
<string name="preferences_interface_drawer_scrolling_fade_adjacent_screens_summary">Fade the side pages when scrolling screens</string>
<string name="preferences_interface_drawer_indicator_category">Indicator</string>
- <string name="preferences_interface_drawer_indicator_enable_title">Show Page Indicator</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Show page indicator</string>
<string name="preferences_interface_drawer_indicator_enable_summary">Show current page indicator at the bottom of the screen</string>
- <string name="preferences_interface_drawer_indicator_fade_title">Fade Indicator</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Fade indicator</string>
<string name="preferences_interface_drawer_indicator_fade_summary">Fade the indicator after the page has changed</string>
<!-- Dock -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ef3ee5c..1bbc9ac 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -35,6 +35,29 @@
launcher:maxExternal="ui_homescreen_screens"
launcher:max="7"
launcher:min="1" />
+ <com.cyanogenmod.trebuchet.preference.DoubleNumberPickerPreference android:key="ui_homescreen_grid"
+ android:title="@string/preferences_interface_homescreen_general_grid_title"
+ android:summary="@string/preferences_interface_homescreen_general_grid_summary"
+ launcher:pickerTitle1="@string/preferences_interface_homescreen_general_grid_rows_title"
+ launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title"
+ launcher:defaultValue1="@integer/config_workspaceRows"
+ launcher:defaultValue2="@integer/config_workspaceColumns"
+ launcher:max1="7"
+ launcher:min1="3"
+ launcher:max2="7"
+ launcher:min2="3" />
+ <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screen_padding_vertical"
+ android:title="@string/preferences_interface_homescreen_general_screen_padding_vertical_title"
+ android:summary="@string/preferences_interface_homescreen_general_screen_padding_vertical_summary"
+ android:defaultValue="0"
+ launcher:max="10"
+ launcher:min="0" />
+ <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screen_padding_horizontal"
+ android:title="@string/preferences_interface_homescreen_general_screen_padding_horizontal_title"
+ android:summary="@string/preferences_interface_homescreen_general_screen_padding_horizontal_summary"
+ android:defaultValue="0"
+ launcher:max="10"
+ launcher:min="0" />
<CheckBoxPreference android:key="ui_homescreen_general_search"
android:title="@string/preferences_interface_homescreen_general_search_title"
android:summary="@string/preferences_interface_homescreen_general_search_summary"
@@ -42,6 +65,9 @@
<CheckBoxPreference android:key="ui_homescreen_general_resize_any_widget"
android:title="@string/preferences_interface_homescreen_general_resize_any_widget_title"
android:summary="@string/preferences_interface_homescreen_general_resize_any_widget_summary" />
+ <CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels"
+ android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title"
+ android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_interface_homescreen_scrolling_category">
<ListPreference android:key="ui_homescreen_scrolling_transition_effect"
@@ -59,7 +85,8 @@
android:summary="@string/preferences_interface_homescreen_scrolling_scroll_wallpaper_summary"
android:defaultValue="true" />
</PreferenceCategory>
- <PreferenceCategory android:title="@string/preferences_interface_homescreen_indicator_category">
+ <PreferenceCategory android:key="ui_homescreen_indicator"
+ android:title="@string/preferences_interface_homescreen_indicator_category">
<CheckBoxPreference android:key="ui_homescreen_indicator_enable"
android:title="@string/preferences_interface_homescreen_indicator_enable_title"
android:summary="@string/preferences_interface_homescreen_indicator_enable_summary"
@@ -96,7 +123,8 @@
android:title="@string/preferences_interface_drawer_scrolling_fade_adjacent_screens_title"
android:summary="@string/preferences_interface_drawer_scrolling_fade_adjacent_screens_summary" />
</PreferenceCategory>
- <PreferenceCategory android:title="@string/preferences_interface_drawer_indicator_category">
+ <PreferenceCategory android:key="ui_drawer_indicator"
+ android:title="@string/preferences_interface_drawer_indicator_category">
<CheckBoxPreference android:key="ui_drawer_indicator_enable"
android:title="@string/preferences_interface_drawer_indicator_enable_title"
android:summary="@string/preferences_interface_drawer_indicator_enable_summary"
@@ -110,16 +138,16 @@
</PreferenceScreen>
<!-- Dock -->
- <PreferenceScreen android:key="ui_dock"
+ <!-- <PreferenceScreen android:key="ui_dock"
android:title="@string/preferences_interface_dock_title">
- </PreferenceScreen>
+ </PreferenceScreen> -->
<!-- Icons -->
- <PreferenceScreen android:key="ui_icons"
+ <!-- <PreferenceScreen android:key="ui_icons"
android:title="@string/preferences_interface_icons_title">
- </PreferenceScreen>
+ </PreferenceScreen> -->
<!-- General -->
<PreferenceScreen android:key="ui_general"
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
index f3ca9e7..eb1642c 100644
--- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
@@ -493,7 +493,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
public void showAllAppsCling() {
- Cling allAppsCling = (Cling) getTabHost().findViewById(R.id.all_apps_cling);
+ AppsCustomizeTabHost tabHost = getTabHost();
+ if (tabHost == null) return;
+ Cling allAppsCling = (Cling) tabHost.findViewById(R.id.all_apps_cling);
if (!mHasShownAllAppsCling && isDataReady() && testDataReady()) {
mHasShownAllAppsCling = true;
// Calculate the position for the cling punch through
diff --git a/src/com/cyanogenmod/trebuchet/BubbleTextView.java b/src/com/cyanogenmod/trebuchet/BubbleTextView.java
index 0fa3d91..83ab2aa 100644
--- a/src/com/cyanogenmod/trebuchet/BubbleTextView.java
+++ b/src/com/cyanogenmod/trebuchet/BubbleTextView.java
@@ -62,6 +62,9 @@ public class BubbleTextView extends TextView {
private boolean mStayPressed;
+ private boolean mTextVisible = true;
+ private CharSequence mVisibleText;
+
public BubbleTextView(Context context) {
super(context);
init();
@@ -314,4 +317,15 @@ public class BubbleTextView extends TextView {
}
return true;
}
+
+ public void setTextVisible(boolean visible) {
+ if (mTextVisible == visible) return;
+ mTextVisible = visible;
+ if (visible) {
+ setText(mVisibleText);
+ } else {
+ mVisibleText = getText();
+ setText("");
+ }
+ }
}
diff --git a/src/com/cyanogenmod/trebuchet/CellLayout.java b/src/com/cyanogenmod/trebuchet/CellLayout.java
index 8bb5b56..0586d29 100644
--- a/src/com/cyanogenmod/trebuchet/CellLayout.java
+++ b/src/com/cyanogenmod/trebuchet/CellLayout.java
@@ -255,7 +255,6 @@ public class CellLayout extends ViewGroup {
mForegroundRect = new Rect();
mChildren = new CellLayoutChildren(context);
- mChildren.setCellDimensions(mCellWidth, mCellHeight, mWidthGap, mHeightGap);
addView(mChildren);
}
@@ -835,6 +834,11 @@ public class CellLayout extends ViewGroup {
int numWidthGaps = mCountX - 1;
int numHeightGaps = mCountY - 1;
+ if (!LauncherApplication.isScreenLarge()){
+ mCellWidth = mOriginalCellWidth = (widthSpecSize - mPaddingLeft - mPaddingRight) / mCountX;
+ mCellHeight = mOriginalCellHeight = (heightSpecSize - mPaddingTop - mPaddingBottom) / mCountY;
+ }
+
if (mOriginalWidthGap < 0 || mOriginalHeightGap < 0) {
int hSpace = widthSpecSize - mPaddingLeft - mPaddingRight;
int vSpace = heightSpecSize - mPaddingTop - mPaddingBottom;
@@ -848,6 +852,8 @@ public class CellLayout extends ViewGroup {
mHeightGap = mOriginalHeightGap;
}
+ mChildren.setCellDimensions(mCellWidth, mCellHeight, mWidthGap, mHeightGap);
+
// Initial values correspond to widthSpecMode == MeasureSpec.EXACTLY
int newWidth = widthSpecSize;
int newHeight = heightSpecSize;
diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
index 7c23677..28fabef 100644
--- a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
@@ -28,6 +28,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.util.AttributeSet;
+import android.view.HapticFeedbackConstants;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.DecelerateInterpolator;
@@ -59,6 +60,7 @@ public class DeleteDropTarget extends ButtonDropTarget {
private final Runnable mShowUninstaller = new Runnable() {
public void run() {
+ performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
switchToUninstallTarget();
}
};
@@ -88,6 +90,9 @@ public class DeleteDropTarget extends ButtonDropTarget {
}
}
+ private boolean isAllAppsItem(DragSource source, Object info) {
+ return isAllAppsApplication(source, info) || isAllAppsWidget(source, info);
+ }
private boolean isAllAppsApplication(DragSource source, Object info) {
return (source instanceof AppsCustomizeView) && (info instanceof ApplicationInfo);
}
@@ -143,7 +148,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
setTextColor(mOriginalTextColor);
((ViewGroup) getParent()).setVisibility(View.VISIBLE);
if (getText().length() > 0) {
- setText(R.string.delete_target_label);
+ if (isAllAppsItem(source, info)) {
+ setText(R.string.cancel_target_label);
+ } else {
+ setText(R.string.delete_target_label);
+ }
}
}
@@ -191,7 +200,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
mMode = MODE_DELETE;
if (getText().length() > 0) {
- setText(R.string.delete_target_label);
+ if (isAllAppsItem(d.dragSource, d.dragInfo)) {
+ setText(R.string.cancel_target_label);
+ } else {
+ setText(R.string.delete_target_label);
+ }
}
setCompoundDrawablesWithIntrinsicBounds(mRemoveNormalDrawable, null, null, null);
diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java
index 509bc96..57fcfcb 100644
--- a/src/com/cyanogenmod/trebuchet/Folder.java
+++ b/src/com/cyanogenmod/trebuchet/Folder.java
@@ -47,6 +47,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.cyanogenmod.trebuchet.FolderInfo.FolderListener;
+import com.cyanogenmod.trebuchet.preference.PreferencesProvider;
import java.util.ArrayList;
@@ -172,6 +173,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
mFolderName.setSelectAllOnFocus(true);
mFolderName.setInputType(mFolderName.getInputType() |
InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+
+ if (PreferencesProvider.Interface.Homescreen.getHideIconLabels(mLauncher)){
+ mFolderName.setVisibility(View.GONE);
+ mFolderNameHeight = getPaddingBottom();
+ }
}
private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {
@@ -250,7 +256,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
// Convert to a string here to ensure that no other state associated with the text field
// gets saved.
String newTitle = mFolderName.getText().toString();
- mInfo.setTitle(newTitle);
+ if (!PreferencesProvider.Interface.Homescreen.getHideIconLabels(mLauncher)) {
+ mInfo.setTitle(newTitle);
+ }
LauncherModel.updateItemInDatabase(mLauncher, mInfo);
if (commit) {
diff --git a/src/com/cyanogenmod/trebuchet/FolderIcon.java b/src/com/cyanogenmod/trebuchet/FolderIcon.java
index 4042f4c..44f1c7a 100644
--- a/src/com/cyanogenmod/trebuchet/FolderIcon.java
+++ b/src/com/cyanogenmod/trebuchet/FolderIcon.java
@@ -37,8 +37,10 @@ import android.view.animation.DecelerateInterpolator;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+
import com.cyanogenmod.trebuchet.DropTarget.DragObject;
import com.cyanogenmod.trebuchet.FolderInfo.FolderListener;
+import com.cyanogenmod.trebuchet.preference.PreferencesProvider;
import java.util.ArrayList;
diff --git a/src/com/cyanogenmod/trebuchet/Hotseat.java b/src/com/cyanogenmod/trebuchet/Hotseat.java
index f75333c..524da5a 100644
--- a/src/com/cyanogenmod/trebuchet/Hotseat.java
+++ b/src/com/cyanogenmod/trebuchet/Hotseat.java
@@ -35,6 +35,9 @@ public class Hotseat extends FrameLayout {
private int mCellCountY;
private boolean mIsLandscape;
+ private static final int DEFAULT_CELL_COUNT_X = 5;
+ private static final int DEFAULT_CELL_COUNT_Y = 1;
+
public Hotseat(Context context) {
this(context, null);
}
@@ -81,8 +84,8 @@ public class Hotseat extends FrameLayout {
@Override
protected void onFinishInflate() {
super.onFinishInflate();
- if (mCellCountX < 0) mCellCountX = LauncherModel.getCellCountX();
- if (mCellCountY < 0) mCellCountY = LauncherModel.getCellCountY();
+ if (mCellCountX < 0) mCellCountX = DEFAULT_CELL_COUNT_X;
+ if (mCellCountY < 0) mCellCountY = DEFAULT_CELL_COUNT_Y;
mContent = (CellLayout) findViewById(R.id.layout);
mContent.setGridSize(mCellCountX, mCellCountY);
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index cf1ccd8..9283243 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -164,7 +164,7 @@ public final class Launcher extends Activity
// Type: long
private static final String RUNTIME_STATE_PENDING_FOLDER_RENAME_ID = "launcher.rename_folder_id";
- private static final String TOOLBAR_ICON_METADATA_NAME = "com.cyanogenmod.trebuchet.toolbar_icon";
+ private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher.toolbar_icon";
/** The different states that Launcher can be in. */
private enum State { WORKSPACE, APPS_CUSTOMIZE, APPS_CUSTOMIZE_SPRING_LOADED };
@@ -260,6 +260,7 @@ public final class Launcher extends Activity
// Preferences
private boolean mShowSearchBar;
private boolean mShowDockDivider;
+ private boolean mHideIconLabels;
private boolean mAutoRotate;
private Runnable mBuildLayersRunnable = new Runnable() {
@@ -298,6 +299,7 @@ public final class Launcher extends Activity
// Preferences
mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(this);
mShowDockDivider = PreferencesProvider.Interface.Homescreen.Indicator.getShowDockDivider(this);
+ mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels(this);
mAutoRotate = PreferencesProvider.Interface.General.getAutoRotate(this, getResources().getBoolean(R.bool.config_defaultAutoRotate));
if (PROFILE_STARTUP) {
@@ -605,7 +607,12 @@ public final class Launcher extends Activity
if (mFirstTime) {
mFirstTime = false;
} else {
- workspace.post(mBuildLayersRunnable);
+ // We delay the layer building a bit in order to give
+ // other message processing a time to run. In particular
+ // this avoids a delay in hiding the IME if it was
+ // currently shown, because doing that may involve
+ // some communication back with the app.
+ workspace.postDelayed(mBuildLayersRunnable, 500);
observer.removeOnPreDrawListener(this);
}
return true;
@@ -860,6 +867,9 @@ public final class Launcher extends Activity
View createShortcut(int layoutResId, ViewGroup parent, ShortcutInfo info) {
BubbleTextView favorite = (BubbleTextView) mInflater.inflate(layoutResId, parent, false);
favorite.applyFromShortcutInfo(info, mIconCache);
+ if (mHideIconLabels) {
+ favorite.setTextVisible(false);
+ }
favorite.setOnClickListener(this);
return favorite;
}
@@ -1620,6 +1630,9 @@ public final class Launcher extends Activity
// Create the view
FolderIcon newFolder =
FolderIcon.fromXml(R.layout.folder_icon, this, layout, folderInfo, mIconCache);
+ if (mHideIconLabels) {
+ newFolder.setTextVisible(false);
+ }
mWorkspace.addInScreen(newFolder, container, screen, cellX, cellY, 1, 1,
isWorkspaceLocked());
return newFolder;
@@ -2905,10 +2918,14 @@ public final class Launcher extends Activity
// Find the app market activity by resolving an intent.
// (If multiple app markets are installed, it will return the ResolverActivity.)
ComponentName activityName = intent.resolveActivity(getPackageManager());
+
+ if (activityName != null) {
+ mAppMarketIntent = intent;
+ }
+
if (activityName != null && (ViewConfiguration.get(this).hasPermanentMenuKey() ||
getResources().getBoolean(R.bool.config_cyanogenmod))) {
int coi = getCurrentOrientationIndexForGlobalIcons();
- mAppMarketIntent = intent;
sAppMarketIcon[coi] = updateTextButtonWithIconFromExternalActivity(
R.id.market_button, activityName, R.drawable.ic_launcher_market_holo);
marketButton.setVisibility(View.VISIBLE);
@@ -2948,7 +2965,7 @@ public final class Launcher extends Activity
Dialog createDialog() {
mAdapter = new AddAdapter(Launcher.this);
- final AlertDialog.Builder builder = new AlertDialog.Builder(Launcher.this,
+ final AlertDialog.Builder builder = new AlertDialog.Builder(Launcher.this,
AlertDialog.THEME_HOLO_DARK);
builder.setAdapter(mAdapter, this);
@@ -3122,6 +3139,9 @@ public final class Launcher extends Activity
FolderIcon newFolder = FolderIcon.fromXml(R.layout.folder_icon, this,
(ViewGroup) workspace.getChildAt(workspace.getCurrentPage()),
(FolderInfo) item, mIconCache);
+ if (!mHideIconLabels) {
+ newFolder.setTextVisible(false);
+ }
workspace.addInScreen(newFolder, item.container, item.screen, item.cellX,
item.cellY, 1, 1, false);
break;
diff --git a/src/com/cyanogenmod/trebuchet/LauncherApplication.java b/src/com/cyanogenmod/trebuchet/LauncherApplication.java
index a174985..cfb4905 100644
--- a/src/com/cyanogenmod/trebuchet/LauncherApplication.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherApplication.java
@@ -40,10 +40,7 @@ public class LauncherApplication extends Application {
super.onCreate();
// set sIsScreenXLarge and sScreenDensity *before* creating icon cache
- final int screenSize = getResources().getConfiguration().screenLayout &
- Configuration.SCREENLAYOUT_SIZE_MASK;
- sIsScreenLarge = screenSize == Configuration.SCREENLAYOUT_SIZE_LARGE ||
- screenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE;
+ sIsScreenLarge = getResources().getConfiguration().smallestScreenWidthDp >= 600;
sScreenDensity = getResources().getDisplayMetrics().density;
mIconCache = new IconCache(this);
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 35d1b71..16d92c3 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -258,8 +258,11 @@ public class Workspace extends PagedView
// Preferences
private int mNumberHomescreens;
private int mDefaultHomescreen;
+ private int mScreenPaddingVertical;
+ private int mScreenPaddingHorizontal;
private boolean mShowSearchBar;
private boolean mResizeAnyWidget;
+ private boolean mHideIconLabels;
private boolean mScrollWallpaper;
private boolean mShowScrollingIndicator;
private boolean mFadeScrollingIndicator;
@@ -303,26 +306,9 @@ public class Workspace extends PagedView
final Resources res = context.getResources();
if (LauncherApplication.isScreenLarge()) {
- // Determine number of rows/columns dynamically
- // TODO: This code currently fails on tablets with an aspect ratio < 1.3.
- // Around that ratio we should make cells the same size in portrait and
- // landscape
- TypedArray actionBarSizeTypedArray =
- context.obtainStyledAttributes(new int[] { android.R.attr.actionBarSize });
- final float actionBarHeight = actionBarSizeTypedArray.getDimension(0, 0f);
- final float systemBarHeight = res.getDimension(R.dimen.status_bar_height);
- final float smallestScreenDim = res.getConfiguration().smallestScreenWidthDp;
-
- cellCountX = 1;
- while (CellLayout.widthInPortrait(res, cellCountX + 1) <= smallestScreenDim) {
- cellCountX++;
- }
-
- cellCountY = 1;
- while (actionBarHeight + CellLayout.heightInLandscape(res, cellCountY + 1)
- <= smallestScreenDim - systemBarHeight) {
- cellCountY++;
- }
+ int[] cellCount = getCellCountsForLarge(context);
+ cellCountX = cellCount[0];
+ cellCountY = cellCount[1];
}
mSpringLoadedShrinkFactor =
@@ -334,6 +320,12 @@ public class Workspace extends PagedView
cellCountY = a.getInt(R.styleable.Workspace_cellCountY, cellCountY);
a.recycle();
+ // if there is a value set it the preferences, use that instead
+ if (!LauncherApplication.isScreenLarge()) {
+ cellCountX = PreferencesProvider.Interface.Homescreen.getCellCountX(context, cellCountX);
+ cellCountY = PreferencesProvider.Interface.Homescreen.getCellCountY(context, cellCountY);
+ }
+
LauncherModel.updateWorkspaceLayoutCells(cellCountX, cellCountY);
setHapticFeedbackEnabled(false);
@@ -344,8 +336,11 @@ public class Workspace extends PagedView
if (mDefaultHomescreen >= mNumberHomescreens) {
mDefaultHomescreen = mNumberHomescreens / 2;
}
+ mScreenPaddingVertical = PreferencesProvider.Interface.Homescreen.getScreenPaddingVertical(context);
+ mScreenPaddingHorizontal = PreferencesProvider.Interface.Homescreen.getScreenPaddingHorizontal(context);
mShowSearchBar = PreferencesProvider.Interface.Homescreen.getShowSearchBar(context);
mResizeAnyWidget = PreferencesProvider.Interface.Homescreen.getResizeAnyWidget(context);
+ mHideIconLabels = PreferencesProvider.Interface.Homescreen.getHideIconLabels(context);
mScrollWallpaper = PreferencesProvider.Interface.Homescreen.Scrolling.getScrollWallpaper(context);
mTransitionEffect = PreferencesProvider.Interface.Homescreen.Scrolling.getTransitionEffect(context,
res.getString(R.string.config_workspaceDefaultTransitionEffect));
@@ -362,6 +357,33 @@ public class Workspace extends PagedView
setMotionEventSplittingEnabled(true);
}
+ public static int[] getCellCountsForLarge(Context context) {
+ int[] cellCount = new int[2];
+
+ final Resources res = context.getResources();
+ // Determine number of rows/columns dynamically
+ // TODO: This code currently fails on tablets with an aspect ratio < 1.3.
+ // Around that ratio we should make cells the same size in portrait and
+ // landscape
+ TypedArray actionBarSizeTypedArray =
+ context.obtainStyledAttributes(new int[] { android.R.attr.actionBarSize });
+ final float actionBarHeight = actionBarSizeTypedArray.getDimension(0, 0f);
+ final float systemBarHeight = res.getDimension(R.dimen.status_bar_height);
+ final float smallestScreenDim = res.getConfiguration().smallestScreenWidthDp;
+
+ cellCount[0] = 1;
+ while (CellLayout.widthInPortrait(res, cellCount[0] + 1) <= smallestScreenDim) {
+ cellCount[0]++;
+ }
+
+ cellCount[1] = 1;
+ while (actionBarHeight + CellLayout.heightInLandscape(res, cellCount[1] + 1)
+ <= smallestScreenDim - systemBarHeight) {
+ cellCount[1]++;
+ }
+ return cellCount;
+ }
+
// estimate the size of a widget with spans hSpan, vSpan. return MAX_VALUE for each
// dimension if unsuccessful
public int[] estimateItemSize(int hSpan, int vSpan,
@@ -447,8 +469,12 @@ public class Workspace extends PagedView
LayoutInflater inflater =
(LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
for (int i = 0; i < mNumberHomescreens; i++) {
- inflater.inflate(R.layout.workspace_screen, this);
- }
+ View screen = inflater.inflate(R.layout.workspace_screen, null);
+ screen.setPadding(screen.getPaddingLeft() + mScreenPaddingHorizontal,
+ screen.getPaddingTop() + mScreenPaddingVertical,
+ screen.getPaddingRight() + mScreenPaddingHorizontal,
+ screen.getPaddingBottom() + mScreenPaddingVertical);
+ addView(screen); }
try {
mBackground = res.getDrawable(R.drawable.apps_customize_bg);
@@ -571,9 +597,13 @@ public class Workspace extends PagedView
layout = mLauncher.getHotseat().getLayout();
child.setOnKeyListener(null);
- // Hide folder title in the hotseat
- if (child instanceof FolderIcon) {
- ((FolderIcon) child).setTextVisible(false);
+ if (!mHideIconLabels) {
+ // Hide titles in the hotseat
+ if (child instanceof FolderIcon) {
+ ((FolderIcon) child).setTextVisible(false);
+ } else if (child instanceof BubbleTextView) {
+ ((BubbleTextView) child).setTextVisible(false);
+ }
}
if (screen < 0) {
@@ -585,9 +615,13 @@ public class Workspace extends PagedView
y = mLauncher.getHotseat().getCellYFromOrder(screen);
}
} else {
- // Show folder title if not in the hotseat
- if (child instanceof FolderIcon) {
- ((FolderIcon) child).setTextVisible(true);
+ if (!mHideIconLabels) {
+ // Show titles if not in the hotseat
+ if (child instanceof FolderIcon) {
+ ((FolderIcon) child).setTextVisible(true);
+ } else if (child instanceof BubbleTextView) {
+ ((BubbleTextView) child).setTextVisible(true);
+ }
}
layout = (CellLayout) getPageAt(screen);
@@ -911,8 +945,7 @@ public class Workspace extends PagedView
return offset;
}
private void syncWallpaperOffsetWithScroll() {
- final boolean enableWallpaperEffects = isHardwareAccelerated();
- if (enableWallpaperEffects) {
+ if (mScrollWallpaper) {
mWallpaperOffset.setFinalX(wallpaperOffsetForCurrentScroll());
}
}
@@ -2024,7 +2057,7 @@ public class Workspace extends PagedView
invalidate();
for (int i = 0; i < getChildCount(); i++) {
final CellLayout cl = (CellLayout) getPageAt(i);
- cl.fastInvalidate();
+ cl.invalidate();
cl.setFastTranslationX(a * mOldTranslationXs[i] + b * mNewTranslationXs[i]);
cl.setFastTranslationY(a * mOldTranslationYs[i] + b * mNewTranslationYs[i]);
cl.setFastScaleX(a * mOldScaleXs[i] + b * mNewScaleXs[i]);
@@ -2034,6 +2067,7 @@ public class Workspace extends PagedView
cl.setBackgroundAlphaMultiplier(a * mOldBackgroundAlphaMultipliers[i] +
b * mNewBackgroundAlphaMultipliers[i]);
cl.setFastAlpha(a * mOldAlphas[i] + b * mNewAlphas[i]);
+ cl.invalidate();
}
syncChildrenLayersEnabledOnVisiblePages();
}
@@ -2100,11 +2134,13 @@ public class Workspace extends PagedView
d.draw(destCanvas);
} else {
if (v instanceof FolderIcon) {
- // For FolderIcons the text can bleed into the icon area, and so we need to
- // hide the text completely (which can't be achieved by clipping).
- if (((FolderIcon) v).getTextVisible()) {
- ((FolderIcon) v).setTextVisible(false);
- textVisible = true;
+ if (!mHideIconLabels) {
+ // For FolderIcons the text can bleed into the icon area, and so we need to
+ // hide the text completely (which can't be achieved by clipping).
+ if (((FolderIcon) v).getTextVisible()) {
+ ((FolderIcon) v).setTextVisible(false);
+ textVisible = true;
+ }
}
} else if (v instanceof BubbleTextView) {
final BubbleTextView tv = (BubbleTextView) v;
@@ -2120,7 +2156,7 @@ public class Workspace extends PagedView
v.draw(destCanvas);
// Restore text visibility of FolderIcon if necessary
- if (textVisible) {
+ if (!mHideIconLabels && textVisible) {
((FolderIcon) v).setTextVisible(true);
}
}
@@ -3313,6 +3349,9 @@ public class Workspace extends PagedView
case LauncherSettings.Favorites.ITEM_TYPE_FOLDER:
view = FolderIcon.fromXml(R.layout.folder_icon, mLauncher, cellLayout,
(FolderInfo) info, mIconCache);
+ if (mHideIconLabels) {
+ ((FolderIcon) view).setTextVisible(false);
+ }
break;
default:
throw new IllegalStateException("Unknown item type: " + info.itemType);
diff --git a/src/com/cyanogenmod/trebuchet/preference/DoubleNumberPickerPreference.java b/src/com/cyanogenmod/trebuchet/preference/DoubleNumberPickerPreference.java
new file mode 100644
index 0000000..1a38639
--- /dev/null
+++ b/src/com/cyanogenmod/trebuchet/preference/DoubleNumberPickerPreference.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.cyanogenmod.trebuchet.preference;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.preference.DialogPreference;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.EditText;
+import android.widget.NumberPicker;
+import com.cyanogenmod.trebuchet.R;
+
+/*
+ * @author Danesh
+ * @author nebkat
+ */
+
+public class DoubleNumberPickerPreference extends DialogPreference {
+ private int mMin1, mMax1, mDefault1;
+ private int mMin2, mMax2, mDefault2;
+
+ private String mMaxExternalKey1, mMinExternalKey1;
+ private String mMaxExternalKey2, mMinExternalKey2;
+
+ private String mPickerTitle1;
+ private String mPickerTitle2;
+
+ private NumberPicker mNumberPicker1;
+ private NumberPicker mNumberPicker2;
+
+ public DoubleNumberPickerPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ TypedArray dialogType = context.obtainStyledAttributes(attrs,
+ com.android.internal.R.styleable.DialogPreference, 0, 0);
+ TypedArray doubleNumberPickerType = context.obtainStyledAttributes(attrs,
+ R.styleable.DoubleNumberPickerPreference, 0, 0);
+
+ mMaxExternalKey1 = doubleNumberPickerType.getString(R.styleable.DoubleNumberPickerPreference_maxExternal1);
+ mMinExternalKey1 = doubleNumberPickerType.getString(R.styleable.DoubleNumberPickerPreference_minExternal1);
+ mMaxExternalKey2 = doubleNumberPickerType.getString(R.styleable.DoubleNumberPickerPreference_maxExternal2);
+ mMinExternalKey2 = doubleNumberPickerType.getString(R.styleable.DoubleNumberPickerPreference_minExternal2);
+
+ mPickerTitle1 = doubleNumberPickerType.getString(R.styleable.DoubleNumberPickerPreference_pickerTitle1);
+ mPickerTitle2 = doubleNumberPickerType.getString(R.styleable.DoubleNumberPickerPreference_pickerTitle2);
+
+ mMax1 = doubleNumberPickerType.getInt(R.styleable.DoubleNumberPickerPreference_max1, 5);
+ mMin1 = doubleNumberPickerType.getInt(R.styleable.DoubleNumberPickerPreference_min1, 0);
+ mMax2 = doubleNumberPickerType.getInt(R.styleable.DoubleNumberPickerPreference_max2, 5);
+ mMin2 = doubleNumberPickerType.getInt(R.styleable.DoubleNumberPickerPreference_min2, 0);
+
+ mDefault1 = doubleNumberPickerType.getInt(R.styleable.DoubleNumberPickerPreference_defaultValue1, mMin1);
+ mDefault2 = doubleNumberPickerType.getInt(R.styleable.DoubleNumberPickerPreference_defaultValue2, mMin2);
+
+ dialogType.recycle();
+ doubleNumberPickerType.recycle();
+ }
+
+ @Override
+ protected View onCreateDialogView() {
+ int max1 = mMax1;
+ int min1 = mMin1;
+ int max2 = mMax2;
+ int min2 = mMin2;
+
+ // External values
+ if (mMaxExternalKey1 != null) {
+ max1 = getSharedPreferences().getInt(mMaxExternalKey1, mMax1);
+ }
+ if (mMinExternalKey1 != null) {
+ min1 = getSharedPreferences().getInt(mMinExternalKey1, mMin1);
+ }
+ if (mMaxExternalKey2 != null) {
+ max2 = getSharedPreferences().getInt(mMaxExternalKey2, mMax2);
+ }
+ if (mMinExternalKey2 != null) {
+ min2 = getSharedPreferences().getInt(mMinExternalKey2, mMin2);
+ }
+
+ LayoutInflater inflater =
+ (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ View view = inflater.inflate(R.layout.double_number_picker_dialog, null);
+
+ mNumberPicker1 = (NumberPicker) view.findViewById(R.id.number_picker_1);
+ mNumberPicker2 = (NumberPicker) view.findViewById(R.id.number_picker_2);
+
+ if (mNumberPicker1 == null || mNumberPicker2 == null) {
+ throw new RuntimeException("mNumberPicker1 or mNumberPicker2 is null!");
+ }
+
+ // Initialize state
+ mNumberPicker1.setWrapSelectorWheel(false);
+ mNumberPicker1.setMaxValue(max1);
+ mNumberPicker1.setMinValue(min1);
+ mNumberPicker1.setValue(getPersistedValue(1));
+ mNumberPicker2.setWrapSelectorWheel(false);
+ mNumberPicker2.setMaxValue(max2);
+ mNumberPicker2.setMinValue(min2);
+ mNumberPicker2.setValue(getPersistedValue(2));
+
+ // Titles
+ TextView pickerTitle1 = (TextView) view.findViewById(R.id.picker_title_1);
+ TextView pickerTitle2 = (TextView) view.findViewById(R.id.picker_title_2);
+
+ if (pickerTitle1 != null && pickerTitle2 != null) {
+ pickerTitle1.setText(mPickerTitle1);
+ pickerTitle2.setText(mPickerTitle2);
+ }
+
+ // No keyboard popup
+ EditText textInput1 = (EditText) mNumberPicker1.findViewById(com.android.internal.R.id.numberpicker_input);
+ EditText textInput2 = (EditText) mNumberPicker2.findViewById(com.android.internal.R.id.numberpicker_input);
+ if (textInput1 != null && textInput2 != null) {
+ textInput1.setCursorVisible(false);
+ textInput1.setFocusable(false);
+ textInput1.setFocusableInTouchMode(false);
+ textInput2.setCursorVisible(false);
+ textInput2.setFocusable(false);
+ textInput2.setFocusableInTouchMode(false);
+ }
+
+ return view;
+ }
+
+ private int getPersistedValue(int value) {
+ String[] values = getPersistedString(mDefault1 + "|" + mDefault2).split("\\|");
+ if (value == 1) {
+ try {
+ return Integer.parseInt(values[0]);
+ } catch (NumberFormatException e) {
+ return mDefault1;
+ }
+ } else {
+ try {
+ return Integer.parseInt(values[1]);
+ } catch (NumberFormatException e) {
+ return mDefault2;
+ }
+ }
+ }
+
+ @Override
+ protected void onDialogClosed(boolean positiveResult) {
+ if (positiveResult) {
+ persistString(mNumberPicker1.getValue() + "|" + mNumberPicker2.getValue());;
+ }
+ }
+
+ public void setMin1(int min) {
+ mMin1 = min;
+ }
+ public void setMax1(int max) {
+ mMax1 = max;
+ }
+ public void setMin2(int min) {
+ mMin2 = min;
+ }
+ public void setMax2(int max) {
+ mMax2 = max;
+ }
+ public void setDefault1(int def) {
+ mDefault1 = def;
+ }
+ public void setDefault2(int def) {
+ mDefault2 = def;
+ }
+
+}
diff --git a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java
index 31f8756..810ff40 100644
--- a/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java
+++ b/src/com/cyanogenmod/trebuchet/preference/NumberPickerPreference.java
@@ -36,7 +36,6 @@ public class NumberPickerPreference extends DialogPreference {
private int mMin, mMax, mDefault;
private String mMaxExternalKey, mMinExternalKey;
- private Preference mMaxExternalPreference, mMinExternalPreference;
private NumberPicker mNumberPicker;
@@ -59,38 +58,17 @@ public class NumberPickerPreference extends DialogPreference {
numberPickerType.recycle();
}
-
- protected void onAttachedToActivity() {
- // External values
- if (mMaxExternalKey != null) {
- Preference maxPreference = findPreferenceInHierarchy(mMaxExternalKey);
- if (maxPreference != null) {
- if (maxPreference instanceof NumberPickerPreference) {
- mMaxExternalPreference = maxPreference;
- }
- }
- }
- if (mMinExternalKey != null) {
- Preference minPreference = findPreferenceInHierarchy(mMinExternalKey);
- if (minPreference != null) {
- if (minPreference instanceof NumberPickerPreference) {
- mMinExternalPreference = minPreference;
- }
- }
- }
- }
-
@Override
protected View onCreateDialogView() {
int max = mMax;
int min = mMin;
// External values
- if (mMaxExternalKey != null && mMaxExternalPreference != null) {
- max = mMaxExternalPreference.getSharedPreferences().getInt(mMaxExternalKey, mMax);
+ if (mMaxExternalKey != null) {
+ max = getSharedPreferences().getInt(mMaxExternalKey, mMax);
}
- if (mMinExternalKey != null && mMinExternalPreference != null) {
- min = mMinExternalPreference.getSharedPreferences().getInt(mMinExternalKey, mMin);
+ if (mMinExternalKey != null) {
+ min = getSharedPreferences().getInt(mMinExternalKey, mMin);
}
LayoutInflater inflater =
diff --git a/src/com/cyanogenmod/trebuchet/preference/Preferences.java b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
index f508524..6952b39 100644
--- a/src/com/cyanogenmod/trebuchet/preference/Preferences.java
+++ b/src/com/cyanogenmod/trebuchet/preference/Preferences.java
@@ -21,6 +21,10 @@ import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceActivity;
+import android.preference.PreferenceGroup;
+
+import com.cyanogenmod.trebuchet.LauncherApplication;
+
import com.cyanogenmod.trebuchet.R;
public class Preferences extends PreferenceActivity {
@@ -38,7 +42,19 @@ public class Preferences extends PreferenceActivity {
editor.putBoolean(PreferencesProvider.PREFERENCES_CHANGED, true);
editor.commit();
+ // Remove some preferences on large screens
+ if (LauncherApplication.isScreenLarge()) {
+ PreferenceGroup homescreen = (PreferenceGroup) findPreference("ui_homescreen");
+ homescreen.removePreference(findPreference("ui_homescreen_grid"));
+ homescreen.removePreference(findPreference("ui_homescreen_screen_padding_vertical"));
+ homescreen.removePreference(findPreference("ui_homescreen_screen_padding_horizontal"));
+ homescreen.removePreference(findPreference("ui_homescreen_indicator"));
+
+ PreferenceGroup drawer = (PreferenceGroup) findPreference("ui_drawer");
+ drawer.removePreference(findPreference("ui_drawer_indicator"));
+ }
+
Preference version = findPreference("application_version");
- version.setTitle(getString(R.string.application_name) + " " + getString(R.string.application_version));
+ version.setTitle(getString(R.string.application_name));
}
}
diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
index 4e9c03a..2b68ffd 100644
--- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
+++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
@@ -19,6 +19,7 @@ package com.cyanogenmod.trebuchet.preference;
import android.content.Context;
import android.content.SharedPreferences;
+import com.cyanogenmod.trebuchet.LauncherApplication;
import com.cyanogenmod.trebuchet.Workspace;
import com.cyanogenmod.trebuchet.AppsCustomizePagedView;
@@ -37,6 +38,34 @@ public final class PreferencesProvider {
final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
return preferences.getInt("ui_homescreen_default_screen", def + 1) - 1;
}
+ public static int getCellCountX(Context context, int def) {
+ final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
+ String[] values = preferences.getString("ui_homescreen_grid", "0|" + def).split("\\|");
+ try {
+ return Integer.parseInt(values[1]);
+ } catch (NumberFormatException e) {
+ return def;
+ }
+ }
+ public static int getCellCountY(Context context, int def) {
+ final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
+ String[] values = preferences.getString("ui_homescreen_grid", def + "|0").split("\\|");;
+ try {
+ return Integer.parseInt(values[0]);
+ } catch (NumberFormatException e) {
+ return def;
+ }
+ }
+ public static int getScreenPaddingVertical(Context context) {
+ final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
+ return (int)((float) preferences.getInt("ui_homescreen_screen_padding_vertical", 0) * 3.0f *
+ LauncherApplication.getScreenDensity());
+ }
+ public static int getScreenPaddingHorizontal(Context context) {
+ final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
+ return (int)((float) preferences.getInt("ui_homescreen_screen_padding_horizontal", 0) * 3.0f *
+ LauncherApplication.getScreenDensity());
+ }
public static boolean getShowSearchBar(Context context) {
final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
return preferences.getBoolean("ui_homescreen_general_search", true);
@@ -45,6 +74,10 @@ public final class PreferencesProvider {
final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
return preferences.getBoolean("ui_homescreen_general_resize_any_widget", false);
}
+ public static boolean getHideIconLabels(Context context) {
+ final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);
+ return preferences.getBoolean("ui_homescreen_general_hide_icon_labels", false);
+ }
public static class Scrolling {
public static boolean getScrollWallpaper(Context context) {
final SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_KEY, 0);