From 138dea64f191d68e49d9ed31f6ff5d2a8fa1b17a Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Wed, 26 Oct 2011 11:07:54 -0700
Subject: Import revised translations.  DO NOT MERGE

Change-Id: I148c0854418139512c1c28e8bd0013a61f425d81
---
 res/values-en-rGB/strings.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'res/values-en-rGB')

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fe2e54da2..fccc645c3 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -22,21 +22,21 @@
     <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
-    <string name="chooser_wallpaper" msgid="5988031014201479733">"Select wallpaper from"</string>
+    <string name="chooser_wallpaper" msgid="6063168087625352235">"Choose wallpaper from"</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string>
     <string name="pick_wallpaper" msgid="5630222540525626723">"Wallpaper"</string>
-    <string name="activity_not_found" msgid="5591731020063337696">"Application is not installed."</string>
+    <string name="activity_not_found" msgid="217823393239365967">"App isn\'t installed."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Widgets"</string>
-    <string name="long_press_widget_to_add" msgid="8915177487173521501">"Touch &amp; hold to pick up a widget"</string>
+    <string name="long_press_widget_to_add" msgid="7395697462851217506">"Touch &amp; hold to pick up a widget."</string>
     <string name="market" msgid="2652226429823445833">"Shop"</string>
-    <string name="external_drop_widget_error" msgid="4976816434597126575">"Could not drop item onto this home screen"</string>
-    <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Select widget to create"</string>
+    <string name="external_drop_widget_error" msgid="127440783198670829">"Couldn\'t drop item onto this Home screen."</string>
+    <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Choose widget to create"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Folder name"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Rename folder"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
     <string name="cancel_action" msgid="3811860427489435048">"Cancel"</string>
     <string name="menu_item_add_item" msgid="6233177331075781114">"Add to Home screen"</string>
-    <string name="group_applications" msgid="4118484163419674240">"Applications"</string>
+    <string name="group_applications" msgid="2103752818818161976">"Apps"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"Shortcuts"</string>
     <string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
     <string name="group_wallpapers" msgid="1568191644272224858">"Wallpaper"</string>
@@ -46,7 +46,7 @@
     <string name="shortcut_uninstalled" msgid="2129499669449749995">"<xliff:g id="NAME">%s</xliff:g>Shortcut \"\" was removed."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"<xliff:g id="NAME">%s</xliff:g>Shortcut \"\" already exists."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Select shortcut"</string>
-    <string name="title_select_application" msgid="8031072293115454221">"Select application"</string>
+    <string name="title_select_application" msgid="1793455815754848652">"Choose app"</string>
     <string name="all_apps_button_label" msgid="2578400570124163469">"Apps"</string>
     <string name="all_apps_home_button_label" msgid="1022222300329398558">"Home"</string>
     <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Remove"</string>
@@ -56,7 +56,7 @@
     <string name="info_target_label" msgid="4019495079517426980">"App info"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Search"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Voice Search"</string>
-    <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Applications"</string>
+    <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Apps"</string>
     <string name="accessibility_delete_button" msgid="3628162007991023603">"Remove"</string>
     <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Uninstall update"</string>
     <string name="menu_add" msgid="3065046628354640854">"Add"</string>
@@ -66,31 +66,31 @@
     <string name="menu_notifications" msgid="6424587053194766192">"Notifications"</string>
     <string name="menu_settings" msgid="3946232973327980394">"System settings"</string>
     <string name="menu_help" msgid="4901160661634590633">"Help"</string>
-    <string name="cab_menu_delete_app" msgid="1242619904941293871">"Uninstall application"</string>
-    <string name="cab_menu_app_info" msgid="5180426909324882018">"Application details"</string>
-    <string name="cab_app_selection_text" msgid="606113924828167756">"1 application selected"</string>
+    <string name="cab_menu_delete_app" msgid="4089398025537640349">"Uninstall app"</string>
+    <string name="cab_menu_app_info" msgid="914548323652698884">"App details"</string>
+    <string name="cab_app_selection_text" msgid="6378522164293415735">"1 app selected"</string>
     <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget selected"</string>
     <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 folder selected"</string>
     <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 shortcut selected"</string>
     <string name="permlab_install_shortcut" msgid="1201690825493376489">"install shortcuts"</string>
-    <string name="permdesc_install_shortcut" msgid="7429365847558984148">"Allows an application to add shortcuts without user intervention."</string>
+    <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Allows an app to add shortcuts without user intervention."</string>
     <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"uninstall shortcuts"</string>
-    <string name="permdesc_uninstall_shortcut" msgid="959972195916090900">"Allows an application to remove shortcuts without user intervention."</string>
+    <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Allows an app to remove shortcuts without user intervention."</string>
     <string name="permlab_read_settings" msgid="3452408290738106747">"read Home settings and short cuts"</string>
-    <string name="permdesc_read_settings" msgid="8377434937176025492">"Allows an application to read the settings and shortcuts in Home."</string>
+    <string name="permdesc_read_settings" msgid="1836104524215167383">"Allows an app 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="permdesc_write_settings" msgid="6763846563231494591">"Allows an app to change the settings and shortcuts in Home."</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="uninstall_system_app_text" msgid="6429814133777046491">"This is a system application and cannot be uninstalled."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Unnamed Folder"</string>
     <string name="workspace_cling_title" msgid="738396473989890567">"Make yourself at home"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"You can put your favourite apps here."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"To see all your apps, touch the circle."</string>
     <string name="all_apps_cling_title" msgid="2559734712581447107">"Choose some apps"</string>
-    <string name="all_apps_cling_add_item" msgid="7404588523183860170">"To add an app to your home screen, touch &amp; hold it."</string>
+    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"To add an app to your Home screen, touch &amp; hold it."</string>
     <string name="folder_cling_title" msgid="4308949882377840953">"Organise your apps with folders"</string>
     <string name="folder_cling_move_item" msgid="270598675060435169">"To move an app, touch &amp; hold it."</string>
-    <string name="folder_cling_create_folder" msgid="289412698047625601">"To make a new folder on your home screen, stack one app on top of another."</string>
+    <string name="folder_cling_create_folder" msgid="8352867485656129478">"To make a new folder on your Home screen, stack one app on top of another."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
 </resources>
-- 
cgit v1.2.3


From a6e5f12e8901b704d92fb7d2fbbb3962d37d5a54 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 28 Oct 2011 13:53:36 -0700
Subject: Import revised translations.  DO NOT MERGE

Change-Id: I9032a0b75d14cf33f128ce594f7767a6b34456e9
---
 res/values-en-rGB/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'res/values-en-rGB')

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fccc645c3..66b67899f 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -84,6 +84,14 @@
     <string name="uninstall_system_app_text" msgid="6429814133777046491">"This is a system application and cannot be uninstalled."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Unnamed Folder"</string>
+    <!-- no translation found for default_scroll_format (4057140866420001240) -->
+    <skip />
+    <!-- no translation found for workspace_scroll_format (7911126267695001437) -->
+    <skip />
+    <!-- no translation found for apps_customize_apps_scroll_format (5494241912377704885) -->
+    <skip />
+    <!-- no translation found for apps_customize_widgets_scroll_format (5383009742241717437) -->
+    <skip />
     <string name="workspace_cling_title" msgid="738396473989890567">"Make yourself at home"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"You can put your favourite apps here."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"To see all your apps, touch the circle."</string>
@@ -93,4 +101,16 @@
     <string name="folder_cling_move_item" msgid="270598675060435169">"To move an app, touch &amp; hold it."</string>
     <string name="folder_cling_create_folder" msgid="8352867485656129478">"To make a new folder on your Home screen, stack one app on top of another."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
+    <!-- no translation found for folder_opened (4129072635480822768) -->
+    <skip />
+    <!-- no translation found for folder_tap_to_close (4076794242530255812) -->
+    <skip />
+    <!-- no translation found for folder_tap_to_rename (2125528923948315223) -->
+    <skip />
+    <!-- no translation found for folder_closed (3130534551370511932) -->
+    <skip />
+    <!-- no translation found for folder_renamed (781234745487414781) -->
+    <skip />
+    <!-- no translation found for folder_name_format (4513766553514769310) -->
+    <skip />
 </resources>
-- 
cgit v1.2.3


From aae1f99b9e29acbf65c1093c4b42a524a1c4240e Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Tue, 1 Nov 2011 13:36:49 -0700
Subject: Import revised translations.  DO NOT MERGE

Change-Id: I0ea74913b09a2a0f22b96b72f76beb94b15d7a43
---
 res/values-en-rGB/strings.xml | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'res/values-en-rGB')

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 66b67899f..22d98047c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -84,14 +84,10 @@
     <string name="uninstall_system_app_text" msgid="6429814133777046491">"This is a system application and cannot be uninstalled."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Unnamed Folder"</string>
-    <!-- no translation found for default_scroll_format (4057140866420001240) -->
-    <skip />
-    <!-- no translation found for workspace_scroll_format (7911126267695001437) -->
-    <skip />
-    <!-- no translation found for apps_customize_apps_scroll_format (5494241912377704885) -->
-    <skip />
-    <!-- no translation found for apps_customize_widgets_scroll_format (5383009742241717437) -->
-    <skip />
+    <string name="default_scroll_format" msgid="4057140866420001240">"Page %1$d of %2$d"</string>
+    <string name="workspace_scroll_format" msgid="7911126267695001437">"Workspace %1$d of %2$d"</string>
+    <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Apps page %1$d of %2$d"</string>
+    <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Widgets page %1$d of %2$d"</string>
     <string name="workspace_cling_title" msgid="738396473989890567">"Make yourself at home"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"You can put your favourite apps here."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"To see all your apps, touch the circle."</string>
@@ -101,16 +97,10 @@
     <string name="folder_cling_move_item" msgid="270598675060435169">"To move an app, touch &amp; hold it."</string>
     <string name="folder_cling_create_folder" msgid="8352867485656129478">"To make a new folder on your Home screen, stack one app on top of another."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
-    <!-- no translation found for folder_opened (4129072635480822768) -->
-    <skip />
-    <!-- no translation found for folder_tap_to_close (4076794242530255812) -->
-    <skip />
-    <!-- no translation found for folder_tap_to_rename (2125528923948315223) -->
-    <skip />
-    <!-- no translation found for folder_closed (3130534551370511932) -->
-    <skip />
-    <!-- no translation found for folder_renamed (781234745487414781) -->
-    <skip />
-    <!-- no translation found for folder_name_format (4513766553514769310) -->
-    <skip />
+    <string name="folder_opened" msgid="4129072635480822768">"Folder opened, %1$d by %2$d"</string>
+    <string name="folder_tap_to_close" msgid="4076794242530255812">"Tap to close folder"</string>
+    <string name="folder_tap_to_rename" msgid="2125528923948315223">"Tap to commit rename"</string>
+    <string name="folder_closed" msgid="3130534551370511932">"Folder closed"</string>
+    <string name="folder_renamed" msgid="781234745487414781">"Folder renamed to %1$s"</string>
+    <string name="folder_name_format" msgid="4513766553514769310">"Folder: %1$s"</string>
 </resources>
-- 
cgit v1.2.3