summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 02:31:39 +0000
committerskuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 02:31:39 +0000
commitb23624b1286b39b81df10d82d4d2654ac4af3c39 (patch)
tree62ce9c20643d5d646696988d1ccde2b13abc910b /chrome/app
parente38f6a4e1c4cd73dff58fc29f573f8ce36677984 (diff)
downloadchromium_src-b23624b1286b39b81df10d82d4d2654ac4af3c39.zip
chromium_src-b23624b1286b39b81df10d82d4d2654ac4af3c39.tar.gz
chromium_src-b23624b1286b39b81df10d82d4d2654ac4af3c39.tar.bz2
Adding a dialog which explains that the multi user session has ended because a user policy has changed.
BUG=314930 TEST=manual Review URL: https://codereview.chromium.org/149173004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chromeos_strings.grdp12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index ff0c395..55b38b4 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -4712,7 +4712,7 @@ Battery full
Multiple sign-in
</message>
<message name="IDS_MULTIPROFILES_INTRO_MESSAGE" desc="Content of the multi-profiles intro dialog shown when the user adds another user in multi-profiles mode.">
- This feature allows you to access quickly any signed-in user without requiring a password.
+ This feature allows you to access quickly any signed-in user without requiring a password.
</message>
<message name="IDS_MULTIPROFILES_INTRO_EXPLANATION" desc="Content of the multi-profiles intro dialog shown when the user adds another user in multi-profiles mode.">
Only use this feature with accounts you trust.
@@ -4720,6 +4720,16 @@ Battery full
<message name="IDS_MULTIPROFILES_INTRO_NOSHOW_AGAIN" desc="In multi-profiles intro dialog, text for no-show-again option.">
Got it, don't show me this again.
</message>
+ <message name="IDS_MULTIPROFILES_SESSION_ABORT_HEADLINE" desc="Describes that the current multi profile session ends because one user left.">
+ Multiple sign-in has been disallowed for a user in this session
+ </message>
+ <message name="IDS_MULTIPROFILES_SESSION_ABORT_MESSAGE" desc="Content of the description that the current multi profile session ended because one user left.">
+ An administrator has disallowed multiple sign-in for <ph name="USER_EMAIL">$1<ex>john@google.com</ex></ph>.
+All users must sign out to continue.
+ </message>
+ <message name="IDS_MULTIPROFILES_SESSION_ABORT_BUTTON_LABEL" desc="Button label for the button in the multi profile session ended because one user left dialog.">
+ Sign out
+ </message>
<!-- First-run tutorial -->
<message name="IDS_FIRST_RUN_GREETING_STEP_HEADER" desc="Greeting message shown as header of the first dialog of first-run tutorial.">