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_voice_effect.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_voice_effect.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/panel_voice_effect.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml index 530f0fb59d..57a1bb7838 100644 --- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml +++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml @@ -4,12 +4,12 @@ ボイスモーフィングなし </string> <string name="preview_voice_effects"> - ボイスモーフィングをプレビュー ▶ + ボイスモーフィングをプレビュー </string> <string name="get_voice_effects"> - ボイスモーフィングを取得 ▶ + ボイスモーフィングを取得 </string> - <combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択して音声を変更"> + <combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択してボイスを変更"> <combo_box.item label="ボイスモーフィングなし" name="no_voice_effect"/> </combo_box> </panel> |