commit b3b5746a9cd5c4b310c7c27f0b787d108e285d42
author Pankaj Garg <pgarg@codeaurora.org> Tue Nov 18 17:28:30 2014 -0800
committer Pankaj Garg <pgarg@codeaurora.org> Mon Dec 01 12:37:10 2014 -0800
tree 4977de28d80fe3f5ce777525868921c52c08fe82
parent 1f5a0952599285350be6b1351110518086047fd1

Cleanup of settings menu

- Removed obsolete items
- Rearranged similar items together
- Reduced the depth of menu

Change-Id: I693dbb2b3c8cb244329be965f49ab288b73efa1a

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61c5d9e..10fa74f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -310,7 +310,7 @@
     <!-- Menu item to open the Settings screen -->
     <string name="menu_preferences">Settings</string>
     <!-- Settings screen, section title -->
-    <string name="pref_content_title">Page content</string>
+    <string name="pref_content_title">Content settings</string>
     <!-- Settings label [CHAR LIMIT=45]-->
     <string name="pref_allow_apptabs">Allow multiple tabs per app</string>
     <!-- Settings label -->
@@ -440,8 +440,16 @@
 
     <!-- Settings screen, section title [CHAR-LIMIT=50] -->
     <string name="pref_privacy_security_title">Privacy &amp; security</string>
+    <!-- Popup dialog -->
+    <string name="pref_select_items">Select items to be cleared</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_cache">Clear cache</string>
+    <string name="pref_privacy_clear_selected">Clear selected items</string>
+    <!-- Settings summary -->
+    <string name="pref_privacy_clear_selected_summary">Clear selected items in the list</string>
+    <!-- Confirmation dialog message -->
+    <string name="pref_privacy_clear_selected_dlg">Clear following items?</string>
+    <!-- Settings label -->
+    <string name="pref_privacy_clear_cache">Cache</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_cache_summary">Clear locally cached content and databases</string>
     <!-- Confirmation dialog message -->
@@ -449,13 +457,13 @@
     <!-- Cookie settings category [CHAR-LIMIT=50] -->
     <string name="pref_privacy_cookies_title">Cookies</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_cookies">Clear all cookie data</string>
+    <string name="pref_privacy_clear_cookies">Cookies</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_cookies_summary">Clear all browser cookies</string>
     <!-- Confirmation dialog message -->
     <string name="pref_privacy_clear_cookies_dlg">Delete all cookies?</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_history">Clear history</string>
+    <string name="pref_privacy_clear_history">History</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_history_summary">Clear the browser navigation history</string>
     <!-- Confirmation dialog message -->
@@ -463,13 +471,13 @@
     <!-- Formdata settings category [CHAR-LIMIT=50] -->
     <string name="pref_privacy_formdata_title">Form data</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_form_data">Clear form data</string>
+    <string name="pref_privacy_clear_form_data">Form data</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_form_data_summary">Clear all saved form data</string>
     <!-- Confirmation dialog message -->
     <string name="pref_privacy_clear_form_data_dlg">Delete all saved form data?</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_passwords">Clear passwords</string>
+    <string name="pref_privacy_clear_passwords">Passwords</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_passwords_summary">Clear all saved passwords</string>
     <!-- Confirmation dialog message -->
@@ -481,7 +489,7 @@
     <!-- Settings summary -->
     <string name="pref_privacy_enable_geolocation_summary">Allow sites to request access to your location</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_geolocation_access">Clear location access</string>
+    <string name="pref_privacy_clear_geolocation_access">Location access</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_geolocation_access_summary">Clear location access for all websites</string>
     <!-- Confirmation dialog message -->