Merge "Reverting change to load workspace items in reverse order. (5290651)"

commit: 6027705e8c4713daabe63d049d71f9acdf972244 [log] [tgz]
author: Winson Chung <winsonc@google.com> Mon Sep 12 10:59:43 2011 -0700
committer: Android (Google) Code Review <android-gerrit@google.com> Mon Sep 12 10:59:43 2011 -0700
tree: 7df1fbe5289fc003a390a2a1925facdc757a7b27
parent: 65cc0c2d627f4891af1980cca89a9903bb7215d5 [diff]
parent: e61e93e56fcd37331943a4059f8cbdaa5d08136a [diff]
diff --git a/res/drawable-hdpi/overscroll_glow_left.9.png b/res/drawable-hdpi/overscroll_glow_left.9.png
new file mode 100644
index 0000000..cb8f22a
--- /dev/null
+++ b/res/drawable-hdpi/overscroll_glow_left.9.png
Binary files differ

diff --git a/res/drawable-hdpi/overscroll_glow_right.9.png b/res/drawable-hdpi/overscroll_glow_right.9.png
new file mode 100644
index 0000000..3135816
--- /dev/null
+++ b/res/drawable-hdpi/overscroll_glow_right.9.png
Binary files differ

diff --git a/res/drawable-mdpi/overscroll_glow_left.9.png b/res/drawable-mdpi/overscroll_glow_left.9.png
new file mode 100644
index 0000000..5989dce
--- /dev/null
+++ b/res/drawable-mdpi/overscroll_glow_left.9.png
Binary files differ

diff --git a/res/drawable-mdpi/overscroll_glow_right.9.png b/res/drawable-mdpi/overscroll_glow_right.9.png
new file mode 100644
index 0000000..5a6d2bc
--- /dev/null
+++ b/res/drawable-mdpi/overscroll_glow_right.9.png
Binary files differ

diff --git a/res/drawable-xhdpi/overscroll_glow_left.9.png b/res/drawable-xhdpi/overscroll_glow_left.9.png
new file mode 100644
index 0000000..cb47760
--- /dev/null
+++ b/res/drawable-xhdpi/overscroll_glow_left.9.png
Binary files differ

diff --git a/res/drawable-xhdpi/overscroll_glow_right.9.png b/res/drawable-xhdpi/overscroll_glow_right.9.png
new file mode 100644
index 0000000..25abad0
--- /dev/null
+++ b/res/drawable-xhdpi/overscroll_glow_right.9.png
Binary files differ

diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index b45800e..898e849 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml

@@ -46,6 +46,10 @@
         android:layout_gravity="bottom"
         android:layout_marginBottom="@dimen/button_bar_height" />
 
+    <include
+        android:id="@+id/qsb_bar"
+        layout="@layout/qsb_bar" />
+
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
@@ -67,10 +71,6 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <include
-        android:id="@+id/qsb_bar"
-        layout="@layout/qsb_bar" />
-
     <include layout="@layout/apps_customize_pane"
         android:id="@+id/apps_customize_pane"
         android:layout_width="match_parent"

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 17d3dfe..8f87d7e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -84,7 +84,7 @@
     <skip />
     <!-- no translation found for menu_notifications (6424587053194766192) -->
     <skip />
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Stelselinstellings"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Stelselinstellings"</string>
     <string name="menu_help" msgid="4901160661634590633">"Hulp"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Deïnstalleer program"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Programdetails"</string>
@@ -102,7 +102,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Stel \'n program in staat om die instellings en kortpaaie in Tuis te lees."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"skryf Tuis-instellings en -kortpaaie"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Stel program in staat om die instellings en kortpaaie in Tuis te verander."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Kon nie legstuk laai nie"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dit is \'n stelselprogram en kan nie gedeïnstalleer word nie."</string>
     <!-- no translation found for dream_name (2847171357608437154) -->

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d5ce9cc..bfe39a5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -84,7 +84,7 @@
     <skip />
     <!-- no translation found for menu_notifications (6424587053194766192) -->
     <skip />
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"ስርዓት ቅንጅቶች"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"የስርዓት ቅንጅቶች"</string>
     <string name="menu_help" msgid="4901160661634590633">"እገዛ"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"ትግበራ አራግፍ"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"የትግበራ ዝርዝሮች"</string>
@@ -102,7 +102,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"ቅንብሮችን እና አቋራጮችን በመነሻለማንበብ ትግበራ ይፈቅዳል።"</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"መነሻ ቅንብሮች እና አቋራጮች ፃፍ"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"ቅንብሮችን እና አቋራጮችን በመነሻለመለወጥ ትግበራ ይፈቅዳል።"</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"የGoogle ትግበራዎች"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"የGoogle ትግበራዎች"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"ፍርግም የመጫን ችግር"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"ይህ የስርዓት ትግበራ ነው እና አለማራገፍ አይቻልም።"</string>
     <!-- no translation found for dream_name (2847171357608437154) -->

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 667b8e4..a44faa8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"خلفية"</string>
     <string name="menu_search" msgid="4826514464423239041">"بحث"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"التنبيهات"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"إعدادات النظام"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"إعدادات النظام"</string>
     <string name="menu_help" msgid="4901160661634590633">"مساعدة"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"إزالة التطبيق"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"تفاصيل التطبيق"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"للسماح لتطبيق ما بقراءة الإعدادات والاختصارات في الشاشة الرئيسية."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"كتابة إعدادات الشاشة الرئيسية والاختصارات"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"للسماح لتطبيق ما بتغيير الإعدادات والاختصارات في الشاشة الرئيسية."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"حدثت مشكلة أثناء تحميل الأداة"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"هذا تطبيق نظام وتتعذر إزالته."</string>
     <string name="dream_name" msgid="2847171357608437154">"راجمة"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0e175f7..eba6d15 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Тапет"</string>
     <string name="menu_search" msgid="4826514464423239041">"Търсене"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Известия"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Системни настройки"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Системни настройки"</string>
     <string name="menu_help" msgid="4901160661634590633">"Помощ"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Деинсталиране на приложението"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Подробности за приложението"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Разрешава на приложение да прочете настройките и преките пътища към „Начало“."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"въведете настройките за „Начало“ и преки пътища"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Разрешава на приложение да промени настройките и преките пътища в „Начало“."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Приложения"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Приложения"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Проблем при зареждане на приспособление"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Това е системно приложение и не може да се деинсталира."</string>
     <string name="dream_name" msgid="2847171357608437154">"Ракетна площадка"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 558b677..a4f1a46 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Empaperat"</string>
     <string name="menu_search" msgid="4826514464423239041">"Cerca"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificacions"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Paràmetres del sistema"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Configuració del sistema"</string>
     <string name="menu_help" msgid="4901160661634590633">"Ajuda"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstal·la l\'aplicació"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalls de l\'aplicació"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Permet a una aplicació llegir la configuració i les dreceres de la pantalla Inici."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"escriure la configuració i les dreceres de la pantalla Inici"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permet que una aplicació canviï la configuració i les dreceres de la pantalla Inici."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"S\'ha produït un problema en carregar el widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Això és una aplicació del sistema i no es pot desinstal·lar."</string>
     <string name="dream_name" msgid="2847171357608437154">"Llançamíssils"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f032fa5..2dfc5a5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapeta"</string>
     <string name="menu_search" msgid="4826514464423239041">"Hledat"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Oznámení"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Systémová nastavení"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Systémová nastavení"</string>
     <string name="menu_help" msgid="4901160661634590633">"Nápověda"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Odinstalovat aplikaci"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Podrobnosti o aplikaci"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Povoluje aplikaci číst nastavení a odkazy plochy."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"zápis nastavení a odkazů plochy"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Povoluje aplikaci změnit nastavení a odkazy plochy."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problém s načtením widgetu"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Toto je systémová aplikace a nelze ji odinstalovat."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketomet"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fba9465..f14fe7a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapet"</string>
     <string name="menu_search" msgid="4826514464423239041">"Søg"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Meddelelser"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Systemindstillinger"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Systemindstillinger"</string>
     <string name="menu_help" msgid="4901160661634590633">"Hjælp"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Afinstaller applikation"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Programoplysninger"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Tillader, at en applikation læser indstillingerne og genvejene i Start."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"skriv indstillinger og genveje for Start"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Tillader, at en applikation ændrer indstillingerne og genvejene i Start."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Der er problemer med indlæsning af widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram, som ikke kan afinstalleres."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5567b85..df26d79 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -46,7 +46,7 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"\"<xliff:g id="NAME">%s</xliff:g>\"-Verknüpfung wurde entfernt."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"\"<xliff:g id="NAME">%s</xliff:g>\"-Verknüpfung ist bereits vorhanden."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Tastenkürzel auswählen"</string>
