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_region_general.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_region_general.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_region_general.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml index d23007dc6b..2e4ee72b28 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="地域" name="General"> +<panel label="リージョン（地域）" name="General"> <text name="region_text_lbl"> - 地域： + リージョン（地域）： </text> <text left_delta="70" name="region_text"> 未知 </text> - <text name="version_channel_text_lbl" width="100"> + <text name="version_channel_text_lbl"> バージョン： </text> <text left_delta="70" name="version_channel_text"> @@ -37,8 +37,8 @@ <icons_combo_box.item label="General" name="PG" value="13"/> </icons_combo_box> <button label="適用" name="apply_btn"/> - <button label="住人 1 名をホームにテレポート..." name="kick_btn"/> - <button label="住人全員をホームにテレポート..." name="kick_all_btn"/> - <button label="メッセージを地域に送信..." name="im_btn"/> - <button label="テレハブの管理..." name="manage_telehub_btn"/> + <button label="住人 1 名をホームにテレポート…" name="kick_btn"/> + <button label="住人全員をホームにテレポート…" name="kick_all_btn"/> + <button label="メッセージを地域に送信…" name="im_btn"/> + <button label="テレハブの管理…" name="manage_telehub_btn"/> </panel> |