From ee349d1bf28e70377686f1a3bf1a22de55c22806 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sun, 5 Jun 2011 08:00:38 -0400
Subject: [PATCH] FIRE-1197, Objct menu improvements and translation, from
 Ansariel.

---
 indra/newview/skins/default/xui/de/menu_object.xml | 13 +++++++++++--
 indra/newview/skins/default/xui/en/menu_object.xml |  4 +---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 91d7f5a25e..a9aec75fbd 100644
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -8,7 +8,16 @@
 	<menu_item_call label="Öffnen" name="Open"/>
 	<menu_item_call label="Hier sitzen" name="Object Sit"/>
 	<menu_item_call label="Aufstehen" name="Object Stand Up"/>
-	<menu_item_call label="Objektprofil" name="Object Inspect"/>
+	<context_menu label="Objekt" name="Object Features">
+		<menu_item_call label="Objektprofil" name="Object Inspect"/>
+		<menu_item_call label="Untersuchen" name="Object_Inspect_Floater"/>
+		<menu_item_call label="Verknüpfen" name="Object Link"/>
+		<menu_item_call label="Verknüpfung auflösen" name="Object Unlink"/>
+		<menu_item_check label="Verknüpfte Teile bearbeiten" name="Object Edit Linked Parts"/>
+		<menu_item_call label="Skripte zurücksetzen" name="Object Reset Scripts"/>
+		<menu_item_call label="Skripte ausführen" name="Object Set Scripts to Running"/>
+		<menu_item_call label="Skripte stoppen" name="Object Set Scripts to Not Running"/>
+	</context_menu>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<context_menu label="Anziehen" name="Put On">
 		<menu_item_call label="Anziehen" name="Wear"/>
@@ -19,8 +28,8 @@
 	<context_menu label="Entfernen" name="Remove">
 		<menu_item_call label="Missbrauch melden" name="Report Abuse..."/>
 		<menu_item_call label="Ignorieren" name="Object Mute"/>
-		<menu_item_call label="Zurückgeben" name="Return..."/>
 	</context_menu>
+	<menu_item_call label="Zurückgeben" name="Return..."/>
 	<menu_item_call label="Nehmen" name="Pie Object Take"/>
 	<menu_item_call label="Kopie nehmen" name="Take Copy"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index caa59ff81f..f1c6a928ce 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -74,7 +74,7 @@
       </menu_item_call>
       <menu_item_call
          label="Inspect"
-         name="Object Inspect">
+         name="Object_Inspect_Floater">
         <menu_item_call.on_click
          function="Floater.Show"
          parameter="inspect" />
@@ -104,8 +104,6 @@
          <menu_item_check.on_enable function="Tools.EnableToolNotPie" />
          </menu_item_check>
    <menu_item_separator layout="topleft" />
-    label="Scripts"
-    name="Object Scripts">
        <menu_item_call
           label="Reset Scripts"
           name="Object Reset Scripts">