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

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 1002283005: Add an error page for net::ERR_ICANN_NAME_COLLISION. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dns_53
Patch Set: rebase (dependent change now landed) Created 5 years, 9 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:
Download patch
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | chrome/common/localized_error.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2893fc744112c09a17188291df49089afacbf795..d7803b7a2096b88ebcbc36b02763b73a44f2b638 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9292,6 +9292,14 @@ I don't think this site should be blocked!
<ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>
from accessing the network.
</message>
+ <message name="IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION" desc="Summary in the error page when a dns look up fails due to having contained 127.0.53.53.">
+ This site is using a
+ <ph name="BEGIN_LINK">&lt;a href="https://support.google.com/chrome/?p=top_level_domain&amp;hl=[GRITLANGCODE]"&gt;</ph>new generic top-level domain<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
mmenke 2015/03/26 14:44:43 This seems weird - why is there an example ("ex")
eroman 2015/03/26 14:58:30 I copy pasted the line from another place and then
+ (gTLD). If you have used
+ <ph name="HOST_NAME">&lt;strong jscontent="hostName"&gt;&lt;/strong&gt;<ex>www.whatever.com</ex></ph>
+ to access an internal site in the past, contact your network
+ administrator.
+ </message>
<message name="IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE" desc="Summary in the error page when we can't reach a site. This is slightly more specific than just being unable to connect, as it means we can't find a route to the server.">
<ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>
cannot reach the website. This is typically caused by network issues,
@@ -9482,6 +9490,9 @@ I don't think this site should be blocked!
<message name="IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED" desc="The error message displayed when a dns look up fails.">
Unable to resolve the server's DNS address.
</message>
+ <message name="IDS_ERRORPAGES_DETAILS_ICANN_NAME_COLLISION" desc="The error message displayed when a dns look up fails due to containing 127.0.53.53.">
+ This site is using a new generic top-level domain.
+ </message>
<message name="IDS_ERRORPAGES_DETAILS_ADDRESS_UNREACHABLE" desc="The error message displayed when we can't reach a server.">
Unable to reach the server.
</message>
« no previous file with comments | « build/ios/grit_whitelist.txt ('k') | chrome/common/localized_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698