Index: chrome/app/chromeos_strings.grdp |
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp |
index ba49d8afba97c8c948b556f58bdffc5be300f30e..148d41da42ad66d179bb3fa3e9738d3abfde7cc0 100644 |
--- a/chrome/app/chromeos_strings.grdp |
+++ b/chrome/app/chromeos_strings.grdp |
@@ -1567,6 +1567,9 @@ Press any key to continue exploring. |
<message name="IDS_LOGIN_CAPTCHA_INSTRUCTIONS" desc="Explanatory message shown when the user must type letters shown in a captcha image to reauthenticate."> |
Type the characters you see in the picture below. |
</message> |
+ <message name="IDS_OPTIONS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session."> |
+ Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com</ex></ph> are currently being shared with you. Changes to these settings will be saved with <ph name="PROFILE_NAME">$2<ex>john</ex></ph> and only affect your account when using multiple sign-in. |
+ </message> |
<message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME"> |
Date and time |
</message> |
@@ -2672,6 +2675,15 @@ Press any key to continue exploring. |
<message name="IDS_OPTION_DISABLED_BY_POLICY" desc="Tooltip for options managed by enterprise policy"> |
This option is controlled by enterprise policy. Please contact your administrator for more information. |
</message> |
+ <message name="IDS_OPTIONS_CONTROLLED_SETTING_OWNER_MULTIPROFILES" desc="Tooltip shown in a multi-profile session for options which can be edited only by the owner."> |
+ This setting is managed by the device owner, <ph name="OWNER_EMAIL">$1<ex>john@google.com</ex></ph>. |
+ </message> |
+ <message name="IDS_OPTIONS_CONTROLLED_SETTING_SHARED_MULTIPROFILES" desc="Tooltip shown in a multi-profile session for options which belong to the owner but can be edited."> |
+ 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
|
+ </message> |
+ <message name="IDS_OPTIONS_CONTROLLED_SETTING_SHARED_SCREEN_LOCK" desc="Tooltip for the screen lock option, indicating screen lock is enabled if it's set for any profile in a multi-profile session."> |
+ 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
|
+ </message> |
<message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE" |
desc="The title for the Chewing input settings dialog. Please note that 'Chewing' here is name of an input method and not 'an act of biting and grinding with the teeth'."> |
Chewing input settings |