summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-09 09:47:19 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-01-09 09:47:19 -0500
commit3ed8f8907665d8700199a1181a5dd106a6804edb (patch)
tree3c41a427dfbae7e14272ccd64d2f6bf47bf70216 /indra/newview/skins/default/xui/en/notifications.xml
parent837e38d8195b2928648c9c383bea1b3f1cf68fa5 (diff)
parent41ceee848bbbaec892471b6396bd2d2383d10aa3 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml22
1 files changed, 21 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a7705c8bac..1daf2e6948 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3409,7 +3409,7 @@ Are you sure you want to return the selected objects to their owners? Transferab
icon="alert.tga"
name="GroupLeaveConfirmMember"
type="alert">
-You are currently a member of the group [GROUP].
+You are currently a member of the group &lt;nolink&gt;[GROUP]&lt;/nolink&gt;.
Leave Group?
<tag>group</tag>
<tag>confirm</tag>
@@ -6953,6 +6953,26 @@ With the following Residents:
<notification
icon="notifytip.tga"
+ name="ShareFolderConfirmation"
+ type="alertmodal">
+Only one folder at a time can be shared.
+
+Are you sure you want to share the following items:
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+With the following Residents:
+
+[RESIDENTS]
+ <tag>confirm</tag>
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="Ok"/>
+ </notification>
+
+ <notification
+ icon="notifytip.tga"
name="ItemsShared"
type="notifytip">
Items successfully shared.