summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-18 11:17:39 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-18 11:17:39 +0100
commit9b0da85a4742b65ec0459e36982d01890a57e5be (patch)
treea64f49cbb4abc1405579a3d2a3117999b98275db /indra/newview/skins
parent01b1d3cc951ea3b04ff3bac79ab2fadfd9429ca7 (diff)
parent98c49322c16c49eef9ef1e335b4016b4db609ac9 (diff)
merge storm-153
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3fa5c7afec..6b3fd9ff9e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3029,7 +3029,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Ad-hoc Conference
</string>
<string name="conference-title-incoming">
- [AGENT_NAME] Conference
+ Conference with [AGENT_NAME]
</string>
<string name="inventory_item_offered-im">
Inventory item offered
@@ -3039,6 +3039,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
</string>
+ <string name="no_session_message">
+ (IM Session Doesn't Exist)
+ </string>
<string name="only_user_message">
You are the only user in this session.
</string>