Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index 7328629a082e1e11ec131417c7f8d214c6ca411c..1bd4c1c9197e7bcc862d53c36007dded9a94e1f9 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -303,6 +303,9 @@ are declared in build/common.gypi. |
<message name="IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT" desc="The label used for JavaScript permission controls in the Website Settings popup."> |
JavaScript |
</message> |
+ <message name="IDS_WEBSITE_SETTINGS_TYPE_KEYGEN" desc="The label used for the key generation permission controls in the Website Settings popup."> |
+ Key Generation |
+ </message> |
<message name="IDS_WEBSITE_SETTINGS_TYPE_POPUPS" desc="The label used for popups permission controls in the Website Settings popup."> |
Popups |
</message> |
@@ -2625,6 +2628,18 @@ Even if you have downloaded files from this website before, the website might ha |
<message name="IDS_BLOCKED_JAVASCRIPT_LINK" desc="Link to JavaScript section of content blocking management dialog, displayed in bubble when a page tries to run JavaScript."> |
Manage JavaScript blocking... |
</message> |
+ <message name="IDS_BLOCKED_KEYGEN_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to use key generation due to key generation being deprecated."> |
+ A form attempting to use key generation was blocked on this page (Key generation is in the process of being deprecated). |
+ </message> |
+ <message name="IDS_BLOCKED_KEYGEN_UNBLOCK" desc="Radio button choice to unblock a site from using key generation in forms, displayed in bubble when a page tries to render a keygen form element."> |
+ Always allow forms to use key generation on <ph name="HOST">$1<ex>mail.google.com</ex></ph> |
+ </message> |
+ <message name="IDS_BLOCKED_KEYGEN_NO_ACTION" desc="Radio button choice to continue blocking a site from using the key generation in forms, displayed in bubble when a page tries to render a keygen form element."> |
+ Continue blocking forms from using key generation |
+ </message> |
+ <message name="IDS_BLOCKED_KEYGEN_LINK" desc="Link to keygen section of content blocking management dialog, displayed in bubble when a page tries to render a keygen form element."> |
+ Manage key generation blocking... |
+ </message> |
<message name="IDS_BLOCKED_PLUGINS_TITLE" desc="Bubble info header text when a page is not allowed to display plugins."> |
The following plugins were blocked on this page: |
</message> |
@@ -8016,6 +8031,18 @@ I don't think this site should be blocked! |
<message name="IDS_JS_DONOTALLOW_RADIO" desc="A radio button in the Content Settings dialog for preventing JavaScript use on any site."> |
Do not allow any site to run JavaScript |
</message> |
+ <message name="IDS_KEYGEN_TAB_LABEL" desc="Label for key generation tab on Content Settings dialog"> |
+ Key generation |
+ </message> |
+ <message name="IDS_KEYGEN_HEADER" desc="Label for key generation exception management page on Content Settings dialog"> |
+ Key generation exceptions |
+ </message> |
+ <message name="IDS_KEYGEN_ALLOW_RADIO" desc="A radio button in the Content Settings dialog for allowing forms to use key generation on any site."> |
+ Allow all sites to use key generation in forms. |
+ </message> |
+ <message name="IDS_KEYGEN_DONOTALLOW_RADIO" desc="A radio button in the Content Settings dialog for preventing forms from using key generation on any site."> |
+ Do not allow any site to use key generation in forms (recommended) |
+ </message> |
<message name="IDS_HANDLERS_TAB_LABEL" desc="Label for Handlers tab on Content Settings dialog"> |
Handlers |
</message> |