Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index a295f4af58d61bb82457068c9d965f634d64d776..d09f7bdf61fbc734ac732999cb48f76508ba408a 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -233,21 +233,6 @@ are declared in build/common.gypi. |
<message name="IDS_WEBSITE_SETTINGS_INFOBAR_BUTTON" desc="The string used in the infobar button allowing the user to reload the page directly from the infobar."> |
Reload |
</message> |
- <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to allow and managed by policy."> |
- Allow (by policy) |
- </message> |
- <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to block and managed by policy."> |
- Block (by policy) |
- </message> |
- <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_POLICY" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to ask and managed by policy."> |
- Ask (by policy) |
- </message> |
- <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_EXTENSION" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to allow and managed by an extension."> |
- Allow (by extension) |
- </message> |
- <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_EXTENSION" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to block and managed by an extension."> |
- Block (by extension) |
- </message> |
<message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button was explicitly set to allow by the user."> |
Allow |
</message> |
@@ -290,6 +275,15 @@ are declared in build/common.gypi. |
<message name="IDS_WEBSITE_SETTINGS_PERMISSION_BLOCK" desc="The label used in the permissions dropdowns for the option that denies a permissions. "> |
block |
</message> |
+ <message name="IDS_WEBSITE_SETTINGS_PERMISSION_SET_BY_POLICY" desc="The label used underneath a permission listed in the Website Settings popup if the permission was explicitly set by the user's enterprise policy."> |
+ Set by enterprise policy |
+ </message> |
+ <message name="IDS_WEBSITE_SETTINGS_PERMISSION_SET_BY_EXTENSION" desc="The label used underneath a permission listed in the Website Settings popup if the permission was explicitly set by one of the user's extensions."> |
+ Set by an extension |
+ </message> |
+ <message name="IDS_WEBSITE_SETTINGS_PERMISSION_AUTOMATICALLY_BLOCKED" desc="The label used underneath a permission listed in the Website Settings popup if the permission was blocked by Chrome on behalf of the user."> |
+ Automatically blocked |
+ </message> |
<message name="IDS_WEBSITE_SETTINGS_PERMISSION_ASK" desc="The label used in the permissions dropdowns for the option that makes the browser asks for permission. "> |
ask |
</message> |