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

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

Issue 302653006: Remove use of ResourceRequestInfo::GetRequestID from cert enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 3371 matching lines...) Expand 10 before | Expand all | Expand 10 after
3382 Import and Bind to Device... 3382 Import and Bind to Device...
3383 </message> 3383 </message>
3384 <message name="IDS_CERT_MANAGER_KEY_FORMAT_LONG" desc="A longer format f or keys in the wifi / vpn config dialogs."> 3384 <message name="IDS_CERT_MANAGER_KEY_FORMAT_LONG" desc="A longer format f or keys in the wifi / vpn config dialogs.">
3385 <ph name="ISSUED_BY">$1<ex>Google Inc</ex></ph> [<ph name="ISSUED_TO"> $2<ex>John Doe</ex></ph>] 3385 <ph name="ISSUED_BY">$1<ex>Google Inc</ex></ph> [<ph name="ISSUED_TO"> $2<ex>John Doe</ex></ph>]
3386 </message> 3386 </message>
3387 <message name="IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT_LONG" desc="A longer format for hardware-backed keys in the wifi / vpn config dialogs."> 3387 <message name="IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT_LONG" desc="A longer format for hardware-backed keys in the wifi / vpn config dialogs.">
3388 <ph name="ISSUED_BY">$1<ex>Google Inc</ex></ph> [<ph name="ISSUED_TO"> $2<ex>John Doe</ex></ph>] (<ph name="DEVICE">$3<ex>hardware-backed</ex></ph>) 3388 <ph name="ISSUED_BY">$1<ex>Google Inc</ex></ph> [<ph name="ISSUED_TO"> $2<ex>John Doe</ex></ph>] (<ph name="DEVICE">$3<ex>hardware-backed</ex></ph>)
3389 </message> 3389 </message>
3390 </if> 3390 </if>
3391 3391
3392 <!-- Add Client Certificate Dialog --> 3392 <!-- Client certificate enrollment failure infobar -->
3393 <if expr="is_macosx">
3394 <message name="IDS_ADD_CERT_DIALOG_ADD" desc="Title of the button that a dds the certificate in the Add Client Certificate dialog">
3395 Add Certificate
3396 </message>
3397 </if>
3398 <message name="IDS_ADD_CERT_ERR_INVALID_CERT" desc="Error message when the server returns an invalid client certificate after key generation"> 3393 <message name="IDS_ADD_CERT_ERR_INVALID_CERT" desc="Error message when the server returns an invalid client certificate after key generation">
3399 The server returned an invalid client certificate. Error <ph name="ERROR _number">$1<ex>207</ex></ph> (<ph name="ERROR_NAME">$2<ex>net::ERR_CERT_INVALID< /ex></ph>). 3394 The server returned an invalid client certificate. Error <ph name="ERROR _number">$1<ex>207</ex></ph> (<ph name="ERROR_NAME">$2<ex>net::ERR_CERT_INVALID< /ex></ph>).
3400 </message> 3395 </message>
3401 <message name="IDS_ADD_CERT_ERR_FAILED" desc="Generic error message for a failure to add the generated certificate to the cert store/keychain"> 3396 <message name="IDS_ADD_CERT_ERR_FAILED" desc="Generic error message for a failure to add the generated certificate to the cert store/keychain">
3402 There was an error while trying to store the client certificate. Error < ph name="ERROR_number">$1<ex>207</ex></ph> (<ph name="ERROR_NAME">$2<ex>net::ERR _CERT_INVALID</ex></ph>). 3397 There was an error while trying to store the client certificate. Error < ph name="ERROR_number">$1<ex>207</ex></ph> (<ph name="ERROR_NAME">$2<ex>net::ERR _CERT_INVALID</ex></ph>).
3403 </message> 3398 </message>
3404 3399
3405 <!-- Certificate success infobar --> 3400 <!-- Client certificate enrollment infobar -->
3406 <message name="IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL" desc="Label displayed i n an infobar when the browser successfully imports a certificate"> 3401 <message name="IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL" desc="Label displayed i n an infobar when the browser successfully imports a certificate">
3407 Successfully stored client certificate issued by <ph name="ISSUER">$1<ex >VeriSign</ex></ph>. 3402 Successfully stored client certificate issued by <ph name="ISSUER">$1<ex >VeriSign</ex></ph>.
3408 </message> 3403 </message>
3409 <message name="IDS_ADD_CERT_SUCCESS_INFOBAR_BUTTON" desc="The label of the 'view' button on the infobar after a client certificate import; clicking opens a certificate viewer for the new certificate"> 3404 <message name="IDS_ADD_CERT_SUCCESS_INFOBAR_BUTTON" desc="The label of the 'view' button on the infobar after a client certificate import; clicking opens a certificate viewer for the new certificate">
3410 View 3405 View
3411 </message> 3406 </message>
3412 3407
3413 <!-- Autolaunch infobar --> 3408 <!-- Autolaunch infobar -->
3414 <if expr="is_win"> 3409 <if expr="is_win">
3415 <message name="IDS_AUTO_LAUNCH_OK" desc="Label for OK button on Autolaun ch confirmation infobar."> 3410 <message name="IDS_AUTO_LAUNCH_OK" desc="Label for OK button on Autolaun ch confirmation infobar.">
(...skipping 10743 matching lines...) Expand 10 before | Expand all | Expand 10 after
14159 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode"> 14154 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode">
14160 Enforce (try to get hashes, and enforce them if successful) 14155 Enforce (try to get hashes, and enforce them if successful)
14161 </message> 14156 </message>
14162 14157
14163 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode"> 14158 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode">
14164 Enforce strict (hard fail if we can't get hashes) 14159 Enforce strict (hard fail if we can't get hashes)
14165 </message> 14160 </message>
14166 </messages> 14161 </messages>
14167 </release> 14162 </release>
14168 </grit> 14163 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698