Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1047)

Side by Side Diff: chrome/app/settings_strings.grdp

Issue 2677003004: MD Settings: Make Protected Content setting available to all platforms. (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 399-settings-make-enab… Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/privacy_page/privacy_page.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Settings-specific strings (included from generated_resources.grd). --> 2 <!-- Settings-specific strings (included from generated_resources.grd). -->
3 <grit-part> 3 <grit-part>
4 <!-- About Page --> 4 <!-- About Page -->
5 <message name="IDS_SETTINGS_ABOUT_PAGE_BROWSER_VERSION" desc="The text label d escribing the version of the browser, example: Version 57.0.2937.0 (Developer Bu ild) unknown (64-bit)"> 5 <message name="IDS_SETTINGS_ABOUT_PAGE_BROWSER_VERSION" desc="The text label d escribing the version of the browser, example: Version 57.0.2937.0 (Developer Bu ild) unknown (64-bit)">
6 Version <ph name="PRODUCT_VERSION">$1<ex>15.0.865.0</ex></ph> (<ph name="PRO DUCT_CHANNEL">$2<ex>Developer Build</ex></ph>) <ph name="PRODUCT_MODIFIER">$3</p h> <ph name="PRODUCT_VERSION_BITS">$4</ph> 6 Version <ph name="PRODUCT_VERSION">$1<ex>15.0.865.0</ex></ph> (<ph name="PRO DUCT_CHANNEL">$2<ex>Developer Build</ex></ph>) <ph name="PRODUCT_MODIFIER">$3</p h> <ph name="PRODUCT_VERSION_BITS">$4</ph>
7 </message> 7 </message>
8 <if expr="chromeos"> 8 <if expr="chromeos">
9 <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label desc ribing the section that shows detailed information about the current Chrome buil d."> 9 <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label desc ribing the section that shows detailed information about the current Chrome buil d.">
10 Detailed build information 10 Detailed build information
(...skipping 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 <message name="IDS_SETTINGS_SITE_SETTINGS_POPUPS" desc="Label for the popups s ite settings."> 1747 <message name="IDS_SETTINGS_SITE_SETTINGS_POPUPS" desc="Label for the popups s ite settings.">
1748 Popups 1748 Popups
1749 </message> 1749 </message>
1750 <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT" desc="Label for t he protected content site settings."> 1750 <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT" desc="Label for t he protected content site settings.">
1751 Protected Content 1751 Protected Content
1752 </message> 1752 </message>
1753 <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_EXPLANATION" desc= "Text that is displayed on the Protected Content section of Content Settings. Th is text explains that enabling protected content may require using a uniquely id entifiable machine identifier."> 1753 <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_EXPLANATION" desc= "Text that is displayed on the Protected Content section of Content Settings. Th is text explains that enabling protected content may require using a uniquely id entifiable machine identifier.">
1754 Some content services use unique identifiers for the purposes of authorizing access to protected content. 1754 Some content services use unique identifiers for the purposes of authorizing access to protected content.
1755 </message> 1755 </message>
1756 <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ENABLE" desc="Labe l for the toggle enabling protected content."> 1756 <message name="IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ENABLE" desc="Labe l for the toggle enabling protected content.">
1757 Allow identifiers for protected content (computer restart may be required) 1757 Allow sites to play protected content (recommended)
1758 </message> 1758 </message>
1759 <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS" desc="Label for the unsandboxed plugin access site settings."> 1759 <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS" desc="Label for the unsandboxed plugin access site settings.">
1760 Unsandboxed plugin access 1760 Unsandboxed plugin access
1761 </message> 1761 </message>
1762 <message name="IDS_SETTINGS_SITE_SETTINGS_USB_DEVICES" desc="Label for the USB devices in site settings."> 1762 <message name="IDS_SETTINGS_SITE_SETTINGS_USB_DEVICES" desc="Label for the USB devices in site settings.">
1763 USB devices 1763 USB devices
1764 </message> 1764 </message>
1765 <message name="IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS" desc="Label for the Zoo m levels category in site settings."> 1765 <message name="IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS" desc="Label for the Zoo m levels category in site settings.">
1766 Zoom levels 1766 Zoom levels
1767 </message> 1767 </message>
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
2809 System 2809 System
2810 </message> 2810 </message>
2811 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available."> 2811 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available.">
2812 Use hardware acceleration when available 2812 Use hardware acceleration when available
2813 </message> 2813 </message>
2814 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 2814 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
2815 Change proxy settings 2815 Change proxy settings
2816 </message> 2816 </message>
2817 </if> 2817 </if>
2818 </grit-part> 2818 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/privacy_page/privacy_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698