| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index d758239a74ac214a3b12eac3c1eeaae4278d4462..aac0b635f2679cab3523c6e1ec6a05827c12cb32 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -210,13 +210,13 @@ are declared in build/common.gypi.
|
| Cookies and site data
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_PERMISSION_ALLOW" desc="The label used in the permissions dropdowns for the option that grants a permissions.">
|
| - Allow
|
| + allow
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_PERMISSION_BLOCK" desc="The label used in the permissions dropdowns for the option that denies a permissions. ">
|
| - Block
|
| + block
|
| </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
|
| + ask
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_PERMISSION_DEFAULT" desc="The label used in the permissions dropdowns for the global browser wide default. ">
|
| Global default
|
| @@ -288,17 +288,20 @@ are declared in build/common.gypi.
|
| <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_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>)
|
| + 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 permisisons dropdown.">
|
| - Always <ph name="PERMISSION_VALUE">$1<ex>ALLOW</ex></ph>
|
| + Always <ph name="PERMISSION_VALUE">$1<ex>allow</ex></ph>
|
| </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_DEFAULT_SETTING">
|
| + <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">
|
| + <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>
|
|
|
| <message name="IDS_SHOWFULLHISTORY_LINK" desc="The label of the Show Full History link at the bottom of the back/forward menu.">
|
| Show Full History
|
|
|