diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-20 11:44:26 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-20 11:44:26 -0400 |
commit | b0c700bfa0b94ca9288470d1bae78ce12369d4f5 (patch) | |
tree | a9ba02e80bf88d6234f34c35d63b05dc5c27e8e1 /indra/newview/skins/default/xui/en | |
parent | 06aa2322b2b769fec118ac1f2f0f51c915f5ec23 (diff) | |
parent | 62040b686568410cdd87d12228b48f0b2ee12f1b (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 04bdb4302c..95ee374e39 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6343,7 +6343,7 @@ Avatar '[NAME]' left as fully loaded. name="AvatarRezSelfBakeNotification" type="notifytip"> ( [EXISTENCE] seconds alive ) -You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. +You [ACTION] a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. </notification> <notification @@ -6402,11 +6402,14 @@ If you continue to have problems, please visit the [SUPPORT_SITE]. - Your system memory does not meet the minimum requirements. </global> -<!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed +<!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed whenever the server string changes --> <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> If you own a piece of land, you can make it your home location. Otherwise, you can look at the Map and find places marked "Infohub". </global> + <global name="You died and have been teleported to your home location"> +You died and have been teleported to your home location. + </global> </notifications> |