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

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

Issue 10407105: Improve error messaging of webRequest API in case of conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix windows compilation Created 8 years, 2 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 | Annotate | Revision Log
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 5298 matching lines...) Expand 10 before | Expand all | Expand 10 after
5309 </message> 5309 </message>
5310 <message name="IDS_EXTENSION_WARNINGS_TITLE" desc="The title of a section in chrome://extensions which contains the warning(s) that relates to one particu lar extension"> 5310 <message name="IDS_EXTENSION_WARNINGS_TITLE" desc="The title of a section in chrome://extensions which contains the warning(s) that relates to one particu lar extension">
5311 Warning: 5311 Warning:
5312 </message> 5312 </message>
5313 <message name="IDS_EXTENSION_WARNINGS_NETWORK_DELAY" desc="Warning message indicating that an extension caused excessive network delays for web requests"> 5313 <message name="IDS_EXTENSION_WARNINGS_NETWORK_DELAY" desc="Warning message indicating that an extension caused excessive network delays for web requests">
5314 This extension is slowing down <ph name="PRODUCT_NAME">$1<ex>Google Chro me</ex></ph>. You should disable it to restore <ph name="PRODUCT_NAME">$1<ex>Goo gle Chrome</ex></ph>'s performance. 5314 This extension is slowing down <ph name="PRODUCT_NAME">$1<ex>Google Chro me</ex></ph>. You should disable it to restore <ph name="PRODUCT_NAME">$1<ex>Goo gle Chrome</ex></ph>'s performance.
5315 </message> 5315 </message>
5316 <message name="IDS_EXTENSION_WARNINGS_NETWORK_CONFLICT" desc="Warning mess age which indicates that two or more extensions tried to modify a network reques t in a conflicting way and the modification of this extension was ignored"> 5316 <message name="IDS_EXTENSION_WARNINGS_NETWORK_CONFLICT" desc="Warning mess age which indicates that two or more extensions tried to modify a network reques t in a conflicting way and the modification of this extension was ignored">
5317 This extension failed to modify a network request because the modificati on conflicted with another extension. 5317 This extension failed to modify a network request because the modificati on conflicted with another extension.
5318 </message> 5318 </message>
5319 <message name="IDS_EXTENSION_WARNINGS_REDIRECT_CONFLICT" desc="Warning mes sage indicating that two extensions tried to redirect to different destinations" >
5320 This extension failed to redirect a network request to <ph name="ATTEMPT ED_REDIRECT_DESTINATION">$1<ex>http://www.google.com</ex></ph> because another e xtension (<ph name="EXTENSION_NAME">$2<ex>My Cool Extension</ex></ph>) redirecte d it to <ph name="ACTUAL_REDIRECT_DESTINATION">$3<ex>https://www.google.com</ex> </ph>.
5321 </message>
5322 <message name="IDS_EXTENSION_WARNINGS_REQUEST_HEADER_CONFLICT" desc="Warni ng message which indicates that two or more extensions tried to modify a network request in a conflicting way and the modification of this extension was ignored ">
5323 This extension failed to modify the request header "<ph name="HEADER_NAM E">$1<ex>User-Agent</ex></ph>" of a network request because the modification con flicted with another extension (<ph name="EXTENSION_NAME">$2<ex>My Cool Extensio n</ex></ph>).
5324 </message>
5325 <message name="IDS_EXTENSION_WARNINGS_RESPONSE_HEADER_CONFLICT" desc="Warn ing message which indicates that two or more extensions tried to modify a networ k request in a conflicting way and the modification of this extension was ignore d">
5326 This extension failed to modify the response header "<ph name="HEADER_NA ME">$1<ex>User-Agents</ex></ph>" of a network request because the modification c onflicted with another extension (<ph name="EXTENSION_NAME">$2<ex>My Cool Extens ion</ex></ph>).
5327 </message>
5328 <message name="IDS_EXTENSION_WARNINGS_CREDENTIALS_CONFLICT" desc="Warning message which indicates that two or more extensions tried to modify a network re quest in a conflicting way and the modification of this extension was ignored">
5329 This extension failed to provide credentials to a network request becaus e another extension (<ph name="EXTENSION_NAME">$1<ex>My Cool Extension</ex></ph> ) provided different credentials.
5330 </message>
5319 5331
5320 <!-- External extension install alerts --> 5332 <!-- External extension install alerts -->
5321 <!-- TODO(mpcomplete): We may need to change Chrome to 5333 <!-- TODO(mpcomplete): We may need to change Chrome to
5322 PRODUCT_NAME. Leaving it as-is until we finalize 5334 PRODUCT_NAME. Leaving it as-is until we finalize
5323 these strings. --> 5335 these strings. -->
5324 <message name="IDS_EXTENSION_EXTERNAL_INSTALL_ALERT" desc="The wrench menu item indicating that a new external extension was installed."> 5336 <message name="IDS_EXTENSION_EXTERNAL_INSTALL_ALERT" desc="The wrench menu item indicating that a new external extension was installed.">
5325 New extension added (<ph name="EXTENSION_NAME">$1<ex>Babylon Toolbar</ex ></ph>) 5337 New extension added (<ph name="EXTENSION_NAME">$1<ex>Babylon Toolbar</ex ></ph>)
5326 </message> 5338 </message>
5327 <message name="IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_TITLE" desc=""> 5339 <message name="IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_TITLE" desc="">
5328 "<ph name="EXTENSION_NAME">$1<ex>Babylon Toolbar</ex></ph>" added 5340 "<ph name="EXTENSION_NAME">$1<ex>Babylon Toolbar</ex></ph>" added
(...skipping 9340 matching lines...) Expand 10 before | Expand all | Expand 10 after
14669 14681
14670 <structures fallback_to_english="true"> 14682 <structures fallback_to_english="true">
14671 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14683 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14672 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14684 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14673 </structure> 14685 </structure>
14674 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14686 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14675 </structure> 14687 </structure>
14676 </structures> 14688 </structures>
14677 </release> 14689 </release>
14678 </grit> 14690 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698