diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /indra/newview/skins/default/xui/ja/floater_import_collada.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_import_collada.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_import_collada.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml index 65edafb169..a5a62d6304 100644 --- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml +++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Import Collada" title="風景のインポート"> <text name="mesh count"> - メッシュ： [COUNT] + メッシュ：[COUNT] </text> <text name="texture count"> - テクスチャ： [COUNT] + テクスチャ：[COUNT] </text> <text name="status"> - ステータス： [STATUS] + ステータス：[STATUS] </text> - <button label="取り消し" name="cancel"/> - <button label="OK" name="ok"/> + <button label="キャンセル" name="cancel"/> + <button label="ＯＫ" name="ok"/> <string name="status_idle"> 待機状態 </string> |