diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml | |
parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml index 58948180eb..506614316e 100644 --- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
- <menu_item_call label="触る" name="touch"/>
- <menu_item_call label="座る" name="sit"/>
- <menu_item_call label="支払う" name="pay"/>
- <menu_item_call label="買う" name="buy"/>
- <menu_item_call label="取る" name="take"/>
- <menu_item_call label="コピーを取る" name="take_copy"/>
- <menu_item_call label="開く" name="open"/>
- <menu_item_call label="編集" name="edit"/>
- <menu_item_call label="装着" name="wear"/>
- <menu_item_call label="報告" name="report"/>
- <menu_item_call label="ブロック" name="block"/>
- <menu_item_call label="ズームイン" name="zoom_in"/>
- <menu_item_call label="削除" name="remove"/>
- <menu_item_call label="詳細" name="more_info"/>
-</menu>
+<?xml version="1.0" encoding="utf-8"?> +<menu name="Gear Menu"> + <menu_item_call label="触る" name="touch"/> + <menu_item_call label="座る" name="sit"/> + <menu_item_call label="支払う" name="pay"/> + <menu_item_call label="買う" name="buy"/> + <menu_item_call label="取る" name="take"/> + <menu_item_call label="コピーを取る" name="take_copy"/> + <menu_item_call label="開く" name="open"/> + <menu_item_call label="編集" name="edit"/> + <menu_item_call label="装着" name="wear"/> + <menu_item_call label="報告" name="report"/> + <menu_item_call label="ブロック" name="block"/> + <menu_item_call label="ズームイン" name="zoom_in"/> + <menu_item_call label="削除" name="remove"/> + <menu_item_call label="詳細" name="more_info"/> +</menu> |