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

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: 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
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 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after
1560 </message> 1560 </message>
1561 <message name="IDS_LOGIN_OOBE_HELP_DIALOG_TITLE" desc="Default title for help dialogs during OOBE/login"> 1561 <message name="IDS_LOGIN_OOBE_HELP_DIALOG_TITLE" desc="Default title for help dialogs during OOBE/login">
1562 Help 1562 Help
1563 </message> 1563 </message>
1564 <message name="IDS_LOGIN_CAPTCHA_DIALOG_TITLE" desc="Title shown for captcha i nput dialog"> 1564 <message name="IDS_LOGIN_CAPTCHA_DIALOG_TITLE" desc="Title shown for captcha i nput dialog">
1565 Sign in 1565 Sign in
1566 </message> 1566 </message>
1567 <message name="IDS_LOGIN_CAPTCHA_INSTRUCTIONS" desc="Explanatory message shown when the user must type letters shown in a captcha image to reauthenticate."> 1567 <message name="IDS_LOGIN_CAPTCHA_INSTRUCTIONS" desc="Explanatory message shown when the user must type letters shown in a captcha image to reauthenticate.">
1568 Type the characters you see in the picture below. 1568 Type the characters you see in the picture below.
1569 </message> 1569 </message>
1570 <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.">
1571 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com</e x></ph> are currently being shared with you. Changes to these settings will be s aved with <ph name="PROFILE_NAME">$2<ex>john</ex></ph> and only affect your acco unt when using multiple sign-in.
1572 </message>
1570 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME"> 1573 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME">
1571 Date and time 1574 Date and time
1572 </message> 1575 </message>
1573 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRED_NETWORK" desc="Title f or section in settings/internet for list of wired networks (usually one)"> 1576 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRED_NETWORK" desc="Title f or section in settings/internet for list of wired networks (usually one)">
1574 Wired network 1577 Wired network
1575 </message> 1578 </message>
1576 <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)"> 1579 <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)">
1577 Wireless networks 1580 Wireless networks
1578 </message> 1581 </message>
1579 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK" desc="Title fo r the Wifi network group on the settings page."> 1582 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIFI_NETWORK" desc="Title fo r the Wifi network group on the settings page.">
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
2665 <message name="IDS_TERMS_OF_SERVICE_SCREEN_ACCEPT_BUTTON" desc="Text of the ac cept button on the Terms of Service screen."> 2668 <message name="IDS_TERMS_OF_SERVICE_SCREEN_ACCEPT_BUTTON" desc="Text of the ac cept button on the Terms of Service screen.">
2666 Accept and continue 2669 Accept and continue
2667 </message> 2670 </message>
2668 2671
2669 <message name="IDS_OPTIONS_CONTROLLED_SETTING_OWNER" desc="Tooltip for options which can be edited only by the owner"> 2672 <message name="IDS_OPTIONS_CONTROLLED_SETTING_OWNER" desc="Tooltip for options which can be edited only by the owner">
2670 This setting is enforced by the owner of the device. 2673 This setting is enforced by the owner of the device.
2671 </message> 2674 </message>
2672 <message name="IDS_OPTION_DISABLED_BY_POLICY" desc="Tooltip for options manage d by enterprise policy"> 2675 <message name="IDS_OPTION_DISABLED_BY_POLICY" desc="Tooltip for options manage d by enterprise policy">
2673 This option is controlled by enterprise policy. Please contact your administ rator for more information. 2676 This option is controlled by enterprise policy. Please contact your administ rator for more information.
2674 </message> 2677 </message>
2678 <message name="IDS_OPTIONS_CONTROLLED_SETTING_OWNER_MULTIPROFILES" desc="Toolt ip shown in a multi-profile session for options which can be edited only by the owner.">
2679 This setting is managed by the device owner, <ph name="OWNER_EMAIL">$1<ex>jo hn@google.com</ex></ph>.
2680 </message>
2681 <message name="IDS_OPTIONS_CONTROLLED_SETTING_SHARED_MULTIPROFILES" desc="Tool tip shown in a multi-profile session for options which belong to the owner but c an be edited.">
2682 These settings belong to <ph name="OWNER_EMAIL">$1<ex>john@google.com</ex></ ph>.
stevenjb 2014/02/07 00:40:09 It's odd that one of these is 'setting' singular a
michaelpg 2014/02/07 02:04:27 good point. This string refers to a section of set
michaelpg 2014/02/10 21:16:22 Actually, this is controlled settings work for oth
2683 </message>
2684 <message name="IDS_OPTIONS_CONTROLLED_SETTING_SHARED_SCREEN_LOCK" desc="Toolti p for the screen lock option, indicating screen lock is enabled if it's set for any profile in a multi-profile session.">
2685 Another user has turned this on, so passwords are required for all signed-in users.
stevenjb 2014/02/07 00:40:09 "turned this on" sounds odd to me here, maybe doub
michaelpg 2014/02/07 02:04:27 Yeah this string is still under discussion.
michaelpg 2014/02/10 21:16:22 String finalized. On 2014/02/07 02:04:27, Michael
2686 </message>
2675 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE" 2687 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE"
2676 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'."> 2688 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'.">
2677 Chewing input settings 2689 Chewing input settings
2678 </message> 2690 </message>
2679 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR" 2691 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR"
2680 desc="The checkbox label for a Chewing input method preference"> 2692 desc="The checkbox label for a Chewing input method preference">
2681 Automatically move cursor to the next character 2693 Automatically move cursor to the next character
2682 </message> 2694 </message>
2683 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIREC TION" 2695 <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIREC TION"
2684 desc="The checkbox label for a Chewing input method preference"> 2696 desc="The checkbox label for a Chewing input method preference">
(...skipping 2239 matching lines...) Expand 10 before | Expand all | Expand 10 after
4924 We see that you've ordered a replacement charger. 4936 We see that you've ordered a replacement charger.
4925 </message> 4937 </message>
4926 <message name="IDS_CHARGER_REPLACEMENT_CHARGER_MORE_INFO" desc="Text for finin g more info for charger"> 4938 <message name="IDS_CHARGER_REPLACEMENT_CHARGER_MORE_INFO" desc="Text for finin g more info for charger">
4927 You can find more info at 4939 You can find more info at
4928 </message> 4940 </message>
4929 <message name="IDS_CHARGER_REPLACEMENT_DIALOG_TITLE" desc="Title of the charge r replacement UI dialg"> 4941 <message name="IDS_CHARGER_REPLACEMENT_DIALOG_TITLE" desc="Title of the charge r replacement UI dialg">
4930 Check charger 4942 Check charger
4931 </message> 4943 </message>
4932 4944
4933 </grit-part> 4945 </grit-part>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698