Skip to content
Snippets Groups Projects
Commit 34b44fe7 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1719

parents 5bad3eda 93dbcb4d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ 34b44fe7
...@@ -590,6 +590,7 @@ Jonathan Yap ...@@ -590,6 +590,7 @@ Jonathan Yap
STORM-1674 STORM-1674
STORM-1685 STORM-1685
STORM-1721 STORM-1721
STORM-1719
Kadah Coba Kadah Coba
STORM-1060 STORM-1060
Jondan Lundquist Jondan Lundquist
......
indra/newview/skins/default/xui/en/notifications.xml
+ 2
− 2
View file @ 34b44fe7
...@@ -6939,7 +6939,7 @@ With the following Residents: ...@@ -6939,7 +6939,7 @@ With the following Residents:
<usetemplate <usetemplate
name="okcancelbuttons" name="okcancelbuttons"
notext="Cancel" notext="Cancel"
yestext="Ok"/> yestext="OK"/>
</notification> </notification>
<notification <notification
...@@ -7135,7 +7135,7 @@ Mute everyone? ...@@ -7135,7 +7135,7 @@ Mute everyone?
<usetemplate <usetemplate
ignoretext="Confirm before I mute all participants in a group call" ignoretext="Confirm before I mute all participants in a group call"
name="okcancelignore" name="okcancelignore"
yestext="Ok" yestext="OK"
notext="Cancel"> notext="Cancel">
<unique/> <unique/>
</usetemplate> </usetemplate>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment