chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d2a501aae0266f84e9bb2fcfce4b7b5170e6ba58..82b606b77b124dbd20c8ed35488abd6fbf9f4a31 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7695,31 +7695,31 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
         Obliterate the following items from:
       </message>
       <message name="IDS_DEL_BROWSING_HISTORY_CHKBOX" desc="Checkbox for deleting Browsing History">
-        Clear browsing history
+        Browsing history
       </message>
       <message name="IDS_DEL_DOWNLOAD_HISTORY_CHKBOX" desc="Checkbox for deleting Download History">
-        Clear download history
+        Download history
       </message>
       <message name="IDS_DEL_CACHE_CHKBOX" desc="Checkbox for deleting Cache">
-        Empty the cache
+        Cached images and files
       </message>
       <message name="IDS_DEL_COOKIES_CHKBOX" desc="Checkbox for deleting Cookies and other site data">
-        Delete cookies and other site data
+        Cookies and other site data
       </message>
       <message name="IDS_DEL_COOKIES_FLASH_CHKBOX" desc="Checkbox for deleting Cookies and other site data">
-        Delete cookies and other site and plug-in data
+        Cookies and other site and plug-in data
       </message>
       <message name="IDS_DEL_PASSWORDS_CHKBOX" desc="Checkbox for deleting Passwords">
-        Clear saved passwords
+        Passwords
       </message>
       <message name="IDS_DEL_FORM_DATA_CHKBOX" desc="Checkbox for deleting form data saved for Autofill">
-        Clear saved Autofill form data
+        Autofill form data
       </message>
       <message name="IDS_DEL_HOSTED_APPS_DATA_CHKBOX" desc="Checkbox for deleting data of hosted apps">
-        Clear data from hosted apps
+        hosted app data

[Evan Stade, 2013/12/09 19:07:13]

nit: capitalization

[battre, 2013/12/11 06:10:30]

Done.

       </message>
       <message name="IDS_DEAUTHORIZE_CONTENT_LICENSES_CHKBOX" desc="Checkbox for deauthorizing content licenses (DRM videos, etc.)">
-        Deauthorize content licenses
+        Content licenses
       </message>
       <message name="IDS_CLEAR_BROWSING_DATA_COMMIT" desc="Title for OK button on dialog">
         Clear browsing data
@@ -7742,6 +7742,9 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
       <message name="IDS_CLEAR_DATA_EVERYTHING" desc="deletion period combo box: everything. In English this finishes the sentence that starts with 'Delete the following items from'.">
         the beginning of time
       </message>
+      <message name="IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS" desc="Information that some data may remain even though the user clears their browsing history">
+        Saved <ph name="BEGIN_LINK">&lt;button id="open-content-settings-from-clear-browsing-data" class="link-button"&gt;</ph>content settings<ph name="END_LINK">&lt;/button&gt;</ph> and <ph name="BEGIN2_LINK">&lt;button id="open-search-engines-from-clear-browsing-data" class="link-button"&gt;</ph>search engines<ph name="END2_LINK">&lt;/button&gt;</ph> will not be cleared and may reflect your browsing habits.

[Evan Stade, 2013/12/09 19:07:13]

this makes me feel a bit queasy; it's hard to read, it spreads important code
like IDs into a .grd file, we have to rely on translators not to mess it up or
functionality is lost, and the use of innerhtml creates a potential
vulnerability. Can you do something like
IDS_AUTOFILL_WALLET_BUYER_COUNTRY_NOT_SUPPORTED?

[battre, 2013/12/11 06:10:30]

Done.

+      </message>
 
       <!-- Managed User Avatar Menu -->
       <message name="IDS_MANAGED_USER_INFO" desc="Text which explains that a supervised user is managed by a custodian.">