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_experience_log.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_experience_log.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_experience_log.xml | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml index 16976df035..541a1e34cf 100644 --- a/indra/newview/skins/default/xui/ja/panel_experience_log.xml +++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml @@ -1,24 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="EVENTS"> - <string name="no_events" value="イベントなし。"/> - <string name="loading" value="ローディング..."/> - <layout_stack> - <layout_panel> +<panel name="panel_experience_log" label="イベント"> + <string name="no_events" value="イベントはありません。"/> + <string name="loading" value="読み込んでいます…。"/> + <layout_stack name="ls1"> + <layout_panel name="list panel"> <scroll_list name="experience_log_list"> - <columns label="時間" name="time"/> - <columns label="イベント" name="event"/> - <columns label="体験" name="experience_name"/> - <columns label="オブジェクト" name="object_name"/> + <columns name="time" label="時間"/> + <columns name="event" label="イベント"/> + <columns name="experience_name" label="体験"/> + <columns name="object_name" label="オブジェクト"/> </scroll_list> - <button label="知らせる" name="btn_notify"/> - <button label="プロフィール" name="btn_profile_xp"/> - <button label="報告" name="btn_report_xp"/> + <button name="btn_notify" label="通知"/> + <button name="btn_profile_xp" label="プロフィール"/> + <button name="btn_report_xp" label="報告"/> </layout_panel> <layout_panel name="button_panel"> - <check_box label="すべてのイベント 日数を通知" name="notify_all"/> - <button label="クリア" name="btn_clear"/> - <button label="<" name="btn_prev"/> - <button label=">" name="btn_next"/> + <check_box label="すべてのイベント日数を通知" name="notify_all"/> + <spinner name="logsizespinner"/> + <button name="btn_clear" label="クリア"/> + <button name="btn_prev" label="⇦"/> + <button name="btn_next" label="⇨"/> </layout_panel> </layout_stack> </panel> |