-    <string name="title_select_application" msgid="8031072293115454221">"Anwendung auswählen"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"App auswählen"</string>
     <string name="all_apps_button_label" msgid="2578400570124163469">"Apps"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Startseite"</string>
     <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Entfernen"</string>
@@ -64,11 +64,11 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Hintergrund"</string>
     <string name="menu_search" msgid="4826514464423239041">"Suchen"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Benachrichtigungen"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Systemeinstellungen"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Systemeinstellungen"</string>
     <string name="menu_help" msgid="4901160661634590633">"Hilfe"</string>
-    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Anwendung deinstallieren"</string>
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"App deinstallieren"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Anwendungsdetails"</string>
-    <string name="cab_app_selection_text" msgid="606113924828167756">"1 Anwendung ausgewählt"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 App ausgewählt"</string>
     <string name="cab_widget_selection_text" msgid="962527270506951955">"1 Widget ausgewählt"</string>
     <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 Ordner ausgewählt"</string>
     <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 Verknüpfung ausgewählt"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Ermöglicht einer App, die Einstellungen und Shortcuts auf der Startseite zu lesen."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"Einstellungen und Shortcuts für Startseite schreiben"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Ermöglicht einer App, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem beim Laden des Widgets"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketenstartgerät"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 50446de..07ba4bd 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Ταπετσαρία"</string>
     <string name="menu_search" msgid="4826514464423239041">"Αναζήτηση"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Ειδοποιήσεις"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Ρυθμίσεις συστήματος"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Ρυθμίσεις συστήματος"</string>
     <string name="menu_help" msgid="4901160661634590633">"Βοήθεια"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Κατάργηση εγκατάστασης εφαρμογής"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Λεπτομέρειες εφαρμογής"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Επιτρέπει σε μια εφαρμογή την ανάγνωση των ρυθμίσεων και των συντομεύσεων στην αρχική οθόνη."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"εγγραφή ρυθμίσεων και συντομεύσεων αρχικής οθόνης"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Επιτρέπει σε μια εφαρμογή την αλλαγή των ρυθμίσεων και των συντομεύσεων στην αρχική οθόνη."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Αυτή είναι εφαρμογή του συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 77ce051..aa45f42 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Allows an application to read the settings and shortcuts in Home."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"write Home settings and shortcuts"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Allows an application to change the settings and shortcuts in Home."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem loading widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"This is a system application and cannot be uninstalled."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 25a560b..8c36049 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Papel tapiz"</string>
     <string name="menu_search" msgid="4826514464423239041">"Buscar"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Configuraciones del sistema"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Configuración del sistema"</string>
     <string name="menu_help" msgid="4901160661634590633">"Ayuda"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar la aplicación"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalles de la aplicación"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Permite a una aplicación leer la configuración y los accesos directos de la página principal."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"escribir configuración y accesos directos de la página principal"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite a una aplicación cambiar la configuración y los accesos directos de la página principal."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Esta es una aplicación de sistema y no puede desinstalarse."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lanzacohetes"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f0b9649..3330250 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Fondo de pantalla"</string>
     <string name="menu_search" msgid="4826514464423239041">"Buscar con Google"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Ajustes del sistema"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Ajustes del sistema"</string>
     <string name="menu_help" msgid="4901160661634590633">"Ayuda"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar aplicación"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Información de la aplicación"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Permite que una aplicación lea la información de configuración y accesos directos del escritorio."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"escribir información de accesos directos y de configuración del escritorio"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que una aplicación modifique la configuración y los accesos directos de la página de inicio."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Se trata de una aplicación del sistema y no se puede desinstalar."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0722530..02c0867 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"تصویر زمینه"</string>
     <string name="menu_search" msgid="4826514464423239041">"جستجو"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"اعلان ها"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"تنظیمات سیستم"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"تنظیمات سیستم"</string>
     <string name="menu_help" msgid="4901160661634590633">"راهنما"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"حذف نصب برنامه"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"جزئیات برنامه کاربردی"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"به یک برنامه کاربردی اجازه می دهد تنظیمات و میانبرهای موجود در صفحه اصلی را بخواند."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"نوشتن تنظیمات صفحه اصلی و میانبرها"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"به برنامه کاربردی اجازه می دهد تنظیمات و میانبرها را در صفحه اصلی تغییر دهد."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"مشکل در بارگیری ابزارک"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"این یک برنامه سیستمی است و لغو نصب نمی شود."</string>
     <string name="dream_name" msgid="2847171357608437154">"پرتاب کننده موشک"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4589ea9..f7f2ea3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Taustakuva"</string>
     <string name="menu_search" msgid="4826514464423239041">"Haku"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Ilmoitukset"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Järjestelmän asetukset"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Järjestelmän asetukset"</string>
     <string name="menu_help" msgid="4901160661634590633">"Ohje"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Poista sovellus"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Sovelluksen tiedot"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Antaa sovelluksen lukea etusivun asetuksia ja pikakuvakkeita."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"kirjoittaa etusivun asetuksia ja pikakuvakkeita"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Antaa sovelluksen muuttaa etusivun asetuksia ja pikakuvakkeita."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Ongelma ladattaessa widgetiä"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Tämä on järjestelmäsovellus, eikä sitä voi poistaa."</string>
     <string name="dream_name" msgid="2847171357608437154">"Sinko"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e7330ad..bc68b90 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Fond d\'écran"</string>
     <string name="menu_search" msgid="4826514464423239041">"Rechercher"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notifications"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Paramètres du système"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Paramètres système"</string>
     <string name="menu_help" msgid="4901160661634590633">"Aide"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Désinstaller l\'application"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Infos sur l\'application"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Permet à une application de lire les paramètres et raccourcis de la page d\'accueil."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"Enregistrer les paramètres de la page d\'accueil et des raccourcis"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permet à une application de modifier les paramètres et les raccourcis de la page d\'accueil."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problème lors du chargement du widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Il s\'agit d\'une application système que vous ne pouvez pas désinstaller."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lance-missile"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 39b26a2..acd8301 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Pozadinska slika"</string>
     <string name="menu_search" msgid="4826514464423239041">"Pretraži"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Obavijesti"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Postavke sustava"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Postavke sustava"</string>
     <string name="menu_help" msgid="4901160661634590633">"Pomoć"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Deinstaliraj aplikaciju"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalji aplikacije"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Dopušta aplikaciji čitanje postavki i prečaca na početnom zaslonu."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"zapiši postavke početnog zaslona i prečaca"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Dopušta aplikaciji promjenu postavki i prečaca na početnom zaslonu."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem pri učitavanju widgeta"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ovo je aplikacija sustava i ne može se ukloniti."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8bbd3a4..dbf0e2f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Háttérkép"</string>
     <string name="menu_search" msgid="4826514464423239041">"Keresés"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Értesítések"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Rendszerbeállítások"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Rendszerbeállítások"</string>
     <string name="menu_help" msgid="4901160661634590633">"Súgó"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Alkalmazás eltávolítása"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Alkalmazás részletei"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Lehetővé teszi egy alkalmazás számára, hogy beolvassa a Főoldal beállításait és parancsikonjait."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"Főoldal beállításainak és parancsikonjainak írása"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Lehetővé teszi egy alkalmazás számára, hogy módosítsa a Főoldal beállításait és parancsikonjait."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Probléma történt a modul betöltésekor"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ez egy rendszeralkalmazás, ezért nem lehet eltávolítani."</string>
     <string name="dream_name" msgid="2847171357608437154">"Aknavető"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 55fba69..9f4025c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Wallpaper"</string>
     <string name="menu_search" msgid="4826514464423239041">"Telusuri"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Pemberitahuan"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Setelan Sistem"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Setelan sistem"</string>
     <string name="menu_help" msgid="4901160661634590633">"Bantuan"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Copot pemasangan aplikasi"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Detail aplikasi"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Mengizinkan aplikasi membaca setelan dan pintasan dalam Beranda."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"tuliskan setelan dan pintasan Beranda"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Mengizinkan aplikasi mengubah setelan dan pintasan dalam Beranda."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Masalah memuat widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ini adalah aplikasi sistem dan tidak dapat diunduh."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0a6716f..4b7342f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Consente a un\'applicazione di leggere le impostazioni e le scorciatoie in Home."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"creare impostazioni e scorciatoie in Home"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Consente a un\'applicazione di modificare le impostazioni e le scorciatoie in Home."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Errore durante il caricamento del widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Questa è un\'applicazione di sistema e non può essere disinstallata."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lanciamissili"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 213e6a0..c36f7b6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"טפט"</string>
     <string name="menu_search" msgid="4826514464423239041">"חפש"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"התראות"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"הגדרות מערכת"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"הגדרות מערכת"</string>
     <string name="menu_help" msgid="4901160661634590633">"עזרה"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"הסר התקנה של יישום"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"פרטי יישום"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"מאפשר ליישום לקרוא את ההגדרות וקיצורי הדרך בדף הבית."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"כתוב הגדרות וקיצורי דרך של דף הבית"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"מאפשר ליישום לשנות את ההגדרות וקיצורי הדרך בדף הבית."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"בעיה בטעינת Widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"זהו יישום מערכת ואין אפשרות להסיר את התקנתו."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 358682d..9385101 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"壁紙"</string>
     <string name="menu_search" msgid="4826514464423239041">"検索"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"システム設定"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"システム設定"</string>
     <string name="menu_help" msgid="4901160661634590633">"ヘルプ"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"アプリケーションのアンインストール"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"アプリケーションの詳細"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"ホームの設定とショートカットの読み取りをアプリケーションに許可します。"</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"ホームの設定とショートカットの書き込み"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"ウィジェットを表示できません"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"このシステムアプリケーションはアンインストールできません。"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
