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 a089edd44f3b3626fa7b1c69a64fe87aaff8ef67..c4a59cc73fb9a49747afe0e1f92c2e67b76a8d83 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7704,31 +7704,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
       </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
@@ -7751,6 +7751,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. The text in brackets and braces will be turned into buttons. The translated text should contain exactly one phrase in brackets and one phrase in braces.">
+        Saved [content settings] and {search engines} will not be cleared and may reflect your browsing habits.

[Evan Stade, 2013/12/14 00:32:45]

hmmm... it actually seems unlikely that a translation could transpose these two
links. Code would be a little simpler without multiple types of brackets.

[battre, 2013/12/14 00:47:53]

I think that the code would actually be slightly more complicated because we
need to count how many buttons have been added already.

Do you know whether the assumption that translatedText.indexOf('[') <
translatedText.indexOf(']') is maintained for RTL languages?

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