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

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

Issue 152143009: Clarify settings UI in multi-profiles mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: string fixes, rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/theme/default_100_percent/common/controlled_setting_owner.png » ('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 <!-- ChromeOS-specific strings (included from generated_resources.grd). 2 <!-- ChromeOS-specific strings (included from generated_resources.grd).
3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. --> 3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. -->
4 <grit-part> 4 <grit-part>
5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required."> 5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required.">
6 </message> 6 </message>
7 <!-- Idle logout dialog for retail mode --> 7 <!-- Idle logout dialog for retail mode -->
8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only."> 8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only.">
9 Are you still there? 9 Are you still there?
10 </message> 10 </message>
(...skipping 1566 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 </message> 1577 </message>
1578 <message name="IDS_LOGIN_OOBE_HELP_DIALOG_TITLE" desc="Default title for help dialogs during OOBE/login"> 1578 <message name="IDS_LOGIN_OOBE_HELP_DIALOG_TITLE" desc="Default title for help dialogs during OOBE/login">
1579 Help 1579 Help
1580 </message> 1580 </message>
1581 <message name="IDS_LOGIN_CAPTCHA_DIALOG_TITLE" desc="Title shown for captcha i nput dialog"> 1581 <message name="IDS_LOGIN_CAPTCHA_DIALOG_TITLE" desc="Title shown for captcha i nput dialog">
1582 Sign in 1582 Sign in
1583 </message> 1583 </message>
1584 <message name="IDS_LOGIN_CAPTCHA_INSTRUCTIONS" desc="Explanatory message shown when the user must type letters shown in a captcha image to reauthenticate."> 1584 <message name="IDS_LOGIN_CAPTCHA_INSTRUCTIONS" desc="Explanatory message shown when the user must type letters shown in a captcha image to reauthenticate.">
1585 Type the characters you see in the picture below. 1585 Type the characters you see in the picture below.
1586 </message> 1586 </message>
1587 <message name="IDS_OPTIONS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displa yed in settings page when the user is secondary in a multi-profile session.">
1588 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com</e x></ph> are being shared with you. These settings only affect your account when using multiple sign-in.
1589 </message>
1587 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME"> 1590 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME">
1588 Date and time 1591 Date and time
1589 </message> 1592 </message>
1590 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRED_NETWORK" desc="Title f or section in settings/internet for list of wired networks (usually one)"> 1593 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRED_NETWORK" desc="Title f or section in settings/internet for list of wired networks (usually one)">
1591 Wired network 1594 Wired network
1592 </message> 1595 </message>
1593 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRELESS_NETWORK" desc="Titl e for section in settings/internet for list of wireless networks (wifi and cellu lar)"> 1596 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRELESS_NETWORK" desc="Titl e for section in settings/internet for list of wireless networks (wifi and cellu lar)">
1594 Wireless networks 1597 Wireless networks
1595 </message> 1598 </message>
1596 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK" desc="Title fo r the Wifi network group on the settings page."> 1599 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK" desc="Title fo r the Wifi network group on the settings page.">
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
2675 </message> 2678 </message>
2676 <message name="IDS_TERMS_OF_SERVICE_SCREEN_TRY_AGAIN" desc="Message telling th e user to try again later. Shown beneath the error message when the Terms of Ser vice could not be loaded."> 2679 <message name="IDS_TERMS_OF_SERVICE_SCREEN_TRY_AGAIN" desc="Message telling th e user to try again later. Shown beneath the error message when the Terms of Ser vice could not be loaded.">
2677 Please try again later. 2680 Please try again later.
2678 </message> 2681 </message>
2679 <message name="IDS_TERMS_OF_SERVICE_SCREEN_BACK_BUTTON" desc="Text of the back button on Terms of Service screen."> 2682 <message name="IDS_TERMS_OF_SERVICE_SCREEN_BACK_BUTTON" desc="Text of the back button on Terms of Service screen.">
2680 Back 2683 Back
2681 </message> 2684 </message>
2682 <message name="IDS_TERMS_OF_SERVICE_SCREEN_ACCEPT_BUTTON" desc="Text of the ac cept button on the Terms of Service screen."> 2685 <message name="IDS_TERMS_OF_SERVICE_SCREEN_ACCEPT_BUTTON" desc="Text of the ac cept button on the Terms of Service screen.">
2683 Accept and continue 2686 Accept and continue
2684 </message> 2687 </message>
2685 2688 <message name="IDS_OPTIONS_CONTROLLED_SETTING_OWNER" desc="Text displayed in t he controlled settings bubble when a setting's value can be edited only by the o wner.">
2686 <message name="IDS_OPTIONS_CONTROLLED_SETTING_OWNER" desc="Tooltip for options which can be edited only by the owner"> 2689 This setting is managed by the device owner, <ph name="OWNER_EMAIL">$1<ex>jo hn@google.com</ex></ph>.
2687 This setting is enforced by the owner of the device.
2688 </message> 2690 </message>
2689 <message name="IDS_OPTION_DISABLED_BY_POLICY" desc="Tooltip for options manage d by enterprise policy"> 2691 <message name="IDS_OPTION_DISABLED_BY_POLICY" desc="Text displayed in the cont rolled settings bubble when a setting's value is enforced by enterprise policy." >
2690 This option is controlled by enterprise policy. Please contact your administ rator for more information. 2692 This option is controlled by enterprise policy. Please contact your administ rator for more information.
2691 </message> 2693 </message>
2694 <message name="IDS_OPTIONS_CONTROLLED_SETTINGS_SHARED" desc="Text displayed in the controlled settings bubble when it is shown for a group of settings which b elong to the primary user but can be edited.">
michaelpg 2014/02/10 21:16:23 Following the convention in generated_resources.gr
2695 These settings belong to <ph name="OWNER_EMAIL">$1<ex>john@google.com</ex></ ph>.
2696 </message>
2697 <message name="IDS_OPTIONS_CONTROLLED_SETTING_SHARED_SCREEN_LOCK" desc="Text d isplayed in the controlled settings bubble for the screen lock option, indicatin g screen lock is enabled if it's set for any profile in a session.">
2698 Passwords are required for signed-in users, as one or more users has this se tting turned on.
2699 </message>
2692 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE" 2700 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE"
2693 desc="The title for the Chewing input settings dialog. Please note th at 'Chewing' here is name of an input method and not 'an act of biting and grind ing with the teeth'."> 2701 desc="The title for the Chewing input settings dialog. Please note th at 'Chewing' here is name of an input method and not 'an act of biting and grind ing with the teeth'.">
2694 Chewing input settings 2702 Chewing input settings
2695 </message> 2703 </message>
2696 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR" 2704 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR"
2697 desc="The checkbox label for a Chewing input method preference"> 2705 desc="The checkbox label for a Chewing input method preference">
2698 Automatically move cursor to the next character 2706 Automatically move cursor to the next character
2699 </message> 2707 </message>
2700 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIREC TION" 2708 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIREC TION"
2701 desc="The checkbox label for a Chewing input method preference"> 2709 desc="The checkbox label for a Chewing input method preference">
(...skipping 2239 matching lines...) Expand 10 before | Expand all | Expand 10 after
4941 We see that you've ordered a replacement charger. 4949 We see that you've ordered a replacement charger.
4942 </message> 4950 </message>
4943 <message name="IDS_CHARGER_REPLACEMENT_CHARGER_MORE_INFO" desc="Text for finin g more info for charger"> 4951 <message name="IDS_CHARGER_REPLACEMENT_CHARGER_MORE_INFO" desc="Text for finin g more info for charger">
4944 You can find more info at 4952 You can find more info at
4945 </message> 4953 </message>
4946 <message name="IDS_CHARGER_REPLACEMENT_DIALOG_TITLE" desc="Title of the charge r replacement UI dialg"> 4954 <message name="IDS_CHARGER_REPLACEMENT_DIALOG_TITLE" desc="Title of the charge r replacement UI dialg">
4947 Check charger 4955 Check charger
4948 </message> 4956 </message>
4949 4957
4950 </grit-part> 4958 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/theme/default_100_percent/common/controlled_setting_owner.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698