@@ -88,7 +88,7 @@
     <string name="workspace_cling_title" msgid="6772061635561632299">"ホーム画面へようこそ。"</string>
     <string name="workspace_cling_move_item" msgid="897064551822359347">"アプリまたはウィジェットを移動するには、アプリまたはウィジェットを押し続けた後、新しい場所に配置します。"</string>
     <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"すべてのアプリを見るには、[すべてのアプリ]をタップします。"</string>
-    <string name="all_apps_cling_title" msgid="3057036297077247772">"すべてのアプリを表示しています"</string>
+    <string name="all_apps_cling_title" msgid="3057036297077247772">"全アプリを表示しています"</string>
     <string name="all_apps_cling_add_item" msgid="4635717397976102935">"ホーム画面にアプリまたはウィジェットを追加するには、アプリまたはウィジェットを押し続けた後、希望の場所に配置します。"</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6327918..5838a63 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"배경화면"</string>
     <string name="menu_search" msgid="4826514464423239041">"검색"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"알림"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"시스템 설정"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"시스템 설정"</string>
     <string name="menu_help" msgid="4901160661634590633">"도움말"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"애플리케이션 제거"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"애플리케이션 세부정보"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"애플리케이션이 홈에 있는 설정 및 바로가기를 읽을 수 있도록 합니다."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"홈 설정 및 바로가기 쓰기"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"애플리케이션이 홈에 있는 설정 및 바로가기를 변경할 수 있도록 합니다."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"위젯을 로드하는 중 문제가 발생했습니다."</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"시스템 애플리케이션은 제거할 수 없습니다."</string>
     <string name="dream_name" msgid="2847171357608437154">"로켓 실행기"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 519b204..5ce8b26 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Darbalaukio fonas"</string>
     <string name="menu_search" msgid="4826514464423239041">"Ieškoti"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Įspėjimai"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Sistemos nustatymai"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Sistemos nustatymai"</string>
     <string name="menu_help" msgid="4901160661634590633">"Pagalba"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Pašalinti programą"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Išsami programos informacija"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Leidžia programai skaityti pagrindinio puslapio nustatymus ir sparčiuosius klavišus."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"rašyti pagrindinio puslapio nustatymus ir sparčiuosius klavišus"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Leidžia programai keisti pagrindinio puslapio nustatymus ir sparčiuosius klavišus."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema įkeliant valdiklį"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Tai sistemos programa ir jos negalima pašalinti."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketinis prieštankinis šautuvas"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7139fad..3c7f6c8 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Fona tapete"</string>
     <string name="menu_search" msgid="4826514464423239041">"Meklēt"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Paziņojumi"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Sistēmas iestatījumi"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Sistēmas iestatījumi"</string>
     <string name="menu_help" msgid="4901160661634590633">"Palīdzība"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Atinstalēt lietojumprogrammu"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Lietojumprogrammas dati"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Ļauj lietojumprogrammai lasīt iestatījumus un saīsnes sākuma ekrānā."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"rakstīt sākuma ekrāna iestatījumus un saīsnes"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Ļauj lietojumprogrammai mainīt iestatījumus un saīsnes sākuma ekrānā."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Radās problēma, ielādējot logrīku"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Šī ir sistēmas lietojumprogramma un to nevar atinstalēt."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 02da1d6..68697e7 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Kertas dinding"</string>
     <string name="menu_search" msgid="4826514464423239041">"Cari"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Pemberitahuan"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Tetapan Sistem"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Tetapan sistem"</string>
     <string name="menu_help" msgid="4901160661634590633">"Bantuan"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Nyahpasang aplikasi"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Butiran aplikasi"</string>
@@ -80,15 +80,15 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Membenarkan aplikasi untuk membaca tetapan dan pintasan di Laman Utama."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"menulis tetapan dan pintasan Laman Utama"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Membenarkan aplikasi untuk menukar tetapan dan pintasan di Laman Utama."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Masalah memuatkan widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ini adalah aplikasi sistem dan tidak boleh dinyahpasang."</string>
     <string name="dream_name" msgid="2847171357608437154">"Pelancar Roket"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Folder Tanpa Nama"</string>
     <string name="workspace_cling_title" msgid="6772061635561632299">"Selamat Kembali!"</string>
-    <string name="workspace_cling_move_item" msgid="897064551822359347">"Untuk memindahkan aplikasi atau widget, sentuh &amp; tahan, kemudian susunkan ia."</string>
+    <string name="workspace_cling_move_item" msgid="897064551822359347">"Untuk memindahkan aplikasi atau widget, sentuh &amp; tahan, kemudian atur kedudukannya."</string>
     <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Untuk melihat semua aplikasi anda, sentuh butang Semua Aplikasi."</string>
     <string name="all_apps_cling_title" msgid="3057036297077247772">"Berikut adalah semua aplikasi anda"</string>
-    <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Untuk menambahkan aplikasi atau widget ke skrin utama anda, sentuh,&amp; tahan, kemudian susunkan ia."</string>
+    <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Untuk menambahkan aplikasi atau widget pada skrin utama anda, sentuh &amp; tahan, kemudian atur kedudukannya."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
 </resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 58599ae..7cb7411 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -46,7 +46,7 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Fjernet snarveien «<xliff:g id="NAME">%s</xliff:g>»."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» fins allerede."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Velg snarvei"</string>
-    <string name="title_select_application" msgid="8031072293115454221">"Velg program"</string>
+    <string name="title_select_application" msgid="8031072293115454221">"Velg applikasjon"</string>
     <string name="all_apps_button_label" msgid="2578400570124163469">"Programmer"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Startsiden"</string>
     <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Fjern"</string>
@@ -64,11 +64,11 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Bakgrunnsbilde"</string>
     <string name="menu_search" msgid="4826514464423239041">"Søk"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Varslinger"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Systeminnstillinger"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Systeminnstillinger"</string>
     <string name="menu_help" msgid="4901160661634590633">"Hjelp"</string>
-    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Avinstaller program"</string>
+    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Avinstaller applikasjon"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Søknadsopplysninger"</string>
-    <string name="cab_app_selection_text" msgid="606113924828167756">"1 program valgt"</string>
+    <string name="cab_app_selection_text" msgid="606113924828167756">"1 applikasjon valgt"</string>
     <string name="cab_widget_selection_text" msgid="962527270506951955">"1 modul valgt"</string>
     <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 mappe valgt"</string>
     <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 snarvei valgt"</string>
