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

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

Issue 2919853002: [MD settings] site exceptions, use embedding origin rather than embeddingDisplayName (Closed)
Patch Set: review changes Created 3 years, 5 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/site_settings/site_list.js » ('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 <!-- Main Page --> 4 <!-- Main Page -->
5 <if expr="chromeos"> 5 <if expr="chromeos">
6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session."> 6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session.">
7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in. 7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in.
8 </message> 8 </message>
9 </if> 9 </if>
10 10
(...skipping 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 Make default 1933 Make default
1934 </message> 1934 </message>
1935 <message name="IDS_SETTINGS_SEARCH_ENGINES_REMOVE_FROM_LIST" desc="Label for a button that removes a search engine from the list of search engines"> 1935 <message name="IDS_SETTINGS_SEARCH_ENGINES_REMOVE_FROM_LIST" desc="Label for a button that removes a search engine from the list of search engines">
1936 Remove from list 1936 Remove from list
1937 </message> 1937 </message>
1938 <message name="IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION" desc="Text displa yed for a button that allows the user to manage a Chrome extension"> 1938 <message name="IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION" desc="Text displa yed for a button that allows the user to manage a Chrome extension">
1939 Manage 1939 Manage
1940 </message> 1940 </message>
1941 1941
1942 <!-- Site Settings Page --> 1942 <!-- Site Settings Page -->
1943 <message name="IDS_SETTINGS_EXCEPTIONS_EMBEDDED_ON_HOST" desc="Template text f or a child row in the content Exceptions page view. Controls the permission sett ing for the parent page when embedded on the specified site.">
1944 embedded on <ph name="URL">$1<ex>www.google.com</ex></ph>
1945 </message>
1946 <message name="IDS_SETTINGS_EXCEPTIONS_EMBEDDED_ON_ANY_HOST" desc="Template te xt for a child row in the content Exceptions page view. Controls the permission setting for the parent page when embedded on any site.">
1947 embedded on any host
1948 </message>
1943 <message name="IDS_SETTINGS_SITE_SETTINGS_CATEGORY" desc="Name of the settings page which allows users to modify a specific category under site settings."> 1949 <message name="IDS_SETTINGS_SITE_SETTINGS_CATEGORY" desc="Name of the settings page which allows users to modify a specific category under site settings.">
1944 Permission Category 1950 Permission Category
1945 </message> 1951 </message>
1946 <message name="IDS_SETTINGS_SITE_SETTINGS_ALL_SITES" desc="Label for the all s ites site settings."> 1952 <message name="IDS_SETTINGS_SITE_SETTINGS_ALL_SITES" desc="Label for the all s ites site settings.">
1947 All sites 1953 All sites
1948 </message> 1954 </message>
1949 <message name="IDS_SETTINGS_SITE_SETTINGS_ADS" desc="Label for the ads site se ttings."> 1955 <message name="IDS_SETTINGS_SITE_SETTINGS_ADS" desc="Label for the ads site se ttings.">
1950 Ads 1956 Ads
1951 </message> 1957 </message>
1952 <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS" desc="Label for the automatic downloads site settings."> 1958 <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS" desc="Label for the automatic downloads site settings.">
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after
3199 System 3205 System
3200 </message> 3206 </message>
3201 <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."> 3207 <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.">
3202 Use hardware acceleration when available 3208 Use hardware acceleration when available
3203 </message> 3209 </message>
3204 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings."> 3210 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings.">
3205 Open proxy settings 3211 Open proxy settings
3206 </message> 3212 </message>
3207 </if> 3213 </if>
3208 </grit-part> 3214 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/site_settings/site_list.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698