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/menu_im_conversation.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/menu_im_conversation.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/menu_im_conversation.xml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml index 55cd6610f7..b3d3917965 100644 --- a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml +++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml @@ -3,13 +3,14 @@ <menu_item_call label="プロフィールを表示" name="View Profile"/> <menu_item_call label="フレンド登録" name="Add Friend"/> <menu_item_call label="フレンドを削除" name="remove_friend"/> - <menu_item_call label="テレポートを送る" name="offer_teleport"/> - <menu_item_call label="グループに招待..." name="invite_to_group"/> - <menu_item_call label="チャットの履歴..." name="chat_history"/> + <menu_item_call label="テレポートをオファー" name="offer_teleport"/> + <menu_item_call label="グループに招待…" name="invite_to_group"/> + <menu_item_call label="チャットの履歴…" name="chat_history"/> <menu_item_call label="ズームイン" name="zoom_in"/> - <menu_item_call label="地図" name="map"/> + <menu_item_call label="マップ" name="map"/> <menu_item_call label="共有" name="Share"/> <menu_item_call label="支払い" name="Pay"/> - <menu_item_check label="ボイスをブロック" name="Block/Unblock"/> - <menu_item_check label="文字をブロックする" name="MuteText"/> + <menu_item_call label="迷惑行為の報告" name="Report Abuse"/> + <menu_item_check label="ボイスのブロック／解除" name="Block/Unblock"/> + <menu_item_check label="テキストをブロックする" name="MuteText"/> </toggleable_menu> |