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_sound_preview.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_sound_preview.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_sound_preview.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml index 7d83309c46..b55a664cfa 100644 --- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml @@ -6,10 +6,10 @@ <text name="description_label"> 説明： </text> - <button label="取り消し" label_selected="取り消し" name="cancel_btn"/> - <button label="アップロード （L$[AMOUNT]）" label_selected="アップロード （L$[AMOUNT]）" name="ok_btn"/> + <button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/> + <button label="アップロード（L$[AMOUNT]）" label_selected="アップロード（L$ [AMOUNT]）" name="ok_btn"/> <text name="text"> - ビットレート(kbps)： + ビットレート（kbps）： </text> <radio_group name="bitrate"> <radio_item label="32" name="32"/> |