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_settings_picker.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_settings_picker.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_settings_picker.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml index b8b1699f03..ffef8733cf 100644 --- a/indra/newview/skins/default/xui/ja/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/ja/floater_settings_picker.xml @@ -10,20 +10,20 @@ 設定を選択 </floater.string> <floater.string name="track_water"> - 水 + 水面 </floater.string> <floater.string name="track_ground"> 地面 </floater.string> <floater.string name="track_sky"> - 空 [NUM] + 空[NUM] </floater.string> <layout_stack name="test_stack"> <layout_panel name="inv_list"> - <filter_editor label="テクスチャをフィルター" name="flt_inventory_search"/> + <filter_editor label="テクスチャをフィルタ" name="flt_inventory_search"/> </layout_panel> <layout_panel name="temp"> - <button label="OK" label_selected="OK" name="btn_select"/> + <button label="ＯＫ" label_selected="ＯＫ" name="btn_select"/> <button label="キャンセル" label_selected="キャンセル" name="btn_cancel"/> </layout_panel> </layout_stack> |