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

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 2025433002: MD User Manager: Display error message when all profiles are locked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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:
Download patch
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | chrome/browser/profiles/profiles_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 5df0d15047a18e831fca9ca887966c536485238c..3b8933021fdfe750579975f73bec568d9e5ce62d 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13089,6 +13089,15 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
All files and local data associated with the supervised user will be permanently deleted once this supervised user is removed. Visited websites and settings for this supervised user may still be visible by the manager at <ph name="MANAGEMENT_URL">$1<ex>www.example.com</ex></ph>.
</message>
<if expr="not chromeos">
+ <message name="IDS_USER_MANAGER_GO_GUEST_PROFILES_LOCKED_ERROR" desc="Error Message Displayed when trying to browser as guest while all profiles are locked.">
dpapad 2016/05/27 23:59:42 Nit here and below s/Error Message Displayed/Error
Moe 2016/05/30 18:33:05 Done.
+ Please unlock your profile before browsing as a guest.
+ </message>
+ <message name="IDS_USER_MANAGER_REMOVE_PROFILE_PROFILES_LOCKED_ERROR" desc="Error Message Displayed when trying to remove a profile while all profiles are locked.">
+ Please unlock your profile before removing a person.
+ </message>
+ <message name="IDS_USER_MANAGER_ADD_PROFILE_PROFILES_LOCKED_ERROR" desc="Error Message Displayed when trying to add a profile while all profiles are locked.">
+ Please unlock your profile before adding a person.
+ </message>
<message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_NONSYNC" desc="Main text shown as a warning when attempting to remove an user. This case is for non-synced profiles, with all statistics loaded correctly. The symbol $1 will be substituted with custom JS code, so it should not be replaced by a #.">
{NUM_ITEMS, plural,
=1 {This will permanently delete $1 item from this device.}
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | chrome/browser/profiles/profiles_state.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698