diff options
| author | Richard Linden <none@none> | 2012-01-05 10:59:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-05 10:59:29 -0800 |
| commit | 66fcc2da3925cd16939e4438dad749b2c22dbc27 (patch) | |
| tree | 771fe7786750454ad478773d7045accb4a353b53 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) | |
| parent | 9c8f6ba6a51b799d16e89e995bbcf3b0dcc15c62 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 22 |
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 <nolink>[GROUP]</nolink>. 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: + +<nolink>[ITEMS]</nolink> + +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. |