chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2ad33ec089ea3ce4e74f42c7eaf2b8fbe164026e..6f87b953ac47cb0f830fd8fe7bacb348ff6890f6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1169,9 +1169,6 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
           <message name="IDS_PRINT" desc="The text label of the Print... menu item. Opens a dialog box to select print settings">
             &amp;Print...
           </message>
-          <message name="IDS_TOOLS_MENU" desc="The text label of the Tools submenu">
-            Too&amp;ls
-          </message>
           <message name="IDS_MORE_TOOLS_MENU" desc="The text label of the Tools submenu for touch">
             More too&amp;ls
           </message>
@@ -1246,9 +1243,6 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
           <message name="IDS_PRINT" desc="In Title Case: The text label of the Print... menu item. Opens a dialog box to select print settings">
             &amp;Print...
           </message>
-          <message name="IDS_TOOLS_MENU" desc="The text label of the Tools submenu">
-            Too&amp;ls
-          </message>
           <message name="IDS_MORE_TOOLS_MENU" desc="The text label of the Tools submenu for touch">
             More too&amp;ls
           </message>
@@ -9450,9 +9444,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH" desc="The text for the paragraph at the bottom with the proceed link.">
         <ph name="BEGIN_LINK">&lt;a href="#" id="proceed-link"&gt;</ph>Proceed to <ph name="SITE">$1<ex>example.com</ex></ph> (unsafe)<ph name="END_LINK">&lt;/a&gt;</ph>
       </message>
-      <message name="IDS_SSL_OVERRIDABLE_PROCEED_LINK_TEXT" desc="Just the proceed link text.">
-        Proceed to the site (unsafe)
-      </message>
 
       <!-- SSL Interstitial V2: Non-overridable -->
       <message name="IDS_SSL_NONOVERRIDABLE_RELOAD_BUTTON" desc="The text for the button that reloads the page.">
@@ -9475,67 +9466,6 @@ and incorrect credentials. Either an attacker is trying to pretend to be <ph nam
       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>
 
-      <!-- SSL Interstitial V1: Overridable -->
-      <message name="IDS_SSL_OVERRIDABLE_PAGE_TITLE" desc="The title of the overridable SSL interstitial.">
-        SSL Error
-      </message>
-      <message name="IDS_SSL_OVERRIDABLE_PAGE_PROCEED" desc="Proceed button text of the overridable SSL interstitial.">
-        Proceed anyway
-      </message>
-      <message name="IDS_SSL_OVERRIDABLE_PAGE_EXIT" desc="'Back' button text of the overridable SSL interstitial.">
-        Back to safety
-      </message>
-      <message name="IDS_SSL_OVERRIDABLE_PAGE_SHOULD_NOT_PROCEED" desc="Message advising the user not to proceed past the SSL interstitial.">
-        You should not proceed, &lt;strong&gt;especially&lt;/strong&gt; if you have never seen this warning before for this site.
-      </message>
-
-      <!-- SSL Interstitial V1: Non-overridable -->
-      <message name="IDS_SSL_BLOCKING_PAGE_TITLE" desc="The title of the non-overridable SSL error.">
-        SSL Error
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_HEADLINE" desc="Headline of the non-overridable SSL error.">
-        Cannot connect to the real <ph name="SITE">$1<ex>google.com</ex></ph>
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_BODY_TEXT" desc="The main body text of the non-overridable SSL error.">
-        &lt;p&gt;Something is currently interfering with your secure connection to <ph name="SITE">$1<ex>google.com</ex></ph>.&lt;/p&gt; &lt;p&gt;<ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Try to reload this page in a few minutes or after switching to a new network.<ph name="END_BOLD">&lt;/strong&gt;</ph> If you have recently connected to a new Wi-Fi network, finish logging in before reloading.&lt;/p&gt; &lt;p&gt;If you were to visit <ph name="SITE">$1<ex>google.com</ex></ph> right now, you might share private information with an attacker. To protect your privacy, Chrome will not load the page until it can establish a secure connection to the real <ph name="SITE">$1<ex>google.com</ex></ph>.&lt;/p&gt;
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_MORE_TITLE" desc="Headline for the explanation shown if the user clicks the More button.">
-        What does this mean?
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_MORE_TEXT" desc="Body text for the explanation shown if user clicks on the More button.">
-        &lt;p&gt;<ph name="SITE">$1<ex>google.com</ex></ph> normally uses encryption (SSL) to protect your information. When Chrome tried to connect to <ph name="SITE">$1<ex>google.com</ex></ph> this time, <ph name="SITE">$1<ex>google.com</ex></ph> returned unusual and incorrect credentials. Either an attacker is trying to pretend to be <ph name="SITE">$1<ex>google.com</ex></ph>, or a Wi-Fi sign-in screen has interrupted the connection. Your information is still secure because Chrome stopped the connection before any data was exchanged.&lt;/p&gt; &lt;p&gt;Network errors and attacks are usually temporary, so this page will probably work later. You can also try switching to another network.&lt;/p&gt;
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_TECH_TITLE" desc="Headline for the technical details shown if the user clicks the More button.">
-        Technical details
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_HSTS" desc="Description of an HSTS failure.">
-        <ph name="SITE">$1<ex>google.com</ex></ph> has asked Chrome to block any certificates with errors, but the certificate that Chrome received during this connection attempt has an error.
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_REVOKED" desc="Description of a certificate revocation failure.">
-        The certificate that Chrome received during this connection attempt has been revoked.
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_FORMATTED" desc="Description of an invalid certificate error.">
-        The certificate that Chrome received during this connection attempt is not formatted correctly, so Chrome cannot use it to protect your information.
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_PINNING" desc="Description of a certificate pinning failure.">
-        <ph name="SITE">$1<ex>google.com</ex></ph> provided Chrome with a list of pre-approved certificate credentials. Chrome did not receive any of the pre-approved credentials during this connection attempt, which indicates that an attacker is trying to impersonate <ph name="SITE">$1<ex>google.com</ex></ph>.
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_WEAK_DH" desc="Description of an error shown when the server has a weak Diffie-Hellman public key. Diffie-Hellman is a name that should be left untrauslated. '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 means that the number is too small to resist an exhaustive attempt to break the required secrecy.">
-        <ph name="SITE">$1<ex>google.com</ex></ph> is using a weak ephemeral Diffie-Hellman public key, which means that Chrome cannot verify the server's identity.
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_ERROR" desc="This provides the technical term for the type of error that we have encountered.">
-        Error type: <ph name="ERROR_TYPE">$1<ex>HSTS failure</ex></ph>
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_SUBJECT" desc="The 'subject' is who the certificate was issued to.">
-        Subject: <ph name="SUBJECT">$1<ex>a248.e.akamai.net</ex></ph>
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_ISSUER" desc="The 'issuer' is authority who vouches for the certificate.">
-        Issuer: <ph name="ISSUER">$1<ex>GTE CyberTrust Global Root</ex></ph>
-      </message>
-      <message name="IDS_SSL_BLOCKING_PAGE_HASHES" desc="Technical detail of the error.">
-        Public key hashes: <ph name="HASHES">$1<ex>9FEE18CC4302340DDE234345345345</ex></ph>
-      </message>
-
       <!-- Misc strings for SSL UI -->
       <message name="IDS_UNSAFE_FRAME_MESSAGE" desc="The text displayed in the content that is subsituted to an unsafe frame.">
         This frame was blocked because it contains some insecure content.