Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Side by Side Diff: chrome/app/generated_resources.grd

Issue 501082: Implement delaying resource requests until privacy blacklists are ready. (Closed)
Patch Set: don't get stuck on errors Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/net/chrome_url_request_context.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 6024 matching lines...) Expand 10 before | Expand all | Expand 10 after
6035 Open Files 6035 Open Files
6036 </message> 6036 </message>
6037 6037
6038 <!-- Privacy Blacklist --> 6038 <!-- Privacy Blacklist -->
6039 <message name="IDS_BLACKLIST_TITLE" desc="Title of the page displayed when a page is blocked."> 6039 <message name="IDS_BLACKLIST_TITLE" desc="Title of the page displayed when a page is blocked.">
6040 Blocked Resource 6040 Blocked Resource
6041 </message> 6041 </message>
6042 <message name="IDS_BLACKLIST_MESSAGE" desc="Message shown instead of a block ed element."> 6042 <message name="IDS_BLACKLIST_MESSAGE" desc="Message shown instead of a block ed element.">
6043 The following Privacy Blacklists prevented this content from showing: 6043 The following Privacy Blacklists prevented this content from showing:
6044 </message> 6044 </message>
6045 <message name="IDS_BLACKLIST_UNBLOCK" desc="Prompt to unblock a blacklisted element.">
6046 Click to unblock
6047 </message>
6048 <message name="IDS_BLACKLIST_BLOCKED_COOKIES" desc="Cookies was blacklisted. "> 6045 <message name="IDS_BLACKLIST_BLOCKED_COOKIES" desc="Cookies was blacklisted. ">
6049 Cookies not sent 6046 Cookies not sent
6050 </message> 6047 </message>
6051 <message name="IDS_BLACKLIST_BLOCKED_REFERRER" desc="Referrer sending was bl acklisted."> 6048 <message name="IDS_BLACKLIST_BLOCKED_REFERRER" desc="Referrer sending was bl acklisted.">
6052 Referrer not sent 6049 Referrer not sent
6053 </message> 6050 </message>
6054 <message name="IDS_BLACKLIST_ERROR_LOADING_TITLE" desc="Title of the dialog shown when the privacy blacklist cannot be loaded."> 6051 <message name="IDS_BLACKLIST_ERROR_LOADING_TITLE" desc="Title of the dialog shown when the privacy blacklist cannot be loaded.">
6055 Privacy Blacklist Error 6052 Privacy Blacklist Error
6056 </message> 6053 </message>
6057 <message name="IDS_BLACKLIST_ERROR_LOADING_TEXT" desc="Text of the dialog sh own when the privacy blacklist cannot be loaded."> 6054 <message name="IDS_BLACKLIST_ERROR_LOADING_TEXT" desc="Text of the dialog sh own when the privacy blacklist cannot be loaded.">
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
6183 <message name="IDS_COMPACT_NAVBAR" desc="The menu item on the app menu to toggle compact navigation bar"> 6180 <message name="IDS_COMPACT_NAVBAR" desc="The menu item on the app menu to toggle compact navigation bar">
6184 Toggle Compact Navigation Bar 6181 Toggle Compact Navigation Bar
6185 </message> 6182 </message>
6186 </if> 6183 </if>
6187 <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing "> 6184 <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing ">
6188 Import bookmarks now... 6185 Import bookmarks now...
6189 </message> 6186 </message>
6190 </messages> 6187 </messages>
6191 </release> 6188 </release>
6192 </grit> 6189 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/net/chrome_url_request_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698