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/panel_experiences.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/panel_experiences.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_experiences.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_experiences.xml b/indra/newview/skins/default/xui/ja/panel_experiences.xml index ab0d2a97a4..11bbf784b3 100644 --- a/indra/newview/skins/default/xui/ja/panel_experiences.xml +++ b/indra/newview/skins/default/xui/ja/panel_experiences.xml @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Experiences"> - <string name="loading_experiences" value="体験をロード中..."/> - <string name="no_experiences" value="体験がありません。"/> - <string name="acquire" value="体験を取得"/> +<panel name="panel_experiences" label="体験"> + <string name="loading_experiences" value="体験を読み込んでいます…"/> + <string name="no_experiences" value="体験はありません。"/> + <string name="acquire" value="体験する"/> + <layout_stack> + <layout_panel> + <flat_list_view name="experiences_list"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="btn_action"/> + </layout_panel> + </layout_stack> </panel> |