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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/chromeos_strings.grdp

Issue 468873002: Show a desktop notification when the enrollment is completed or failed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a bug that NotificationUIManager is created too early. Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/theme/default_100_percent/cros/consumer_management_notification_icon.png » ('j') | chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chromeos_strings.grdp
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index 5c885709aafea59c6813682478d10627dae4f86b..8533d611f4d2a69651b0bfbb10077a0d2aa82486 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -5052,9 +5052,6 @@ Battery full
<message name="IDS_LOGIN_CONNECTING_INDICATOR_TEXT" desc="A message to show telling the user that the device is attempting to re-connect to the network.">
Connecting and verifying<ph name="ANIMATED_ELLIPSIS">$1<ex>...</ex></ph>
</message>
- <message name="IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT" desc="A message to show at the signin page when consumer management enrollment is in progress.">
- The owner must sign in to complete enrollment with Google Device Manager.
- </message>
<!-- Idle warning dialog -->
<message name="IDS_IDLE_WARNING_TITLE" desc="Title of the warning dialog shown when the user becomes idle and is about to get logged out.">
@@ -5707,7 +5704,10 @@ All users must sign out to continue.
Failed to submit NDEF:
</message>
- <!-- About the device control section in the settings page -->
oshima 2014/08/20 13:24:00 you have removed this comment, which looks to me s
davidyu 2014/08/21 04:08:23 Yes. I put all consumer management service strings
+ <!-- About consumer management service -->
+ <message name="IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT" desc="A message to show at the signin page when consumer management enrollment is in progress.">
bartfab (slow) 2014/08/20 13:55:48 Nit: s/signin/sign-in/
davidyu 2014/08/21 04:08:23 Done.
+ The owner must sign in to complete enrollment with Google Device Manager.
+ </message>
<message name="IDS_OPTIONS_DEVICE_CONTROL_SECTION_TITLE" desc="The title of the device control section in the settings page.">
Device control
</message>
@@ -5741,6 +5741,24 @@ All users must sign out to continue.
<message name="IDS_OPTIONS_CONSUMER_MANAGEMENT_OVERLAY_UNENROLL" desc="The button text of the consumer management overlay in the settings page for unenrollment.">
Unenroll and restart
</message>
+ <message name="IDS_CONSUMER_MANAGEMENT_ENROLLMENT_NOTIFICATION_TITLE" desc="The title of the desktop notification shown when the consumer management enrollment is completed">
bartfab (slow) 2014/08/20 13:55:48 Nit: s/the consumer/consumer/
davidyu 2014/08/21 04:08:23 Done.
+ Enrolled
+ </message>
+ <message name="IDS_CONSUMER_MANAGEMENT_ENROLLMENT_NOTIFICATION_BODY" desc="The body of the desktop notification shown when the consumer management enrollment is completed">
bartfab (slow) 2014/08/20 13:55:48 Nit: s/the consumer/consumer/
davidyu 2014/08/21 04:08:23 Done.
+ You can now lock this device remotely anytime on Chrome Manager.
bartfab (slow) 2014/08/20 13:55:48 I presume this string was approved by Chrome UI? "
davidyu 2014/08/21 04:08:23 The string is from a version of the mocks. UI revi
+ </message>
+ <message name="IDS_CONSUMER_MANAGEMENT_ENROLLMENT_FAILURE_NOTIFICATION_TITLE" desc="The title of the desktop notification shown when the consumer management enrollment is failed">
bartfab (slow) 2014/08/20 13:55:48 Nit 1: s/the consumer/consumer/ Nit 2: s/is failed
davidyu 2014/08/21 04:08:23 Done.
+ Unable to enroll
+ </message>
+ <message name="IDS_CONSUMER_MANAGEMENT_ENROLLMENT_FAILURE_NOTIFICATION_BODY" desc="The body of the desktop notification shown when the consumer management enrollment is failed">
bartfab (slow) 2014/08/20 13:55:48 Nit 1: s/the consumer/consumer/ Nit 2: s/is failed
davidyu 2014/08/21 04:08:23 Done.
+ Enrollment in Google Device Manager was not successful.
bartfab (slow) 2014/08/20 13:55:48 Here you say "Google Device Manager," in the succe
davidyu 2014/08/21 04:08:23 I copied the text from the mock. I'll update the s
+ </message>
+ <message name="IDS_CONSUMER_MANAGEMENT_NOTIFICATION_MODIFY_SETTINGS_BUTTON" desc="The label of the modify settings button on the desktop notification shown when the consumer management enrollment or unenrollment is completed">
bartfab (slow) 2014/08/20 13:55:48 Nit: s/the consumer/consumer/
davidyu 2014/08/21 04:08:24 Done.
+ Modify settings
+ </message>
+ <message name="IDS_CONSUMER_MANAGEMENT_NOTIFICATION_TRY_AGAIN_BUTTON" desc="The label of the modify settings button on the desktop notification shown when the consumer management enrollment or unenrollment is failed">
bartfab (slow) 2014/08/20 13:55:48 Nit 1: s/the consumer/consumer/ Nit 2: s/is failed
davidyu 2014/08/21 04:08:24 Done.
+ Try again
+ </message>
<!-- Set time/date UI display strings -->
<message name="IDS_SET_TIME_TITLE" desc="Title of the set time/date UI.">
« no previous file with comments | « no previous file | chrome/app/theme/default_100_percent/cros/consumer_management_notification_icon.png » ('j') | chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698