summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-30 06:36:25 -0400
committerOz Linden <oz@lindenlab.com>2011-06-30 06:36:25 -0400
commita80c79097d24133a9ff9ce6288a2ace506ef0946 (patch)
treed637fa2f144fcf8a13fe135521d4c32d10c3e73d /indra/newview/skins/default
parentd3a7792703028531618f8516110f13bb599b13ea (diff)
parentf23d6c22b4b2451c68ee49ae8d66f4ac8be68b64 (diff)
merge changes for storm-457
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/ja/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index a6691fb764..ff22221aab 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -3821,7 +3821,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
アドホックコンファレンス
</string>
<string name="conference-title-incoming">
- [AGENT_NAME]とコンファレンスする
+ [AGENT_NAME] とコンファレンスする
</string>
<string name="inventory_item_offered-im">
持ち物アイテムを送りました