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_group_info_sidetray.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_group_info_sidetray.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml index bd1013d6ca..70670d3cac 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="グループインベントリ" name="GroupInfo"> <panel.string name="default_needs_apply_text"> - 保存していない変更があります + 保存していない変更があります。 </panel.string> <panel.string name="want_apply_text"> 変更を保存しますか？ </panel.string> <panel.string name="group_join_btn"> - 参加 （L$[AMOUNT]） + 入会費（L$ [AMOUNT]） </panel.string> <panel.string name="group_join_free"> 無料 </panel.string> <panel name="group_info_top"> - <text_editor name="group_name" value="（ローディング...）"/> + <text_editor name="group_name" value="（読み込んでいます…）"/> <line_editor label="新しいグループの名前を入力してください" name="group_name_editor"/> </panel> <layout_stack name="layout"> <layout_panel name="group_accordions"> <accordion name="groups_accordion"> <accordion_tab name="group_general_tab" title="一般"/> - <accordion_tab name="group_roles_tab" title="役割 & メンバー"/> + <accordion_tab name="group_roles_tab" title="役割とメンバー"/> <accordion_tab name="group_notices_tab" title="通知"/> <accordion_tab name="group_land_tab" title="土地・資産"/> <accordion_tab name="group_experiences_tab" title="体験"/> |