Merge "qc refactor part1" into honeycomb-mr1
diff --git a/res/menu/bookmarkscontext.xml b/res/menu/bookmarkscontext.xml
index 3a13b9a..df6f9af 100644
--- a/res/menu/bookmarkscontext.xml
+++ b/res/menu/bookmarkscontext.xml
@@ -20,7 +20,7 @@
<item android:id="@+id/open_context_menu_id"
android:title="@string/open_bookmark"/>
<item android:id="@+id/new_window_context_menu_id"
- android:title="@string/open_in_new_window"/>
+ android:title="@string/contextmenu_openlink_newwindow"/>
<item android:id="@+id/edit_context_menu_id"
android:title="@string/edit_bookmark"/>
<item android:id="@+id/shortcut_context_menu_id"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b0ddaaa..c7607ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -207,8 +207,6 @@
<!-- Confirmation dialog message confirming that the user wishes to delete
the bookmark they selected for deletion -->
<string name="delete_bookmark_warning">Bookmark \"<xliff:g id="bookmark">%s</xliff:g>\" will be deleted.</string>
- <!-- Context Menu item to open the selected link in a new window -->
- <string name="open_in_new_window">Open in new window</string>
<!-- Context menu item to open every bookmark in a folder in new windows [CHAR LIMIT=50] -->
<string name="open_all_in_new_window">Open all in new windows</string>
<!-- Menu item to open a dialog which allows the user to enter a url or do search-->
@@ -310,8 +308,8 @@
<string name="pref_content_load_images">Load images</string>
<!-- Settings label -->
<string name="pref_content_load_images_summary">Display images on web pages</string>
- <!-- Settings label -->
- <string name="pref_content_block_popups">Block pop-up windows</string>
+ <!-- Settings label [CHAR LIMIT=30] -->
+ <string name="pref_content_block_popups">Block pop-ups</string>
<!-- Settings label -->
<string name="pref_content_javascript">Enable JavaScript</string>
<!-- Settings label -->
@@ -331,8 +329,8 @@
</string-array>
<!-- Settings summary [CHAR LIMIT=50]-->
<string name="pref_content_open_in_background_summary">Open new windows behind the current one</string>
- <!-- Settings label -->
- <string name="pref_content_homepage">Set home page</string>
+ <!-- Settings label [CHAR LIMIT=50] -->
+ <string name="pref_content_homepage">Set homepage</string>
<!-- Settings label -->
<string name="pref_content_search_engine">Set search engine</string>
<!-- Settings summary -->
@@ -373,13 +371,13 @@
<string name="pref_personal_account_dialog_title">Select Google account to share with</string>
<!-- Checkbox setting for enabling/disabling the form AutoFill feature [CHAR-LIMIT=32] -->
- <string name="pref_autofill_enabled">Form AutoFill</string>
+ <string name="pref_autofill_enabled">Form auto-fill</string>
<!-- Settings summary for the form AutoFill feature. [CHAR-LIMIT=none] -->
<string name="pref_autofill_enabled_summary">Fill out web forms in a single click</string>
<!-- Label for option that when clicked opens the AutoFill settings screen. Also used as the title of that AutoFill Settings screen. [CHAR-LIMIT=32] -->
- <string name="pref_autofill_profile_editor">AutoFill Settings</string>
+ <string name="pref_autofill_profile_editor">Auto-fill data</string>
<!-- Summary for the AutoFill Settings preference [CHAR-LIMIT=none] -->
- <string name="pref_autofill_profile_editor_summary">Set up & manage data for AutoFilled forms</string>
+ <string name="pref_autofill_profile_editor_summary">Enter and save data for auto-filling web form fields</string>
<!-- Auto login preference title [CHAR-LIMIT=32] -->
<string name="pref_autologin_title">Automatic Google sign-in</string>
@@ -388,7 +386,7 @@
<!-- Summary when there is an account available [CHAR-LIMIT=none] -->
<string name="pref_autologin_summary">Sign into Google sites automatically using <xliff:g>%s</xliff:g></string>
<!-- Message shown during auto login [CHAR-LIMIT=none] -->
- <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g>\nYour Privacy & Security settings control automatic Google sign-in</string>
+ <string name="pref_autologin_progress">Signing into Google sites using <xliff:g>%s</xliff:g>\nYour privacy & security settings control automatic Google sign-in</string>
<!-- Option in account list to disable autologin [CHAR-LIMIT=50] -->
<string name="pref_autologin_disable">Don\'t sign in automatically</string>
<!-- Auto-login bar description [CHAR-LIMIT=40] -->
@@ -446,7 +444,7 @@
<string name="disable_autofill">Disable AutoFill</string>
<!-- Settings screen, section title [CHAR-LIMIT=50] -->
- <string name="pref_privacy_security_title">Privacy & Security</string>
+ <string name="pref_privacy_security_title">Privacy & security</string>
<!-- Settings label -->
<string name="pref_privacy_clear_cache">Clear cache</string>
<!-- Settings summary -->
@@ -636,21 +634,21 @@
<!-- Title for lab settings [CHAR LIMIT=25] -->
<string name="pref_lab_title">Labs</string>
<!-- Title for lab quick controls feature [CHAR LIMIT=40] -->
- <string name="pref_lab_quick_controls">Quick Controls</string>
+ <string name="pref_lab_quick_controls">Quick controls</string>
<!-- Summary for lab quick controls feature [CHAR LIMIT=80] -->
<string name="pref_lab_quick_controls_summary">
- Swipe thumb from left or right edge to access quick controls</string>
+ Swipe thumb from left or right edge to access quick controls and hide Application and URL bars</string>
<!-- Title for lab "Most Visited" homepage feature [CHAR LIMIT=40] -->
- <string name="pref_lab_most_visited_homepage">Most Visited Homepage</string>
+ <string name="pref_lab_most_visited_homepage">Most-visited homepage</string>
<!-- Summary for lab "Most Visited" homepage feature [CHAR LIMIT=80] -->
<string name="pref_lab_most_visited_homepage_summary">
- Sets your homepage to show the most visited pages.</string>
+ Your homepage displays your most-visited webpages.</string>
<!-- Title for the "Instant search" lab feature [CHAR LIMIT=40] -->
- <string name="pref_use_instant_search">Use Instant Search</string>
+ <string name="pref_use_instant_search">Google Instant</string>
<!-- Summary for the "Instant search" lab feature [CHAR LIMIT=120] -->
<string name="pref_use_instant_search_summary">
- Enable instant for faster searching and browsing. This might result
- in higher data and bandwidth usage.</string>
+ Use Google Instant when you use Google Search, to show results as you
+ type (this can increase data use).</string>
<!-- Title for a dialog displayed when the browser has a data connectivity
problem -->
<string name="browserFrameNetworkErrorLabel">Data connectivity problem</string>