diff options
author | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 18:03:36 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-12 18:03:36 +0000 |
commit | c0ff08e0b4af5ce58a47321f39c69c1d24600d1e (patch) | |
tree | 7626bfcb4589b7a2e27c3b9ea7d8a219aad49929 /indra/newview/skins/default/xui/en | |
parent | 74cb5c82a4e5eeb1ef722f73c96f64c4750db2be (diff) | |
parent | 700085a093c71023703b43ca19e7ba114f2183ff (diff) |
Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
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 ea66bfa197..761c17cfd2 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2863,7 +2863,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Connecting... </string> <string name="conference-title"> - Friends Conference + Ad-hoc Conference </string> <string name="inventory_item_offered-im"> Inventory item offered |