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

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

Issue 2625263002: MD Settings: Convert reset profile banner to a dialog. (Closed)
Patch Set: Rebase (there were no conflits, but CQ failed to apply patch somehow) 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/basic_page/basic_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 <!-- 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 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 <ph name="TITLE">$1<ex>Block</ex></ph> - <ph name="COUNT">$2<ex>42</ex></ph> 1617 <ph name="TITLE">$1<ex>Block</ex></ph> - <ph name="COUNT">$2<ex>42</ex></ph>
1618 </message> 1618 </message>
1619 1619
1620 <!-- Reset Settings Page --> 1620 <!-- Reset Settings Page -->
1621 <message name="IDS_SETTINGS_RESET" desc="Name of the settings page where setti ngs may be reset."> 1621 <message name="IDS_SETTINGS_RESET" desc="Name of the settings page where setti ngs may be reset.">
1622 Reset 1622 Reset
1623 </message> 1623 </message>
1624 <message name="IDS_SETTINGS_RESET_VIEW_REPORTED_SETTINGS" desc="Label of a lin k that when clicked displays the settings that will be reported to Google for an alysis."> 1624 <message name="IDS_SETTINGS_RESET_VIEW_REPORTED_SETTINGS" desc="Label of a lin k that when clicked displays the settings that will be reported to Google for an alysis.">
1625 View report settings 1625 View report settings
1626 </message> 1626 </message>
1627 <message name="IDS_SETTINGS_RESET_AUTOMATED_DIALOG_TITLE" desc="The title of t he dialog informing the user that automated resetting of some settings occurred. ">
1628 Some settings were reset
1629 </message>
1627 1630
1628 <!-- Search Page --> 1631 <!-- Search Page -->
1629 <message name="IDS_SETTINGS_SEARCH" desc="Name of the settings page which disp lays search engine preferences."> 1632 <message name="IDS_SETTINGS_SEARCH" desc="Name of the settings page which disp lays search engine preferences.">
1630 Search engine 1633 Search engine
1631 </message> 1634 </message>
1632 <message name="IDS_SETTINGS_SEARCH_EXPLANATION" desc="Explanation for the sear ch engine dropdown setting."> 1635 <message name="IDS_SETTINGS_SEARCH_EXPLANATION" desc="Explanation for the sear ch engine dropdown setting.">
1633 Search engine used when searching from the <ph name="BEGIN_LINK">&lt;a targe t="_blank" href="$1"&gt;</ph>omnibox<ph name="END_LINK">&lt;/a&gt;</ph> 1636 Search engine used when searching from the <ph name="BEGIN_LINK">&lt;a targe t="_blank" href="$1"&gt;</ph>omnibox<ph name="END_LINK">&lt;/a&gt;</ph>
1634 </message> 1637 </message>
1635 <message name="IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES" desc="Label for the Manage Search Engines button."> 1638 <message name="IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES" desc="Label for the Manage Search Engines button.">
1636 Manage search engines 1639 Manage search engines
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after
2872 System 2875 System
2873 </message> 2876 </message>
2874 <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."> 2877 <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.">
2875 Use hardware acceleration when available 2878 Use hardware acceleration when available
2876 </message> 2879 </message>
2877 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 2880 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
2878 Change proxy settings 2881 Change proxy settings
2879 </message> 2882 </message>
2880 </if> 2883 </if>
2881 </grit-part> 2884 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/basic_page/basic_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698