summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-30 21:21:41 +0000
committerantrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-30 21:21:41 +0000
commit2a9fa873f683a2412e00499fb07ff92b4032778e (patch)
tree7edb319634b30354f5d9aa4249732721190d3f02
parenteb6bcafd8168639e7ade3877d75b46df82dbade2 (diff)
downloadchromium_src-2a9fa873f683a2412e00499fb07ff92b4032778e.zip
chromium_src-2a9fa873f683a2412e00499fb07ff92b4032778e.tar.gz
chromium_src-2a9fa873f683a2412e00499fb07ff92b4032778e.tar.bz2
Update string (see bug description)
BUG=281246 R=ygorshenin@chromium.org Review URL: https://chromiumcodereview.appspot.com/23757003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220661 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/chromeos_strings.grdp2
-rw-r--r--chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css1
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index 8ccc4fd..241c9ff 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -601,7 +601,7 @@ Press any key to continue exploring.
Creating supervised user
</message>
<message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_CREATION_TIMEOUT_MESSAGE" desc="Text shown at the place of progess indicator if creation takes too long and should be cancelled.">
- Profile takes too long to create. You may want to cancel process and retry later.
+ This is taking much longer than it should.
</message>
<message name="IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE" desc="Text for notifications showing that this user is locally managed">
This user is supervised by <ph name="MANAGER_EMAIL">$1<ex>user@example.com</ex></ph>. Usage and history from this user can be reviewed by the manager on chrome.com.
diff --git a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css
index 021480e..f5d6adb 100644
--- a/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css
+++ b/chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css
@@ -256,6 +256,7 @@ input.managed-user-creation-manager-password,
#managed-user-creation-status .id-text {
display: -webkit-inline-box;
margin-top: 1px;
+ max-width: 480px;
vertical-align: baseline;
}