| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index fa2d0fd961eabf48747647882883ed758cf2824f..db88596a70b82ef432d5a404a2ac3dda46ce99db 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -8300,20 +8300,18 @@ I don't think this site should be blocked!
|
| <message name="IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST" desc="Template text for a child row in the Geolocation Exceptions page view. Controls the permission setting for the parent page when embedded on the specified site.">
|
| embedded on <ph name="URL">$1<ex>www.google.com</ex></ph>
|
| </message>
|
| - <if expr="chromeos or is_win">
|
| - <message name="IDS_PROTECTED_CONTENT_TAB_LABEL" desc="Label for the Protected Content tab on the Content Settings dialog.">
|
| - Protected content
|
| - </message>
|
| - <message name="IDS_PROTECTED_CONTENT_INFO" desc="Text that is displayed on the Protected Content tab of the Content Settings dialog. This text explains that enabling protected content may require using a uniquely identifiable machine identifier.">
|
| - Some content services use machine identifiers to uniquely identify you for the purposes of authorizing access to protected content.
|
| - </message>
|
| - <message name="IDS_PROTECTED_CONTENT_ENABLE" desc="The label of the checkbox for enabling protected content.">
|
| - Allow identifiers for protected content (computer restart may be required)
|
| - </message>
|
| - <message name="IDS_PROTECTED_CONTENT_HEADER" desc="Text label for the managing exceptions of Protected Content.">
|
| - Protected content exceptions
|
| - </message>
|
| - </if>
|
| + <message name="IDS_PROTECTED_CONTENT_TAB_LABEL" desc="Label for the Protected Content tab on the Content Settings dialog.">
|
| + Protected content
|
| + </message>
|
| + <message name="IDS_PROTECTED_CONTENT_INFO" desc="Text that is displayed on the Protected Content section of the Content Settings dialog. This text explains that enabling protected content may require using a uniquely identifiable machine identifier.">
|
| + Some content services use unique identifiers for the purposes of authorizing access to protected content.
|
| + </message>
|
| + <message name="IDS_PROTECTED_CONTENT_ENABLE" desc="The label of the checkbox for enabling protected content.">
|
| + Allow all sites to play protected content (recommended)
|
| + </message>
|
| + <message name="IDS_PROTECTED_CONTENT_HEADER" desc="Text label for the managing exceptions of Protected Content.">
|
| + Protected content exceptions
|
| + </message>
|
| <message name="IDS_PPAPI_BROKER_TAB_LABEL" desc="Label for PPAPI broker tab on Content Settings dialog">
|
| Unsandboxed plugin access
|
| </message>
|
|
|