summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 01:32:22 +0000
committerkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-23 01:32:22 +0000
commita2dbe3326328c8fded7dab6f330a6df2c874945a (patch)
tree5818e038810995d4d3414db4f25adf650c25e84b
parent4b663dd78b78a65a03641283852211b98d0599af (diff)
downloadchromium_src-a2dbe3326328c8fded7dab6f330a6df2c874945a.zip
chromium_src-a2dbe3326328c8fded7dab6f330a6df2c874945a.tar.gz
chromium_src-a2dbe3326328c8fded7dab6f330a6df2c874945a.tar.bz2
chromeos: modify string to disable proxy per sumit
BUG=chromium-os:18094 TEST=verfiy per bug rpt Review URL: http://codereview.chromium.org/7980065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102418 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd14
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 13b47e2..c0bbd34 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6587,13 +6587,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
&gt;
<ph name="INTERNET_TITLE">&lt;span jscontent="internetTitle"&gt;&lt;/span&gt;<ex>Internet</ex></ph>
&gt;
- <ph name="OPTIONS_BUTTON">&lt;span jscontent="optionsButton"&gt;&lt;/span&gt;<ex>Options...</ex></ph>
- of connected network &gt;
+ &quot;<ph name="OPTIONS_BUTTON">&lt;span jscontent="optionsButton"&gt;&lt;/span&gt;<ex>Options...</ex></ph>&quot;
+ <ph name="END_BOLD">&lt;/strong&gt;</ph>
+ (for the current Network). If the
+ <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
+ &quot;<ph name="PROXY_BUTTON">&lt;span jscontent="proxyButton"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>&quot;
+ <ph name="END_BOLD">&lt;/strong&gt;</ph>button (in the
+ <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>
<ph name="NETWORK_TAB">&lt;span jscontent="networkTab"&gt;&lt;/span&gt;<ex>Network</ex></ph>
- tab &gt;
- <ph name="PROXY_BUTTON">&lt;span jscontent="proxyButton"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
<ph name="END_BOLD">&lt;/strong&gt;</ph>
- and make sure your configuration is set to &quot;Direct&quot;.
+ tab) is present, click on that and make sure your configuration
+ is set to &quot;Direct&quot;.
</message>
</if>
<if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx">