Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index 58b7b0eb0b848505b1275c84092310b48adc044f..4e2849977349c81eb5e44084a685fb2eadb7171a 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -14704,6 +14704,9 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex |
<message name="IDS_MANAGED_USER_ALREADY_ON_THIS_DEVICE" desc="Text shown in the list of supervised users beside the name of a supervised user that already exists on the current device."> |
(already on this device) |
</message> |
+ <message name="IDS_MANAGED_USER_NAME_CONFLICT" desc="Text shown in the list of supervised users beside the name of a supervised user that has the same name as a profile on this device."> |
+ (name conflict with existing local profile) |
Bernhard Bauer
2014/01/09 16:33:18
Has this string been reviewed?
Also, does this wo
Adrian Kuegel
2014/01/10 09:53:43
No, it had not been reviewed. I just talked with R
|
+ </message> |
<message name="IDS_MANAGED_USER_NO_EXISTING_ERROR" desc="Message shown to the custodian when he opens the 'supervised user import' overlay but he has no existing supervised users to import."> |
Oops! Looks like you have no existing supervised users to import. Please create one or more from another device then you can import them here. |
</message> |