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_object_weights.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_object_weights.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/floater_object_weights.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml index d727a268fb..18a6b77f8e 100644 --- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml +++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml @@ -1,28 +1,28 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="object_weights" title="詳しい設定"> - <floater.string name="nothing_selected" value="--"/> + <floater.string name="nothing_selected" value="─"/> <text name="selected_text" value="選択済"/> - <text name="objects" value="--"/> + <text name="objects" value="─"/> <text name="objects_label" value="オブジェクト"/> - <text name="prims" value="--"/> + <text name="prims" value="─"/> <text name="prims_label" value="プリム"/> <text name="weights_of_selected_text" value="選択済みアイテムのウエイト"/> - <text name="download" value="--"/> + <text name="download" value="─"/> <text name="download_label" value="ダウンロード"/> - <text name="physics" value="--"/> + <text name="physics" value="─"/> <text name="physics_label" value="物理効果"/> - <text name="server" value="--"/> + <text name="server" value="─"/> <text name="server_label" value="サーバー"/> - <text name="display" value="--"/> + <text name="display" value="─"/> <text name="display_label" value="ディスプレイ"/> <text name="land_impacts_text" value="土地の負荷"/> - <text name="selected" value="--"/> + <text name="selected" value="─"/> <text name="selected_label" value="選択済"/> - <text name="rezzed_on_land" value="--"/> + <text name="rezzed_on_land" value="─"/> <text name="rezzed_on_land_label" value="土地に Rez 済み"/> - <text name="remaining_capacity" value="--"/> + <text name="remaining_capacity" value="─"/> <text name="remaining_capacity_label" value="残りの許容数"/> - <text name="total_capacity" value="--"/> + <text name="total_capacity" value="─"/> <text name="total_capacity_label" value="許容合計"/> <text name="help_SLURL" value="[secondlife:///app/help/object_weights オブジェクトのウェイトとは？]"/> </floater> |