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

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

Issue 2500653002: MD Settings: Add import data dialog. (Closed)
Patch Set: Fix bad merge Created 4 years, 1 month 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/extensions/api/settings_private/prefs_util.cc » ('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 <if expr="chromeos"> 5 <if expr="chromeos">
6 <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."> 6 <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.">
7 Detailed build information 7 Detailed build information
8 </message> 8 </message>
9 <message name="IDS_SETTINGS_ABOUT_PAGE_ARC_VERSION" desc="Label for ARC vers ion"> 9 <message name="IDS_SETTINGS_ABOUT_PAGE_ARC_VERSION" desc="Label for ARC vers ion">
10 ARC Version 10 ARC Version
(...skipping 2131 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 <message name="IDS_SETTINGS_USE_DEFAULT_SETTINGS" desc="Text for button which, when clicked, activates the default sync settings."> 2142 <message name="IDS_SETTINGS_USE_DEFAULT_SETTINGS" desc="Text for button which, when clicked, activates the default sync settings.">
2143 Use default settings 2143 Use default settings
2144 </message> 2144 </message>
2145 <message name="IDS_SETTINGS_PERSONALIZE_GOOGLE_SERVICES_TITLE" desc="Title of the personalize Google services section. When clicked, takes the user to the Goo gle Activity Controls."> 2145 <message name="IDS_SETTINGS_PERSONALIZE_GOOGLE_SERVICES_TITLE" desc="Title of the personalize Google services section. When clicked, takes the user to the Goo gle Activity Controls.">
2146 Personalize Google services 2146 Personalize Google services
2147 </message> 2147 </message>
2148 <message name="IDS_SETTINGS_PERSONALIZE_GOOGLE_SERVICES_TEXT" desc="Text of th e personalize Google services section. When clicked, takes the user to the Googl e Activity Controls."> 2148 <message name="IDS_SETTINGS_PERSONALIZE_GOOGLE_SERVICES_TEXT" desc="Text of th e personalize Google services section. When clicked, takes the user to the Googl e Activity Controls.">
2149 Control how Google uses your browsing history to personalize Search, ads, an d other Google services 2149 Control how Google uses your browsing history to personalize Search, ads, an d other Google services
2150 </message> 2150 </message>
2151 2151
2152 <!-- Import Settings Dialog --> 2152 <if expr="not chromeos">
2153 <!-- Android uses custom UI for Bookmark importing --> 2153 <!-- Import Settings Dialog -->
2154 <if expr="not is_android"> 2154 <message name="IDS_SETTINGS_IMPORT_SETTINGS_TITLE" desc="Dialog title for im port dialog.">
2155 Import bookmarks and settings
2156 </message>
2155 <message name="IDS_SETTINGS_IMPORT_FROM_LABEL" desc="Label before profile se lect combo box"> 2157 <message name="IDS_SETTINGS_IMPORT_FROM_LABEL" desc="Label before profile se lect combo box">
2156 From: 2158 From:
2157 </message> 2159 </message>
2158 <message name="IDS_SETTINGS_IMPORT_ITEMS_LABEL" desc="Label before item sele ct checkboxes"> 2160 <message name="IDS_SETTINGS_IMPORT_ITEMS_LABEL" desc="Label before item sele ct checkboxes">
2159 Select items to import: 2161 Select items to import:
2160 </message> 2162 </message>
2161 <message name="IDS_SETTINGS_IMPORT_LOADING_PROFILES" desc="Status text to no tify the user that profiles are being loaded"> 2163 <message name="IDS_SETTINGS_IMPORT_LOADING_PROFILES" desc="Status text to no tify the user that profiles are being loaded">
2162 Loading... 2164 Loading...
2163 </message> 2165 </message>
2164 2166
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 System 2559 System
2558 </message> 2560 </message>
2559 <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."> 2561 <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.">
2560 Use hardware acceleration when available 2562 Use hardware acceleration when available
2561 </message> 2563 </message>
2562 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 2564 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
2563 Change proxy settings 2565 Change proxy settings
2564 </message> 2566 </message>
2565 </if> 2567 </if>
2566 </grit-part> 2568 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/settings_private/prefs_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698