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

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

Issue 2805003005: MD Settings: Move Activity Controls link to Sync subpage (Closed)
Patch Set: remove an obsolete test Created 3 years, 8 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 2507 matching lines...) Expand 10 before | Expand all | Expand 10 after
2518 <message name="IDS_SETTINGS_SUBMIT_PASSPHRASE" desc="Text for the button which , when clicked, submits a sync password for verification."> 2518 <message name="IDS_SETTINGS_SUBMIT_PASSPHRASE" desc="Text for the button which , when clicked, submits a sync password for verification.">
2519 Submit 2519 Submit
2520 </message> 2520 </message>
2521 <message name="IDS_SETTINGS_USE_DEFAULT_SETTINGS" desc="Text for button which, when clicked, activates the default sync settings."> 2521 <message name="IDS_SETTINGS_USE_DEFAULT_SETTINGS" desc="Text for button which, when clicked, activates the default sync settings.">
2522 Use default settings 2522 Use default settings
2523 </message> 2523 </message>
2524 <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."> 2524 <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.">
2525 Personalize Google services 2525 Personalize Google services
2526 </message> 2526 </message>
2527 <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."> 2527 <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.">
2528 Control how Google uses your browsing history to personalize Search, ads, an d other Google services 2528 Control how your browsing history personalizes Search, ads, and other Google services
2529 </message> 2529 </message>
2530 2530
2531 <if expr="not chromeos"> 2531 <if expr="not chromeos">
2532 <!-- Import Settings Dialog --> 2532 <!-- Import Settings Dialog -->
2533 <message name="IDS_SETTINGS_IMPORT_SETTINGS_TITLE" desc="Dialog title for im port dialog."> 2533 <message name="IDS_SETTINGS_IMPORT_SETTINGS_TITLE" desc="Dialog title for im port dialog.">
2534 Import bookmarks and settings 2534 Import bookmarks and settings
2535 </message> 2535 </message>
2536 <message name="IDS_SETTINGS_IMPORT_FROM_LABEL" desc="Label before profile se lect combo box"> 2536 <message name="IDS_SETTINGS_IMPORT_FROM_LABEL" desc="Label before profile se lect combo box">
2537 From: 2537 From:
2538 </message> 2538 </message>
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
2975 System 2975 System
2976 </message> 2976 </message>
2977 <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."> 2977 <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.">
2978 Use hardware acceleration when available 2978 Use hardware acceleration when available
2979 </message> 2979 </message>
2980 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings."> 2980 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings.">
2981 Open proxy settings 2981 Open proxy settings
2982 </message> 2982 </message>
2983 </if> 2983 </if>
2984 </grit-part> 2984 </grit-part>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698