Merge 4.0.3

Conflicts:
	res/values/strings.xml
	src/com/android/launcher2/AppsCustomizePagedView.java
	src/com/android/launcher2/AppsCustomizeTabHost.java
	src/com/android/launcher2/Launcher.java
	src/com/android/launcher2/PagedView.java
	src/com/android/launcher2/SearchDropTargetBar.java
	src/com/android/launcher2/Workspace.java

Change-Id: Ia26c63bbf28b790c06f298c65fb48c79f49dc897

1 files changed, 28 insertions, 18 deletions

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5c9d43b4b..7c03dbf84 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -21,21 +21,21 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="uid_name" msgid="3371120195364560632">"Matične aplikacije za Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
-    <string name="chooser_wallpaper" msgid="5988031014201479733">"Odabir između pozadinskih slika"</string>
+    <string name="chooser_wallpaper" msgid="6063168087625352235">"Odabir pozadinske slike iz"</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Postavi pozadinsku sliku"</string>
     <string name="pick_wallpaper" msgid="5630222540525626723">"Pozadinske slike"</string>
-    <string name="activity_not_found" msgid="5591731020063337696">"Aplikacija nije instalirana."</string>
+    <string name="activity_not_found" msgid="217823393239365967">"Aplikacija nije instalirana."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgeti"</string>
-    <string name="long_press_widget_to_add" msgid="8915177487173521501">"Dodirnite i držite kako biste preuzeli widget"</string>
+    <string name="long_press_widget_to_add" msgid="7395697462851217506">"Dodirnite i držite kako biste preuzeli widget."</string>
     <string name="market" msgid="2652226429823445833">"Trgovina"</string>
-    <string name="external_drop_widget_error" msgid="4976816434597126575">"Nije bilo moguće spustiti stavku na početni zaslon"</string>
-    <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Odabir widgeta za stvaranje"</string>
+    <string name="external_drop_widget_error" msgid="127440783198670829">"Nije bilo moguće spustiti stavku na početni zaslon"</string>
+    <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Odabir widgeta za stvaranje"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Naziv mape"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Preimenuj mapu"</string>
     <string name="rename_action" msgid="6016003384693240896">"U redu"</string>
     <string name="cancel_action" msgid="3811860427489435048">"Odustani"</string>
     <string name="menu_item_add_item" msgid="6233177331075781114">"Dodaj na početni zaslon"</string>
-    <string name="group_applications" msgid="4118484163419674240">"Aplikacije"</string>
+    <string name="group_applications" msgid="2103752818818161976">"Aplikacije"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"Prečaci"</string>
     <string name="group_widgets" msgid="6704978494073105844">"Widgeti"</string>
     <string name="group_wallpapers" msgid="1568191644272224858">"Pozadinske slike"</string>
@@ -45,7 +45,7 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"Prečac za \"<xliff:g id="NAME">%s</xliff:g>\" je uklonjen."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Prečac za \"<xliff:g id="NAME">%s</xliff:g>\" već postoji."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Odaberite prečac"</string>
-    <string name="title_select_application" msgid="8031072293115454221">"Odaberite aplikaciju"</string>
+    <string name="title_select_application" msgid="1793455815754848652">"Odabir aplikacije"</string>
     <string name="all_apps_button_label" msgid="2578400570124163469">"Aplikacije"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Početna"</string>
     <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Ukloni"</string>
@@ -55,7 +55,7 @@
     <string name="info_target_label" msgid="4019495079517426980">"Informacije o aplikaciji"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Pretraži"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Glasovno pretraživanje"</string>
-    <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplikacije"</string>
+    <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Aplikacije"</string>
     <string name="accessibility_delete_button" msgid="3628162007991023603">"Ukloni"</string>
     <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Deinstalacija ažuriranja"</string>
     <string name="menu_add" msgid="3065046628354640854">"Dodaj"</string>
@@ -65,31 +65,41 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Obavijesti"</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>
-    <string name="cab_app_selection_text" msgid="606113924828167756">"1 aplikacija odabrana"</string>
+    <string name="cab_menu_delete_app" msgid="4089398025537640349">"Deinstaliraj aplikaciju"</string>
+    <string name="cab_menu_app_info" msgid="914548323652698884">"Pojedinosti o aplikaciji"</string>
+    <string name="cab_app_selection_text" msgid="6378522164293415735">"Odabrana je 1 aplikacija"</string>
     <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget odabran"</string>
     <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 mapa odabrana"</string>
     <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 prečac odabran"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"instaliraj prečace"</string>
-    <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Dopušta aplikaciji dodavanje prečaca bez intervencije korisnika."</string>
+    <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Omogućuje aplikaciji dodavanje prečaca bez intervencije korisnika."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"deinstaliraj prečace"</string>
-    <string name="permdesc_uninstall_shortcut" msgid="959972195916090900">"Dopušta aplikaciji uklanjanje prečaca bez intervencije korisnika."</string>
+    <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Dopušta aplikaciji uklanjanje prečaca bez intervencije korisnika."</string>
     <string name="permlab_read_settings" msgid="3452408290738106747">"pročitaj postavke početnog zaslona i prečaca"</string>
-    <string name="permdesc_read_settings" msgid="8377434937176025492">"Dopušta aplikaciji čitanje postavki i prečaca na početnom zaslonu."</string>
+    <string name="permdesc_read_settings" msgid="1836104524215167383">"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="permdesc_write_settings" msgid="6763846563231494591">"Dopušta aplikaciji promjenu postavki i prečaca na početnom zaslonu."</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="uninstall_system_app_text" msgid="6429814133777046491">"Ovo je aplikacija sustava i ne može se ukloniti."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Neimenovana mapa"</string>
+    <string name="default_scroll_format" msgid="4057140866420001240">"Stranica %1$d od %2$d"</string>
+    <string name="workspace_scroll_format" msgid="7911126267695001437">"Radni prostor %1$d od %2$d"</string>
+    <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Stranica aplikacija %1$d od %2$d"</string>
+    <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Stranica widgeta %1$d od %2$d"</string>
     <string name="workspace_cling_title" msgid="738396473989890567">"Osjećajte se kao kod kuće"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"Ovdje možete staviti svoje omiljene aplikacije."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Da biste vidjeli sve aplikacije, dodirnite krug."</string>
     <string name="all_apps_cling_title" msgid="2559734712581447107">"Odaberite neke aplikacije"</string>
-    <string name="all_apps_cling_add_item" msgid="7404588523183860170">"Da biste početnom zaslonu dodali aplikaciju, dodirnite je i zadržite."</string>
+    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Da biste početnom zaslonu dodali aplikaciju, dodirnite je i zadržite."</string>
     <string name="folder_cling_title" msgid="4308949882377840953">"Organizirajte svoje aplikacije putem mapa"</string>
     <string name="folder_cling_move_item" msgid="270598675060435169">"Da biste premjestili aplikaciju, dodirnite je i zadržite."</string>
-    <string name="folder_cling_create_folder" msgid="289412698047625601">"Da biste napravili novu mapu na početnom zaslonu, stavite jednu aplikaciju na drugu."</string>
+    <string name="folder_cling_create_folder" msgid="8352867485656129478">"Da biste napravili novu mapu na početnom zaslonu, stavite jednu aplikaciju na drugu."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"U redu"</string>
+    <string name="folder_opened" msgid="4129072635480822768">"Mapa je otvorena, %1$d s %2$d"</string>
+    <string name="folder_tap_to_close" msgid="4076794242530255812">"Dotaknite za zatvaranje mape"</string>
+    <string name="folder_tap_to_rename" msgid="2125528923948315223">"Dotaknite za izvršavanje preimenovanja"</string>
+    <string name="folder_closed" msgid="3130534551370511932">"Mapa zatvorena"</string>
+    <string name="folder_renamed" msgid="781234745487414781">"Mapa je preimenovana u %1$s"</string>
+    <string name="folder_name_format" msgid="4513766553514769310">"Mapa: %1$s"</string>
 </resources>