Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index 18b557ba9c4a48264c0c06d841d37401af9bb633..9f417b999f54263d51fdc7b5b7fbf8377bc79e92 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -7883,7 +7883,7 @@ Keep your key file in a safe place. You will need it to create new versions of y |
</message> |
<message name="IDS_PASSWORD_MANAGER_UPDATE_BUTTON" desc="Update button text for password manager"> |
Update password |
- </message> |
+ </message> |
<message name="IDS_PASSWORD_MANAGER_SAVE_ACCOUNT_BUTTON" desc="Save button text for password manager"> |
Save |
</message> |
@@ -14409,8 +14409,32 @@ After you create a new supervised user, you can manage their settings at any tim |
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_LOGIN_POD_USER_REMOVE_WARNING" desc="Text shown as a warning when attempting to remove an user."> |
- Are you sure you want to delete this user and all the data associated with it from this computer? This cannot be undone! |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_NONSYNC" desc="Main text shown as a warning when attempting to remove an user."> |
+ This will permanently delete <ph name="TOTAL_COUNT"><span class="total-count">...</span><ex>1234</ex></ph> items from this device. |
Dmitry Polukhin
2015/08/13 15:34:16
I think we should use plain text messages and avoi
lwchkg
2015/08/17 17:36:32
I see. I still need an HTML tag here. So I'll just
Dmitry Polukhin
2015/08/18 10:25:50
IMHO, I would give up with formating here but UX m
lwchkg
2015/08/21 17:36:44
I see. Anyway I've just uploaded another patch whi
|
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_NONSYNC_NOSTATS" desc="Main text shown as a warning when attempting to remove an user."> |
+ This will permanently delete your browsing data from this device. |
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_HISTORY" desc="One of the statistics shown below the warning when attempting to remove an user. This is the category, and a number is displayed next to it."> |
+ Browsing History |
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_PASSWORDS" desc="One of the statistics shown below the warning when attempting to remove an user. This is the category, and a number is displayed next to it."> |
+ Passwords |
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_BOOKMARKS" desc="One of the statistics shown below the warning when attempting to remove an user. This is the category, and a number is displayed next to it."> |
+ Bookmarks |
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SETTINGS" desc="One of the statistics shown below the warning when attempting to remove an user. This is the category, and a number is displayed next to it."> |
+ Settings |
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_CALCULATING" desc="Put next to any loading statistics, which is shown below the warning when attempting to remove an user."> |
+ ... |
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC" desc="Main text shown as a warning when attempting to remove an user with a synced account."> |
+ This will permanently delete <span class="total-count">...</span> items from this device but not clear synced items from other devices. |
+ </message> |
+ <message name="IDS_LOGIN_POD_USER_REMOVE_WARNING_SYNC_NOSTATS" desc="Main text shown as a warning when attempting to remove an user with a synced account having statistics unavailable."> |
+ This will permanently delete your browsing data from this device but not clear synced items from other devices. |
</message> |
</if> |