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_preferences_alerts.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_preferences_alerts.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml index 4c2906cc18..1137907fec 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml @@ -3,10 +3,10 @@ <text name="tell_me_label"> 知らせる： </text> - <check_box label="L$ を使用する場合" name="notify_money_spend_checkbox"/> - <check_box label="フレンドがログイン・ログアウトするとき" name="friends_online_notify_checkbox"/> - <check_box label="L$ を手に入れる場合" name="notify_money_received_checkbox"/> - <text name="show_label" width="300"> + <check_box label="L$の使用時" name="notify_money_spend_checkbox"/> + <check_box label="フレンドのログイン状態変化時" name="friends_online_notify_checkbox"/> + <check_box label="L$の入手時" name="notify_money_received_checkbox"/> + <text name="show_label"> 常に表示するメッセージ： </text> <text name="dont_show_label"> |