| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 081afb9e3fc1255e0cc079d72c52a772d0ec9e20..5ff8bb6ed62c8455ec93d794fb48d984ab96c291 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -7011,9 +7011,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| </if> <!-- is_win -->
|
|
|
| <!-- Plug-in placeholders -->
|
| - <message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug-in, displayed in the click to play UI.">
|
| - Click to run <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>.
|
| - </message>
|
| <message name="IDS_PLUGIN_HIDE" desc="The tooltip for hiding a blocked plug-in, displayed in the click to play UI.">
|
| Hide this plug-in
|
| </message>
|
| @@ -8023,14 +8020,14 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_PLUGIN_HEADER" desc="Header for plugin exception management page on Content Settings dialog">
|
| Plug-in exceptions
|
| </message>
|
| - <message name="IDS_PLUGIN_LOAD_RADIO" desc="A radio button in the Content Settings dialog for allowing plug-ins use on any site.">
|
| - Run automatically (recommended)
|
| + <message name="IDS_PLUGIN_ALLOW_RADIO" desc="A radio button in the Content Settings dialog for allowing plug-ins use on any site.">
|
| + Run all plugin content (recommended)
|
| </message>
|
| - <message name="IDS_PLUGIN_ASK_RADIO" desc="A radio button in the Content Settings dialog for gating plug-ins on a mouse click (left button).">
|
| - Click to play
|
| + <message name="IDS_PLUGIN_DETECT_RADIO" desc="A radio button in the Content Settings dialog for detecting and running important plugin content only.">
|
| + Detect and run important plugin content
|
| </message>
|
| - <message name="IDS_PLUGIN_ASK_MENU_RADIO" desc="A radio button in the Content Settings dialog for gating plug-ins on a context menu activation.">
|
| - Block by default (You can manually run a blocked plug-in at any time.)
|
| + <message name="IDS_PLUGIN_BLOCK_RADIO" desc="A radio button in the Content Settings dialog for gating plug-ins on a context menu activation.">
|
| + Do not run plugins by default
|
| </message>
|
| <message name="IDS_PLUGIN_SELECTIVE_DISABLE" desc="Link to selectively disable plug-ins">
|
| Disable individual plug-ins...
|
| @@ -8135,14 +8132,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_EXCEPTIONS_ALLOW_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is allowed for a given domain">
|
| Allow
|
| </message>
|
| - <message name="IDS_EXCEPTIONS_ASK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is set to promt for a given domain.">
|
| + <message name="IDS_EXCEPTIONS_BLOCK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is blocked for a given domain.">
|
| + Block
|
| + </message>
|
| + <message name="IDS_EXCEPTIONS_ASK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is set to prompt for a given domain.">
|
| Ask
|
| </message>
|
| <message name="IDS_EXCEPTIONS_SESSION_ONLY_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is allow but only for the duration of the session for a given domain.">
|
| Clear on exit
|
| </message>
|
| - <message name="IDS_EXCEPTIONS_BLOCK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is blocked for a given domain.">
|
| - Block
|
| + <message name="IDS_EXCEPTIONS_DETECT_IMPORTANT_CONTENT_BUTTON" desc="A label to display in the exception page's action column when only important content is allowed.">
|
| + Detect important content
|
| </message>
|
| <message name="IDS_EXCEPTIONS_OTR_LABEL" desc="A label informing the user that the table below the label shows incognito-only exceptions">
|
| Exceptions below only apply to the current incognito session.
|
|
|