summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-12-04 14:52:19 -0800
committerMerov Linden <merov@lindenlab.com>2012-12-04 14:52:19 -0800
commit90f9f5dbad8a0e6dc20b3f7fc58527e572a6b3f7 (patch)
tree2b6d67485b851d3c9a7adcad4709fed64b11c428 /indra/newview/skins/default/xui/en/strings.xml
parentb43c8afc36a11c34fa76443be85430cac6c72c42 (diff)
parent3f6f374c2566c85e1a9480da674bfc2172dd9162 (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a884ac94d6..c75bd98c38 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3400,7 +3400,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Connecting...
</string>
<string name="conference-title">
- Ad-hoc Conference
+ Multi-person chat
</string>
<string name="conference-title-incoming">
Conference with [AGENT_NAME]