summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2009-11-11 10:59:31 +0000
committerLynx Linden <lynx@lindenlab.com>2009-11-11 10:59:31 +0000
commitd5f3e6b2a82fa166179943fab435f69059f6686b (patch)
treed8a663de234a09315aaeaa95b42db4aafc0a9212 /indra/newview/skins/default/xui
parent3cfd8a7ae8fb760fccfc992d8185db7bb37ff4ec (diff)
parent162924aadfb6a7312287d91a25a129885239c0a4 (diff)
Automated merge with file:///home/lynx/hg/general/viewer-2-0
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c850dce141..b0a406a277 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2863,6 +2863,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="answering-im">
Connecting...
</string>
+ <string name="conference-title">
+ Friends Conference
+ </string>
<string name="inventory_item_offered-im">
Inventory item offered
</string>