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

Unified Diff: chrome/app/google_chrome_strings.grd

Issue 1467193003: Componentize error pages strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to review Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/google_chrome_strings.grd
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 7fe768c856b4f938cf9088bf2ad5b687f0a65b53..1bce2212949b2e3a12541bac586a8876cba6641f 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -869,49 +869,6 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
Copied to Chrome
</message>
- <!-- Network Error Pages -->
- <message name="IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER" desc="When a webpage fails to load, in some cases we suggest reconfiguring the firewall. This is a header above some details.">
- Allow Chrome to access the network in your firewall or antivirus
- settings.
- </message>
- <if expr="is_macosx">
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server.">
- Go to
- Applications &gt; System Preferences &gt; Network &gt; Advanced &gt; Proxies
- and deselect any proxies that have been selected.
- </message>
- </if>
- <if expr="is_android or is_ios">
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
- </message>
- </if>
- <if expr="not chromeos and is_posix and not is_macosx and not is_android and not is_ios">
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
- Go to
- the Chrome menu &gt;
- <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
- &gt;
- <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
- &gt;
- <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
- and make sure your configuration is set to &quot;no proxy&quot; or &quot;direct.&quot;
- </message>
- </if>
- <if expr="is_win">
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server.">
- Go to
- the Chrome menu &gt;
- <ph name="SETTINGS_TITLE">&lt;span jscontent="settingsTitle"&gt;&lt;/span&gt;<ex>Settings</ex></ph>
- &gt;
- <ph name="ADVANCED_TITLE">&lt;span jscontent="advancedTitle"&gt;&lt;/span&gt;<ex>Under the Hood</ex></ph>
- &gt;
- <ph name="PROXIES_TITLE">&lt;span jscontent="proxyTitle"&gt;&lt;/span&gt;<ex>Change proxy settings...</ex></ph>
- &gt;
- LAN Settings
- and deselect &quot;Use a proxy server for your LAN&quot;.
- </message>
- </if>
-
<!-- Chrome OS keyboard overlay-->
<if expr="chromeos">
<message name="IDS_KEYBOARD_OVERLAY_SHOW_WRENCH_MENU" desc="The text in the keyboard overlay to explain the shortcut that opens the main Chrome menu.">
@@ -1195,13 +1152,6 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
You cannot visit <ph name="SITE">$1<ex>google.com</ex></ph> right now because the website sent scrambled credentials that Chrome cannot process. Network errors and attacks are usually temporary, so this page will probably work later.
</message>
- <!-- Offline interstitial -->
- <if expr="not is_android and not is_ios">
- <message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED" desc="Summary of the error page when the network connection failed. May be followed by platform dependent instructions.">
- Google Chrome can't display the webpage because your computer isn't connected to the Internet.
- </message>
- </if>
-
<!-- Runtime permission strings -->
<if expr="is_android">
<message name="IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT" desc="Text shown in an infobar when a website has requested access to the camera capabilities, but Chrome is missing the Android camera permission.">
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698