diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 15:37:25 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-04-21 15:37:25 +0300 |
| commit | 4cf42435733a111610a13620c56728b1b659b1e9 (patch) | |
| tree | 5ac5ac10070448dcfdf38bf36e23ea9b6b766f95 /indra/newview/skins/default/xui/ja/menu_inventory.xml | |
| parent | dcb6b5489d2c3cfdb13d5862f8cb29fee06745a7 (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ja/menu_inventory.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/menu_inventory.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml index 0b06b77901..ec16f1cf17 100644 --- a/indra/newview/skins/default/xui/ja/menu_inventory.xml +++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml @@ -10,7 +10,6 @@ <menu_item_call label="有効にする" name="Marketplace Activate"/> <menu_item_call label="無効にする" name="Marketplace Deactivate"/> <menu_item_call label="共有" name="Share"/> - <menu_item_call label="購入" name="Task Buy"/> <menu_item_call label="開く" name="Task Open"/> <menu_item_call label="再生" name="Task Play"/> <menu_item_call label="プロパティ" name="Task Properties"/> @@ -34,6 +33,7 @@ <menu_item_call label="新しいパンツ" name="New Underpants"/> <menu_item_call label="新しいアルファマスク" name="New Alpha Mask"/> <menu_item_call label="新しいタトゥ" name="New Tattoo"/> + <menu_item_call label="新しいユニバーサル" name="New Universal"/> <menu_item_call label="新規の物理作用" name="New Physics"/> </menu> <menu label="新しい身体部位" name="New Body Parts"> @@ -42,6 +42,11 @@ <menu_item_call label="新しい髪" name="New Hair"/> <menu_item_call label="新しい眼" name="New Eyes"/> </menu> + <menu label="新しい設定" name="New Settings"> + <menu_item_call label="新しい空" name="New Sky"/> + <menu_item_call label="新しい水" name="New Water"/> + <menu_item_call label="新しいデイサイクル" name="New Day Cycle"/> + </menu> <menu label="次のデフォルトとして使用" name="upload_def"> <menu_item_call label="画像のアップロード" name="Image uploads"/> <menu_item_call label="サウンドのアップロード" name="Sound uploads"/> @@ -103,6 +108,8 @@ <menu_item_call label="編集" name="Wearable Edit"/> <menu_item_call label="追加" name="Wearable Add"/> <menu_item_call label="取り外す" name="Take Off"/> + <menu_item_call label="自分にのみ適用" name="Settings Apply Local"/> + <menu_item_call label="区画に適用" name="Settings Apply Parcel"/> <menu_item_call label="マーケットプレイスのリストにコピー" name="Marketplace Copy"/> <menu_item_call label="マーケットプレイスのリストに移動" name="Marketplace Move"/> <menu_item_call label="－－オプションなし－－" name="--no options--"/> |