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

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 10870103: Remove no longer used NetNanny and ESET anti-virus error (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | « no previous file | 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
===================================================================
--- chrome/app/generated_resources.grd (revision 153481)
+++ chrome/app/generated_resources.grd (working copy)
@@ -8166,9 +8166,6 @@
<message name="IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY" desc="Heading of the error page when the server has a weak Diffie-Hellman public key. Diffie-Hellman is a technical term and the conjuction of two names so may be best left untranslated. 'key' here is used as the technical name for a large number with certain mathematical properties that allow it to be used to encrypt and decrypt data. 'weak' here means that the number is too small to resist an exhaustive attempt to find certain mathematical structures in it, the secrecy of which is critical.">
Server has a weak ephemeral Diffie-Hellman public key
</message>
- <message name="IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION" desc="Heading of the error page when we detect that ESET anti-virus is running and intercepting our HTTPS connections. 'ESET' is a product name and may be best left untranslated.">
- Cannot make secure connection because of ESET anti-virus
- </message>
<message name="IDS_ERRORPAGES_HEADING_BLOCKED" desc="Heading of the error page when a request is blocked by an extension.">
This webpage was blocked by an extension
</message>
@@ -8386,51 +8383,6 @@
won't use insecure connections in order to protect your privacy.
</message>
- <if expr="pp_ifdef('android')">
- <message name="IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION" desc="Mobile: Summary in the error page when we detect that ESET anti-virus is running and intercepting our HTTPS connections. 'ESET' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
- <ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>
- has detected that an ESET product is intercepting secure connections.
- This is typically not a security issue as the ESET software is
- usually running on the same mobile device. However, due to an intolerance
- to specific aspects of
- <ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>'s
- secure connections, ESET products have to be configured to not
- perform this interception. Click the 'Learn more' link for
- instructions.
- </message>
-
- <message name="IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION" desc="Mobile: Summary in the error page when we detect that NetNanny is running and intercepting our HTTPS connections. 'NetNanny' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
- <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> has detected that
- NetNanny is intercepting secure connections. This is typically
- not a security issue as the NetNanny software is usually running on the
- same mobile device. However, due to an intolerance to specific aspects of
- Chrome's secure connections, NetNanny has to be configured to not
- perform this interception. Click the 'Learn more' link for instructions.
- </message>
- </if>
- <if expr="not pp_ifdef('android')">
- <message name="IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION" desc="Summary in the error page when we detect that ESET anti-virus is running and intercepting our HTTPS connections. 'ESET' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
- <ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>
- has detected that an ESET product is intercepting secure connections.
- This is typically not a security issue as the ESET software is
- usually running on the same computer. However, due to an intolerance
- to specific aspects of
- <ph name="PRODUCT_NAME">&lt;span jscontent="productName"&gt;&lt;/span&gt;<ex>Google Chrome</ex></ph>'s
- secure connections, ESET products have to be configured to not
- perform this interception. Click the 'Learn more' link for
- instructions.
- </message>
-
- <message name="IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION" desc="Summary in the error page when we detect that NetNanny is running and intercepting our HTTPS connections. 'NetNanny' is a product name and may be best left untranslated. 'Learn more' should be the contents of IDS_LEARN_MORE.">
- <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> has detected that
- NetNanny is intercepting secure connections. This is typically
- not a security issue as the NetNanny software is usually running on the
- same computer. However, due to an intolerance to specific aspects of
- Chrome's secure connections, NetNanny has to be configured to not
- perform this interception. Click the 'Learn more' link for instructions.
- </message>
- </if>
-
<message name="IDS_ERRORPAGES_DETAILS_TEMPLATE" desc="On the bottom of the error page text, there is a box that includes extra information for tech savvy users.">
Error <ph name="ERROR_NUMBER">$1<ex>5</ex></ph> (<ph name="ERROR_NAME">$2<ex>net::ERR_FILE_NOT_FOUND</ex></ph>): <ph name="ERROR_TEXT">$3<ex>The requested file is not found.</ex></ph>
</message>
« no previous file with comments | « no previous file | chrome/common/localized_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698