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_profile_pick.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_profile_pick.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_profile_pick.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml index 0a20c04ad6..3b952458d3 100644 --- a/indra/newview/skins/default/xui/ja/panel_profile_pick.xml +++ b/indra/newview/skins/default/xui/ja/panel_profile_pick.xml @@ -4,10 +4,10 @@ （掲載後更新） </panel.string> <line_editor name="pick_location"> - ロード中... + （読み込んでいます…） </line_editor> <button label="テレポート" name="teleport_btn"/> - <button label="地図に表示" name="show_on_map_btn"/> + <button label="マップに表示" name="show_on_map_btn"/> <button label="場所を設定" name="set_to_curr_location_btn" tool_tip="現在地に設定"/> <button label="ピックを保存" name="save_changes_btn"/> </panel> |