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_post_process.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_post_process.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/floater_post_process.xml | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml index 7c4d9c78ee..91ecbb73a2 100644 --- a/indra/newview/skins/default/xui/ja/floater_post_process.xml +++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml @@ -1,27 +1,27 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Post-Process Floater" title="ポストプロセス設定"> <tab_container name="Post-Process Tabs"> - <panel label="カラー・フィルター" name="wmiColorFilterPanel"> - <check_box label="有効" name="wmiColorFilterToggle" /> + <panel label="カラー・フィルタ" name="wmiColorFilterPanel"> + <check_box label="有効" name="wmiColorFilterToggle"/> <text name="wmiColorFilterBrightnessText"> - 明るさ + 明度 </text> <text name="wmiColorFilterSaturationText"> 彩度 </text> <text name="wmiColorFilterContrastText"> - コントラスト + 輝度 </text> <text name="wmiColorFilterBaseText"> - コントラストの基本色 + 輝度の基準色 </text> - <slider label="R" name="wmiColorFilterBaseR" /> - <slider label="G" name="wmiColorFilterBaseG" /> - <slider label="B" name="wmiColorFilterBaseB" /> - <slider label="I" name="wmiColorFilterBaseI" /> + <slider label="赤" name="wmiColorFilterBaseR"/> + <slider label="緑" name="wmiColorFilterBaseG"/> + <slider label="青" name="wmiColorFilterBaseB"/> + <slider label="I" name="wmiColorFilterBaseI"/> </panel> - <panel label="ナイトビジョン" name="wmiNightVisionPanel"> - <check_box label="有効" name="wmiNightVisionToggle" /> + <panel label="暗視" name="wmiNightVisionPanel"> + <check_box label="有効" name="wmiNightVisionToggle"/> <text name="wmiNightVisionBrightMultText"> 光の増幅(マルチ) </text> @@ -33,7 +33,7 @@ </text> </panel> <panel label="ブルーム" name="wmiBloomPanel"> - <check_box label="有効" name="wmiBloomToggle" /> + <check_box label="有効" name="wmiBloomToggle"/> <text name="wmiBloomExtractText"> 明度の抽出 </text> @@ -45,10 +45,9 @@ </text> </panel> <panel label="その他" name="Extras"> - <button label="効果読み込み" label_selected="効果読み込み" - name="PPLoadEffect" /> - <button label="効果保存" label_selected="効果保存" name="PPSaveEffect" /> - <line_editor label="効果名" name="PPEffectNameEditor" /> + <button label="効果読み込み" label_selected="効果読み込み" name="PPLoadEffect"/> + <button label="効果保存" label_selected="効果保存" name="PPSaveEffect"/> + <line_editor label="効果名" name="PPEffectNameEditor"/> </panel> </tab_container> </floater> |