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_snapshot_postcard.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_snapshot_postcard.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml index 569c07ad47..9cb0b8f116 100644 --- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml +++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="panel_snapshot_postcard"> <string name="default_subject"> - [SECOND_LIFE] からのポストカードです。 + [SECOND_LIFE]からのポストカードです。 </string> <string name="default_message"> ぜひご覧ください！ </string> <string name="upload_message"> - 送信中... + 送信中… </string> <text name="title"> - E メール + Ｅメール </text> <tab_container name="postcard_tabs"> <panel label="メッセージ" name="panel_postcard_message"/> <panel label="設定" name="panel_postcard_settings"/> </tab_container> - <button label="取り消し" name="cancel_btn"/> + <button label="キャンセル" name="cancel_btn"/> <button label="送信" name="send_btn"/> </panel> |