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

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

Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge upstream changes Created 5 years 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 <!-- Policy Indicators --> 4 <!-- Policy Indicators -->
5 <message name="IDS_SETTINGS_CONTROLLED_SETTING_EXTENSION" desc="Text displayed in the controlled settings indicator tooltip when a setting's value is enforced by an extension."> 5 <message name="IDS_SETTINGS_CONTROLLED_SETTING_EXTENSION" desc="Text displayed in the controlled settings indicator tooltip when a setting's value is enforced by an extension.">
6 This setting is controlled by extension <ph name="NAME">$1<ex>Settings Exten sion</ex></ph> 6 This setting is controlled by extension <ph name="NAME">$1<ex>Settings Exten sion</ex></ph>
7 </message> 7 </message>
8 8
9 <if expr="chromeos"> 9 <if expr="chromeos">
10 <!-- Accessibility Page --> 10 <!-- Accessibility Page -->
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 Permissions 539 Permissions
540 </message> 540 </message>
541 <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_BUTTON" desc="The Clear and Re set button, used to clear all permissions and storage for a given site."> 541 <message name="IDS_SETTINGS_SITE_SETTINGS_CLEAR_BUTTON" desc="The Clear and Re set button, used to clear all permissions and storage for a given site.">
542 Clear &amp; Reset 542 Clear &amp; Reset
543 </message> 543 </message>
544 <message name="IDS_SETTINGS_SITE_SETTINGS_DELETE" desc="Label for the trashcan icon used to delete storage on the Site Details page."> 544 <message name="IDS_SETTINGS_SITE_SETTINGS_DELETE" desc="Label for the trashcan icon used to delete storage on the Site Details page.">
545 Delete 545 Delete
546 </message> 546 </message>
547 547
548 <!-- Sync / People Page --> 548 <!-- Sync / People Page -->
549 <message name="IDS_SETTINGS_SYNC_PEOPLE" desc="Name of the settings page which manages Chrome's signed-in Google profile."> 549 <message name="IDS_SETTINGS_PEOPLE" desc="Name of the settings page which mana ges Chrome's signed-in Google profile.">
550 People 550 People
551 </message> 551 </message>
552 <message name="IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE" desc="Label for the bu tton that opens the multi profile user manager.">
553 Manage other people
554 </message>
555
552 <message name="IDS_SETTINGS_SYNC_OVERVIEW" desc="The message that appears in t he options dialog when sync has not been set up by the user."> 556 <message name="IDS_SETTINGS_SYNC_OVERVIEW" desc="The message that appears in t he options dialog when sync has not been set up by the user.">
553 Sign in to get your bookmarks, history, passwords and other settings on all your devices. You'll also automatically be signed in to your Google services. 557 Sign in to get your bookmarks, history, passwords and other settings on all your devices. You'll also automatically be signed in to your Google services.
554 </message> 558 </message>
555 <message name="IDS_SETTINGS_SYNC_DISCONNECT" desc="The text to display on the button to indicate stop syncing functionality."> 559 <message name="IDS_SETTINGS_SYNC_DISCONNECT" desc="The text to display on the button to indicate stop syncing functionality.">
556 Sign Out 560 Sign Out
557 </message> 561 </message>
558 <message name="IDS_SETTINGS_SYNC_DISCONNECT_TITLE" desc="The title of the dial og that explains what 'stop syncing' means."> 562 <message name="IDS_SETTINGS_SYNC_DISCONNECT_TITLE" desc="The title of the dial og that explains what 'stop syncing' means.">
559 Disconnect your Google Account 563 Disconnect your Google Account
560 </message> 564 </message>
561 <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE" desc="The text to display by the checkbox asking user whether to also delete profile when stopping sync."> 565 <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE" desc="The text to display by the checkbox asking user whether to also delete profile when stopping sync.">
562 Also clear your history, bookmarks, settings, and other Chrome data stored o n this device. 566 Also clear your history, bookmarks, settings, and other Chrome data stored o n this device.
563 </message> 567 </message>
564 <message name="IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM" desc="The text to display on the button to confirm the user wishes to stop syncing."> 568 <message name="IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM" desc="The text to display on the button to confirm the user wishes to stop syncing.">
565 Clear and Disconnect 569 Clear and Disconnect
566 </message> 570 </message>
567 <message name="IDS_SETTINGS_SYNC_MANAGE_OTHER_PEOPLE" desc="Label for the butt on that opens the multi profile user manager.">
568 Manage other people
569 </message>
570 571
571 <message name="IDS_SETTINGS_SYNC" desc="Name of the settings page which manage s syncing data between multiple browser instances with the same Google profile." > 572 <message name="IDS_SETTINGS_SYNC" desc="Name of the settings page which manage s syncing data between multiple browser instances with the same Google profile." >
572 Advanced sync settings 573 Advanced sync settings
573 </message> 574 </message>
574 <message name="IDS_SETTINGS_SYNC_LOADING" desc="The message shown when waiting for the sync backend to start up."> 575 <message name="IDS_SETTINGS_SYNC_LOADING" desc="The message shown when waiting for the sync backend to start up.">
575 Please wait... 576 Please wait...
576 </message> 577 </message>
577 <message name="IDS_SETTINGS_SYNC_TIMEOUT" desc="Text explaining what to do if sync times out."> 578 <message name="IDS_SETTINGS_SYNC_TIMEOUT" desc="Text explaining what to do if sync times out.">
578 Please make sure your network connection is working and if the problem persi sts, please sign out and sign in again to refresh your credentials. 579 Please make sure your network connection is working and if the problem persi sts, please sign out and sign in again to refresh your credentials.
579 </message> 580 </message>
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 <message name="IDS_SETTINGS_LOREM_IPSUM" desc="Gibberish example text in setti ngs."> 735 <message name="IDS_SETTINGS_LOREM_IPSUM" desc="Gibberish example text in setti ngs.">
735 Lorem ipsum dolor sit amet, consectetur adipiscing elit. 736 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
736 </message> 737 </message>
737 <message name="IDS_SETTINGS_LOADING" desc="Placeholder text while waiting for font settings to appear, shown only until font settings have loaded."> 738 <message name="IDS_SETTINGS_LOADING" desc="Placeholder text while waiting for font settings to appear, shown only until font settings have loaded.">
738 Loading... 739 Loading...
739 </message> 740 </message>
740 <message name="IDS_SETTINGS_ADVANCED_FONT_SETTINGS" desc="Label for advanced f ont settings."> 741 <message name="IDS_SETTINGS_ADVANCED_FONT_SETTINGS" desc="Label for advanced f ont settings.">
741 Advanced font settings 742 Advanced font settings
742 </message> 743 </message>
743 </grit-part> 744 </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