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

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

Issue 6793045: Change text of DNS prefetch option to Network prediction option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another bad merge fix Created 9 years, 8 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
« no previous file with comments | « no previous file | chrome/app/policy/policy_templates.json » ('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. OS values are passed through from Python's sys.platform: 5 locale. OS values are passed through from Python's sys.platform:
6 6
7 win32 - Windows 7 win32 - Windows
8 darwin - Mac 8 darwin - Mac
9 linux2 - Linux (both Views and GTK+) 9 linux2 - Linux (both Views and GTK+)
10 10
(...skipping 5864 matching lines...) Expand 10 before | Expand all | Expand 10 after
5875 Go to the home page of the site: 5875 Go to the home page of the site:
5876 </message> 5876 </message>
5877 <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION" desc="When a pa ge fails to load, sometimes we suggest checking the network connection."> 5877 <message name="IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION" desc="When a pa ge fails to load, sometimes we suggest checking the network connection.">
5878 Check your internet connection. Reboot any routers, modems, or other 5878 Check your internet connection. Reboot any routers, modems, or other
5879 network devices you may be using. 5879 network devices you may be using.
5880 </message> 5880 </message>
5881 <message name="IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG" desc="When a page fai ls to load, sometimes we suggest checking the DNS configuration."> 5881 <message name="IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG" desc="When a page fai ls to load, sometimes we suggest checking the DNS configuration.">
5882 Check your DNS settings. Contact your network administrator if you're 5882 Check your DNS settings. Contact your network administrator if you're
5883 not sure what this means. 5883 not sure what this means.
5884 </message> 5884 </message>
5885 <message name="IDS_ERRORPAGES_SUGGESTION_DNS_PREFETCH" desc="When a page f ails to load, sometimes we suggest disabling prefetching."> 5885 <message name="IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION" desc="When a page fails to load, sometimes we suggest disabling network prediction.">
5886 Try disabling DNS prefetching by following these steps: 5886 Try disabling network prediction by following these steps:
5887 Go to 5887 Go to
5888 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph> 5888 <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
5889 Wrench menu &gt; 5889 Wrench menu &gt;
5890 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph> 5890 <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/spa n&gt;<ex>Settings</ex></ph>
5891 &gt; 5891 &gt;
5892 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/spa n&gt;<ex>Under the Hood</ex></ph> 5892 <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/spa n&gt;<ex>Under the Hood</ex></ph>
5893 <ph name="END_BOLD">&lt;/strong&gt;</ph> 5893 <ph name="END_BOLD">&lt;/strong&gt;</ph>
5894 and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent ="noPrefetchTitle"&gt;&lt;/span&gt;<ex>Use DNS pre-fetching to improve page load performance</ex></ph>.&quot; 5894 and deselect &quot;<ph name="NO_PREFETCH_DESCRIPTION">&lt;span jscontent ="noNetworkPredictionTitle"&gt;&lt;/span&gt;<ex>Predict network actions to impro ve page load performance</ex></ph>.&quot;
wtc 2011/05/02 18:27:14 Just a nit: the placeholder name "NO_PREFETCH_DESC
5895 </message> 5895 </message>
5896 <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG" desc="When a web page fails to load, in some cases we suggest reconfiguring the firewall."> 5896 <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG" desc="When a web page fails to load, in some cases we suggest reconfiguring the firewall.">
5897 Try adding 5897 Try adding
5898 <ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt ;<ex>Google Chrome</ex></ph> 5898 <ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt ;<ex>Google Chrome</ex></ph>
5899 as a permitted program in your firewall or antivirus software's settings . If it is 5899 as a permitted program in your firewall or antivirus software's settings . If it is
5900 already a permitted program, try deleting it from the list of permitted programs 5900 already a permitted program, try deleting it from the list of permitted programs
5901 and adding it again. 5901 and adding it again.
5902 </message> 5902 </message>
5903
5904 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG" desc="When a web pa ge fails to load, in some cases we suggest checking the proxy server configurati on."> 5903 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG" desc="When a web pa ge fails to load, in some cases we suggest checking the proxy server configurati on.">
5905 If you use a proxy server, check your proxy settings or check with your network administrator 5904 If you use a proxy server, check your proxy settings or check with your network administrator
5906 to make sure the proxy server is working. 5905 to make sure the proxy server is working.
5907 </message> 5906 </message>
5908 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE" desc="When a web p age fails to load, in some cases we suggest disabling the proxy server."> 5907 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE" desc="When a web p age fails to load, in some cases we suggest disabling the proxy server.">
5909 If you don't believe you should be using a proxy server, try the followi ng steps: 5908 If you don't believe you should be using a proxy server, try the followi ng steps:
5910 <ph name="PLATFORM_TEXT">$1<ex>Goto the wrench menu and choose Fix It</e x></ph> 5909 <ph name="PLATFORM_TEXT">$1<ex>Goto the wrench menu and choose Fix It</e x></ph>
5911 </message> 5910 </message>
5912 <if expr="os == 'darwin'"> 5911 <if expr="os == 'darwin'">
5913 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server."> 5912 <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="M ac OSX instructions for disabling use of a proxy server.">
(...skipping 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after
7350 Search preferences 7349 Search preferences
7351 </message> 7350 </message>
7352 </if> 7351 </if>
7353 <if expr="os == 'win32'"> 7352 <if expr="os == 'win32'">
7354 <message name="IDS_OPTIONS_SEARCH_PLACEHOLDER" desc="Text placeholder fo r an empty search field on Windows."> 7353 <message name="IDS_OPTIONS_SEARCH_PLACEHOLDER" desc="Text placeholder fo r an empty search field on Windows.">
7355 Search options 7354 Search options
7356 </message> 7355 </message>
7357 </if> 7356 </if>
7358 7357
7359 <!-- Misc advanced option description strings. --> 7358 <!-- Misc advanced option description strings. -->
7360 <message name="IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION" desc="In the advanced options tab, the text next to the checkbox that enables DNS prefetching . DNS prefetching involves scanning pages and user text entries, guessing what domain the user may next navigate to, and obtaining the domain's DNS information for that URL in advance. "> 7359 <message name="IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION" desc="In the ad vanced options tab, the text next to the checkbox that enables prediction of net work actions. Actions include DNS prefetching, TCP and SSL preconnection, and p rerendering of web pages.">
7361 Use DNS pre-fetching to improve page load performance 7360 Predict network actions to improve page load performance
7362 </message> 7361 </message>
7363 7362
7364 <!-- Collected cookies window --> 7363 <!-- Collected cookies window -->
7365 <message name="IDS_COLLECTED_COOKIES_DIALOG_TITLE" desc="The title of the collect cookies dialog"> 7364 <message name="IDS_COLLECTED_COOKIES_DIALOG_TITLE" desc="The title of the collect cookies dialog">
7366 Cookies set by this page 7365 Cookies set by this page
7367 </message> 7366 </message>
7368 <message name="IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL" desc="The labe l used to describe the cookies that were allowed"> 7367 <message name="IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL" desc="The labe l used to describe the cookies that were allowed">
7369 The following cookies were set when you viewed this page: 7368 The following cookies were set when you viewed this page:
7370 </message> 7369 </message>
7371 <message name="IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL" desc="The labe l used to describe the cookies that were blocked"> 7370 <message name="IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL" desc="The labe l used to describe the cookies that were blocked">
(...skipping 4350 matching lines...) Expand 10 before | Expand all | Expand 10 after
11722 </includes> 11721 </includes>
11723 <structures fallback_to_english="true"> 11722 <structures fallback_to_english="true">
11724 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 11723 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
11725 </structure> 11724 </structure>
11726 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 11725 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
11727 </structure> 11726 </structure>
11728 </structures> 11727 </structures>
11729 11728
11730 </release> 11729 </release>
11731 </grit> 11730 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/policy/policy_templates.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698