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_volume_pulldown.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_volume_pulldown.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml index 967dedf061..849a65d0c1 100644 --- a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml @@ -4,11 +4,11 @@ <slider label="ボタン" name="UI Volume"/> <slider label="環境音" name="Wind Volume"/> <slider label="サウンド" name="SFX Volume"/> - <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする"/> + <check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする。"/> <slider label="音楽" name="Music Volume"/> - <check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする"/> + <check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする。"/> <slider label="メディア" name="Media Volume"/> - <check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする"/> + <check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする。"/> <slider label="ボイス" name="Voice Volume"/> - <check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする"/> + <check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする。"/> </panel> |