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

Side by Side Diff: chrome/app/google_chrome_strings.grd

Issue 10689116: Cleanup: better session restore UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 years, 5 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- This file contains definitions of strings that are specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. --> 4 Chrome supports. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/google_chrome_strings.h" type="rc_header"> 9 <output filename="grit/google_chrome_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 <message name="IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL" desc="Link to knowledge-base article about Chrome Frame Ready Mode"> 161 <message name="IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL" desc="Link to knowledge-base article about Chrome Frame Ready Mode">
162 http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&a mp;answer=161796 162 http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&a mp;answer=161796
163 </message> 163 </message>
164 <message name="IDS_CHROME_FRAME_READY_MODE_PROMPT" desc="Ready Mode prom pt message"> 164 <message name="IDS_CHROME_FRAME_READY_MODE_PROMPT" desc="Ready Mode prom pt message">
165 This site recommends Google Chrome Frame (already installed). 165 This site recommends Google Chrome Frame (already installed).
166 </message> 166 </message>
167 </if> 167 </if>
168 <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant confir m dialog"> 168 <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant confir m dialog">
169 Google Chrome Instant 169 Google Chrome Instant
170 </message> 170 </message>
171 <!-- Session restore & conflicting content settings -->
172 <message name="IDS_SESSION_RESTORE_OVERLAY_MESSAGE" desc="Message of the s ession restore conflicts with content settings dialog">
173 Google Chrome will restore your previous session on startup. Some of you r session-based settings, such as those that clear data on exit, will be disable d.
174 </message>
175 <message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate" > 171 <message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate" >
176 In this case, the address listed in the certificate does not match the a ddress of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenti ng a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though th at certificate is not valid for all of those websites. Google Chrome can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></p h>&lt;/strong&gt;, but cannot verify that that is the same site as &lt;strong&gt ;<ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph>&lt;/strong&gt; which you inten ded to reach. If you proceed, Chrome will not check for any further name mismatc hes. 172 In this case, the address listed in the certificate does not match the a ddress of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenti ng a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though th at certificate is not valid for all of those websites. Google Chrome can say for sure that you reached &lt;strong&gt;<ph name="DOMAIN2">$1<ex>paypal.com</ex></p h>&lt;/strong&gt;, but cannot verify that that is the same site as &lt;strong&gt ;<ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph>&lt;/strong&gt; which you inten ded to reach. If you proceed, Chrome will not check for any further name mismatc hes.
177 </message> 173 </message>
178 <message name="IDS_CERT_ERROR_EXPIRED_DETAILS" desc="Details for an expire d X509 certificate"> 174 <message name="IDS_CERT_ERROR_EXPIRED_DETAILS" desc="Details for an expire d X509 certificate">
179 You attempted to reach &lt;strong&gt;<ph name="DOMAIN">$1<ex>paypal.com< /ex></ph>&lt;/strong&gt;, but the server presented an expired certificate. No in formation is available to indicate whether that certificate has been compromised since its expiration. This means Google Chrome cannot guarantee that you are co mmunicating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt; /strong&gt; and not an attacker. Your computer's clock is currently set to <ph n ame="CURRENT_TIME">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that lo ok right? If not, you should correct the error and refresh this page. 175 You attempted to reach &lt;strong&gt;<ph name="DOMAIN">$1<ex>paypal.com< /ex></ph>&lt;/strong&gt;, but the server presented an expired certificate. No in formation is available to indicate whether that certificate has been compromised since its expiration. This means Google Chrome cannot guarantee that you are co mmunicating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt; /strong&gt; and not an attacker. Your computer's clock is currently set to <ph n ame="CURRENT_TIME">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that lo ok right? If not, you should correct the error and refresh this page.
180 </message> 176 </message>
181 <message name="IDS_CERT_ERROR_NOT_YET_VALID_DETAILS" desc="Details for an X509 certificate that is not yet valid"> 177 <message name="IDS_CERT_ERROR_NOT_YET_VALID_DETAILS" desc="Details for an X509 certificate that is not yet valid">
182 You attempted to reach &lt;strong&gt;<ph name="DOMAIN">$1<ex>paypal.com< /ex></ph>&lt;/strong&gt;, but the server presented a certificate that is not yet valid. No information is available to indicate whether that certificate can be trusted. Google Chrome cannot reliably guarantee that you are communicating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt;/strong&gt; and not an attacker. Your computer's clock is currently set to <ph name="CURRENT_TIM E">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that look right? If not , you should correct any error the refresh this page. 178 You attempted to reach &lt;strong&gt;<ph name="DOMAIN">$1<ex>paypal.com< /ex></ph>&lt;/strong&gt;, but the server presented a certificate that is not yet valid. No information is available to indicate whether that certificate can be trusted. Google Chrome cannot reliably guarantee that you are communicating with &lt;strong&gt;<ph name="DOMAIN2">$2<ex>paypal.com</ex></ph>&lt;/strong&gt; and not an attacker. Your computer's clock is currently set to <ph name="CURRENT_TIM E">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that look right? If not , you should correct any error the refresh this page.
183 </message> 179 </message>
184 <message name="IDS_CERT_ERROR_AUTHORITY_INVALID_DETAILS" desc="Details for an X509 certificate with an invalid authority"> 180 <message name="IDS_CERT_ERROR_AUTHORITY_INVALID_DETAILS" desc="Details for an X509 certificate with an invalid authority">
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 Chrome Autofill settings 717 Chrome Autofill settings
722 </message> 718 </message>
723 719
724 <!-- Web Intents --> 720 <!-- Web Intents -->
725 <message name="IDS_INTENT_PICKER_INSTALL_EXTENSION" desc="Text on the butt on in the web intent picker that installs an extension then uses the extension a s an intent service."> 721 <message name="IDS_INTENT_PICKER_INSTALL_EXTENSION" desc="Text on the butt on in the web intent picker that installs an extension then uses the extension a s an intent service.">
726 Add to Chrome 722 Add to Chrome
727 </message> 723 </message>
728 </messages> 724 </messages>
729 </release> 725 </release>
730 </grit> 726 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698