diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-03 19:28:18 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-03 19:42:47 +0300 |
commit | 13f1273c1d0cd7af382b282bd54da2b7efcc70b3 (patch) | |
tree | 31a0e89bd7fe86a91b0fccf3f33642af0741c7bc /indra/newview/skins/default/xui/ja/panel_main_inventory.xml | |
parent | 78f5dbd95f1295af14093807ca125b92e6f5a9d3 (diff) | |
parent | 2465470817957c8378e81ec1a7e32551fbac7b26 (diff) |
Merge branch 'main' into DRTVWR-588-maint-W
# Conflicts:
# indra/llui/lltooltip.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/textures/textures.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ja/panel_main_inventory.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/panel_main_inventory.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml index 9d78beb9da..a38492c6d1 100644 --- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml @@ -9,6 +9,7 @@ <panel.string name="ItemcountUnknown"> [ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得しました。[FILTER] </panel.string> + <panel.string name="inventory_title">インベントリ</panel.string> <text name="ItemcountText"> アイテム: </text> |