summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-11-30 05:26:07 -0500
committerJonathan Yap <none@none>2011-11-30 05:26:07 -0500
commit93dbcb4dc8b22ebbdd7c97854b3559502c68ed43 (patch)
tree57a59bb02d2e1d8caa9d63849c0e06a2218341dc
parentd22584bfe51c034076d9e8df01f70628abc22f85 (diff)
STORM-1719 notifications.xml has two instances where a button shows as "Ok" and Not "OK"
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml4
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9f6de781b4..ce1dc07c49 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -589,6 +589,7 @@ Jonathan Yap
STORM-1659
STORM-1674
STORM-1685
+ STORM-1719
Kadah Coba
STORM-1060
Jondan Lundquist
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>