diff options
| author | Callum Prentice <callum@gmail.com> | 2020-09-22 13:07:39 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-09-22 13:07:39 -0700 |
| commit | 38faec3b11d27c2f88b89283fe1a3a60d6ec4e42 (patch) | |
| tree | cc2c7f22a38a2efba72eeb01124c3f873c3a1f83 /indra/newview/skins/default/xui/ja | |
| parent | 14b5d490c37d234db7a52295502b130723186f3c (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge branch 'master' into DRTVWR-519
Diffstat (limited to 'indra/newview/skins/default/xui/ja')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_buy_currency.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml | 12 |
2 files changed, 6 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml index a472f163e3..ac2db917cc 100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml @@ -59,8 +59,7 @@ </text> <button label="購入する" name="buy_btn"/> <button label="取り消し" name="cancel_btn"/> - <text name="info_cannot_buy"> + <floater.string name="info_cannot_buy"> 購入できません - </text> - <button label="Web サイトに移動" name="error_web" width="140"/> + </floater.string> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml index 05e7bfefd2..1221702e9b 100644 --- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml @@ -9,14 +9,10 @@ <text name="Multiple"> 複数のテクスチャ </text> - <radio_group name="mode_selection"> - <radio_item label="インベントリ" name="inventory" value="0"/> - <radio_item label="ローカル" name="local" value="1"/> - <radio_item label="構築（ベーク）" name="bake" value="2"/> - </radio_group> - <text name="unknown"> - サイズ： [DIMENSIONS] - </text> + <combo_box name="mode_selection"> + <combo_box.item label="インベントリ" name="inventory" value="0"/> + <combo_box.item label="ローカル" name="local" value="1"/> + </combo_box> <button label="デフォルト" label_selected="デフォルト" name="Default"/> <button label="ブランク" label_selected="ブランク" name="Blank"/> <button label="なし" label_selected="なし" name="None"/> |