diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-08-23 22:28:01 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-08-23 22:28:01 +0300 |
commit | d08859f3f4ba8ed68d018fba033b652926d1bf6b (patch) | |
tree | fd62430b9a2987ca2eab8a8f08114f113de84120 /indra/newview/skins/default/xui/ja/floater_conversation_log.xml | |
parent | f40b85c4f495b9079991c41a26b76d397a6168ae (diff) | |
parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) |
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_conversation_log.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/floater_conversation_log.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml index 98b1a59a0d..3742030dff 100644 --- a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml +++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_conversation_log" title="会話ログ"> <panel name="buttons_panel"> - <filter_editor label="人をフィルター" name="people_filter_input"/> - <menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/> + <filter_editor label="人物をフィルタ" name="people_filter_input"/> + <menu_button name="conversation_view_btn" tool_tip="表示/並べ替えのオプション"/> <menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/> </panel> </floater> |