summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rwxr-xr-x[-rw-r--r--]res/drawable-hdpi/ic_launcher_home.pngbin4048 -> 23597 bytes
-rw-r--r--res/drawable-hdpi/page_hover_left_holo.9.pngbin255 -> 248 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-mdpi/ic_launcher_home.pngbin3116 -> 12053 bytes
-rw-r--r--res/drawable-mdpi/page_hover_left_holo.9.pngbin206 -> 177 bytes
-rwxr-xr-x[-rw-r--r--]res/drawable-xhdpi/ic_launcher_home.pngbin7810 -> 39749 bytes
-rw-r--r--res/drawable-xhdpi/page_hover_left_holo.9.pngbin304 -> 277 bytes
-rw-r--r--res/layout-land/all_apps_cling.xml6
-rw-r--r--res/layout-land/all_apps_sort_cling.xml48
-rw-r--r--res/layout-land/application.xml2
-rw-r--r--res/layout-land/apps_customize_application.xml4
-rw-r--r--res/layout-land/folder_cling.xml6
-rw-r--r--res/layout-land/folder_icon.xml6
-rw-r--r--res/layout-land/hotseat.xml8
-rw-r--r--res/layout-land/launcher.xml20
-rw-r--r--res/layout-land/search_bar.xml4
-rw-r--r--res/layout-land/workspace_cling.xml6
-rw-r--r--res/layout-port/all_apps_cling.xml6
-rw-r--r--res/layout-port/all_apps_sort_cling.xml48
-rw-r--r--res/layout-port/application.xml2
-rw-r--r--res/layout-port/apps_customize_application.xml4
-rw-r--r--res/layout-port/folder_cling.xml6
-rw-r--r--res/layout-port/folder_icon.xml6
-rw-r--r--res/layout-port/hotseat.xml8
-rw-r--r--res/layout-port/launcher.xml20
-rw-r--r--res/layout-port/search_bar.xml10
-rw-r--r--res/layout-port/workspace_cling.xml6
-rw-r--r--res/layout-sw600dp-port/all_apps_cling.xml6
-rw-r--r--res/layout-sw600dp-port/folder_cling.xml6
-rw-r--r--res/layout-sw600dp/all_apps_sort_cling.xml46
-rw-r--r--res/layout-sw720dp-land/application.xml2
-rw-r--r--res/layout-sw720dp-port/application.xml2
-rw-r--r--res/layout-sw720dp-port/folder_cling.xml6
-rw-r--r--res/layout-sw720dp-port/workspace_cling.xml6
-rw-r--r--res/layout-sw720dp/all_apps_cling.xml6
-rw-r--r--res/layout-sw720dp/folder_cling.xml6
-rw-r--r--res/layout-sw720dp/launcher.xml4
-rw-r--r--res/layout-sw720dp/search_bar.xml6
-rw-r--r--res/layout-sw720dp/workspace.xml13
-rw-r--r--res/layout-sw720dp/workspace_cling.xml6
-rw-r--r--res/layout/apps_customize_pane.xml16
-rw-r--r--res/layout/apps_customize_widget.xml8
-rwxr-xr-xres/layout/double_number_picker_dialog.xml64
-rw-r--r--res/layout/drop_target_bar.xml4
-rw-r--r--res/layout/number_picker_dialog.xml28
-rw-r--r--res/layout/qsb_bar.xml4
-rw-r--r--res/layout/tab_widget_indicator.xml2
-rw-r--r--res/layout/user_folder.xml10
-rw-r--r--res/layout/wallpaper_chooser_base.xml2
-rw-r--r--res/layout/workspace_screen.xml4
-rw-r--r--res/menu/apps_tab.xml10
-rw-r--r--res/values-af-land/strings.xml25
-rw-r--r--res/values-af/strings.xml1
-rw-r--r--res/values-am-land/strings.xml25
-rw-r--r--res/values-am/strings.xml1
-rw-r--r--res/values-ar-land/strings.xml25
-rw-r--r--res/values-ar/strings.xml1
-rw-r--r--res/values-be/strings.xml1
-rw-r--r--res/values-bg-land/strings.xml25
-rw-r--r--res/values-bg/strings.xml1
-rw-r--r--res/values-ca-land/strings.xml25
-rw-r--r--res/values-ca/strings.xml1
-rw-r--r--res/values-cs-land/strings.xml25
-rw-r--r--res/values-cs/strings.xml54
-rw-r--r--res/values-da-land/strings.xml25
-rw-r--r--res/values-da/strings.xml82
-rw-r--r--res/values-de-land/strings.xml25
-rw-r--r--res/values-de/strings.xml110
-rw-r--r--res/values-el-land/strings.xml25
-rw-r--r--res/values-el/strings.xml1
-rw-r--r--res/values-en-rGB-land/strings.xml25
-rw-r--r--res/values-en-rGB/strings.xml1
-rw-r--r--res/values-es-land/strings.xml25
-rw-r--r--res/values-es-rUS-land/strings.xml25
-rw-r--r--res/values-es-rUS/strings.xml1
-rw-r--r--res/values-es/strings.xml53
-rw-r--r--res/values-et/strings.xml1
-rw-r--r--res/values-fa-land/strings.xml25
-rw-r--r--res/values-fa/strings.xml1
-rw-r--r--res/values-fi-land/strings.xml25
-rw-r--r--res/values-fi/strings.xml50
-rw-r--r--res/values-fr-land/strings.xml25
-rw-r--r--res/values-fr/strings.xml66
-rw-r--r--res/values-hi/strings.xml1
-rw-r--r--res/values-hr-land/strings.xml25
-rw-r--r--res/values-hr/strings.xml1
-rw-r--r--res/values-hu-land/strings.xml25
-rw-r--r--res/values-hu/strings.xml76
-rw-r--r--res/values-in-land/strings.xml25
-rw-r--r--res/values-in/strings.xml1
-rw-r--r--res/values-it-land/strings.xml25
-rw-r--r--res/values-it/strings.xml53
-rw-r--r--res/values-iw-land/strings.xml25
-rw-r--r--res/values-iw/strings.xml1
-rw-r--r--res/values-ja-land/strings.xml25
-rw-r--r--res/values-ja/strings.xml56
-rw-r--r--res/values-ko-land/strings.xml25
-rw-r--r--res/values-ko/strings.xml1
-rw-r--r--res/values-lt-land/strings.xml25
-rw-r--r--res/values-lt/strings.xml1
-rw-r--r--res/values-lv-land/strings.xml25
-rw-r--r--res/values-lv/strings.xml1
-rw-r--r--res/values-ms-land/strings.xml25
-rw-r--r--res/values-ms/strings.xml1
-rw-r--r--res/values-nb-land/strings.xml25
-rw-r--r--res/values-nb/strings.xml1
-rw-r--r--res/values-nl-land/strings.xml25
-rw-r--r--res/values-nl/strings.xml130
-rw-r--r--res/values-pl-land/strings.xml25
-rw-r--r--res/values-pl/strings.xml1
-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-rPT/strings.xml1
-rwxr-xr-x[-rw-r--r--]res/values-pt/strings.xml55
-rw-r--r--res/values-rm-land/strings.xml25
-rw-r--r--res/values-rm/strings.xml1
-rw-r--r--res/values-ro-land/strings.xml25
-rw-r--r--res/values-ro/strings.xml49
-rw-r--r--res/values-ru-land/strings.xml25
-rw-r--r--res/values-ru/strings.xml67
-rw-r--r--res/values-sk-land/strings.xml25
-rw-r--r--res/values-sk/strings.xml1
-rw-r--r--res/values-sl-land/strings.xml25
-rw-r--r--res/values-sl/strings.xml1
-rw-r--r--res/values-sr-land/strings.xml25
-rw-r--r--res/values-sr/strings.xml1
-rw-r--r--res/values-sv-land/strings.xml25
-rw-r--r--res/values-sv/strings.xml1
-rw-r--r--res/values-sw-land/strings.xml25
-rw-r--r--res/values-sw/strings.xml1
-rw-r--r--res/values-th-land/strings.xml25
-rw-r--r--res/values-th/strings.xml1
-rw-r--r--res/values-tl-land/strings.xml25
-rw-r--r--res/values-tl/strings.xml1
-rw-r--r--res/values-tr-land/strings.xml25
-rw-r--r--res/values-tr/strings.xml82
-rw-r--r--res/values-ug/strings.xml103
-rw-r--r--res/values-uk-land/strings.xml25
-rw-r--r--res/values-uk/strings.xml1
-rw-r--r--res/values-vi-land/strings.xml25
-rw-r--r--res/values-vi/strings.xml1
-rw-r--r--res/values-zh-rCN-land/strings.xml25
-rw-r--r--res/values-zh-rCN/strings.xml70
-rw-r--r--res/values-zh-rTW-land/strings.xml25
-rw-r--r--res/values-zh-rTW/strings.xml1
-rw-r--r--res/values-zu-land/strings.xml25
-rw-r--r--res/values-zu/strings.xml1
-rw-r--r--res/values/attrs.xml24
-rw-r--r--res/values/config.xml9
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/strings.xml82
-rw-r--r--res/xml-sw600dp/default_workspace.xml2
-rw-r--r--res/xml-sw720dp/default_workspace.xml2
-rw-r--r--res/xml/default_workspace.xml2
-rw-r--r--res/xml/preferences.xml144
-rw-r--r--res/xml/update_workspace.xml2
155 files changed, 1722 insertions, 1379 deletions
diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/drawable-hdpi/ic_launcher_home.png
index 8945ada34..33d36b0dc 100644..100755
--- a/res/drawable-hdpi/ic_launcher_home.png
+++ b/res/drawable-hdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-hdpi/page_hover_left_holo.9.png b/res/drawable-hdpi/page_hover_left_holo.9.png
index 2ac2c39b6..833828b64 100644
--- a/res/drawable-hdpi/page_hover_left_holo.9.png
+++ b/res/drawable-hdpi/page_hover_left_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/drawable-mdpi/ic_launcher_home.png
index 72bd80a2f..5ab889c9a 100644..100755
--- a/res/drawable-mdpi/ic_launcher_home.png
+++ b/res/drawable-mdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-mdpi/page_hover_left_holo.9.png b/res/drawable-mdpi/page_hover_left_holo.9.png
index e1e84c934..0d73ec212 100644
--- a/res/drawable-mdpi/page_hover_left_holo.9.png
+++ b/res/drawable-mdpi/page_hover_left_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_home.png b/res/drawable-xhdpi/ic_launcher_home.png
index 7bef13ca7..70ec47580 100644..100755
--- a/res/drawable-xhdpi/ic_launcher_home.png
+++ b/res/drawable-xhdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-xhdpi/page_hover_left_holo.9.png b/res/drawable-xhdpi/page_hover_left_holo.9.png
index b00d367ee..0dcd5b738 100644
--- a/res/drawable-xhdpi/page_hover_left_holo.9.png
+++ b/res/drawable-xhdpi/page_hover_left_holo.9.png
Binary files differ
diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml
index e89d4c178..e8bd5fa02 100644
--- a/res/layout-land/all_apps_cling.xml
+++ b/res/layout-land/all_apps_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="all_apps_landscape">
<FrameLayout
android:layout_width="match_parent"
@@ -45,4 +45,4 @@
android:layout_marginRight="10dp"
android:layout_gravity="bottom|right"
android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-land/all_apps_sort_cling.xml b/res/layout-land/all_apps_sort_cling.xml
new file mode 100644
index 000000000..6076a59a5
--- /dev/null
+++ b/res/layout-land/all_apps_sort_cling.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+<com.cyanogenmod.trebuchet.Cling
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+ launcher:drawIdentifier="all_apps_sort_landscape">
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="60dp"
+ android:layout_marginTop="50dp">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ style="@style/ClingTitleText"
+ android:id="@+id/all_apps_sort_cling_title"
+ android:text="@string/all_apps_sort_cling_title" />
+ <TextView
+ style="@style/ClingText"
+ android:id="@+id/all_apps_sort_cling_add_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/all_apps_sort_cling_add_item" />
+ </LinearLayout>
+ </FrameLayout>
+ <Button
+ style="@style/ClingButton"
+ android:id="@+id/cling_dismiss"
+ android:layout_marginBottom="15dp"
+ android:layout_marginRight="10dp"
+ android:layout_gravity="bottom|right"
+ android:onClick="dismissAllAppsSortCling" />
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 9ed1fa115..422ecbf4a 100644
--- a/res/layout-land/application.xml
+++ b/res/layout-land/application.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Landscape"
android:focusable="true"
android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-land/apps_customize_application.xml b/res/layout-land/apps_customize_application.xml
index ba95b27a6..e79ab75e4 100644
--- a/res/layout-land/apps_customize_application.xml
+++ b/res/layout-land/apps_customize_application.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher2.PagedViewIcon
+<com.cyanogenmod.trebuchet.PagedViewIcon
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
style="@style/WorkspaceIcon.Landscape.AppsCustomize"
diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml
index 3d7f4f459..2fa73fe26 100644
--- a/res/layout-land/folder_cling.xml
+++ b/res/layout-land/folder_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="folder_landscape">
<FrameLayout
android:layout_width="match_parent"
@@ -45,4 +45,4 @@
android:layout_marginRight="10dp"
android:layout_gravity="bottom|right"
android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml
index 808ff5e7b..5e4126f72 100644
--- a/res/layout-land/folder_icon.xml
+++ b/res/layout-land/folder_icon.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher2.FolderIcon
+<com.cyanogenmod.trebuchet.FolderIcon
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -27,7 +27,7 @@
android:layout_width="@dimen/folder_preview_size"
android:layout_height="@dimen/folder_preview_size"
android:src="@drawable/portal_ring_inner_holo"/>
- <com.android.launcher2.BubbleTextView
+ <com.cyanogenmod.trebuchet.BubbleTextView
android:id="@+id/folder_icon_name"
style="@style/WorkspaceIcon.Landscape.Folder"/>
-</com.android.launcher2.FolderIcon>
+</com.cyanogenmod.trebuchet.FolderIcon>
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index d75919671..2b1334762 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -13,12 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Hotseat
+<com.cyanogenmod.trebuchet.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:cellCountX="1"
launcher:cellCountY="@integer/hotseat_cell_count">
- <com.android.launcher2.CellLayout
+ <com.cyanogenmod.trebuchet.CellLayout
android:id="@+id/layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -33,4 +33,4 @@
launcher:widthGap="@dimen/hotseat_width_gap"
launcher:heightGap="@dimen/hotseat_height_gap"
launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher2.Hotseat>
+</com.cyanogenmod.trebuchet.Hotseat>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 6b65f5666..1a1f908b1 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher2.DragLayer
+<com.cyanogenmod.trebuchet.DragLayer
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:id="@+id/drag_layer"
android:background="@drawable/workspace_bg"
@@ -24,7 +24,7 @@
android:layout_height="match_parent">
<!-- The workspace contains 5 screens of cells -->
- <com.android.launcher2.Workspace
+ <com.cyanogenmod.trebuchet.Workspace
android:id="@+id/workspace"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -32,19 +32,11 @@
android:paddingRight="@dimen/workspace_right_padding"
android:paddingTop="@dimen/workspace_top_padding"
android:paddingBottom="@dimen/workspace_bottom_padding"
- launcher:defaultScreen="2"
launcher:cellCountX="@integer/cell_count_x"
launcher:cellCountY="@integer/cell_count_y"
launcher:pageSpacing="@dimen/workspace_page_spacing"
launcher:scrollIndicatorPaddingLeft="@dimen/qsb_bar_height"
- launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height">
-
- <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
- </com.android.launcher2.Workspace>
+ launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height" />
<include
android:id="@+id/qsb_divider"
@@ -76,7 +68,7 @@
android:id="@+id/qsb_bar"
layout="@layout/qsb_bar" />
- <com.android.launcher2.DrawableStateProxyView
+ <com.cyanogenmod.trebuchet.DrawableStateProxyView
android:id="@+id/voice_button_proxy"
android:layout_width="@dimen/qsb_bar_height"
android:layout_height="@dimen/app_icon_size"
@@ -103,4 +95,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
-</com.android.launcher2.DragLayer>
+</com.cyanogenmod.trebuchet.DragLayer>
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
index 88b7bbf4e..25040c11f 100644
--- a/res/layout-land/search_bar.xml
+++ b/res/layout-land/search_bar.xml
@@ -18,7 +18,7 @@
android:layout_width="@dimen/qsb_bar_height"
android:layout_height="match_parent">
<!-- Global search icon -->
- <com.android.launcher2.HolographicImageView
+ <com.cyanogenmod.trebuchet.HolographicImageView
style="@style/SearchButton"
android:id="@+id/search_button"
android:layout_width="match_parent"
@@ -32,7 +32,7 @@
android:contentDescription="@string/accessibility_search_button" />
<!-- Voice search icon -->
- <com.android.launcher2.HolographicImageView
+ <com.cyanogenmod.trebuchet.HolographicImageView
style="@style/SearchButton"
android:id="@+id/voice_button"
android:layout_width="match_parent"
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml
index b66f1bd8a..130170304 100644
--- a/res/layout-land/workspace_cling.xml
+++ b/res/layout-land/workspace_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="workspace_landscape">
<FrameLayout
android:layout_width="match_parent"
@@ -50,4 +50,4 @@
android:layout_marginRight="10dp"
android:layout_gravity="bottom|right"
android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml
index 09414ce53..ed188e7cf 100644
--- a/res/layout-port/all_apps_cling.xml
+++ b/res/layout-port/all_apps_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="all_apps_portrait">
<FrameLayout
android:layout_width="match_parent"
@@ -45,4 +45,4 @@
android:layout_marginRight="10dp"
android:layout_gravity="bottom|right"
android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-port/all_apps_sort_cling.xml b/res/layout-port/all_apps_sort_cling.xml
new file mode 100644
index 000000000..b53e82589
--- /dev/null
+++ b/res/layout-port/all_apps_sort_cling.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+<com.cyanogenmod.trebuchet.Cling
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+ launcher:drawIdentifier="all_apps_sort_portrait">
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="30dp"
+ android:layout_marginTop="100dp">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ style="@style/ClingTitleText"
+ android:id="@+id/all_apps_sort_cling_title"
+ android:text="@string/all_apps_sort_cling_title" />
+ <TextView
+ style="@style/ClingText"
+ android:id="@+id/all_apps_sort_cling_add_item"
+ android:layout_width="285dp"
+ android:layout_height="wrap_content"
+ android:text="@string/all_apps_sort_cling_add_item" />
+ </LinearLayout>
+ </FrameLayout>
+ <Button
+ style="@style/ClingButton"
+ android:id="@+id/cling_dismiss"
+ android:layout_marginBottom="15dp"
+ android:layout_marginRight="10dp"
+ android:layout_gravity="bottom|right"
+ android:onClick="dismissAllAppsSortCling" />
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
index ddc835420..6e2e756d5 100644
--- a/res/layout-port/application.xml
+++ b/res/layout-port/application.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Portrait"
android:focusable="true"
android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-port/apps_customize_application.xml b/res/layout-port/apps_customize_application.xml
index 84a8712d7..213fe21f7 100644
--- a/res/layout-port/apps_customize_application.xml
+++ b/res/layout-port/apps_customize_application.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher2.PagedViewIcon
+<com.cyanogenmod.trebuchet.PagedViewIcon
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
style="@style/WorkspaceIcon.Portrait.AppsCustomize"
diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml
index d2796a0e5..c107a5a35 100644
--- a/res/layout-port/folder_cling.xml
+++ b/res/layout-port/folder_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="folder_portrait">
<FrameLayout
android:layout_width="match_parent"
@@ -46,4 +46,4 @@
android:layout_marginRight="10dp"
android:layout_gravity="bottom|right"
android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml
index 5ee1327a3..523edf93c 100644
--- a/res/layout-port/folder_icon.xml
+++ b/res/layout-port/folder_icon.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher2.FolderIcon
+<com.cyanogenmod.trebuchet.FolderIcon
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -27,7 +27,7 @@
android:layout_width="@dimen/folder_preview_size"
android:layout_height="@dimen/folder_preview_size"
android:src="@drawable/portal_ring_inner_holo"/>
- <com.android.launcher2.BubbleTextView
+ <com.cyanogenmod.trebuchet.BubbleTextView
android:id="@+id/folder_icon_name"
style="@style/WorkspaceIcon.Portrait.Folder"/>
-</com.android.launcher2.FolderIcon>
+</com.cyanogenmod.trebuchet.FolderIcon>
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index 376173ae9..0420469eb 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -13,12 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Hotseat
+<com.cyanogenmod.trebuchet.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:cellCountX="@integer/hotseat_cell_count"
launcher:cellCountY="1">
- <com.android.launcher2.CellLayout
+ <com.cyanogenmod.trebuchet.CellLayout
android:id="@+id/layout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -33,4 +33,4 @@
launcher:widthGap="@dimen/hotseat_width_gap"
launcher:heightGap="@dimen/hotseat_height_gap"
launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher2.Hotseat>
+</com.cyanogenmod.trebuchet.Hotseat>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index a4275010b..b4ec30c3a 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher2.DragLayer
+<com.cyanogenmod.trebuchet.DragLayer
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:id="@+id/drag_layer"
android:background="@drawable/workspace_bg"
@@ -41,7 +41,7 @@
android:layout_marginBottom="@dimen/button_bar_height" />
<!-- The workspace contains 5 screens of cells -->
- <com.android.launcher2.Workspace
+ <com.cyanogenmod.trebuchet.Workspace
android:id="@+id/workspace"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -49,19 +49,11 @@
android:paddingRight="@dimen/workspace_right_padding"
android:paddingTop="@dimen/workspace_top_padding"
android:paddingBottom="@dimen/workspace_bottom_padding"
- launcher:defaultScreen="2"
launcher:cellCountX="@integer/cell_count_x"
launcher:cellCountY="@integer/cell_count_y"
launcher:pageSpacing="@dimen/workspace_page_spacing"
launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left"
- launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right">
-
- <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
- </com.android.launcher2.Workspace>
+ launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right" />
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
@@ -73,7 +65,7 @@
android:id="@+id/qsb_bar"
layout="@layout/qsb_bar" />
- <com.android.launcher2.DrawableStateProxyView
+ <com.cyanogenmod.trebuchet.DrawableStateProxyView
android:id="@+id/voice_button_proxy"
android:layout_width="80dp"
android:layout_height="@dimen/qsb_bar_height"
@@ -100,4 +92,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
-</com.android.launcher2.DragLayer>
+</com.cyanogenmod.trebuchet.DragLayer>
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 85da2f155..c069c43e0 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -15,14 +15,14 @@
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
style="@style/SearchDropTargetBar"
android:layout_width="match_parent"
android:layout_height="@dimen/search_bar_height"
android:layout_gravity="bottom|center_horizontal"
android:background="@drawable/search_frame">
<!-- Global search icon -->
- <com.android.launcher2.HolographicLinearLayout
+ <com.cyanogenmod.trebuchet.HolographicLinearLayout
style="@style/SearchButton"
launcher:sourceImageViewId="@+id/search_button"
android:id="@+id/search_button_container"
@@ -43,10 +43,10 @@
android:layout_height="match_parent"
android:src="@drawable/ic_home_search_normal_holo"
android:adjustViewBounds="true" />
- </com.android.launcher2.HolographicLinearLayout>
+ </com.cyanogenmod.trebuchet.HolographicLinearLayout>
<!-- Voice search icon -->
- <com.android.launcher2.HolographicLinearLayout
+ <com.cyanogenmod.trebuchet.HolographicLinearLayout
style="@style/SearchButton.Voice"
launcher:sourceImageViewId="@+id/voice_button"
android:id="@+id/voice_button_container"
@@ -67,5 +67,5 @@
android:layout_height="match_parent"
android:src="@drawable/ic_home_voice_search_holo"
android:adjustViewBounds="true" />
- </com.android.launcher2.HolographicLinearLayout>
+ </com.cyanogenmod.trebuchet.HolographicLinearLayout>
</RelativeLayout>
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml
index 10e697620..03f317920 100644
--- a/res/layout-port/workspace_cling.xml
+++ b/res/layout-port/workspace_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="workspace_portrait">
<FrameLayout
android:layout_width="match_parent"
@@ -53,4 +53,4 @@
android:layout_marginRight="10dp"
android:layout_gravity="bottom|right"
android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml
index 049822408..4ae4a0a4c 100644
--- a/res/layout-sw600dp-port/all_apps_cling.xml
+++ b/res/layout-sw600dp-port/all_apps_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="all_apps_portrait">
<FrameLayout
android:layout_width="match_parent"
@@ -47,4 +47,4 @@
android:layout_marginRight="36dp"
android:layout_gravity="top|right"
android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml
index e3a9caa22..5f9495b57 100644
--- a/res/layout-sw600dp-port/folder_cling.xml
+++ b/res/layout-sw600dp-port/folder_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="folder_portrait">
<FrameLayout
android:layout_width="match_parent"
@@ -48,4 +48,4 @@
android:layout_marginRight="36dp"
android:layout_gravity="bottom|right"
android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw600dp/all_apps_sort_cling.xml b/res/layout-sw600dp/all_apps_sort_cling.xml
new file mode 100644
index 000000000..365432b57
--- /dev/null
+++ b/res/layout-sw600dp/all_apps_sort_cling.xml
@@ -0,0 +1,46 @@
+<?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.
+-->
+<com.cyanogenmod.trebuchet.Cling
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
+ launcher:drawIdentifier="all_apps_sort_large">
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/cling_text_block_offset_x"
+ android:layout_marginTop="@dimen/cling_text_block_offset_y">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ style="@style/ClingTitleText"
+ android:id="@+id/all_apps_sort_cling_title"
+ android:text="@string/all_apps_sort_cling_title" />
+ <TextView
+ style="@style/ClingText"
+ android:id="@+id/all_apps_sort_cling_add_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/all_apps_sort_cling_add_item" />
+ <Button
+ style="@style/ClingButton"
+ android:id="@+id/cling_dismiss"
+ android:layout_marginTop="15dp"
+ android:onClick="dismissAllAppsSortCling" />
+ </LinearLayout>
+ </FrameLayout>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp-land/application.xml b/res/layout-sw720dp-land/application.xml
index 9393f7e40..e6e681dc2 100644
--- a/res/layout-sw720dp-land/application.xml
+++ b/res/layout-sw720dp-land/application.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Landscape"
android:focusable="true"
android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-sw720dp-port/application.xml b/res/layout-sw720dp-port/application.xml
index af7a8a4df..a849355e8 100644
--- a/res/layout-sw720dp-port/application.xml
+++ b/res/layout-sw720dp-port/application.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-sw720dp-port/folder_cling.xml b/res/layout-sw720dp-port/folder_cling.xml
index 017d0fde9..3a11dff77 100644
--- a/res/layout-sw720dp-port/folder_cling.xml
+++ b/res/layout-sw720dp-port/folder_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="folder_large">
<FrameLayout
android:layout_width="match_parent"
@@ -43,4 +43,4 @@
android:onClick="dismissFolderCling" />
</LinearLayout>
</FrameLayout>
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp-port/workspace_cling.xml b/res/layout-sw720dp-port/workspace_cling.xml
index 29bea810d..cf9b614dd 100644
--- a/res/layout-sw720dp-port/workspace_cling.xml
+++ b/res/layout-sw720dp-port/workspace_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="workspace_large">
<FrameLayout
android:layout_width="match_parent"
@@ -49,4 +49,4 @@
android:layout_gravity="right"
android:gravity="right"
android:text="@string/workspace_cling_open_all_apps" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml
index 7079b2107..b2f0f6f05 100644
--- a/res/layout-sw720dp/all_apps_cling.xml
+++ b/res/layout-sw720dp/all_apps_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="all_apps_large">
<FrameLayout
android:layout_width="match_parent"
@@ -43,4 +43,4 @@
android:onClick="dismissAllAppsCling" />
</LinearLayout>
</FrameLayout>
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp/folder_cling.xml b/res/layout-sw720dp/folder_cling.xml
index 4188804c2..7ab4cb1d5 100644
--- a/res/layout-sw720dp/folder_cling.xml
+++ b/res/layout-sw720dp/folder_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="folder_large">
<FrameLayout
android:layout_width="match_parent"
@@ -43,4 +43,4 @@
android:onClick="dismissFolderCling" />
</LinearLayout>
</FrameLayout>
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 65149f29a..d5f36accb 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher2.DragLayer
+<com.cyanogenmod.trebuchet.DragLayer
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drag_layer"
@@ -50,4 +50,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
-</com.android.launcher2.DragLayer>
+</com.cyanogenmod.trebuchet.DragLayer>
diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml
index 55ec959de..b4c948271 100644
--- a/res/layout-sw720dp/search_bar.xml
+++ b/res/layout-sw720dp/search_bar.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Global search icon -->
- <com.android.launcher2.HolographicImageView
+ <com.cyanogenmod.trebuchet.HolographicImageView
style="@style/SearchButton"
android:id="@+id/search_button"
android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
android:clickable="true" />
<!-- Voice search icon -->
- <com.android.launcher2.HolographicImageView
+ <com.cyanogenmod.trebuchet.HolographicImageView
style="@style/SearchButton.Voice"
android:id="@+id/voice_button"
android:layout_width="wrap_content"
@@ -55,7 +55,7 @@
android:contentDescription="@string/accessibility_voice_search_button" />
<!-- AppsCustomize icon -->
- <com.android.launcher2.HolographicImageView
+ <com.cyanogenmod.trebuchet.HolographicImageView
android:id="@+id/all_apps_button"
android:onClick="onClickAllAppsButton"
android:layout_width="wrap_content"
diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml
index 5658a4b4f..db2c3a62d 100644
--- a/res/layout-sw720dp/workspace.xml
+++ b/res/layout-sw720dp/workspace.xml
@@ -16,18 +16,11 @@
<!-- The workspace contains 5 screens of cells -->
-<com.android.launcher2.Workspace
+<com.cyanogenmod.trebuchet.Workspace
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:paddingLeft="@dimen/workspace_left_padding"
android:paddingRight="@dimen/workspace_right_padding"
android:paddingTop="@dimen/workspace_top_padding"
android:paddingBottom="@dimen/workspace_bottom_padding"
- launcher:defaultScreen="2"
- launcher:pageSpacing="@dimen/workspace_page_spacing">
- <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
- <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-</com.android.launcher2.Workspace> \ No newline at end of file
+ launcher:pageSpacing="@dimen/workspace_page_spacing" />
diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml
index fd7d4f8b5..959a4f0c4 100644
--- a/res/layout-sw720dp/workspace_cling.xml
+++ b/res/layout-sw720dp/workspace_cling.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
launcher:drawIdentifier="workspace_large">
<FrameLayout
android:layout_width="match_parent"
@@ -49,4 +49,4 @@
android:layout_gravity="right"
android:gravity="right"
android:text="@string/workspace_cling_open_all_apps" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index efd29a673..1b338acaf 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.AppsCustomizeTabHost
+<com.cyanogenmod.trebuchet.AppsCustomizeTabHost
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:background="#FF000000">
<LinearLayout
android:id="@+id/apps_customize_content"
@@ -31,7 +31,7 @@
android:layout_height="@dimen/apps_customize_tab_bar_height"
android:layout_marginTop="@dimen/apps_customize_tab_bar_margin_top"
android:layout_gravity="center_horizontal">
- <com.android.launcher2.FocusOnlyTabWidget
+ <com.cyanogenmod.trebuchet.FocusOnlyTabWidget
android:id="@android:id/tabs"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -50,7 +50,7 @@
android:id="@android:id/tabcontent"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <com.android.launcher2.AppsCustomizePagedView
+ <com.cyanogenmod.trebuchet.AppsCustomizePagedView
android:id="@+id/apps_customize_pane_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -90,4 +90,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
-</com.android.launcher2.AppsCustomizeTabHost>
+
+ <include layout="@layout/all_apps_sort_cling"
+ android:id="@+id/all_apps_sort_cling"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone" />
+</com.cyanogenmod.trebuchet.AppsCustomizeTabHost>
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index abb7508b5..76bcd773b 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -13,9 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.PagedViewWidget
+<com.cyanogenmod.trebuchet.PagedViewWidget
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -26,7 +26,7 @@
android:focusable="true">
<!-- The preview of the widget or shortcut. -->
- <com.android.launcher2.PagedViewWidgetImageView
+ <com.cyanogenmod.trebuchet.PagedViewWidgetImageView
android:id="@+id/widget_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -74,4 +74,4 @@
</LinearLayout>
-</com.android.launcher2.PagedViewWidget>
+</com.cyanogenmod.trebuchet.PagedViewWidget>
diff --git a/res/layout/double_number_picker_dialog.xml b/res/layout/double_number_picker_dialog.xml
new file mode 100755
index 000000000..8c9fb8ef8
--- /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/drop_target_bar.xml b/res/layout/drop_target_bar.xml
index 5fcddc9a0..dbd1a295d 100644
--- a/res/layout/drop_target_bar.xml
+++ b/res/layout/drop_target_bar.xml
@@ -19,7 +19,7 @@
style="@style/DropTargetButtonContainer"
android:layout_weight="1">
<!-- Delete target -->
- <com.android.launcher2.DeleteDropTarget
+ <com.cyanogenmod.trebuchet.DeleteDropTarget
style="@style/DropTargetButton"
android:id="@+id/delete_target_text"
android:text="@string/delete_zone_label_workspace"
@@ -30,7 +30,7 @@
style="@style/DropTargetButtonContainer"
android:layout_weight="1">
<!-- Info target -->
- <com.android.launcher2.InfoDropTarget
+ <com.cyanogenmod.trebuchet.InfoDropTarget
style="@style/DropTargetButton"
android:id="@+id/info_target_text"
android:text="@string/info_target_label"
diff --git a/res/layout/number_picker_dialog.xml b/res/layout/number_picker_dialog.xml
new file mode 100644
index 000000000..2f87bc86f
--- /dev/null
+++ b/res/layout/number_picker_dialog.xml
@@ -0,0 +1,28 @@
+<?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="vertical"
+ android:gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <NumberPicker
+ android:id="@+id/number_picker"
+ android:layout_centerInParent="true"
+ android:layout_width="100dip"
+ android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml
index 322dc006f..563026df1 100644
--- a/res/layout/qsb_bar.xml
+++ b/res/layout/qsb_bar.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.launcher2.SearchDropTargetBar
+<com.cyanogenmod.trebuchet.SearchDropTargetBar
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/QSBBar"
android:focusable="false">
@@ -30,4 +30,4 @@
<include
layout="@layout/drop_target_bar" />
</LinearLayout>
-</com.android.launcher2.SearchDropTargetBar>
+</com.cyanogenmod.trebuchet.SearchDropTargetBar>
diff --git a/res/layout/tab_widget_indicator.xml b/res/layout/tab_widget_indicator.xml
index df43d3ddd..9a14032b2 100644
--- a/res/layout/tab_widget_indicator.xml
+++ b/res/layout/tab_widget_indicator.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-<com.android.launcher2.AccessibleTabView
+<com.cyanogenmod.trebuchet.AccessibleTabView
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/TabIndicator.AppsCustomize" />
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 208390d1e..cd63b1954 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -14,15 +14,15 @@
limitations under the License.
-->
-<com.android.launcher2.Folder
+<com.cyanogenmod.trebuchet.Folder
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/portal_container_holo">
- <com.android.launcher2.CellLayout
+ <com.cyanogenmod.trebuchet.CellLayout
android:id="@+id/folder_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
launcher:cellWidth="@dimen/folder_cell_width"
launcher:cellHeight="@dimen/folder_cell_height" />
- <com.android.launcher2.FolderEditText
+ <com.cyanogenmod.trebuchet.FolderEditText
android:id="@+id/folder_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -52,4 +52,4 @@
android:gravity="center_horizontal"
android:singleLine="true"
android:imeOptions="flagNoExtractUi"/>
-</com.android.launcher2.Folder>
+</com.cyanogenmod.trebuchet.Folder>
diff --git a/res/layout/wallpaper_chooser_base.xml b/res/layout/wallpaper_chooser_base.xml
index fa8ea9372..cf149c0db 100644
--- a/res/layout/wallpaper_chooser_base.xml
+++ b/res/layout/wallpaper_chooser_base.xml
@@ -21,7 +21,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <fragment class="com.android.launcher2.WallpaperChooserDialogFragment"
+ <fragment class="com.cyanogenmod.trebuchet.WallpaperChooserDialogFragment"
android:id="@+id/wallpaper_chooser_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml
index d6e66f69d..37b11dea5 100644
--- a/res/layout/workspace_screen.xml
+++ b/res/layout/workspace_screen.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher2.CellLayout
+<com.cyanogenmod.trebuchet.CellLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/menu/apps_tab.xml b/res/menu/apps_tab.xml
new file mode 100644
index 000000000..8e95139d1
--- /dev/null
+++ b/res/menu/apps_tab.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <group android:checkableBehavior="single">
+ <item android:id="@+id/apps_sort_title"
+ android:title="@string/menu_apps_sort_title"
+ android:checked="true" />
+ <item android:id="@+id/apps_sort_install_date"
+ android:title="@string/menu_apps_sort_install_date" />
+ </group>
+</menu>
diff --git a/res/values-af-land/strings.xml b/res/values-af-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-af/strings.xml b/res/values-af/strings.xml
index 72ba85526..8922b651d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Lanseerpoort"</string>
<string name="home" msgid="5921706419368316758">"Tuis"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Kernprogramme"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-am-land/strings.xml b/res/values-am-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-am/strings.xml b/res/values-am/strings.xml
index 2319638be..6fd0c86df 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"አስነሺ"</string>
<string name="home" msgid="5921706419368316758">"መነሻ"</string>
<string name="uid_name" msgid="3371120195364560632">"የAndroid ኮር ትግበራዎች"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ar-land/strings.xml b/res/values-ar-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-ar/strings.xml b/res/values-ar/strings.xml
index 0ddd36970..dd047208e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"المشغل"</string>
<string name="home" msgid="5921706419368316758">"المنزل"</string>
<string name="uid_name" msgid="3371120195364560632">"تطبيقات Android المركزية"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 150434f40..333bfc889 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Панэль запуску"</string>
<string name="home" msgid="5921706419368316758">"На галоўную старонку"</string>
<string name="uid_name" msgid="3371120195364560632">"Асноўныя прыкладанні для Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-bg-land/strings.xml b/res/values-bg-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-bg/strings.xml b/res/values-bg/strings.xml
index f435ff65a..0e5a62076 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Стартов панел"</string>
<string name="home" msgid="5921706419368316758">"Начало"</string>
<string name="uid_name" msgid="3371120195364560632">"Основни приложения на Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ca-land/strings.xml b/res/values-ca-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-ca/strings.xml b/res/values-ca/strings.xml
index 6ed84db92..c5b9c4815 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Barra d\'execució ràpida"</string>
<string name="home" msgid="5921706419368316758">"Pàgina d\'inici"</string>
<string name="uid_name" msgid="3371120195364560632">"Aplicacions principals d\'Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-cs-land/strings.xml b/res/values-cs-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-cs/strings.xml b/res/values-cs/strings.xml
index dea19f6c5..2065ea816 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Plocha"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -111,4 +110,57 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+ <string name="application_copyright">Autorská práva \u00A9 CyanogenMod 2012</string>
+ <string name="cancel_target_label">Zrušit</string>
+ <string name="menu_preferences">Nastavení</string>
+ <string name="menu_apps_sort_title">Jméno</string>
+ <string name="menu_apps_sort_install_date">Datum instalace</string>
+ <string name="all_apps_sort_cling_title">Seřadit aplikace</string>
+ <string name="all_apps_sort_cling_add_item">Přidrž prst na kartě aplikací pro výběr režimu řazení</string>
+ <string name="preferences_title">Předvolby</string>
+ <string name="preferences_interface_title">Rozhraní</string>
+ <string name="preferences_application_title">Aplikace</string>
+ <string name="preferences_interface_homescreen_title">Domovská obrazovka</string>
+ <string name="preferences_interface_homescreen_general_category">Hlavní</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Domácí plochy</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Počet ploch</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Výchozí plocha</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Vybrat výchozí plochu</string>
+ <string name="preferences_interface_homescreen_general_search_title">Vyhledávací lišta</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Velikost mřížky</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Vyberte počet řádků/sloupců na ploše</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Řádky</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Sloupce</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Svislé odsazení</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Dodatečné svislé rozestupy na ploše</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Vodorovné odsazení</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Dodatečné vodorovné rozestupy na ploše</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Povolit trvalou vyhledávací lištu</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Upravit velikost widgetu</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Povolit změnu velikosti widgetů, které nepodporují změnu velikosti</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skrýt popisky ikon</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skrýt popisky ikon na ploše</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Posouvání</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Posouvání tapety</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Posouvání tapety při posunu plochy</string>
+ <string name="preferences_interface_homescreen_indicator_category">Indikátor</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Zobrazit indikátor ploch</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Zobrazit indikátor aktuální plochy v dolní části obrazovky</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Slábnutí indikátoru</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Slábnutí indikátoru po změně plochy</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Zobrazit lištu ploch</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Zobrazit pozadí za indikátorem ploch</string>
+ <string name="preferences_interface_drawer_title">Seznam aplikací</string>
+ <string name="preferences_interface_drawer_widgets_category">Widgety</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Spojit s aplikacemi</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Přecházet mezi aplikacemi a widgety bez změny záložek</string>
+ <string name="preferences_interface_drawer_indicator_category">Indikátor</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Zobrazit indikátor ploch</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Zobrazit indikátor aktuální plochy v dolní části obrazovky</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Slábnutí indikátoru</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Slábnutí indikátoru po změně plochy</string>
+ <string name="preferences_interface_dock_title">Dok aplikací</string>
+ <string name="preferences_interface_icons_title">Ikony</string>
+ <string name="preferences_interface_general_title">Obecné</string>
+ <string name="preferences_interface_general_orientation_title">Automaticky otáčet displej</string>
</resources>
diff --git a/res/values-da-land/strings.xml b/res/values-da-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-da/strings.xml b/res/values-da/strings.xml
index af00d825b..11d7385d5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Startside"</string>
<string name="uid_name" msgid="3371120195364560632">"Android-kerneprogrammer"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -111,4 +110,85 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+
+ <!-- Trebuchet additional danish translation start -->
+
+ <!-- General -->
+ <!-- Application copyright -->
+ <string name="application_copyright">Copyright \u00A9 CyanogenMod 2012</string>
+
+ <string name="cancel_target_label">Annuller</string>
+
+ <!-- Menus items: -->
+ <!-- Noun, menu item used to show the launcher preferences -->
+ <string name="menu_preferences">Trebuchet-indstillinger</string>
+ <string name="menu_apps_sort_title">Navn</string>
+ <string name="menu_apps_sort_install_date">Installationsdato</string>
+
+ <!-- Clings -->
+ <string name="all_apps_sort_cling_title">Sortér dine apps</string>
+ <string name="all_apps_sort_cling_add_item">Tryk på fanen Apps og hold den nede for at vælge sortering</string>
+
+ <!-- Preferences -->
+ <string name="preferences_title">Indstillinger</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Grænseflade</string>
+ <!-- Application -->
+ <string name="preferences_application_title">Applikation</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <string name="preferences_interface_homescreen_title">Startskærm</string>
+ <string name="preferences_interface_homescreen_general_category">Generelt</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Startskærme</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Antallet af skærme på startskærmen</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Standardskærm</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Vælg standard-startskærm</string>
+ <string name="preferences_interface_homescreen_general_search_title">Søgefelt</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Gitterstørrelse</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Vælg antallet af rækker/kolonner på startskærmen</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Rækker</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Kolonner</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Lodret fyld</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Ekstra lodret afstand på startskærmen</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Vandret fyld</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Ekstra vandret afstand på startskærmen</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Aktivér vedvarende søgefelt</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Ændre størrelse på enhver widget</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Tillader ændring af størrelsen på widgets, der normalt ikke kan ændres</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skjul ikontekst</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skjul ikontekster på startskærmene</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Bladring</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Rul tapet</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Rul tapetet ved bladring mellem startskærme</string>
+ <string name="preferences_interface_homescreen_indicator_category">Indikator</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Vis sideindikator</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Viser den aktuelle side nederst på skærmen</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Udton indikator</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Udtoner indikatoren efter skift mellem startskærmene</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Vis startlinjeadskillelse</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Adskiller startlinjen fra baggrunden</string>
+
+ <!-- Drawer -->
+ <string name="preferences_interface_drawer_title">Applikationer</string>
+ <string name="preferences_interface_drawer_widgets_category">Widgets</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Sammen med apps</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Glid fra applikationer til widgets uden at skifte fane</string>
+ <string name="preferences_interface_drawer_indicator_category">Indikator</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Vis sideindikator</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Viser den aktuelle side nederst på skærmen</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Udton indikator</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Udtoner indikatoren efter skift mellem siderne</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Startlinjen</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Ikoner</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">Generelt</string>
+ <string name="preferences_interface_general_orientation_title">Rotér skærm automatisk</string>
+
+ <!-- Trebuchet additional danish translation end -->
</resources>
diff --git a/res/values-de-land/strings.xml b/res/values-de-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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 0b01e4272..84b1bd26d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Übersicht"</string>
<string name="home" msgid="5921706419368316758">"Startbildschirm"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -55,6 +54,7 @@
<string name="delete_zone_label_workspace" msgid="7153615831493049150">"Entfernen"</string>
<string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Deinstallieren"</string>
<string name="delete_target_label" msgid="665300185123139530">"Entfernen"</string>
+ <string name="cancel_target_label">Abbrechen</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Deinstallieren"</string>
<string name="info_target_label" msgid="4019495079517426980">"App-Info"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Suchen"</string>
@@ -68,7 +68,14 @@
<string name="menu_search" msgid="4826514464423239041">"Suchen"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Benachrichtigungen"</string>
<string name="menu_settings" msgid="3946232973327980394">"Systemeinstellungen"</string>
+ <string name="menu_preferences">Trebuchet-Einstellungen</string>
<string name="menu_help" msgid="4901160661634590633">"Hilfe"</string>
+
+ <!-- Noun, menu item used to sort apps by name -->
+ <string name="menu_apps_sort_title">Name</string>
+ <!-- Noun, menu item used to sort apps by install date -->
+ <string name="menu_apps_sort_install_date">Installationsdatum</string>
+
<string name="cab_menu_delete_app" msgid="4089398025537640349">"App deinstallieren"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"App-Details"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"1 App ausgewählt"</string>
@@ -87,28 +94,129 @@
<string name="uninstall_system_app_text" msgid="6429814133777046491">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
<string name="dream_name" msgid="2847171357608437154">"Raketenstartgerät"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Unbenannter Ordner"</string>
+
+ <!-- The format string for Workspace descriptions [CHAR_LIMIT=none] -->
<string name="workspace_description_format" msgid="2968608205939373034">"Startbildschirm %1$d"</string>
+
+ <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
<string name="default_scroll_format" msgid="4057140866420001240">"Seite %1$d von %2$d"</string>
+ <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
<string name="workspace_scroll_format" msgid="1704767047951143301">"Startbildschirm %1$d von %2$d"</string>
+ <!-- The format string for AppsCustomize Apps page scroll text [CHAR_LIMIT=none] -->
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"App-Seite %1$d von %2$d"</string>
+ <!-- The format string for AppsCustomize Apps page scroll text [CHAR_LIMIT=none] -->
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Widget-Seite %1$d von %2$d"</string>
+
+ <!-- Clings -->
+ <!-- The title text for the workspace cling [CHAR_LIMIT=none] -->
<string name="workspace_cling_title" msgid="738396473989890567">"Fühlen Sie sich wie zu Hause"</string>
+ <!-- The description of how to use the workspace [CHAR_LIMIT=none] -->
<string name="workspace_cling_move_item" msgid="791013895761065070">"Hier können Sie Ihre Lieblings-Apps ablegen."</string>
+ <!-- The description of how to open all apps from the workspace [CHAR_LIMIT=none] -->
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Berühren Sie den Kreis für eine Übersicht aller Apps."</string>
+ <!-- The title text for the All Apps cling [CHAR_LIMIT=none] -->
<string name="all_apps_cling_title" msgid="2559734712581447107">"Apps auswählen"</string>
+ <!-- The description of how to pick up and add an item to the workspace [CHAR_LIMIT=none] -->
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Berühren und halten Sie eine App, um sie zum Startbildschirm hinzuzufügen."</string>
+ <!-- The title text for the All Apps Sort cling [CHAR_LIMIT=none] -->
+ <string name="all_apps_sort_cling_title">Apps sortieren</string>
+ <!-- The description of how to pick sort apps in the drawer [CHAR_LIMIT=none] -->
+ <string name="all_apps_sort_cling_add_item">App-Tab gedrückt halten, um die Art der Sortierung zu wählen.</string>
+ <!-- The title text for the Folder cling [CHAR_LIMIT=none] -->
<string name="folder_cling_title" msgid="4308949882377840953">"Apps mit Ordnern organisieren"</string>
+ <!-- The description of how to move an app [CHAR_LIMIT=none] -->
<string name="folder_cling_move_item" msgid="270598675060435169">"Berühren und halten Sie eine App, um sie zu verschieben."</string>
+ <!-- The description of how to create a folder [CHAR_LIMIT=none] -->
<string name="folder_cling_create_folder" msgid="8352867485656129478">"Stapeln Sie Apps übereinander, um einen neuen Ordner auf Ihrem Startbildschirm zu erstellen."</string>
+ <!-- The text on the button to dismiss a cling [CHAR_LIMIT=none] -->
<string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
+
+ <!-- Folder accessibility -->
+ <!-- The format string for when a folder is opened, speaks the dimensions -->
<string name="folder_opened" msgid="1262064100943801533">"Ordner geöffnet, <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
+ <!-- Instruction that clicking outside will close folder -->
<string name="folder_tap_to_close" msgid="1335478160661137579">"Ordner durch Berühren schließen"</string>
+ <!-- Instruction that clicking outside will commit folder rename -->
<string name="folder_tap_to_rename" msgid="5201612989905472442">"Umbenennung durch Berühren speichern"</string>
+ <!-- Indication that folder closed -->
<string name="folder_closed" msgid="3130534551370511932">"Ordner wurde geschlossen"</string>
+ <!-- Folder renamed format -->
<string name="folder_renamed" msgid="7951233572858053642">"Ordner umbenannt in <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <!-- Folder name format -->
<string name="folder_name_format" msgid="3051680259794759037">"Ordner: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+
+ <!-- Strings used in device overlays -->
+
+ <!-- Clings -->
+ <!-- Dummy string [CHAR_LIMIT=40] -->
<string name="custom_workspace_cling_title_1" msgid="1433009175359948587"></string>
+ <!-- Dummy string [CHAR_LIMIT=60] -->
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
+ <!-- Dummy string [CHAR_LIMIT=40] -->
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
+ <!-- Dummy string [CHAR_LIMIT=60] -->
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></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_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>
+ <string name="preferences_interface_homescreen_scrolling_category">Scrollen</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_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>
+ <string name="preferences_interface_homescreen_indicator_background_title">Dock-Abtrennung anzeigen</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Linie als Indikator-Hintergrund anzeigen</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Dock</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Icons</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 b976926f0..000000000
--- 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-el/strings.xml b/res/values-el/strings.xml
index 78e153ab0..23de9233c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Αρχική σελίδα"</string>
<string name="uid_name" msgid="3371120195364560632">"Βασικές εφαρμογές Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-en-rGB-land/strings.xml b/res/values-en-rGB-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ceb215a73..4ed5f7a61 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Home"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-es-land/strings.xml b/res/values-es-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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 b976926f0..000000000
--- 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-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bc6566dfb..f7b2cbb6b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Casa"</string>
<string name="uid_name" msgid="3371120195364560632">"Aplicaciones del núcleo de Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2987f3e51..cf4d36e5c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Casa"</string>
<string name="uid_name" msgid="3371120195364560632">"Aplicaciones básicas de Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -55,6 +54,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>
@@ -68,7 +68,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 de 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</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>
@@ -97,6 +100,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">Ordenar aplicaciones</string>
+ <string name="all_apps_sort_cling_add_item">Mantener pulsación sobre la pestaña de Aplicaciones para elegir el método 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>
@@ -111,4 +116,50 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+ <string name="preferences_title">"Preferencias"</string>
+ <string name="preferences_interface_title">"Interfaz"</string>
+ <string name="preferences_application_title">"Aplicación"</string>
+ <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">"Escoger la pantalla de inicio por defecto"</string>
+ <string name="preferences_interface_homescreen_general_search_title">"Barra de búsqueda"</string>
+ <string name="preferences_interface_homescreen_general_grid_title">"Filas/Columnas"</string>
+ <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_summary">"Habilitar la barra de búsqueda permanentemente"</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"</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_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>
+ <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 de aplicaciones a pestañas de widgets sin necesidad de cambiar explícitamente de pestaña"</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>
+ <string name="preferences_interface_dock_title">"Barra Aplicaciones"</string>
+ <string name="preferences_interface_icons_title">"Iconos"</string>
+ <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-et/strings.xml b/res/values-et/strings.xml
index 78c983a38..67c30bf78 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Käivitaja"</string>
<string name="home" msgid="5921706419368316758">"Kodu"</string>
<string name="uid_name" msgid="3371120195364560632">"Androidi tuumrakendused"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-fa-land/strings.xml b/res/values-fa-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-fa/strings.xml b/res/values-fa/strings.xml
index d03e82a09..607803a1d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"راه انداز"</string>
<string name="home" msgid="5921706419368316758">"صفحه اصلی"</string>
<string name="uid_name" msgid="3371120195364560632">"برنامه های Android Core"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-fi-land/strings.xml b/res/values-fi-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-fi/strings.xml b/res/values-fi/strings.xml
index 29f38267f..09a32bf0a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Käynnistysohjelma"</string>
<string name="home" msgid="5921706419368316758">"Aloitusruutu"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core -sovellukset"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -111,4 +110,53 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+ <string name="cancel_target_label">Peruuta</string>
+ <string name="menu_apps_sort_title">Nimi</string>
+ <string name="menu_apps_sort_install_date">Asennuspäivä</string>
+ <string name="preferences_title">Asetukset</string>
+ <string name="preferences_interface_title">Käyttöliittymä</string>
+ <string name="preferences_application_title">Sovellus</string>
+ <string name="preferences_interface_homescreen_title">Kotinäyttö</string>
+ <string name="preferences_interface_homescreen_general_category">Yleiset</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Kotinäytöt</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Kotinäyttöjen lukumäärä</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Oletusnäyttö</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Valitse oletusnäyttö</string>
+ <string name="preferences_interface_homescreen_general_search_title">Hakupalkki</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Ruudukon koko</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Valitse kuinka monta riviä/saraketta näytöllä on</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Rivit</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Sarakkeet</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Pystysuora täyttö</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Ylimääräistä pystysuoraa tilaa näytölle</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Vaakasuora täyttö</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Ylimääräistä vaakasuoraa tilaa näytölle</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Ota pysyvä hakupalkki käyttöön</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Vapaa widgetin koko</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Sallii widgetien koon muuttamisen vaikka koon muuttaminen olisi estetty</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Piilota kuvakkeiden tekstit</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Piilota kuvakkeiden tekstit kotinäytöllä</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Selaaminen</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Vieritä taustakuvaa</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Vierittää taustakuvaa kun siirrytään näytöillä</string>
+ <string name="preferences_interface_homescreen_indicator_category">Osoitin</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Näytä sivunosoitin</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Näyttää tämänhetkisen näytön osoittimen näytön alalaidassa</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Häivytä osoitin</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Häivyttää osoittimen kun kotinäyttö on vaihtunut</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Näytä alapalkin jakaja</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Näyttää osoittimen taustan</string>
+ <string name="preferences_interface_drawer_title">Sovellusvalikko</string>
+ <string name="preferences_interface_drawer_widgets_category">Widgetit</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Yhdistä sovelluksiin</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Mahdollistaa pyyhkäisyn suoraan sovellusvalikosta widget-valikkoon ilman välilehden vaihtamista</string>
+ <string name="preferences_interface_drawer_indicator_category">Osoitin</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Näytä sivunosoitin</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Näyttää tämänhetkisen sivun osoittimen näytön alalaidassa</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Häivytä osoitin</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Häivyttää osoittimen kun sivu on vaihtunut</string>
+ <string name="preferences_interface_dock_title">Alapalkki</string>
+ <string name="preferences_interface_icons_title">Kuvakkeet</string>
+ <string name="preferences_interface_general_title">Yleiset</string>
+ <string name="preferences_interface_general_orientation_title">Automaattinen näytön asento</string>
</resources>
diff --git a/res/values-fr-land/strings.xml b/res/values-fr-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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 43bf8379e..b6debb164 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -19,11 +19,10 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Lanceur d\'applications"</string>
<string name="home" msgid="5921706419368316758">"Accueil"</string>
<string name="uid_name" msgid="3371120195364560632">"Applications de base Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
- <string name="chooser_wallpaper" msgid="6063168087625352235">"Sélectionnez un fond d\'écran dans"</string>
+ <string name="chooser_wallpaper" msgid="6063168087625352235">"Sélectionnez un fond d\'écran depuis"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Sélectionner"</string>
<string name="pick_wallpaper" msgid="5630222540525626723">"Fonds d\'écran"</string>
<string name="activity_not_found" msgid="217823393239365967">"L\'application n\'est pas installée."</string>
@@ -111,4 +110,67 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+
+ <!-- -->
+ <!-- Preferences -->
+ <!-- -->
+ <string name="preferences_title">Préférences</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Interface</string>
+ <!-- Application -->
+ <string name="preferences_application_title">Application</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <string name="preferences_interface_homescreen_title">Écrans d\'accueil</string>
+ <string name="preferences_interface_homescreen_general_category">Général</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Écrans d\'accueil</string>
+ <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">Écran 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_search_title">Barre de recherche</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>
+ <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 sur l\'écran d\'accueil</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_summary">Activer la barre de recherche persistante</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Redimensionner tout les widgets</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permet de redimensionner les widgets qui normalement n\'en sont pas capables</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_scrolling_category">Défilement</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 de page en bas de l\'écran</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Fondu</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Faire disparaître l\'indicateur après le changement d\'écran</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>
+
+ <!-- Drawer -->
+ <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</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 de page en bas de l\'écran</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Fondu</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Faire disparaître l\'indicateur après le changement de page</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Barre de Dock</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Icônes</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">Général</string>
+ <string name="preferences_interface_general_orientation_title">Rotation auto. de l\'écran</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c5ae89a44..f481e41ce 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"लॉन्चर"</string>
<string name="home" msgid="5921706419368316758">"मुखपृष्ठ"</string>
<string name="uid_name" msgid="3371120195364560632">"Android मुख्य एप्लिकेशन"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-hr-land/strings.xml b/res/values-hr-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-hr/strings.xml b/res/values-hr/strings.xml
index 665d7b3ff..c10e827ed 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Pokretač"</string>
<string name="home" msgid="5921706419368316758">"Početna"</string>
<string name="uid_name" msgid="3371120195364560632">"Matične aplikacije za Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-hu-land/strings.xml b/res/values-hu-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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 761ee7217..f8357d7ae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Indító"</string>
<string name="home" msgid="5921706419368316758">"Főoldal"</string>
<string name="uid_name" msgid="3371120195364560632">"Alap Android-alkalmazások"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -55,6 +54,8 @@
<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>
+ <!-- Label for cancel drop target. [CHAR_LIMIT=30] -->
+ <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>
@@ -68,7 +69,13 @@
<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>
+ <!-- Noun, menu item used to show the launcher preferences -->
+ <string name="menu_preferences">Trebuchet beállítások</string>
<string name="menu_help" msgid="4901160661634590633">"Súgó"</string>
+ <!-- Noun, menu item used to sort apps by name -->
+ <string name="menu_apps_sort_title">Név</string>
+ <!-- Noun, menu item used to sort apps by install date -->
+ <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>
@@ -97,6 +104,10 @@
<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>
+ <!-- The title text for the All Apps Sort cling [CHAR_LIMIT=none] -->
+ <string name="all_apps_sort_cling_title">Rendezze sorba alkalmazásait</string>
+ <!-- The description of how to pick sort apps in the drawer [CHAR_LIMIT=none] -->
+ <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>
@@ -111,4 +122,67 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+ <!-- -->
+ <!-- Preferences -->
+ <!-- -->
+ <string name="preferences_title">Beállítások</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Felület</string>
+ <!-- Application -->
+ <string name="preferences_application_title">Alkalmazás</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <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_search_title">Keresősáv</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Rács méret</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">A kezdőképernyőn megjelenő sorok és oszlopok számának kiválasztása</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_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 neveit</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Kinézet</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">Jelzé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>
+
+ <!-- Drawer -->
+ <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_indicator_category">Jelzé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>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Tálca</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Ikonok</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">Általános</string>
+ <string name="preferences_interface_general_orientation_title">Képernyő elforgatása</string>
+
</resources>
diff --git a/res/values-in-land/strings.xml b/res/values-in-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-in/strings.xml b/res/values-in/strings.xml
index 3ba622584..24c5c9e78 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Peluncur"</string>
<string name="home" msgid="5921706419368316758">"Beranda"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-it-land/strings.xml b/res/values-it-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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/strings.xml b/res/values-it/strings.xml
index 9a73872e6..b3c6edeba 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Avvio applicazioni"</string>
<string name="home" msgid="5921706419368316758">"Home"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -55,6 +54,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>
@@ -68,7 +68,10 @@
<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>
@@ -97,6 +100,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 scegliere in che ordine visualizzarle</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>
@@ -111,4 +116,50 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></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_search_title">Barra di ricerca</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_summary">Abilita la barra di ricerca persistente</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Ridimensiona widget</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Permette di ridimensionare tutti i widget, anche quelli ai quali normalmente non è consentito</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_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_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 b976926f0..000000000
--- 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 8dd6cd933..be4a64b22 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"מפעיל"</string>
<string name="home" msgid="5921706419368316758">"בית"</string>
<string name="uid_name" msgid="3371120195364560632">"יישומי ליבה של Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ja-land/strings.xml b/res/values-ja-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-ja/strings.xml b/res/values-ja/strings.xml
index 7e29730f9..f11b1358d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"ランチャー"</string>
<string name="home" msgid="5921706419368316758">"Home"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -111,4 +110,59 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+
+ <string name="cancel_target_label">キャンセル</string>
+ <string name="menu_preferences">Trebuchet設定</string>
+ <string name="menu_apps_sort_title">名前</string>
+ <string name="menu_apps_sort_install_date">インストール日時</string>
+ <string name="all_apps_sort_cling_title">アプリの並び替え</string>
+ <string name="all_apps_sort_cling_add_item">アプリタブを長押ししてソートモードを選択</string>
+ <string name="preferences_title">設定</string>
+ <string name="preferences_interface_title">インタフェース</string>
+ <string name="preferences_application_title">アプリケーション</string>
+ <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_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>
+ <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_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>
+ <string name="preferences_interface_dock_title">ドック</string>
+ <string name="preferences_interface_icons_title">アイコン</string>
+ <string name="preferences_interface_general_title">一般</string>
+ <string name="preferences_interface_general_orientation_title">画面の自動回転</string>
+
+
</resources>
diff --git a/res/values-ko-land/strings.xml b/res/values-ko-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-ko/strings.xml b/res/values-ko/strings.xml
index 990dcfb63..34515daaf 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"홈"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core 애플리케이션"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-lt-land/strings.xml b/res/values-lt-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-lt/strings.xml b/res/values-lt/strings.xml
index 885ecf0cf..9f0638eed 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Paleidimo priemonė"</string>
<string name="home" msgid="5921706419368316758">"Pagrindinis"</string>
<string name="uid_name" msgid="3371120195364560632">"Pagrindinės „Android“ programos"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-lv-land/strings.xml b/res/values-lv-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-lv/strings.xml b/res/values-lv/strings.xml
index c1cd54535..ab730923a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Palaidējs"</string>
<string name="home" msgid="5921706419368316758">"Sākums"</string>
<string name="uid_name" msgid="3371120195364560632">"Android kodola lietojumprogrammas"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ms-land/strings.xml b/res/values-ms-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-ms/strings.xml b/res/values-ms/strings.xml
index 3f2d0d84b..11a5cc466 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Pelancar"</string>
<string name="home" msgid="5921706419368316758">"Laman Utama"</string>
<string name="uid_name" msgid="3371120195364560632">"Apl Teras Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-nb-land/strings.xml b/res/values-nb-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-nb/strings.xml b/res/values-nb/strings.xml
index a3455165a..e7bbc3466 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Utskytingsrampe"</string>
<string name="home" msgid="5921706419368316758">"Home"</string>
<string name="uid_name" msgid="3371120195364560632">"Android-kjerneapplikasjoner"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-nl-land/strings.xml b/res/values-nl-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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/strings.xml b/res/values-nl/strings.xml
index 457ac307d..366bb1032 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,25 +1,21 @@
-<?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="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Startpagina"</string>
<string name="uid_name" msgid="3371120195364560632">"Android-kerntoepassingen"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -29,7 +25,7 @@
<string name="activity_not_found" msgid="217823393239365967">"App is niet geïnstalleerd."</string>
<string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Blijf aanraken om een widget toe te voegen"</string>
- <string name="market" msgid="2652226429823445833">"Winkel"</string>
+ <string name="market" msgid="2652226429823445833">"Play Store"</string>
<string name="external_drop_widget_error" msgid="2285187188524172774">"Kan item niet neerzetten in dit startscherm."</string>
<string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Widget selecteren om te maken"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Mapnaam"</string>
@@ -76,15 +72,15 @@
<string name="cab_folder_selection_text" msgid="8916111874189565067">"1 map geselecteerd"</string>
<string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 snelkoppeling geselecteerd"</string>
<string name="permlab_install_shortcut" msgid="1201690825493376489">"snelkoppelingen installeren"</string>
- <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Een app toestaan snelkoppelingen toe te voegen zonder tussenkomst van de gebruiker."</string>
+ <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Hiermee kan de app snelkoppelingen toevoegen zonder tussenkomst van de gebruiker."</string>
<string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"snelkoppelingen verwijderen"</string>
- <string name="permdesc_uninstall_shortcut" msgid="274355570620220977">"Toestaan dat de app snelkoppelingen verwijdert zonder tussenkomst van de gebruiker."</string>
+ <string name="permdesc_uninstall_shortcut" msgid="274355570620220977">"Hiermee kan de app snelkoppelingen verwijderen zonder tussenkomst van de gebruiker."</string>
<string name="permlab_read_settings" msgid="3452408290738106747">"instellingen en snelkoppelingen voor de startpagina lezen"</string>
- <string name="permdesc_read_settings" msgid="5788109303585403679">"Toestaan dat de app de instellingen en snelkoppelingen op de startpagina leest."</string>
+ <string name="permdesc_read_settings" msgid="5788109303585403679">"Hiermee kan de app de instellingen en snelkoppelingen op de startpagina lezen."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"instellingen en snelkoppelingen voor de startpagina schrijven"</string>
- <string name="permdesc_write_settings" msgid="8530105489115785531">"Toestaan dat de app de instellingen en snelkoppelingen op de startpagina wijzigt."</string>
+ <string name="permdesc_write_settings" msgid="8530105489115785531">"Hiermee kan de app de instellingen en snelkoppelingen op de startpagina wijzigen."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Probleem bij het laden van widget"</string>
- <string name="uninstall_system_app_text" msgid="6429814133777046491">"Dit is een systeemapp die niet kan worden verwijderd."</string>
+ <string name="uninstall_system_app_text" msgid="6429814133777046491">"Dit is een systeem-app die niet kan worden verwijderd."</string>
<string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Naamloze map"</string>
<string name="workspace_description_format" msgid="2968608205939373034">"Startscherm %1$d"</string>
@@ -111,4 +107,88 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+
+ <!-- CYANOGENMOD EDITS -->
+
+ <!-- Application copyright -->
+ <string name="application_copyright">Copyright \u00A9 2012 CyanogenMod</string>
+
+ <!-- Label for cancel drop target. [CHAR_LIMIT=30] -->
+ <string name="cancel_target_label">Annuleren</string>
+
+ <!-- Noun, menu item used to show the launcher preferences -->
+ <string name="menu_preferences">Trebuchet-instellingen</string>
+
+ <!-- Noun, menu item used to sort apps by name -->
+ <string name="menu_apps_sort_title">Naam</string>
+ <!-- Noun, menu item used to sort apps by install date -->
+ <string name="menu_apps_sort_install_date">Installatiedatum</string>
+
+ <!-- The title text for the All Apps Sort cling [CHAR_LIMIT=none] -->
+ <string name="all_apps_sort_cling_title">Sorteer uw apps</string>
+ <!-- The description of how to pick sort apps in the drawer [CHAR_LIMIT=none] -->
+ <string name="all_apps_sort_cling_add_item">Blijf de apps-tab aanraken om de sorteermodus te wijzigen.</string>
+
+ <!-- -->
+ <!-- Preferences -->
+ <!-- -->
+ <string name="preferences_title">Voorkeuren</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Uiterlijk</string>
+ <!-- Application -->
+ <string name="preferences_application_title">App</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <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 standaardstartscherm</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Rastergrootte</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Kies het aantal rijen/kolommen op het startscherm</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Rijen</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Kolommen</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Verticale opvulling</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Extra verticale opvulling op het startscherm</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Horizontale opvulling</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Extra horizontale opvulling op het startscherm</string>
+ <string name="preferences_interface_homescreen_general_search_title">Permanente zoekbalk</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Zoekbalk permanent tonen</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Widgetgrootte altijd wijzigen</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Toestaan grootte van alle widgets te veranderen</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Labels verbergen</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Namen onder iconen verbergen</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Scrollen</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Achtergrond schuiven</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Achtergrond laten schuiven bij scrollen door startschermen</string>
+ <string name="preferences_interface_homescreen_indicator_category">Indicator</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Startschermindicator tonen</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Indicator voor huidig startscherm onderaan tonen</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Indicator vervagen</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Indicator vervagen na het wisselen van startscherm</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Scheidingslijn dock tonen</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Achtergrond tonen achter indicator</string>
+
+ <!-- Drawer -->
+ <string name="preferences_interface_drawer_title">App- en widgetoverzicht</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">Van apps naar widgets overgaan zonder van tabblad te wisselen</string>
+ <string name="preferences_interface_drawer_indicator_category">Indicator</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Pagina-indicator tonen</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Indicator voor huidige pagina onderaan tonen</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Indicator vervagen</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Indicator vervagen na het wisselen van pagina</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Dock</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Iconen</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">Algemeen</string>
+ <string name="preferences_interface_general_orientation_title">Scherm autom. draaien</string>
</resources>
diff --git a/res/values-pl-land/strings.xml b/res/values-pl-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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 20b421737..12596ab08 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Program uruchamiający"</string>
<string name="home" msgid="5921706419368316758">"Strona główna"</string>
<string name="uid_name" msgid="3371120195364560632">"Aplikacje główne systemu Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-pt-land/strings.xml b/res/values-pt-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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 b976926f0..000000000
--- 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-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d7cedc09f..94025d519 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Página Inicial"</string>
<string name="uid_name" msgid="3371120195364560632">"Aplicações Principais do Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 53468bfe4..17a69bec5 100644..100755
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Início"</string>
<string name="uid_name" msgid="3371120195364560632">"Principais aplicativos do Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -111,4 +110,56 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
-</resources>
+ <string name="menu_preferences">Configurações Trebuchet</string>
+ <string name="preferences_title">Preferências</string>
+ <string name="preferences_interface_title">Interface</string>
+ <string name="preferences_application_title">Aplicação</string>
+ <string name="preferences_interface_homescreen_title">Tela Inicial</string>
+ <string name="preferences_interface_homescreen_general_category">Geral</string>
+ <string name="preferences_interface_homescreen_general_search_title">Barra de Pesquisa</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_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_drawer_title">Grade de Apps</string>
+ <string name="preferences_interface_dock_title">Dock</string>
+ <string name="preferences_interface_icons_title">Ícones</string>
+ <string name="preferences_interface_general_title">Geral</string>
+ <string name="preferences_interface_general_orientation_title">Auto Rotacionar Tela</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Espaçamento Vertical</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Espaço vertical extra na tela inicial</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Espaçamento Horizontal</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Espaço horizontal extra na tela inicial</string>
+ <string name="cancel_target_label">Cancelar</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>
+ <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_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_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>
+</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 b976926f0..000000000
--- 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-rm/strings.xml b/res/values-rm/strings.xml
index 99f72bb1e..34d47c8bb 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Lantschader"</string>
<!-- no translation found for home (5921706419368316758) -->
<skip />
<string name="uid_name" msgid="3371120195364560632">"Applicaziuns da basa dad Android"</string>
diff --git a/res/values-ro-land/strings.xml b/res/values-ro-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-ro/strings.xml b/res/values-ro/strings.xml
index 1ed96ac5b..8819332a4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Lansator"</string>
<string name="home" msgid="5921706419368316758">"Ecran de pornire"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -69,6 +68,8 @@
<string name="menu_notifications" msgid="6424587053194766192">"Notificări"</string>
<string name="menu_settings" msgid="3946232973327980394">"Setări de sistem"</string>
<string name="menu_help" msgid="4901160661634590633">"Ajutor"</string>
+ <string name="menu_apps_sort_title">"Nume"</string>
+ <string name="menu_apps_sort_install_date">"Dată Instalare"</string>
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Dezinstalaţi aplicaţia"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"Detalii aplicaţie"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"1 aplicaţie selectată"</string>
@@ -111,4 +112,50 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+ <string name="preferences_title">"Preferinţe"</string>
+ <string name="preferences_interface_title">"Interfaţă"</string>
+ <string name="preferences_application_title">"Aplicaţie"</string>
+ <string name="preferences_interface_homescreen_title">"Ecranul de pornire"</string>
+ <string name="preferences_interface_homescreen_general_category">"General"</string>
+ <string name="preferences_interface_homescreen_general_screens_title">"Ecrane"</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">"Numărul de ecrane pe ecranul de pornire"</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">"Ecranul implicit"</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">"Alegeți ecranul de pornire implicit"</string>
+ <string name="preferences_interface_homescreen_general_search_title">"Bara de Căutare"</string>
+ <string name="preferences_interface_homescreen_general_grid_title">"Dimensiune Grilă"</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">"Alegeți numărul de rânduri / coloane pe ecranul de pornire"</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">"Rânduri"</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">"Coloane"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">"Umplere verticală"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">"Spațierea pe verticală suplimentară pe ecranul de pornire"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">"Umplere orizontală"</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">"Spațierea orizontală suplimentară pe ecranul de pornire"</string>
+ <string name="preferences_interface_homescreen_general_search_summary">"Activează bara de cautare persistentă"</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">"Redimensionarea orice widget"</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">"Permite redimensionarea widget-urilor care în mod normal nu sunt redimensionabile"</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">"Ascundeți etichetele pictogramelor"</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">"Ascundeți etichetele pictogramelor pe ecranul de pornire"</string>
+ <string name="preferences_interface_homescreen_scrolling_category">"Defilare"</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">"Defilați Imaginea de Fundal"</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">"Defilați imaginea de fundal atunci când defilaţi ecranele"</string>
+ <string name="preferences_interface_homescreen_indicator_category">"Indicator"</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">"Afișaţi indicatorul de pagină"</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">"Afişaţi indicatorul de pagină curentă, în partea de jos a ecranului"</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">"Ascundeţi indicatorul"</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">"Ascundeţi indicatorul după ce ecranul de pornire s-a schimbat"</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">"Afişaţi divizorul de andocare"</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">"Afişaţi fundalul în spatele indicatorului"</string>
+ <string name="preferences_interface_drawer_title">"Sertar"</string>
+ <string name="preferences_interface_drawer_widgets_category">"Widget-uri"</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">"Alăturați la aplicații"</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">"Trecere de la sertar aplicații la sertar widget-uri, fără a schimba filele"</string>
+ <string name="preferences_interface_drawer_indicator_category">"Indicator"</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">"Afișaţi indicatorul de pagină"</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">"Afişaţi indicatorul de pagină curentă, în partea de jos a ecranului"</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">"Ascundeţi indicatorul"</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">"Ascundeţi indicator după ce pagina s-a schimbat"</string>
+ <string name="preferences_interface_dock_title">"Doc"</string>
+ <string name="preferences_interface_icons_title">"Pictograme"</string>
+ <string name="preferences_interface_general_title">"General"</string>
+ <string name="preferences_interface_general_orientation_title">"Rotire automată a ecranului"</string>
</resources>
diff --git a/res/values-ru-land/strings.xml b/res/values-ru-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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/strings.xml b/res/values-ru/strings.xml
index c2b88d519..08d742e98 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Главный экран"</string>
<string name="uid_name" msgid="3371120195364560632">"Основные приложения"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -55,6 +54,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>
@@ -69,6 +69,8 @@
<string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
<string name="menu_settings" msgid="3946232973327980394">"Настройки"</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>
@@ -111,4 +113,67 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></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_search_title">Строка поиска</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_summary">Включить неисчезающую строку поиска Google</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_scroll_wallpaper_title">Прокрутка обоев</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_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>
+ <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>
+
+ <!-- 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_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 b976926f0..000000000
--- 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-sk/strings.xml b/res/values-sk/strings.xml
index 43c4c1675..d648dc21e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Spúšťač"</string>
<string name="home" msgid="5921706419368316758">"Plocha"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sl-land/strings.xml b/res/values-sl-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-sl/strings.xml b/res/values-sl/strings.xml
index 3217c0a18..f5af01ccf 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Zaganjalnik"</string>
<string name="home" msgid="5921706419368316758">"Začetna stran"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sr-land/strings.xml b/res/values-sr-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-sr/strings.xml b/res/values-sr/strings.xml
index 5dd726a82..7c0a00dee 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Покретач"</string>
<string name="home" msgid="5921706419368316758">"Кућни"</string>
<string name="uid_name" msgid="3371120195364560632">"Основне Android апликације"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sv-land/strings.xml b/res/values-sv-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-sv/strings.xml b/res/values-sv/strings.xml
index 067b5f10b..aed344085 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Startbild"</string>
<string name="home" msgid="5921706419368316758">"Startsida"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sw-land/strings.xml b/res/values-sw-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-sw/strings.xml b/res/values-sw/strings.xml
index 676edcb56..f88a7ba22 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Kizinduzi"</string>
<string name="home" msgid="5921706419368316758">"Nyumbani"</string>
<string name="uid_name" msgid="3371120195364560632">"Programu Kuu za Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-th-land/strings.xml b/res/values-th-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-th/strings.xml b/res/values-th/strings.xml
index 91070ad77..3deb934aa 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"ตัวเรียกใช้งาน"</string>
<string name="home" msgid="5921706419368316758">"หน้าแรก"</string>
<string name="uid_name" msgid="3371120195364560632">"แอปหลัก Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-tl-land/strings.xml b/res/values-tl-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-tl/strings.xml b/res/values-tl/strings.xml
index dfa535754..6c68bb5df 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Home"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-tr-land/strings.xml b/res/values-tr-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-tr/strings.xml b/res/values-tr/strings.xml
index d9ce91529..d99275d1b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -19,19 +19,18 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
<string name="home" msgid="5921706419368316758">"Ana Ekran"</string>
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
<string name="chooser_wallpaper" msgid="6063168087625352235">"Duvar kağıdı seçin:"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Duvar kağıdını ayarla"</string>
<string name="pick_wallpaper" msgid="5630222540525626723">"Duvar Kağıtları"</string>
- <string name="activity_not_found" msgid="217823393239365967">"Uygulama yüklü değil."</string>
- <string name="widgets_tab_label" msgid="9145860100000983599">"Widget\'lar"</string>
- <string name="long_press_widget_to_add" msgid="7395697462851217506">"Widget seçmek için dokunun ve basılı tutun."</string>
- <string name="market" msgid="2652226429823445833">"Alışveriş"</string>
+ <string name="activity_not_found">Uygulama yüklü değil</string>
+ <string name="widgets_tab_label">Araçlar</string>
+ <string name="long_press_widget_to_add">Araç seçmek için dokunun ve basılı tutun.</string>
+ <string name="market">Google Play</string>
<string name="external_drop_widget_error" msgid="2285187188524172774">"Öğe bu Ana Ekrana bırakılamadı."</string>
- <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Oluşturmak için widget seçin"</string>
+ <string name="external_drop_widget_pick_title">Oluşturmak için araç seçin</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Klasör adı"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Klasörü yeniden adlandır"</string>
<string name="rename_action" msgid="6016003384693240896">"Tamam"</string>
@@ -39,12 +38,12 @@
<string name="menu_item_add_item" msgid="6233177331075781114">"Ana Sayfaya ekle"</string>
<string name="group_applications" msgid="2103752818818161976">"Uygulamalar"</string>
<string name="group_shortcuts" msgid="9133529424900391877">"Kısayollar"</string>
- <string name="group_widgets" msgid="6704978494073105844">"Widget\'lar"</string>
+ <string name="group_widgets">Araçlar</string>
<string name="group_wallpapers" msgid="1568191644272224858">"Duvar Kağıtları"</string>
<string name="completely_out_of_space" msgid="1759078539443491182">"Ana ekranlarınızda yer kalmadı."</string>
<string name="out_of_space" msgid="8365249326091984698">"Bu Ana Sayfada yer yok."</string>
<string name="hotseat_out_of_space" msgid="6304886797358479361">"Favori kısayollarda yer yok"</string>
- <string name="invalid_hotseat_item" msgid="6545340627805449250">"Bu widget, hotseat için çok büyük."</string>
+ <string name="invalid_hotseat_item">Bu araç, hotseat için çok büyük.</string>
<string name="shortcut_installed" msgid="7071557296331322355">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu oluşturuldu."</string>
<string name="shortcut_uninstalled" msgid="2129499669449749995">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu kaldırıldı."</string>
<string name="shortcut_duplicate" msgid="4757756326465060694">"\"<xliff:g id="NAME">%s</xliff:g>\" kısayolu zaten var."</string>
@@ -55,6 +54,7 @@
<string name="delete_zone_label_workspace" msgid="7153615831493049150">"Kaldır"</string>
<string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Yüklemeyi Kaldır"</string>
<string name="delete_target_label" msgid="665300185123139530">"Kaldır"</string>
+ <string name="cancel_target_label">İptal</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Yüklemeyi kaldır"</string>
<string name="info_target_label" msgid="4019495079517426980">"Uygulama bilgileri"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Ara"</string>
@@ -63,16 +63,19 @@
<string name="accessibility_delete_button" msgid="3628162007991023603">"Kaldır"</string>
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Güncelleme kaldırılsın mı?"</string>
<string name="menu_add" msgid="3065046628354640854">"Ekle"</string>
- <string name="menu_manage_apps" msgid="2308685199463588895">"Uyglm yönet"</string>
- <string name="menu_wallpaper" msgid="5837429080911269832">"Duvar Kağıdı"</string>
+ <string name="menu_manage_apps">Uygulamalar</string>
+ <string name="menu_wallpaper">Duvar kağıdı</string>
<string name="menu_search" msgid="4826514464423239041">"Ara"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Bildirimler"</string>
<string name="menu_settings" msgid="3946232973327980394">"Sistem ayarları"</string>
+ <string name="menu_preferences">Trebuchet ayarları</string>
<string name="menu_help" msgid="4901160661634590633">"Yardım"</string>
+ <string name="menu_apps_sort_title">Ad</string>
+ <string name="menu_apps_sort_install_date">Kurulum Tarihi</string>
<string name="cab_menu_delete_app" msgid="4089398025537640349">"Uygulamayı kaldır"</string>
<string name="cab_menu_app_info" msgid="914548323652698884">"Uygulama ayrıntıları"</string>
<string name="cab_app_selection_text" msgid="6378522164293415735">"1 uygulama seçildi"</string>
- <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget seçildi"</string>
+ <string name="cab_widget_selection_text" msgid="962527270506951955">"1 araç seçildi"</string>
<string name="cab_folder_selection_text" msgid="8916111874189565067">"1 klasör seçildi"</string>
<string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 kısayol seçildi"</string>
<string name="permlab_install_shortcut" msgid="1201690825493376489">"kısayolları yükle"</string>
@@ -83,7 +86,7 @@
<string name="permdesc_read_settings" msgid="5788109303585403679">"Uygulamaya Ana Ekrandaki ayarları ve kısayolları okuma izni verir."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"Ana Sayfa ayarlarını ve kısayollarını yaz"</string>
<string name="permdesc_write_settings" msgid="8530105489115785531">"Uygulamaya Ana Ekrandaki ayarları ve kısayolları değiştirme izni verir."</string>
- <string name="gadget_error_text" msgid="8359351016167075858">"Widget yüklenirken sorun oluştu"</string>
+ <string name="gadget_error_text" msgid="8359351016167075858">"Araç yüklenirken sorun oluştu"</string>
<string name="uninstall_system_app_text" msgid="6429814133777046491">"Bu bir sistem uygulamasıdır ve kaldırılamaz."</string>
<string name="dream_name" msgid="2847171357608437154">"Roket Fırlatıcı"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Adsız Klasör"</string>
@@ -91,12 +94,14 @@
<string name="default_scroll_format" msgid="4057140866420001240">"Sayfa %1$d / %2$d"</string>
<string name="workspace_scroll_format" msgid="1704767047951143301">"Ana ekran %1$d / %2$d"</string>
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Uygulama sayfası %1$d / %2$d"</string>
- <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Widget sayfası %1$d / %2$d"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"Kendinizi evinizde hissedin"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Favori uygulamalarınızı buraya koyabilirsiniz."</string>
+ <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Araç sayfası %1$d / %2$d"</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"Masaüstünü özelleştir"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Favori uygulamalarınızı buraya sürükleyin."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Tüm uygulamalarınızı görmek için çembere dokunun."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"İstediğiniz uygulamaları seçin"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ana Ekranınıza bir uygulama eklemek için, ilgili uygulamaya dokunup basılı tutun."</string>
+ <string name="all_apps_sort_cling_title">Uygulamaları sırala</string>
+ <string name="all_apps_sort_cling_add_item">Sıralama modunu seçmek için uygulamalara dokunun ve basılı tutun</string>
<string name="folder_cling_title" msgid="4308949882377840953">"Uygulamalarınızı klasörlerle düzenleyin"</string>
<string name="folder_cling_move_item" msgid="270598675060435169">"Bir uygulamayı taşımak için, uygulamaya dokunun ve basılı tutun."</string>
<string name="folder_cling_create_folder" msgid="8352867485656129478">"Ana Ekranınızda yeni bir klasör oluşturmak için, bir uygulamayı diğerinin üzerine getirin."</string>
@@ -111,4 +116,51 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></string>
+ <skip />
+ <string name="preferences_title">Tercihler</string>
+ <string name="preferences_interface_title">Arayüz</string>
+ <string name="preferences_application_title">Uygulama</string>
+ <string name="preferences_interface_homescreen_title">Ana ekran</string>
+ <string name="preferences_interface_homescreen_general_category">Genel</string>
+ <string name="preferences_interface_homescreen_general_screens_title">Ana ekranlar</string>
+ <string name="preferences_interface_homescreen_general_screens_summary">Ana ekran sayısı</string>
+ <string name="preferences_interface_homescreen_general_default_screen_title">Varsayılan ekran</string>
+ <string name="preferences_interface_homescreen_general_default_screen_summary">Varsayılan ekranı seçin</string>
+ <string name="preferences_interface_homescreen_general_grid_title">Döşeme boyutu</string>
+ <string name="preferences_interface_homescreen_general_grid_summary">Ana ekranda gösterilecek satır/sütun sayısını seçin</string>
+ <string name="preferences_interface_homescreen_general_grid_rows_title">Satırlar</string>
+ <string name="preferences_interface_homescreen_general_grid_columns_title">Sütunlar</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_title">Dikey aralık</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_vertical_summary">Ana ekrandaki ek dikey boşluk</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_title">Yatay aralık</string>
+ <string name="preferences_interface_homescreen_general_screen_padding_horizontal_summary">Ana ekrandaki ek yatay boşluk</string>
+ <string name="preferences_interface_homescreen_general_search_title">Arama çubuğu</string>
+ <string name="preferences_interface_homescreen_general_search_summary">Arama çubuğunu sürekli göster</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_title">Bütün araçları boyutlandır</string>
+ <string name="preferences_interface_homescreen_general_resize_any_widget_summary">Boyutlandırmayı desteklemese bile araçları yine de boyutlandır</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Simge etiketlerini gizle</string>
+ <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Ana ekrandaki simge etiketlerini gizle</string>
+ <string name="preferences_interface_homescreen_scrolling_category">Kaydırma</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_title">Duvar kağıdını kaydır</string>
+ <string name="preferences_interface_homescreen_scrolling_scroll_wallpaper_summary">Ana ekranları duvar kağıdı ile birlikte kaydır</string>
+ <string name="preferences_interface_homescreen_indicator_category">Gösterge</string>
+ <string name="preferences_interface_homescreen_indicator_enable_title">Sayfa göstergesi</string>
+ <string name="preferences_interface_homescreen_indicator_enable_summary">Hangi sayfada olduğunuzu gösterir</string>
+ <string name="preferences_interface_homescreen_indicator_fade_title">Göstergeyi soldur</string>
+ <string name="preferences_interface_homescreen_indicator_fade_summary">Ekran değiştikten sonra göstergeyi soldur</string>
+ <string name="preferences_interface_homescreen_indicator_background_title">Ayırıcı çizgiyi göster</string>
+ <string name="preferences_interface_homescreen_indicator_background_summary">Sabit uygulamaların üstünde ayırıcı çizgiyi göster</string>
+ <string name="preferences_interface_drawer_title">Uygulamalar</string>
+ <string name="preferences_interface_drawer_widgets_category">Araçlar</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_title">Uygulamalarla birleştir</string>
+ <string name="preferences_interface_drawer_widgets_join_apps_summary">Sekmelere dokunmadan Uygulamalar/Araçlar arası geçiş yap</string>
+ <string name="preferences_interface_drawer_indicator_category">Gösterge</string>
+ <string name="preferences_interface_drawer_indicator_enable_title">Sayfa göstergesi</string>
+ <string name="preferences_interface_drawer_indicator_enable_summary">Hangi sayfada olduğunuzu gösterir</string>
+ <string name="preferences_interface_drawer_indicator_fade_title">Göstergeyi soldur</string>
+ <string name="preferences_interface_drawer_indicator_fade_summary">Ekran değiştikten sonra göstergeyi soldur</string>
+ <string name="preferences_interface_dock_title">Sabit programlar</string>
+ <string name="preferences_interface_icons_title">Simgeler</string>
+ <string name="preferences_interface_general_title">Genel</string>
+ <string name="preferences_interface_general_orientation_title">Ekranı otomatik döndür</string>
</resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
new file mode 100644
index 000000000..b14228d30
--- /dev/null
+++ b/res/values-ug/strings.xml
@@ -0,0 +1,103 @@
+<?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: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 يادرولۇق پىروگراممىلار"</string>
+ <string name="folder_name" msgid="8551881338202938211"/>
+ <string name="chooser_wallpaper" msgid="6063168087625352235">"تام قەغەز تاللاش ئورنى"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"تام قەغەز تەڭشىكى"</string>
+ <string name="pick_wallpaper" msgid="5630222540525626723">"تام قەغىزى"</string>
+ <string name="activity_not_found" msgid="217823393239365967">"ئەپ ئورنىتىلمىغان."</string>
+ <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="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>
+ <string name="rename_folder_title" msgid="4544573104191526550">"قىسقۇچ ئاتىنى ئۆزگەرت"</string>
+ <string name="rename_action" msgid="6016003384693240896">"جەزملە"</string>
+ <string name="cancel_action" msgid="3811860427489435048">"ۋاز كەچ"</string>
+ <string name="menu_item_add_item" msgid="6233177331075781114">"باش ئېكرانغا قوش"</string>
+ <string name="group_applications" msgid="2103752818818161976">"ئەپلەر"</string>
+ <string name="group_shortcuts" msgid="9133529424900391877">"قىسقا يول"</string>
+ <string name="group_widgets" msgid="6704978494073105844">"پارچەلەر"</string>
+ <string name="group_wallpapers" msgid="1568191644272224858">"تام قەغىزى"</string>
+ <string name="out_of_space" msgid="8365249326091984698">"باش ئېكراندا ئورۇن يوق."</string>
+ <string name="invalid_hotseat_item" msgid="6545340627805449250">"ئاساسىي تەگلىك ئۈچۈن بۇ پارچە بەك چوڭ."</string>
+ <string name="shortcut_installed" msgid="7071557296331322355">"<xliff:g id="NAME">%s</xliff:g>قىسقا يول \"\" قۇرۇلدى."</string>
+ <string name="shortcut_uninstalled" msgid="2129499669449749995">"<xliff:g id="NAME">%s</xliff:g>قىسقا يول \"\" چىقىرىۋېتىلدى."</string>
+ <string name="shortcut_duplicate" msgid="4757756326465060694">"<xliff:g id="NAME">%s</xliff:g>قىسقا يول \"\" مەۋجۇت."</string>
+ <string name="title_select_shortcut" msgid="2858897527672831763">"قىسقا يول تاللاڭ"</string>
+ <string name="title_select_application" msgid="1793455815754848652">"ئەپ تاللاڭ"</string>
+ <string name="all_apps_button_label" msgid="2578400570124163469">"ئەپلەر"</string>
+ <string name="all_apps_home_button_label" msgid="1022222300329398558">"باش بەت"</string>
+ <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="delete_target_uninstall_label" msgid="748894921183769150">"ئۆچۈر"</string>
+ <string name="info_target_label" msgid="4019495079517426980">"ئەپ ئۇچۇرى"</string>
+ <string name="accessibility_search_button" msgid="816822994629942611">"ئىزدە"</string>
+ <string name="accessibility_voice_search_button" msgid="3938249215065842475">"تاۋۇش ئىزدەش"</string>
+ <string name="accessibility_all_apps_button" msgid="8803738611398979849">"ئەپلەر"</string>
+ <string name="accessibility_delete_button" msgid="3628162007991023603">"چىقىرىۋەت"</string>
+ <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_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_help" msgid="4901160661634590633">"ياردەم"</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>
+ <string name="cab_widget_selection_text" msgid="962527270506951955">"1 پارچە تاللاندى"</string>
+ <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 قىسقۇچ تاللاندى"</string>
+ <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 قىسقا يول تاللاندى"</string>
+ <string name="permlab_install_shortcut" msgid="1201690825493376489">"قىسقا يول ئورنىتىش"</string>
+ <string name="permdesc_install_shortcut" msgid="8634424803272077038">"ئەپنىڭ ئىشلەتكۈچى ئارىلاشمىغان ئەھۋالدا قىسقا يول قۇرۇشقا يول قويىدۇ."</string>
+ <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"قىسقا يول ئۆچۈر"</string>
+ <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"ئەپنىڭ ئىشلەتكۈچى ئارىلاشمىغان ئەھۋالدا قىسقا يولنى چىقىرىۋېتىشكە يول قويىدۇ."</string>
+ <string name="permlab_read_settings" msgid="3452408290738106747">"باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ئوقۇيدۇ"</string>
+ <string name="permdesc_read_settings" msgid="1836104524215167383">"ئەپنىڭ باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ئوقۇشىغا يول قويىدۇ."</string>
+ <string name="permlab_write_settings" msgid="1360567537236705628">"باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ياز"</string>
+ <string name="permdesc_write_settings" msgid="6763846563231494591">"ئەپنىڭ باش بەتتىكى تەڭشەك ۋە قىسقا يولنى ئۆزگەرتىشىگە يول قويىدۇ."</string>
+ <string name="gadget_error_text" msgid="8359351016167075858">"پارچە يۈكلەشتە خاتالىق كۆرۈلدى."</string>
+ <string name="uninstall_system_app_text" msgid="6429814133777046491">"بۇ سىستېما ئەپ، ئۆچۈرگىلى بولمايدۇ."</string>
+ <string name="dream_name" msgid="2847171357608437154">"Rocket قوزغاتقۇچ"</string>
+ <string name="folder_hint_text" msgid="8633351560105748141">"ئاتسىز قىسقۇچ"</string>
+ <string name="default_scroll_format" msgid="4057140866420001240">"%1$d-بەت، جەمئىي %2$d بەت"</string>
+ <string name="workspace_scroll_format" msgid="7911126267695001437">"%2$d نىڭ %1$d ئىش بوشلۇقى"</string>
+ <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"%1$d-ئەپ بەت، جەمئىي %2$d بەت"</string>
+ <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"%1$d-پارچە بەت، جەمئىي %2$d بەت"</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"ئۆزىڭىزنىڭ باش ئېكرانىنى ھاسىل قىلىڭ"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"بۇ جايغا ياقتۇرىدىغان ئەپلەرنى قويالايسىز."</string>
+ <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="folder_cling_title" msgid="4308949882377840953">"ئەپلىرىڭىزنى قىسقۇچلار بىلەن تەشكىللەڭ"</string>
+ <string name="folder_cling_move_item" msgid="270598675060435169">"ئەپنى يۆتكەشتە، ئۇنى تۇتۇپ، بېسىپ تۇرۇڭ."</string>
+ <string name="folder_cling_create_folder" msgid="8352867485656129478">"باش ئېكراندا يېڭى قىسقۇچ قۇرۇشتا، ئەپتىن بىرنى تاللاپ ئۇنى باشقىسىنىڭ ئۈستىگە دەستىلەڭ."</string>
+ <string name="cling_dismiss" msgid="2780907108735868381">"جەزملە"</string>
+ <string name="folder_opened" msgid="4129072635480822768">"قىسقۇچ ئېچىلدى، سىغىمى %2$d دىن %1$d"</string>
+ <string name="folder_tap_to_close" msgid="4076794242530255812">"چېكىلسە قىسقۇچ ياپىدۇ"</string>
+ <string name="folder_tap_to_rename" msgid="2125528923948315223">"چېكىلسە ئات ئۆزگەرتىشنى جەزملەيدۇ"</string>
+ <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>
+</resources>
diff --git a/res/values-uk-land/strings.xml b/res/values-uk-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-uk/strings.xml b/res/values-uk/strings.xml
index 5031ea996..5f9eaf0fe 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Пан. запуску"</string>
<string name="home" msgid="5921706419368316758">"Домашня сторінка"</string>
<string name="uid_name" msgid="3371120195364560632">"Служби Android Core"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-vi-land/strings.xml b/res/values-vi-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-vi/strings.xml b/res/values-vi/strings.xml
index 232aa0a13..d77c5a549 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Trình khởi chạy"</string>
<string name="home" msgid="5921706419368316758">"Trang chủ"</string>
<string name="uid_name" msgid="3371120195364560632">"Ứng dụng Lõi Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-zh-rCN-land/strings.xml b/res/values-zh-rCN-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f5eeab19c..768c458d1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"启动器"</string>
<string name="home" msgid="5921706419368316758">"主屏幕"</string>
<string name="uid_name" msgid="3371120195364560632">"Android 核心应用"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
@@ -55,6 +54,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>
@@ -68,7 +68,10 @@
<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>
@@ -97,6 +100,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">按住应用程序标签 &amp; 选择您的排列方式。</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>
@@ -111,4 +116,67 @@
<string name="custom_workspace_cling_description_1" msgid="6875529190849858047"></string>
<string name="custom_workspace_cling_title_2" msgid="5516006164661020362"></string>
<string name="custom_workspace_cling_description_2" msgid="2758258454975288377"></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_search_title">搜索栏</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_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_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_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-zh-rTW-land/strings.xml b/res/values-zh-rTW-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f261ddfb6..f952277f5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"啟動器"</string>
<string name="home" msgid="5921706419368316758">"住家"</string>
<string name="uid_name" msgid="3371120195364560632">"Android 核心應用程式"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-zu-land/strings.xml b/res/values-zu-land/strings.xml
deleted file mode 100644
index b976926f0..000000000
--- 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-zu/strings.xml b/res/values-zu/strings.xml
index 6faa63d01..ed1e57de6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -19,7 +19,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="8424725141379931883">"Isiqalisi"</string>
<string name="home" msgid="5921706419368316758">"Ikhaya"</string>
<string name="uid_name" msgid="3371120195364560632">"I-Android Core Apps"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index c76a6a5c4..f8fbf21d1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -44,8 +44,6 @@
<!-- Workspace specific attributes. These attributes are used to customize
the workspace in XML files. -->
<declare-styleable name="Workspace">
- <!-- The first screen the workspace should display. -->
- <attr name="defaultScreen" format="integer" />
<!-- The number of horizontal cells in the CellLayout -->
<attr name="cellCountX" format="integer" />
<!-- The number of vertical cells in the CellLayout -->
@@ -163,4 +161,26 @@
</declare-styleable>
<declare-styleable name="CustomClingText">
</declare-styleable>
+
+ <declare-styleable name="NumberPickerPreference">
+ <attr name="max" format="integer" />
+ <attr name="min" format="integer" />
+ <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 423a3a96f..5bbaec347 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -7,6 +7,8 @@
<!-- DragController -->
<integer name="config_flingToDeleteMinVelocity">-1500</integer>
+ <bool name="config_cyanogenmod">false</bool>
+
<!-- AllApps/Customize/AppsCustomize -->
<!-- The alpha of the AppsCustomize bg in spring loaded mode -->
<integer name="config_appsCustomizeSpringLoadedBgAlpha">45</integer>
@@ -76,6 +78,13 @@
<integer name="folder_max_count_y">4</integer>
<integer name="folder_max_num_items">16</integer>
+ <!-- Workspace grid size -->
+ <integer name="config_maxWorkspaceRows">7</integer>
+ <integer name="config_maxWorkspaceColumns">7</integer>
+
+ <!-- Allow tablets to set grid size in settings, false disables -->
+ <bool name="config_workspaceTabletGrid">false</bool>
+
<integer name="cell_count_x">4</integer>
<integer name="cell_count_y">4</integer>
<integer name="hotseat_cell_count">5</integer>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f15d3d89b..ecc858ab9 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,6 +27,7 @@
<!-- qsb_bar_height_inset represents qsb_bar_height minus the padding
that we put on each page for allowing folders to draw out of bounds -->
<dimen name="qsb_bar_height_inset">34dp</dimen>
+ <dimen name="qsb_bar_hidden_inset">14dp</dimen>
<dimen name="qsb_bar_height">40dp</dimen>
<dimen name="qsb_padding_left">0dp</dimen>
<dimen name="qsb_padding_right">0dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4aee339e4..a866a0e98 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,11 @@
<!-- General -->
<skip />
<!-- Application name -->
- <string name="application_name">Launcher</string>
+ <string name="application_name" translatable="false">Trebuchet</string>
+ <!-- Application copyright -->
+ <string name="application_copyright">Copyright \u00A9 CyanogenMod 2012</string>
+ <!-- Application version -->
+ <string name="application_version">0.2</string>
<!-- Accessibility-facing application name -->
<string name="home">Home</string>
<!-- Name for all applications running as this uid. -->
@@ -117,6 +121,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] -->
@@ -149,9 +155,16 @@ s -->
<string name="menu_notifications">Notifications</string>
<!-- Noun, menu item used to show the system settings -->
<string name="menu_settings">System settings</string>
+ <!-- Noun, menu item used to show the launcher preferences -->
+ <string name="menu_preferences">Trebuchet settings</string>
<!-- Noun, menu item used to show help. [CHAR_LIMIT=none] -->
<string name="menu_help">Help</string>
+ <!-- Noun, menu item used to sort apps by name -->
+ <string name="menu_apps_sort_title">Name</string>
+ <!-- Noun, menu item used to sort apps by install date -->
+ <string name="menu_apps_sort_install_date">Install Date</string>
+
<!-- URL pointing to help text. If empty, no link to help will be created [DO NOT TRANSLATE] -->
<string name="help_url" translatable="false"></string>
@@ -236,6 +249,10 @@ s -->
<string name="all_apps_cling_title">Choose some apps</string>
<!-- The description of how to pick up and add an item to the workspace [CHAR_LIMIT=none] -->
<string name="all_apps_cling_add_item">To add an app to your Home screen, touch &amp; hold it.</string>
+ <!-- The title text for the All Apps Sort cling [CHAR_LIMIT=none] -->
+ <string name="all_apps_sort_cling_title">Sort your apps</string>
+ <!-- The description of how to pick sort apps in the drawer [CHAR_LIMIT=none] -->
+ <string name="all_apps_sort_cling_add_item">Touch &amp; hold the Apps tab to select your sort mode</string>
<!-- The title text for the Folder cling [CHAR_LIMIT=none] -->
<string name="folder_cling_title">Organize your apps with folders</string>
<!-- The description of how to move an app [CHAR_LIMIT=none] -->
@@ -272,4 +289,67 @@ s -->
<!-- Dummy string [CHAR_LIMIT=60] -->
<string name="custom_workspace_cling_description_2"></string>
+ <skip />
+ <!-- -->
+ <!-- Preferences -->
+ <!-- -->
+ <string name="preferences_title">Preferences</string>
+ <!-- UI -->
+ <string name="preferences_interface_title">Interface</string>
+ <!-- Application -->
+ <string name="preferences_application_title">Application</string>
+
+ <!-- UI -->
+ <!-- Homescreen -->
+ <string name="preferences_interface_homescreen_title">Homescreen</string>
+ <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_summary">Choose the default 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_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_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_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_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_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_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_summary">Swipe from apps drawer to widgets drawer without changing tabs</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_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_summary">Fade the indicator after the page has changed</string>
+
+ <!-- Dock -->
+ <string name="preferences_interface_dock_title">Dock</string>
+
+ <!-- Icons -->
+ <string name="preferences_interface_icons_title">Icons</string>
+
+ <!-- General -->
+ <string name="preferences_interface_general_title">General</string>
+ <string name="preferences_interface_general_orientation_title">Auto-rotate screen</string>
</resources>
diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index 3afb3b755..bf5060546 100644
--- a/res/xml-sw600dp/default_workspace.xml
+++ b/res/xml-sw600dp/default_workspace.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
<!-- Far-left screen [0] -->
<!-- Left screen [1] -->
diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml
index 6302d7e04..e6651aae2 100644
--- a/res/xml-sw720dp/default_workspace.xml
+++ b/res/xml-sw720dp/default_workspace.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
<!-- Far-left screen [0] -->
<!-- Left screen [1] -->
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index f2f4240ab..4c50d8481 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
<!-- Far-left screen [0] -->
<!-- Left screen [1] -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
new file mode 100644
index 000000000..5ec6a95f2
--- /dev/null
+++ b/res/xml/preferences.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
+ <!-- UI -->
+ <PreferenceCategory android:title="@string/preferences_interface_title">
+ <!-- Homescreen -->
+ <PreferenceScreen android:key="ui_homescreen"
+ android:title="@string/preferences_interface_homescreen_title">
+ <PreferenceCategory android:title="@string/preferences_interface_homescreen_general_category">
+ <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/cell_count_y"
+ launcher:defaultValue2="@integer/cell_count_x"
+ launcher:max1="@integer/config_maxWorkspaceRows"
+ launcher:min1="3"
+ launcher:max2="@integer/config_maxWorkspaceColumns"
+ launcher:min2="3" />
+ <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screens"
+ android:title="@string/preferences_interface_homescreen_general_screens_title"
+ android:summary="@string/preferences_interface_homescreen_general_screens_summary"
+ android:defaultValue="5"
+ launcher:max="7"
+ launcher:min="1" />
+ <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_default_screen"
+ android:title="@string/preferences_interface_homescreen_general_default_screen_title"
+ android:summary="@string/preferences_interface_homescreen_general_default_screen_summary"
+ android:defaultValue="3"
+ launcher:maxExternal="ui_homescreen_screens"
+ launcher:max="7"
+ launcher:min="1" />
+ <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"
+ android:defaultValue="true" />
+ <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">
+ <CheckBoxPreference android:key="ui_homescreen_scrolling_scroll_wallpaper"
+ android:title="@string/preferences_interface_homescreen_scrolling_scroll_wallpaper_title"
+ android:summary="@string/preferences_interface_homescreen_scrolling_scroll_wallpaper_summary"
+ android:defaultValue="true" />
+ </PreferenceCategory>
+ <PreferenceCategory 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"
+ android:defaultValue="true" />
+ <CheckBoxPreference android:key="ui_homescreen_indicator_fade"
+ android:title="@string/preferences_interface_homescreen_indicator_fade_title"
+ android:summary="@string/preferences_interface_homescreen_indicator_fade_summary"
+ android:defaultValue="true"
+ android:dependency="ui_homescreen_indicator_enable" />
+ <CheckBoxPreference android:key="ui_homescreen_indicator_background"
+ android:title="@string/preferences_interface_homescreen_indicator_background_title"
+ android:summary="@string/preferences_interface_homescreen_indicator_background_summary"
+ android:defaultValue="true" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+
+ <!-- Drawer -->
+ <PreferenceScreen android:key="ui_drawer"
+ android:title="@string/preferences_interface_drawer_title">
+ <PreferenceCategory android:title="@string/preferences_interface_drawer_widgets_category">
+ <CheckBoxPreference android:key="ui_drawer_widgets_join_apps"
+ android:title="@string/preferences_interface_drawer_widgets_join_apps_title"
+ android:summary="@string/preferences_interface_drawer_widgets_join_apps_summary"
+ android:defaultValue="true" />
+ </PreferenceCategory>
+ <PreferenceCategory 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"
+ android:defaultValue="true" />
+ <CheckBoxPreference android:key="ui_drawer_indicator_fade"
+ android:title="@string/preferences_interface_drawer_indicator_fade_title"
+ android:summary="@string/preferences_interface_drawer_indicator_fade_summary"
+ android:defaultValue="true"
+ android:dependency="ui_drawer_indicator_enable" />
+ </PreferenceCategory>
+ </PreferenceScreen>
+
+ <!-- Dock -->
+ <!-- <PreferenceScreen android:key="ui_dock"
+ android:title="@string/preferences_interface_dock_title">
+
+ </PreferenceScreen> -->
+
+ <!-- Icons -->
+ <!-- <PreferenceScreen android:key="ui_icons"
+ android:title="@string/preferences_interface_icons_title">
+
+ </PreferenceScreen> -->
+
+ <!-- General -->
+ <PreferenceScreen android:key="ui_general"
+ android:title="@string/preferences_interface_general_title">
+ <CheckBoxPreference android:key="ui_general_orientation"
+ android:title="@string/preferences_interface_general_orientation_title" />
+ </PreferenceScreen>
+
+ </PreferenceCategory>
+
+ <!-- Application -->
+ <PreferenceCategory android:title="@string/preferences_application_title">
+ <Preference android:key="application_version"
+ style="?android:preferenceInformationStyle"
+ android:summary="@string/application_copyright" />
+ </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml
index 44a3f9efa..5c2547988 100644
--- a/res/xml/update_workspace.xml
+++ b/res/xml/update_workspace.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
<!-- Update the db with new hotseat items. Note that we reference the browser's original
package name. -->
<!-- Hotseat (We use the screen as the position of the item in the hotseat) -->