@@ -80,12 +80,12 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Lar applikasjonen lese innstillinger og snarveier fra skrivebordet."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"skrive skrivebordsinnstillinger og -snarveier"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Lar applikasjonen endre innstillinger og snarveier på skrivebordet."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem under lasting av gadget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram og kan ikke avinstalleres."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Mappe uten navn"</string>
-    <string name="workspace_cling_title" msgid="6772061635561632299">"Velkommen hjem!"</string>
+    <string name="workspace_cling_title" msgid="6772061635561632299">"Velkommen til startsiden!"</string>
     <string name="workspace_cling_move_item" msgid="897064551822359347">"Du kan flytte en app eller modul ved å berøre og holde nede på den, og deretter flytte den."</string>
     <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Du kan se alle appene dine ved å berøre knappen Alle apper."</string>
     <string name="all_apps_cling_title" msgid="3057036297077247772">"Her er alle appene dine"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d823331..6c2c17e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Achtergrond"</string>
     <string name="menu_search" msgid="4826514464423239041">"Zoeken"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Meldingen"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Systeeminstellingen"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Systeeminstellingen"</string>
     <string name="menu_help" msgid="4901160661634590633">"Help"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"App verwijderen"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Toepassingsdetails"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Hiermee kan een 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="1098648778383349818">"Hiermee kan een app de instellingen en snelkoppelingen op de startpagina wijzigen."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Probleem bij het laden van widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dit is een systeemtoepassing die niet kan worden verwijderd."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2237a22..e40141c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapeta"</string>
     <string name="menu_search" msgid="4826514464423239041">"Szukaj"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Powiadomienia"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Ustawienia systemu"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Ustawienia systemu"</string>
     <string name="menu_help" msgid="4901160661634590633">"Pomoc"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Odinstaluj aplikację"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Szczegóły aplikacji"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Umożliwia aplikacji odczytywanie ustawień i skrótów strony głównej."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"zapisywanie ustawień i skrótów strony głównej"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Umożliwia aplikacji zmianę ustawień i skrótów strony głównej."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem podczas ładowania widżetu"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"To jest aplikacja systemowa i nie można jej odinstalować."</string>
     <string name="dream_name" msgid="2847171357608437154">"Wyrzutnia rakiet"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f8ef573..b405611 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -22,7 +22,7 @@
     <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplicações Principais do Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
-    <string name="chooser_wallpaper" msgid="5988031014201479733">"Seleccionar imagem de fundo a partir de"</string>
+    <string name="chooser_wallpaper" msgid="5988031014201479733">"Selecionar imagem de fundo a partir de"</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir imagem de fundo"</string>
     <string name="pick_wallpaper" msgid="5630222540525626723">"Imagens de fundo"</string>
     <string name="activity_not_found" msgid="5591731020063337696">"A aplicação não está instalada."</string>
@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Imagem de fundo"</string>
     <string name="menu_search" msgid="4826514464423239041">"Pesquisar"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Definições do Sistema"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Definições do sistema"</string>
     <string name="menu_help" msgid="4901160661634590633">"Ajuda"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar aplicação"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalhes da aplicação"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Permite que uma aplicação leia as definições e os atalhos do ecrã principal."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"escrever definições e atalhos do ecrã principal"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que uma aplicação altere as definições e os atalhos do ecrã principal."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Erro ao carregar o widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"É uma aplicação de sistema e não pode ser desinstalada."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lança-mísseis"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d5bcf14..8ee70d2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Plano de fundo"</string>
     <string name="menu_search" msgid="4826514464423239041">"Pesquisa"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Configurações do sistema"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Configurações do sistema"</string>
     <string name="menu_help" msgid="4901160661634590633">"Ajuda"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Desinstalar aplicativo"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalhes do aplicativo"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Permite que um aplicativo leia as configurações e atalhos na Página inicial."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"gravar configurações e atalhos da Página inicial"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que um aplicativo altere as configurações e atalhos na Página inicial."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema ao carregar o widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Este é um aplicativo do sistema e não pode ser desinstalado."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index fc95cb7..af86d52 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml

@@ -105,7 +105,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Pussibilitescha ch\'ina applicaziun possia leger ils parameters e las scursanidas da la pagina da partenza."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"Definir ils parameters e las scursanidas per la pagina da partenza"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Pussibilitescha ch\'ina applicaziun possia midar ils parameters e las scursanidas sin la pagina da partenza."</string>
-    <!-- no translation found for google_apps_folder_name (6379401240457905079) -->
+    <!-- no translation found for google_apps_folder_name (2873137836817266807) -->
     <skip />
     <string name="gadget_error_text" msgid="8359351016167075858">"Problems cun chargiar il widget"</string>
     <!-- no translation found for uninstall_system_app_text (7488523163288397451) -->

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 45724bc..5450e81 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Imagine de fundal"</string>
     <string name="menu_search" msgid="4826514464423239041">"Căutaţi"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Notificări"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Setări de sistem"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Setări de sistem"</string>
     <string name="menu_help" msgid="4901160661634590633">"Ajutor"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Dezinstalaţi aplicaţia"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Detalii aplicaţie"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Permite unei aplicaţii să citească setările şi comenzile rapide în Ecranul de pornire."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"scrieţi setări şi comenzi rapide pentru Ecranul de pornire"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Permite unei aplicaţii să modifice setările şi comenzile rapide pentru Ecranul de pornire."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Probleme la încărcarea obiectului widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Aceasta este o aplicaţie a sistemului şi nu se poate dezinstala."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a2e1065..c85d73e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Обои"</string>
     <string name="menu_search" msgid="4826514464423239041">"Поиск"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Настройки системы"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Настройки системы"</string>
     <string name="menu_help" msgid="4901160661634590633">"Справка"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Удалить приложение"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Сведения о приложении"</string>
@@ -80,15 +80,15 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Позволяет приложению считывать настройки и ярлыки на главном экране."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"изменять настройки и ярлыки главного экрана"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Позволяет приложению изменять настройки и ярлыки на главном экране."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Не удалось загрузить виджет"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Это системное приложение. Удалить его невозможно."</string>
     <string name="dream_name" msgid="2847171357608437154">"Фейерверк"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Папка без названия"</string>
     <string name="workspace_cling_title" msgid="6772061635561632299">"Добро пожаловать на главный экран!"</string>
-    <string name="workspace_cling_move_item" msgid="897064551822359347">"Чтобы переместить значок приложения или виджета, нажмите на него и удерживайте, а затем перетащите на нужное место."</string>
+    <string name="workspace_cling_move_item" msgid="897064551822359347">"Чтобы переместить значок приложения или виджета, нажмите на него и, удерживая, перетащите."</string>
     <string name="workspace_cling_open_all_apps" msgid="5287802320356364228">"Чтобы открыть список всех приложений, нажмите кнопку \"Приложения\"."</string>
     <string name="all_apps_cling_title" msgid="3057036297077247772">"Все приложения"</string>
-    <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Чтобы добавить приложение или виджет на главный экран, нажмите на значок и, удерживая его, перетащите на нужное место."</string>
+    <string name="all_apps_cling_add_item" msgid="4635717397976102935">"Чтобы добавить приложение или виджет на главный экран, нажмите на значок и, удерживая его, перетащите."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"ОК"</string>
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 14bfc8d..bf8e55f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapeta"</string>
     <string name="menu_search" msgid="4826514464423239041">"Hľadať"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Upozornenia"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Nastavenia systému"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Nastavenia systému"</string>
     <string name="menu_help" msgid="4901160661634590633">"Pomocník"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Odinštalovať aplikáciu"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Podrobnosti o aplikácii"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Povoľuje aplikácii čítať nastavenia a odkazy plochy."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"zápis nastavení a odkazov plochy"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Povoľuje aplikácii zmeniť nastavenia a odkazy plochy."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problém s načítaním miniaplikácií"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Toto je systémová aplikácia a nie je možné ju odinštalovať."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketomet"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1817362..6d4c69f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Slika za ozadje"</string>
     <string name="menu_search" msgid="4826514464423239041">"Iskanje"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Obvestila"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Sistemske nastavitve"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Sistemske nastavitve"</string>
     <string name="menu_help" msgid="4901160661634590633">"Pomoč"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Odstrani program"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Podrobnosti o programu"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Omogoča programu branje nastavitev in bližnjic na začetnem zaslonu."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"zapis nastavitev in bližnjic začetnega zaslona"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Omogoča programu spreminjanje nastavitev in bližnjic na začetnem zaslonu."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Aplikacije"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Aplikacije"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Težave pri nalaganju pripomočka"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"To je sistemski program in ga ni mogoče odstraniti."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketno izstrelišče"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 68692ad..e9e731e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Позадина"</string>
     <string name="menu_search" msgid="4826514464423239041">"Претражи"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Обавештења"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Системска подешавања"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Системска подешавања"</string>
     <string name="menu_help" msgid="4901160661634590633">"Помоћ"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Деинсталирај апликацију"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Детаљи о апликацији"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Омогућава апликацији да чита подешавања и пречице на почетном екрану."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"уписивање подешавања и пречица на почетном екрану"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Омогућава апликацији да промени подешавања и пречице на почетном екрану."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Проблем приликом учитавања виџета"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ово је системска апликација и не може да се деинсталира."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 69f8416..7d9b259 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Bakgrund"</string>
     <string name="menu_search" msgid="4826514464423239041">"Sök"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Aviseringar"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Systeminställningar"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Systeminställningar"</string>
     <string name="menu_help" msgid="4901160661634590633">"Hjälp"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Avinstallera app"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Programinformation"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Tillåter att ett program läser inställningar och genvägar på startsidan."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"skriva inställningar och genvägar för startsidan"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Tillåter att ett program ändrar inställningar och genvägar på startsidan."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Det gick inte att läsa in widgeten"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Det här är ett systemprogram och kan inte avinstalleras."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketavfyringsramp"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e0824a0..00afe16 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -84,7 +84,7 @@
     <skip />
     <!-- no translation found for menu_notifications (6424587053194766192) -->
     <skip />
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"mipangilio ya mfumo"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Mipangilio ya mfumo"</string>
     <string name="menu_help" msgid="4901160661634590633">"Msaada"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Ondoa programu"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Maelezo ya programu"</string>
@@ -102,7 +102,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Huruhusu programu kusoma mipangilio na njia za mkato katika Nyumbani."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"andika mipangilio ya Nyumbani na njia za mkato"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Huruhusu programu kubadilisha mipangilio na njia za mkato Nyumbani."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Tatizo la kupakia wijeti"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Hii ni programu ya mfumo na haiwezi kuondolewa."</string>
     <!-- no translation found for dream_name (2847171357608437154) -->

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index fd468b3..a99960b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"วอลเปเปอร์"</string>
     <string name="menu_search" msgid="4826514464423239041">"ค้นหา"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"การแจ้งเตือน"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"การตั้งค่าระบบ"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"การตั้งค่าระบบ"</string>
     <string name="menu_help" msgid="4901160661634590633">"ความช่วยเหลือ"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"ถอนการติดตั้งแอปพลิเคชัน"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"รายละเอียดแอปพลิเคชัน"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"อนุญาตให้แอปพลิเคชันอ่านการตั้งค่าและทางลัดในหน้าแรก"</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"เขียนการตั้งค่าและทางลัดหน้าแรกแล้ว"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"อนุญาตให้แอปพลิเคชันเปลี่ยนการตั้งค่าและทางลัดในหน้าแรก"</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"มีปัญหาขณะโหลดวิดเจ็ต"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"นี่เป็นแอปพลิเคชันระบบและไม่สามารถถอนการติดตั้งได้"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 30b8db8..4350714 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Wallpaper"</string>
     <string name="menu_search" msgid="4826514464423239041">"Paghahanap"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Mga Notification"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Mga Setting ng System"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Mga setting ng system"</string>
     <string name="menu_help" msgid="4901160661634590633">"Tulong"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"I-uninstall ang application"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Mga detalye ng application"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Pinapayagan ang isang application na basahin ang mga setting at shortcut sa Home."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"magsulat ng mga setting ng Home at mga shortcut"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Pinapayagan ang isang application na baguhin ang mga setting at shortcut sa Home."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema sa pag-load ng widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Isa itong system application at hindi maaaring i-install."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ab8760c..bd4dde3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Duvar Kağıdı"</string>
     <string name="menu_search" msgid="4826514464423239041">"Ara"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Bildirimler"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Sistem Ayarları"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Sistem ayarları"</string>
     <string name="menu_help" msgid="4901160661634590633">"Yardım"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Uygulamanın yüklemesini kaldır"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Uygulama ayrıntıları"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Bir uygulamaya Ana Sayfadaki 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="1098648778383349818">"Bir uygulamaya Ana Sayfadaki ayarları ve kısayolları değiştirme izni verir."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Widget yüklenirken sorun oluştu"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Bu bir sistem uygulamasıdır ve kaldırılamaz."</string>
     <string name="dream_name" msgid="2847171357608437154">"Roket Fırlatıcı"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 79c6850..32ab3f9 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Фоновий мал."</string>
     <string name="menu_search" msgid="4826514464423239041">"Пошук"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Сповіщення"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Налаштування системи"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Налаштування системи"</string>
     <string name="menu_help" msgid="4901160661634590633">"Довідка"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Видалити програму"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Деталі програми"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Дозволяє програмі читати налаштування та ярлики на Головній."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"писати налашт-ня Головної та ярлики"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Дозволяє програмі змінювати налаштування та ярлики на Головній."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Пробл із завантаж. віджета"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Це системна програма, її неможливо видалити."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2ce21c8..0165058 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"Hình nền"</string>
     <string name="menu_search" msgid="4826514464423239041">"Tìm kiếm"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Thông báo"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Cài đặt hệ thống"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Cài đặt hệ thống"</string>
     <string name="menu_help" msgid="4901160661634590633">"Trợ giúp"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Gỡ cài đặt ứng dụng"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Chi tiết ứng dụng"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Cho phép ứng dụng đọc cài đặt và lối tắt trên Màn hình trang chủ."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"ghi cài đặt Màn hình trang chủ và lối tắt"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Cho phép ứng dụng thay đổi cài đặt và lối tắt trên Màn hình trang chủ."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Sự cố khi tải tiện ích"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Đây là ứng dụng hệ thống và không thể gỡ cài đặt."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index aab15ad..d601b23 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"壁纸"</string>
     <string name="menu_search" msgid="4826514464423239041">"搜索"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"系统设置"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"系统设置"</string>
     <string name="menu_help" msgid="4901160661634590633">"帮助"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"卸载应用程序"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"应用程序详细信息"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"允许应用程序读取主屏幕的设置和快捷方式。"</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"写入主屏幕的设置和快捷方式"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"允许应用程序更改主屏幕的设置和快捷方式。"</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"载入窗口小部件时出现问题"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"这是系统应用程序，无法卸载。"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 66dbf7f..3ce6aed 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -64,7 +64,7 @@
     <string name="menu_wallpaper" msgid="5837429080911269832">"桌布"</string>
     <string name="menu_search" msgid="4826514464423239041">"搜尋"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"系統設定"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"系統設定"</string>
     <string name="menu_help" msgid="4901160661634590633">"說明"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"解除安裝應用程式"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"應用程式詳細資料"</string>
@@ -80,7 +80,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"允許應用程式讀取主螢幕中的設定和捷徑。"</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"寫入主螢幕設定和捷徑"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"允許應用程式變更主螢幕中的設定和捷徑。"</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Google Apps"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Google Apps"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"載入小工具時發生問題"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"這是系統應用程式，無法將其解除安裝。"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c24b91e..4c2dc1f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -84,7 +84,7 @@
     <skip />
     <!-- no translation found for menu_notifications (6424587053194766192) -->
     <skip />
-    <!-- outdated translation 8590123354578910028 -->     <string name="menu_settings" msgid="3946232973327980394">"Izilungiselelo Zendlela Yokusebenza"</string>
+    <string name="menu_settings" msgid="3946232973327980394">"Izilungiselelo Zendlela Yokusebenza"</string>
     <string name="menu_help" msgid="4901160661634590633">"Usizo"</string>
     <string name="cab_menu_delete_app" msgid="1242619904941293871">"Khipha uhlelo lokusebenza"</string>
     <string name="cab_menu_app_info" msgid="5180426909324882018">"Imininingwane yohlelo lokusebenza"</string>
