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

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

Issue 2919853002: [MD settings] site exceptions, use embedding origin rather than embeddingDisplayName (Closed)
Patch Set: re-added embedded description Created 3 years, 6 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
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 1913 matching lines...) Expand 10 before | Expand all | Expand 10 after
1924 Make default 1924 Make default
1925 </message> 1925 </message>
1926 <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"> 1926 <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">
1927 Remove from list 1927 Remove from list
1928 </message> 1928 </message>
1929 <message name="IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION" desc="Text displa yed for a button that allows the user to manage a Chrome extension"> 1929 <message name="IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION" desc="Text displa yed for a button that allows the user to manage a Chrome extension">
1930 Manage 1930 Manage
1931 </message> 1931 </message>
1932 1932
1933 <!-- Site Settings Page --> 1933 <!-- Site Settings Page -->
1934 <message name="IDS_SETTINGS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST" desc="Tem plate 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.">
msramek 2017/06/28 19:41:33 nit: This is no longer related just to geolocation
dschuyler 2017/06/28 21:05:38 Done.
1935 embedded on <ph name="URL">$1<ex>www.google.com</ex></ph>
1936 </message>
1934 <message name="IDS_SETTINGS_SITE_SETTINGS_CATEGORY" desc="Name of the settings page which allows users to modify a specific category under site settings."> 1937 <message name="IDS_SETTINGS_SITE_SETTINGS_CATEGORY" desc="Name of the settings page which allows users to modify a specific category under site settings.">
1935 Permission Category 1938 Permission Category
1936 </message> 1939 </message>
1937 <message name="IDS_SETTINGS_SITE_SETTINGS_ALL_SITES" desc="Label for the all s ites site settings."> 1940 <message name="IDS_SETTINGS_SITE_SETTINGS_ALL_SITES" desc="Label for the all s ites site settings.">
1938 All sites 1941 All sites
1939 </message> 1942 </message>
1940 <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS" desc="Label for the automatic downloads site settings."> 1943 <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS" desc="Label for the automatic downloads site settings.">
1941 Automatic downloads 1944 Automatic downloads
1942 </message> 1945 </message>
1943 <message name="IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC" desc="Label for the background sync site settings."> 1946 <message name="IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC" desc="Label for the background sync site settings.">
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
3151 System 3154 System
3152 </message> 3155 </message>
3153 <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."> 3156 <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.">
3154 Use hardware acceleration when available 3157 Use hardware acceleration when available
3155 </message> 3158 </message>
3156 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings."> 3159 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings.">
3157 Open proxy settings 3160 Open proxy settings
3158 </message> 3161 </message>
3159 </if> 3162 </if>
3160 </grit-part> 3163 </grit-part>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698