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 1e32cdec74bacd7e957fa554633892c6ffe5171d..ea932571096253ab6a1ef475787acfbc10c2c58f 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 Keygen permission controls in the Website Settings popup.">

[Bernhard Bauer, 2015/11/05 11:13:31]

These strings will be translated into a ton of languages. You will have to
explain what "Keygen" is in the description if you want these translations to
make any sense whatsoever.

[svaldez, 2015/11/05 16:29:56]

Done.

+        Keygen
+      </message>
       <message name="IDS_WEBSITE_SETTINGS_TYPE_POPUPS" desc="The label used for popups permission controls in the Website Settings popup.">
         Popups
       </message>
@@ -2627,6 +2630,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 run Keygen.">
+        Keygen was blocked on this page.
+      </message>
+      <message name="IDS_BLOCKED_KEYGEN_UNBLOCK" desc="Radio button choice to unblock a site from running Keygen, displayed in bubble when a page tries to run Keygen.">
+        Always allow Keygen 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 running Keygen, displayed in bubble when a page tries to run Keygen.">
+        Continue blocking Keygen
+      </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 run Keygen.">
+        Manage Keygen 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>
@@ -7927,6 +7942,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 Keygen tab on Content Settings dialog">
+        Keygen
+      </message>
+      <message name="IDS_KEYGEN_HEADER" desc="Label for Keygen exception management page on Content Settings dialog">
+        Keygen exceptions
+      </message>
+      <message name="IDS_KEYGEN_ALLOW_RADIO" desc="A radio button in the Content Settings dialog for allowing keygen use on any site.">
+        Allow all sites to use keygen.

[Bernhard Bauer, 2015/11/05 11:13:31]

If the primary use case for this content setting is enterprise, consider not
exposing it in the UI at all, or not allowing it by default.

[msramek, 2015/11/05 16:22:31]

+1

[svaldez, 2015/11/05 16:29:56]

Its currently set to be disabled by default, but there a small number of
non-enterprise users that might need to use keygen until we've deprecated it.

[Bernhard Bauer, 2015/11/05 16:42:41]

You could remove the option to have it enabled by default for all websites, but
up to you.

+      </message>
+      <message name="IDS_KEYGEN_DONOTALLOW_RADIO" desc="A radio button in the Content Settings dialog for preventing Keygen use on any site.">
+        Do not allow any site to use keygen (recommended)

[Bernhard Bauer, 2015/11/05 11:13:31]

At the very least you should be consistent in whether you capitalize keygen or
not. Even better would be a more descriptive term.

[svaldez, 2015/11/05 16:29:56]

Fixed, hopefully.

+      </message>
       <message name="IDS_HANDLERS_TAB_LABEL" desc="Label for Handlers tab on Content Settings dialog">
         Handlers
       </message>