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/floater_im_container.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/floater_im_container.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_im_container.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml index a155efdc1e..83ccb3995c 100644 --- a/indra/newview/skins/default/xui/ja/floater_im_container.xml +++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml @@ -6,12 +6,12 @@ <layout_panel name="conversations_layout_panel"> <layout_stack name="conversations_pane_buttons_stack"> <layout_panel name="conversations_pane_buttons_expanded"> - <menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/> + <menu_button name="sort_btn" tool_tip="オプションの表示／並べ替え"/> <button name="add_btn" tool_tip="新しい会話を開始"/> <button name="speak_btn" tool_tip="マイクを使って人と話す"/> </layout_panel> <layout_panel name="conversations_pane_buttons_collapsed"> - <button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/> + <button name="expand_collapse_btn" tool_tip="このリストを閉じる／開く"/> </layout_panel> </layout_stack> </layout_panel> |