diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-08-20 17:58:03 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-08-20 17:58:03 +0300 |
| commit | 886d39f4899fe09d676968c811b3633ec0bcd597 (patch) | |
| tree | ab258ddc23fec1e6807ac4582916aaedcd398a37 /indra/newview/skins/default | |
| parent | d2b813fd79e4cf60d1670472c5a5f09ee9a2eed7 (diff) | |
| parent | effccb94489d41a533e76f5f5834d52e3e817cbd (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 37aa8bb787..d6d48130ab 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -31,6 +31,12 @@ <floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/> + <floater.string + name="participant_added" + value="[NAME] was invited to the conversation."/> + <floater.string + name="multiple_participants_added" + value="[NAME] were invited to the conversation."/> <view follows="all" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6df02a25af..64db7cd969 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4986,6 +4986,20 @@ Go to your [http://secondlife.com/account/ Dashboard] to see your account histor <notification icon="alertmodal.tga" + name="ConfirmAddingChatParticipants" + type="alertmodal"> + <unique/> +When you add a person to an existing conversation, a new conversation will be created. All participants will receive new conversation notifications. + <tag>confirm</tag> + <usetemplate + ignoretext="Confirm adding chat paticipants" + name="okcancelignore" + notext="Cancel" + yestext="Ok"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmQuit" type="alertmodal"> <unique/> |