summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-01 13:27:27 -0500
committerOz Linden <oz@lindenlab.com>2011-12-01 13:27:27 -0500
commit34b44fe714cb8f9e5962b975474400b07599cff8 (patch)
treec48cb7b0a6401449a47171d633abc7ad0b2c9767 /indra/newview/skins/default/xui
parent5bad3eda9244caa3b4c253e25644966ff850931b (diff)
parent93dbcb4dc8b22ebbdd7c97854b3559502c68ed43 (diff)
merge changes for storm-1719
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e4458f33b1..4e4eea0354 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6939,7 +6939,7 @@ With the following Residents:
<usetemplate
name="okcancelbuttons"
notext="Cancel"
- yestext="Ok"/>
+ yestext="OK"/>
</notification>
<notification
@@ -7135,7 +7135,7 @@ Mute everyone?
<usetemplate
ignoretext="Confirm before I mute all participants in a group call"
name="okcancelignore"
- yestext="Ok"
+ yestext="OK"
notext="Cancel">
<unique/>
</usetemplate>