diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-27 15:12:42 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-27 15:12:42 -0700 |
| commit | fee7b15417d2bb1374ec9f861db77e51cbca7fe5 (patch) | |
| tree | 8f7e0655602996316d083500bcdbe52137c2e72a /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 6cb420b20bd509e7bf62c8450f12d433c5a81be2 (diff) | |
| parent | c7a6a2e08f34b2cd21816a905c21e8017646001c (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 51b88cf59a..904084cfa7 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3145,9 +3145,11 @@ You are no longer frozen. icon="alertmodal.tga" name="SetDisplayName" type="alertmodal"> -Change your display name (used for name tags, chat, etc.)? +Your new display name will be used for name tags, chat, friends lists, etc. You can also reset it back to your original username. There will be a delay before you can change your display name again, so choose wisely. -You can also reset it back to your original username. +See http://wiki.secondlife.com/wiki/Setting_your_display_name + +Change your display name? <form name="form"> <input name="display_name" type="text"> [DISPLAY_NAME] @@ -3174,9 +3176,19 @@ You can also reset it back to your original username. type="alertmodal"> Thanks for updating your name! -Just like in real life, it takes a while for everyone to learn about a new name. Please allow [HOURS] hours for your name to update in object ownership, scripts, search, etc. +Just like in real life, it takes a while for everyone to learn about a new name. Please allow several days for your name to update in object ownership, scripts, search, etc. -See http://wiki.secondlife.com/wiki/Setting_your_display_name for details. +See http://wiki.secondlife.com/wiki/Setting_your_display_name + </notification> + + <notification + icon="alertmodal.tga" + name="SetDisplayNameFailedLockout" + type="alertmodal"> +Sorry, you cannot change your display name until: +[TIME] + +See http://wiki.secondlife.com/wiki/Setting_your_display_name </notification> <notification @@ -3195,11 +3207,14 @@ Please try a shorter name. Sorry, we could not set your display name. Please try again later. </notification> +<!-- *NOTE: This should never happen, users should see SetDisplayNameFailedLockout above --> <notification icon="alertmodal.tga" name="AgentDisplayNameUpdateThresholdExceeded" type="alertmodal"> -Sorry, you can only change your name once every 24 hours. +Sorry, you have to wait longer before you can change your display name. + +See http://wiki.secondlife.com/wiki/Setting_your_display_name for details. Please try again later. </notification> |