| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index f840fb409e6ce114ad621c92ea6e96338618f990..676c793f32085b84d170eb6b43044cd741baef83 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>
|
| @@ -7902,6 +7905,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>
|
|
|