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_save_camera_preset.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_save_camera_preset.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml index c3d7db85c7..b12cf36fd3 100644 --- a/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml +++ b/indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml @@ -1,7 +1,17 @@ -<?xml version="1.0" ?> -<floater name="save_camera_preset" title="カメラプリセットを保存"> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="save_camera_preset" title="カメラプリセットの保存"> + <string name="btn_label_save"> + 保存 + </string> + <string name="btn_label_replace"> + 置き換え + </string> <radio_group name="radio_save_preset"> - <radio_item name="replace_preset" label="プリセットを交換する"/> - <radio_item name="new_preset" label="新しいプリセットとして保存する"/> + <radio_item label="新しいプリセットとして保存" name="new_preset"/> + <radio_item label="プリセットを置き換え" name="replace_preset"/> </radio_group> + <line_editor name="preset_txt_editor"/> + <button label="保存" name="save"/> + <button label="キャンセル" name="cancel"/> + <combo_box name="preset_combo"/> </floater> |