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_openobject.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_openobject.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_openobject.xml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml index 3f2f71511b..b3743f03b2 100644 --- a/indra/newview/skins/default/xui/ja/floater_openobject.xml +++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="objectcontents" title="オブジェクトの中身"> +<floater name="objectcontents" title="オブジェクトのコンテンツ"> <text name="object_name"> - [DESC]: + [DESC]： </text> - <text name="border_note"> - インベントリおよびウェアにコピー - </text> - <button label="アウトフィットに追加" label_selected="アウトフィットに追加" name="copy_and_wear_button"/> - <button label="アウトフィットを交換" label_selected="アウトフィットを交換" name="copy_and_replace_button"/> - <button label="インベントリにコピーするだけ" label_selected="インベントリにコピーするだけ" name="copy_to_inventory_button"/> - <button label="取り消し" label_selected="取り消し" name="cancel_button"/> + <panel_inventory_object name="object_contents"/> + <button label="インベントリにコピーのみ" label_selected="インベントリにコピー" name="copy_to_inventory_button"/> + <button label="キャンセル" label_selected="キャンセル" name="cancel_button"/> </floater> |