@@ -102,7 +102,7 @@
     <string name="permdesc_read_settings" msgid="8377434937176025492">"Ivumela uhlelo lokusebenza ukufunda izilungiselelo nezinqamuleli Ekhaya."</string>
     <string name="permlab_write_settings" msgid="1360567537236705628">"bhala izilungiselelo zaseKhaya nezinqamuleli"</string>
     <string name="permdesc_write_settings" msgid="1098648778383349818">"Ivumela izinhlelo ukushintsha izilungiselelo nezinqamuleli Ekhaya."</string>
-    <string name="google_apps_folder_name" msgid="6379401240457905079">"Izinhlelo Zokusebenza ze-Google"</string>
+    <!-- outdated translation 6379401240457905079 -->     <string name="google_apps_folder_name" msgid="2873137836817266807">"Izinhlelo Zokusebenza ze-Google"</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"Inkinga yokulayisha iwijethi"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string>
     <!-- no translation found for dream_name (2847171357608437154) -->

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a5b394d..512419a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml

@@ -35,6 +35,7 @@
     <dimen name="hotseat_cell_height">64dp</dimen>
     <dimen name="hotseat_width_gap">-1dp</dimen>
     <dimen name="hotseat_height_gap">-1dp</dimen>
+    <dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
 
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">0dip</dimen>

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index a583415..dd04039 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java

@@ -31,10 +31,10 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
+import android.graphics.Bitmap.Config;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Process;
@@ -46,6 +46,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
+import android.view.animation.DecelerateInterpolator;
 import android.widget.GridLayout;
 import android.widget.ImageView;
 import android.widget.Toast;
@@ -191,11 +192,12 @@
 
     // Relating to the scroll and overscroll effects
     Workspace.ZInterpolator mZInterpolator = new Workspace.ZInterpolator(0.5f);
-    private float mDensity;
     private static float CAMERA_DISTANCE = 3500;
-    private static float TRANSITION_SCALE_FACTOR = 0.6f;
+    private static float TRANSITION_SCALE_FACTOR = 0.74f;
     private static float TRANSITION_PIVOT = 0.75f;
     private static float TRANSITION_MAX_ROTATION = 26f;
+    private static final boolean PERFORM_OVERSCROLL_ROTATION = false;
+    private AccelerateInterpolator mAlphaInterpolator = new AccelerateInterpolator(0.9f);
 
     // Previews & outlines
     ArrayList<AppsCustomizeAsyncTask> mRunningTasks;
@@ -219,7 +221,6 @@
         mDefaultWidgetBackground = resources.getDrawable(R.drawable.default_widget_preview_holo);
         mAppIconSize = resources.getDimensionPixelSize(R.dimen.app_icon_size);
         mDragViewMultiplyColor = resources.getColor(R.color.drag_view_multiply_color);
-        mDensity = resources.getDisplayMetrics().density;
 
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PagedView, 0, 0);
         // TODO-APPS_CUSTOMIZE: remove these unnecessary attrs after
@@ -1131,49 +1132,47 @@
     @Override
     protected void screenScrolled(int screenCenter) {
         super.screenScrolled(screenCenter);
-        final int halfScreenSize = getMeasuredWidth() / 2;
 
         for (int i = 0; i < getChildCount(); i++) {
             View v = getPageAt(i);
             if (v != null) {
-                int totalDistance = getScaledMeasuredWidth(v) + mPageSpacing;
-                int delta = screenCenter - (getChildOffset(i) -
-                        getRelativeChildOffset(i) + halfScreenSize);
-
-                float scrollProgress = delta / (totalDistance * 1.0f);
-                scrollProgress = Math.min(scrollProgress, 1.0f);
-                scrollProgress = Math.max(scrollProgress, -1.0f);
+                float scrollProgress = getScrollProgress(screenCenter, v, i);
 
                 float interpolatedProgress =
                         mZInterpolator.getInterpolation(Math.abs(Math.min(scrollProgress, 0)));
                 float scale = (1 - interpolatedProgress) +
                         interpolatedProgress * TRANSITION_SCALE_FACTOR;
                 float translationX = Math.min(0, scrollProgress) * v.getMeasuredWidth();
-                float alpha = scrollProgress < 0 ? 1 - Math.abs(scrollProgress) : 1.0f;
+
+                float alpha = scrollProgress < 0 ? mAlphaInterpolator.getInterpolation(
+                        1 - Math.abs(scrollProgress)) : 1.0f;
 
                 v.setCameraDistance(mDensity * CAMERA_DISTANCE);
                 int pageWidth = v.getMeasuredWidth();
                 int pageHeight = v.getMeasuredHeight();
-                if (i == 0 && scrollProgress < 0) {
-                    // Overscroll to the left
-                    v.setPivotX(TRANSITION_PIVOT * pageWidth);
-                    v.setRotationY(-TRANSITION_MAX_ROTATION * scrollProgress);
-                    scale = 1.0f;
-                    alpha = 1.0f;
-                    // On the first page, we don't want the page to have any lateral motion
-                    translationX = getScrollX();
-                } else if (i == getChildCount() - 1 && scrollProgress > 0) {
-                    // Overscroll to the right
-                    v.setPivotX((1 - TRANSITION_PIVOT) * pageWidth);
-                    v.setRotationY(-TRANSITION_MAX_ROTATION * scrollProgress);
-                    scale = 1.0f;
-                    alpha = 1.0f;
-                    // On the last page, we don't want the page to have any lateral motion.
-                    translationX =  getScrollX() - mMaxScrollX;
-                } else {
-                    v.setPivotY(pageHeight / 2.0f);
-                    v.setPivotX(pageWidth / 2.0f);
-                    v.setRotationY(0f);
+
+                if (PERFORM_OVERSCROLL_ROTATION) {
+                    if (i == 0 && scrollProgress < 0) {
+                        // Overscroll to the left
+                        v.setPivotX(TRANSITION_PIVOT * pageWidth);
+                        v.setRotationY(-TRANSITION_MAX_ROTATION * scrollProgress);
+                        scale = 1.0f;
+                        alpha = 1.0f;
+                        // On the first page, we don't want the page to have any lateral motion
+                        translationX = getScrollX();
+                    } else if (i == getChildCount() - 1 && scrollProgress > 0) {
+                        // Overscroll to the right
+                        v.setPivotX((1 - TRANSITION_PIVOT) * pageWidth);
+                        v.setRotationY(-TRANSITION_MAX_ROTATION * scrollProgress);
+                        scale = 1.0f;
+                        alpha = 1.0f;
+                        // On the last page, we don't want the page to have any lateral motion.
+                        translationX =  getScrollX() - mMaxScrollX;
+                    } else {
+                        v.setPivotY(pageHeight / 2.0f);
+                        v.setPivotX(pageWidth / 2.0f);
+                        v.setRotationY(0f);
+                    }
                 }
 
                 v.setTranslationX(translationX);
@@ -1185,26 +1184,7 @@
     }
 
     protected void overScroll(float amount) {
-        int screenSize = getMeasuredWidth();
-
-        // We want to reach the max overscroll effect when the user has
-        // overscrolled half the size of the screen
-        float f = 2 * (amount / screenSize);
-
-        if (f == 0) return;
-
-        // Clamp this factor, f, to -1 < f < 1
-        if (Math.abs(f) >= 1) {
-            f /= Math.abs(f);
-        }
-
-        int overScrollAmount = (int) Math.round(f * screenSize);
-        if (amount < 0) {
-            mScrollX = overScrollAmount;
-        } else {
-            mScrollX = mMaxScrollX + overScrollAmount;
-        }
-        invalidate();
+        dampedOverScroll(amount);
     }
 
     /**

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 667df8b..0d80d16 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java

@@ -32,10 +32,13 @@
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.PointF;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.NinePatchDrawable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -88,6 +91,7 @@
     private ArrayList<FolderRingAnimator> mFolderOuterRings = new ArrayList<FolderRingAnimator>();
     private int[] mFolderLeaveBehindCell = {-1, -1};
 
+    private int mForegroundAlpha = 0;
     private float mBackgroundAlpha;
     private float mBackgroundAlphaMultiplier = 1.0f;
 
@@ -98,10 +102,15 @@
     private Drawable mNormalGlowBackgroundMini;
     private Drawable mActiveBackgroundMini;
     private Drawable mActiveGlowBackgroundMini;
+    private Drawable mOverScrollForegroundDrawable;
+    private Drawable mOverScrollLeft;
+    private Drawable mOverScrollRight;
     private Rect mBackgroundRect;
+    private Rect mForegroundRect;
     private Rect mGlowBackgroundRect;
     private float mGlowBackgroundScale;
     private float mGlowBackgroundAlpha;
+    private int mForegroundPadding;
 
     private boolean mAcceptsDrops = true;
     // If we're actively dragging something over this screen, mIsDragOverlapping is true
@@ -180,6 +189,10 @@
         mNormalGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_blue_strong);
         mActiveBackgroundMini = res.getDrawable(R.drawable.homescreen_small_green);
         mActiveGlowBackgroundMini = res.getDrawable(R.drawable.homescreen_small_green_strong);
+        mOverScrollLeft = res.getDrawable(R.drawable.overscroll_glow_left);
+        mOverScrollRight = res.getDrawable(R.drawable.overscroll_glow_right);
+        mForegroundPadding =
+                res.getDimensionPixelSize(R.dimen.workspace_overscroll_drawable_padding);
 
         mNormalBackground.setFilterBitmap(true);
         mActiveBackground.setFilterBitmap(true);
@@ -261,6 +274,7 @@
         }
 
         mBackgroundRect = new Rect();
+        mForegroundRect = new Rect();
         mGlowBackgroundRect = new Rect();
         setHoverScale(1.0f);
         setHoverAlpha(1.0f);
@@ -311,6 +325,18 @@
                 icon.getBottom() + getPaddingTop() + padding);
     }
 
+    void setOverScrollAmount(float r, boolean left) {
+        if (left && mOverScrollForegroundDrawable != mOverScrollLeft) {
+            mOverScrollForegroundDrawable = mOverScrollLeft;
+        } else if (!left && mOverScrollForegroundDrawable != mOverScrollRight) {
+            mOverScrollForegroundDrawable = mOverScrollRight;
+        }
+
+        mForegroundAlpha = (int) Math.round((r * 255));
+        mOverScrollForegroundDrawable.setAlpha(mForegroundAlpha);
+        invalidate();
+    }
+
     void setPressedOrFocusedIcon(BubbleTextView icon) {
         // We draw the pressed or focused BubbleTextView's background in CellLayout because it
         // requires an expanded clip rect (due to the glow's blur radius)
@@ -577,6 +603,18 @@
         }
     }
 
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+        if (mForegroundAlpha > 0) {
+            mOverScrollForegroundDrawable.setBounds(mForegroundRect);
+            Paint p = ((NinePatchDrawable) mOverScrollForegroundDrawable).getPaint();
+            p.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.ADD));
+            mOverScrollForegroundDrawable.draw(canvas);
+            p.setXfermode(null);
+        }
+    }
+
     public void showFolderAccept(FolderRingAnimator fra) {
         mFolderOuterRings.add(fra);
     }
@@ -962,6 +1000,8 @@
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
         mBackgroundRect.set(0, 0, w, h);
+        mForegroundRect.set(mForegroundPadding, mForegroundPadding,
+                w - 2 * mForegroundPadding, h - 2 * mForegroundPadding);
         updateGlowRect();
     }
 

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 807470c..2b5847b 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java

@@ -66,6 +66,7 @@
     private static final int PAGE_SNAP_ANIMATION_DURATION = 550;
     protected static final float NANOTIME_DIV = 1000000000.0f;
 
+    private static final float OVERSCROLL_ACCELERATE_FACTOR = 2;
     private static final float OVERSCROLL_DAMP_FACTOR = 0.14f;
     private static final int MINIMUM_SNAP_VELOCITY = 2200;
     private static final int MIN_FLING_VELOCITY = 250;
@@ -74,6 +75,7 @@
     // the velocity at which a fling gesture will cause us to snap to the next page
     protected int mSnapVelocity = 500;
 
+    protected float mDensity;
     protected float mSmoothingTime;
     protected float mTouchX;
 
@@ -229,6 +231,7 @@
         mTouchSlop = configuration.getScaledTouchSlop();
         mPagingTouchSlop = configuration.getScaledPagingTouchSlop();
         mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
+        mDensity = getResources().getDisplayMetrics().density;
     }
 
     public void setPageSwitchListener(PageSwitchListener pageSwitchListener) {
@@ -975,6 +978,19 @@
         }
     }
 
+    protected float getScrollProgress(int screenCenter, View v, int page) {
+        final int halfScreenSize = getMeasuredWidth() / 2;
+
+        int totalDistance = getScaledMeasuredWidth(v) + mPageSpacing;
+        int delta = screenCenter - (getChildOffset(page) -
+                getRelativeChildOffset(page) + halfScreenSize);
+
+        float scrollProgress = delta / (totalDistance * 1.0f);
+        scrollProgress = Math.min(scrollProgress, 1.0f);
+        scrollProgress = Math.max(scrollProgress, -1.0f);
+        return scrollProgress;
+    }
+
     // This curve determines how the effect of scrolling over the limits of the page dimishes
     // as the user pulls further and further from the bounds
     private float overScrollInfluenceCurve(float f) {
@@ -982,7 +998,30 @@
         return f * f * f + 1.0f;
     }
 
-    protected void overScroll(float amount) {
+    protected void acceleratedOverScroll(float amount) {
+        int screenSize = getMeasuredWidth();
+
+        // We want to reach the max over scroll effect when the user has
+        // over scrolled half the size of the screen
+        float f = OVERSCROLL_ACCELERATE_FACTOR * (amount / screenSize);
+
+        if (f == 0) return;
+
+        // Clamp this factor, f, to -1 < f < 1
+        if (Math.abs(f) >= 1) {
+            f /= Math.abs(f);
+        }
+
+        int overScrollAmount = (int) Math.round(f * screenSize);
+        if (amount < 0) {
+            mScrollX = overScrollAmount;
+        } else {
+            mScrollX = mMaxScrollX + overScrollAmount;
+        }
+        invalidate();
+    }
+
+    protected void dampedOverScroll(float amount) {
         int screenSize = getMeasuredWidth();
 
         float f = (amount / screenSize);
@@ -1004,9 +1043,13 @@
         invalidate();
     }
 
+    protected void overScroll(float amount) {
+        dampedOverScroll(amount);
+    }
+
     protected float maxOverScroll() {
         // Using the formula in overScroll, assuming that f = 1.0 (which it should generally not
-        // exceed). Used to find out how much extra wallpaper we need for the overscroll effect
+        // exceed). Used to find out how much extra wallpaper we need for the over scroll effect
         float f = 1.0f;
         f = f / (Math.abs(f)) * (overScrollInfluenceCurve(Math.abs(f)));
         return OVERSCROLL_DAMP_FACTOR * f;
@@ -1776,11 +1819,13 @@
         int numPages = getChildCount();
         int pageWidth = getMeasuredWidth();
         int maxPageWidth = (numPages * getChildWidth(0)) + ((numPages - 1) * mPageSpacing);
+        int maxScrollPosition = maxPageWidth - pageWidth; // n-1 * pageWidth
         int trackWidth = pageWidth - mScrollIndicatorPaddingLeft - mScrollIndicatorPaddingRight;
         int indicatorWidth = mScrollIndicator.getMeasuredWidth() -
                 mScrollIndicator.getPaddingLeft() - mScrollIndicator.getPaddingRight();
 
-        float offset = (float) getScrollX() / maxPageWidth;
+        float offset = (float) Math.max(0f, Math.min(maxScrollPosition, getScrollX()))
+                / maxPageWidth;
         int indicatorSpace = trackWidth / numPages;
         int indicatorPos = (int) (offset * trackWidth) + mScrollIndicatorPaddingLeft;
         if (hasElasticScrollIndicator()) {

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e8c5116..01efd4f 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java

@@ -82,20 +82,13 @@
 
     // Y rotation to apply to the workspace screens
     private static final float WORKSPACE_ROTATION = 12.5f;
-
-    // These are extra scale factors to apply to the mini home screens
-    // so as to achieve the desired transform
-    private static final float EXTRA_SCALE_FACTOR_0 = 0.972f;
-    private static final float EXTRA_SCALE_FACTOR_1 = 1.0f;
-    private static final float EXTRA_SCALE_FACTOR_2 = 1.10f;
+    private static final float WORKSPACE_OVERSCROLL_ROTATION = 24f;
 
     private static final int CHILDREN_OUTLINE_FADE_OUT_DELAY = 0;
     private static final int CHILDREN_OUTLINE_FADE_OUT_DURATION = 375;
     private static final int CHILDREN_OUTLINE_FADE_IN_DURATION = 100;
 
     private static final int BACKGROUND_FADE_OUT_DURATION = 350;
-    private static final int BACKGROUND_FADE_IN_DURATION = 350;
-
     private static final int ADJACENT_SCREEN_DROP_DURATION = 300;
 
     // These animators are used to fade the children's outlines
@@ -762,18 +755,21 @@
         int scrollRange = getScrollRange();
         float scrollProgressOffset = 0;
 
-        // Account for overscroll: you only see the absolute edge of the wallpaper if
-        // you overscroll as far as you can in landscape mode. Only do this for static wallpapers
+        // Account for over scroll: you only see the absolute edge of the wallpaper if
+        // you over scroll as far as you can in landscape mode. Only do this for static wallpapers
         // because live wallpapers (and probably 3rd party wallpaper providers) rely on the offset
         // being even intervals from 0 to 1 (eg [0, 0.25, 0.5, 0.75, 1])
         if (isStaticWallpaper) {
-            int overscrollOffset = (int) (maxOverScroll() * display.getWidth());
-            scrollProgressOffset += overscrollOffset / (float) getScrollRange();
-            scrollRange += 2 * overscrollOffset;
+            int overScrollOffset = (int) (maxOverScroll() * display.getWidth());
+            scrollProgressOffset += overScrollOffset / (float) getScrollRange();
+            scrollRange += 2 * overScrollOffset;
         }
 
         // Again, we adjust the wallpaper offset to be consistent between values of mLayoutScale
-        float adjustedScrollX = mWallpaperScrollRatio * mScrollX;
+        boolean overScrollWallpaper = LauncherApplication.isScreenLarge();
+        float adjustedScrollX = overScrollWallpaper ?
+                mScrollX : Math.max(0, Math.min(mScrollX, mMaxScrollX));
+        adjustedScrollX *= mWallpaperScrollRatio;
         mLayoutScale = layoutScale;
 
         float scrollProgress =
@@ -1094,51 +1090,77 @@
         return Math.min(r / threshold, 1.0f);
     }
 
-    @Override
-    protected void screenScrolled(int screenCenter) {
-        super.screenScrolled(screenCenter);
-
-        // If the screen is not xlarge, then don't rotate the CellLayouts
-        // NOTE: If we don't update the side pages alpha, then we should not hide the side pages.
-        //       see unshrink().
-        if (!LauncherApplication.isScreenLarge()) return;
-
-        final int halfScreenSize = getMeasuredWidth() / 2;
-
+    private void screenScrolledLargeUI(int screenCenter) {
         for (int i = 0; i < getChildCount(); i++) {
             CellLayout cl = (CellLayout) getChildAt(i);
             if (cl != null) {
-                int totalDistance = getScaledMeasuredWidth(cl) + mPageSpacing;
-                int delta = screenCenter - (getChildOffset(i) -
-                        getRelativeChildOffset(i) + halfScreenSize);
-
-                float scrollProgress = delta / (totalDistance * 1.0f);
-                scrollProgress = Math.min(scrollProgress, 1.0f);
-                scrollProgress = Math.max(scrollProgress, -1.0f);
-
-                if (!isSmall()) {
-                    // If the current page (i) is being overscrolled, we use a different
-                    // set of rules for setting the background alpha multiplier.
-                    if ((mScrollX < 0 && i == 0) || (mScrollX > mMaxScrollX &&
-                            i == getChildCount() -1 )) {
-                        cl.setBackgroundAlphaMultiplier(
-                                overScrollBackgroundAlphaInterpolator(Math.abs(scrollProgress)));
-                        mOverScrollPageIndex = i;
-                    } else if (mOverScrollPageIndex != i) {
-                        cl.setBackgroundAlphaMultiplier(
-                                backgroundAlphaInterpolator(Math.abs(scrollProgress)));
-                    }
-                }
-
+                float scrollProgress = getScrollProgress(screenCenter, cl, i);
                 float rotation = WORKSPACE_ROTATION * scrollProgress;
                 float translationX = getOffsetXForRotation(rotation, cl.getWidth(), cl.getHeight());
-                cl.setTranslationX(translationX);
 
+                // If the current page (i) is being over scrolled, we use a different
+                // set of rules for setting the background alpha multiplier.
+                if ((mScrollX < 0 && i == 0) || (mScrollX > mMaxScrollX &&
+                        i == getChildCount() -1 )) {
+                    cl.setBackgroundAlphaMultiplier(
+                            overScrollBackgroundAlphaInterpolator(Math.abs(scrollProgress)));
+                    mOverScrollPageIndex = i;
+                } else if (mOverScrollPageIndex != i) {
+                    cl.setBackgroundAlphaMultiplier(
+                            backgroundAlphaInterpolator(Math.abs(scrollProgress)));
+                }
+
+                cl.setTranslationX(translationX);
                 cl.setRotationY(rotation);
             }
         }
     }
 
+    private void resetCellLayoutTransforms(CellLayout cl, boolean left) {
+        cl.setTranslationX(0);
+        cl.setRotationY(0);
+        cl.setOverScrollAmount(0, left);
+        cl.setPivotX(cl.getMeasuredWidth() / 2);
+        cl.setPivotY(cl.getMeasuredHeight() / 2);
+    }
+
+    private void screenScrolledStandardUI(int screenCenter) {
+        if (mScrollX < 0 || mScrollX > mMaxScrollX) {
+            int index = mScrollX < 0 ? 0 : getChildCount() - 1;
+            CellLayout cl = (CellLayout) getChildAt(index);
+            float scrollProgress = getScrollProgress(screenCenter, cl, index);
+            cl.setOverScrollAmount(Math.abs(scrollProgress), index == 0);
+            float translationX = index == 0 ? mScrollX : - (mMaxScrollX - mScrollX);
+            float rotation = - WORKSPACE_OVERSCROLL_ROTATION * scrollProgress;
+            cl.setCameraDistance(mDensity * 6500);
+            cl.setPivotX(cl.getMeasuredWidth() * (index == 0 ? 0.75f : 0.25f));
+            cl.setTranslationX(translationX);
+            cl.setRotationY(rotation);
+        } else {
+            resetCellLayoutTransforms((CellLayout) getChildAt(0), true);
+            resetCellLayoutTransforms((CellLayout) getChildAt(getChildCount() - 1), false);
+        }
+    }
+
+    @Override
+    protected void screenScrolled(int screenCenter) {
+        super.screenScrolled(screenCenter);
+        if (LauncherApplication.isScreenLarge()) {
+            screenScrolledLargeUI(screenCenter);
+        } else {
+            screenScrolledStandardUI(screenCenter);
+        }
+    }
+
+    @Override
+    protected void overScroll(float amount) {
+        if (LauncherApplication.isScreenLarge()) {
+            dampedOverScroll(amount);
+        } else {
+            acceleratedOverScroll(amount);
+        }
+    }
+
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         mWindowToken = getWindowToken();
commit	6027705e8c4713daabe63d049d71f9acdf972244	[log] [tgz]
author	Winson Chung <winsonc@google.com>	Mon Sep 12 10:59:43 2011 -0700
committer	Android (Google) Code Review <android-gerrit@google.com>	Mon Sep 12 10:59:43 2011 -0700
tree	7df1fbe5289fc003a390a2a1925facdc757a7b27
parent	65cc0c2d627f4891af1980cca89a9903bb7215d5 [diff]
parent	e61e93e56fcd37331943a4059f8cbdaa5d08136a [diff]