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_web.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_web.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_profile_web.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_web.xml b/indra/newview/skins/default/xui/ja/panel_profile_web.xml index 4f56a7e98d..4091d4826c 100644 --- a/indra/newview/skins/default/xui/ja/panel_profile_web.xml +++ b/indra/newview/skins/default/xui/ja/panel_profile_web.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Web" name="panel_profile_web"> - <panel.string name="LoadTime" value="ロード時間：[TIME] 秒"/> + <panel.string name="LoadTime" value="ロード時間：[TIME]秒"/> <line_editor name="url_edit"> - (ロード中...) + （読み込んでいます…） </line_editor> <flyout_button label="ロード" name="load" tool_tip="このプロフィールページを、組み込み Web ブラウザでロードします。"> - <flyout_button.item label="ビューワ内のブラウザを開く" name="open_item"/> + <flyout_button.item label="ビューア内のブラウザを開く" name="open_item"/> <flyout_button.item label="外部ブラウザを開く" name="home_item"/> </flyout_button> <button name="web_profile_popout_btn" tool_tip="Web プロフィールのポップアウト"/> |