diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 06:36:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 06:36:25 -0400 |
| commit | a80c79097d24133a9ff9ce6288a2ace506ef0946 (patch) | |
| tree | d637fa2f144fcf8a13fe135521d4c32d10c3e73d | |
| parent | d3a7792703028531618f8516110f13bb599b13ea (diff) | |
| parent | f23d6c22b4b2451c68ee49ae8d66f4ac8be68b64 (diff) | |
merge changes for storm-457
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/strings.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 59147d69a4..59c6786a51 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -449,6 +449,7 @@ Jonathan Yap STORM-1313 STORM-899 STORM-1273 + STORM-457 STORM-1292 STORM-1392 STORM-1302 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"> 持ち物アイテムを送りました |