Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index 86f666f94e99e464b938476ab5102046c25cfd5c..b368998b91210c51447dfb283a59f53dedcaf0cd 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -320,18 +320,27 @@ are declared in build/common.gypi. |
<message name="IDS_WEBSITE_SETTINGS_SITE_DATA_STATS_LINE" desc="The label text with the number of allowed and blocked cookies and site data objects."> |
<ph name="DATA_SOURCE">$1<ex>foo.bar.org</ex></ph> (<ph name="ALLOWED_COUNT">$2<ex>6</ex></ph> Allowed / <ph name="BLOCKED_COUNT">$3<ex>0</ex></ph> Blocked) |
</message> |
+ <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ALLOW" desc="The text of the menu item of a permissions menu on the Website Settings UI that resets the setting to the default setting which is allow."> |
+ Use global default (Allow) |
+ </message> |
+ <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK" desc="The text of the menu item of a permissions menu on the Website Settings UI that resets the setting to the default setting which is block."> |
+ Use global default (Block) |
+ </message> |
+ <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK" desc="The text of the menu item of a permissions menu on the Website Settings UI that reset the setting to the default setting which is ask."> |
+ Use global default (Ask) |
+ </message> |
+ <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW" desc="The text of the menu item of a permissions menu on the Website Settings UI that sets the setting to allow."> |
+ Always allow |
+ </message> |
+ <message name="IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK" desc="The text of the menu item of a permissions menu on the Website Settings UI that sets the setting to allow."> |
+ Always block |
+ </message> |
<message name="IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL" desc="The label for the global default setting that is used in a permissions dropdown."> |
Use global default (<ph name="PERMISSION_VALUE">$1<ex>allow</ex></ph>) |
</message> |
<message name="IDS_WEBSITE_SETTINGS_PERMISSION_LABEL" desc="The label for a permission value that is used in the permissions dropdown."> |
Always <ph name="PERMISSION_VALUE">$1<ex>allow</ex></ph> |
</message> |
- <message name="IDS_WEBSITE_SETTINGS_DEFAULT_SETTING" desc="The label that is used to display permissions for which the global default setting applies."> |
- <ph name="PERMISSION_VALUE">$1<ex>Allowed</ex></ph> by default |
- </message> |
- <message name="IDS_WEBSITE_SETTINGS_USER_SETTING" desc="The label that is used to display permissions for which the user has set a site specific setting."> |
- <ph name="PERMISSION_VALUE">$1<ex>Allowed</ex></ph> by you |
- </message> |
<message name="IDS_WEBSITE_SETTINGS_PERMISSION_TYPE" desc="The label that is used to display permission types in the Website Settings popup. "> |
<ph name="PERMISSION_TYPE_LABEL">$1<ex>Plugins</ex></ph>: |
</message> |