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

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

Issue 8373014: Add new text for indicating we are resolving hosts during proxy resolution. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address eroman's nits. Created 9 years, 1 month 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/ui/tab_contents/tab_contents_wrapper.cc » ('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 <!-- 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 6466 matching lines...) Expand 10 before | Expand all | Expand 10 after
6477 </message> 6477 </message>
6478 <message name="IDS_LOAD_STATE_WAITING_FOR_APPCACHE"> 6478 <message name="IDS_LOAD_STATE_WAITING_FOR_APPCACHE">
6479 Waiting for AppCache... 6479 Waiting for AppCache...
6480 </message> 6480 </message>
6481 <message name="IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL"> 6481 <message name="IDS_LOAD_STATE_ESTABLISHING_PROXY_TUNNEL">
6482 Waiting for proxy tunnel... 6482 Waiting for proxy tunnel...
6483 </message> 6483 </message>
6484 <message name="IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL"> 6484 <message name="IDS_LOAD_STATE_RESOLVING_PROXY_FOR_URL">
6485 Resolving proxy... 6485 Resolving proxy...
6486 </message> 6486 </message>
6487 <message name="IDS_LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT">
6488 Resolving host in proxy script...
6489 </message>
6487 <message name="IDS_LOAD_STATE_RESOLVING_HOST"> 6490 <message name="IDS_LOAD_STATE_RESOLVING_HOST">
6488 Resolving host... 6491 Resolving host...
6489 </message> 6492 </message>
6490 <message name="IDS_LOAD_STATE_CONNECTING"> 6493 <message name="IDS_LOAD_STATE_CONNECTING">
6491 Connecting... 6494 Connecting...
6492 </message> 6495 </message>
6493 <message name="IDS_LOAD_STATE_SSL_HANDSHAKE"> 6496 <message name="IDS_LOAD_STATE_SSL_HANDSHAKE">
6494 Establishing secure connection... 6497 Establishing secure connection...
6495 </message> 6498 </message>
6496 <message name="IDS_LOAD_STATE_SENDING_REQUEST"> 6499 <message name="IDS_LOAD_STATE_SENDING_REQUEST">
(...skipping 8108 matching lines...) Expand 10 before | Expand all | Expand 10 after
14605 </messages> 14608 </messages>
14606 <structures fallback_to_english="true"> 14609 <structures fallback_to_english="true">
14607 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14610 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14608 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14611 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14609 </structure> 14612 </structure>
14610 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14613 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14611 </structure> 14614 </structure>
14612 </structures> 14615 </structures>
14613 </release> 14616 </release>
14614 </grit> 14617 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698