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_sound_devices.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_sound_devices.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/panel_sound_devices.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml index d57e6c796c..ecd8c1caa6 100644 --- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="機器の設定" name="device_settings_panel"> <panel.string name="default_text"> デフォルト </panel.string> <string name="name_no_device"> - 機器が設定されていません + 機器が設定されていません。 </string> <string name="name_default_system_device"> デフォルトのシステム機器 @@ -16,9 +16,9 @@ 出力 </text> <text name="My volume label"> - マイク音量: + マイク音量: </text> - <slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します"/> + <slider_bar name="mic_volume_slider" tool_tip="スライダーを使ってマイクレベルを調節します。"/> <text name="wait_text"> しばらくお待ちください。 </text> |