Skip to content
Snippets Groups Projects
Commit a80c7909 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-457

parents d3a77927 f23d6c22
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ a80c7909
......@@ -449,6 +449,7 @@ Jonathan Yap
STORM-1313
STORM-899
STORM-1273
STORM-457
STORM-1292
STORM-1392
STORM-1302
......
indra/newview/skins/default/xui/ja/strings.xml
+ 1
− 1
View file @ a80c7909
......@@ -3821,7 +3821,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
アドホックコンファレンス
</string>
<string name="conference-title-incoming">
[AGENT_NAME]とコンファレンスする
[AGENT_NAME] とコンファレンスする
</string>
<string name="inventory_item_offered-im">
持ち物アイテムを送りました
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment