diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 2d036735bc..f1aa141d2e 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -142,6 +142,26 @@ bool isMarketplaceSendAction(const std::string& action)
     return ("send_to_marketplace" == action);
 }
 
+// <FS:PP> Submenus grouping
+namespace
+{
+    constexpr bool is_context_submenu_branch(std::string_view name)
+    {
+        return (name == "More") || (name == "create_new") || (name == INVENTORY_SUBMENU_MARKETPLACE) || (name == INVENTORY_SUBMENU_LINKS);
+    }
+}
+
+void add_context_submenu_entry(menuentry_vec_t& items, std::string_view submenu, std::string_view item)
+{
+    const auto submenu_it = std::find(items.cbegin(), items.cend(), submenu);
+    if (submenu_it == items.cend())
+    {
+        items.emplace_back(submenu);
+    }
+    items.emplace_back(item);
+}
+// </FS:PP>
+
 bool isPanelActive(const std::string& panel_name)
 {
     LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(false);
@@ -763,7 +783,10 @@ void disable_context_entries_if_present(LLMenuGL& menu,
 
         // descend into split menus:
         LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(menu_item);
-        if ((name == "More") && branchp)
+        // <FS:PP> Submenus grouping
+        // if ((name == "More") && branchp)
+        if (is_context_submenu_branch(name) && branchp)
+        // </FS:PP>
         {
             disable_context_entries_if_present(*branchp->getBranch(), disabled_entries);
         }
@@ -809,7 +832,10 @@ void hide_context_entries(LLMenuGL& menu,
 
         // descend into split menus:
         LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(menu_item);
-        if (((name == "More") || (name == "create_new")) && branchp)
+        // <FS:PP> Submenus grouping
+        // if (((name == "More") || (name == "create_new")) && branchp)
+        if (is_context_submenu_branch(name) && branchp)
+        // </FS:PP>
         {
             hide_context_entries(*branchp->getBranch(), entries_to_show, disabled_entries);
         }
@@ -947,7 +973,10 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
         {
             if (LLAssetType::lookupCanLink(obj->getType()))
             {
-                items.push_back(std::string("Find Links"));
+                // <FS:PP> Submenus grouping
+                // items.push_back(std::string("Find Links"));
+                add_context_submenu_entry(items, INVENTORY_SUBMENU_LINKS, "Find Links");
+                // </FS:PP>
             }
 
             if (!is_inbox && !single_folder_root)
@@ -1000,12 +1029,17 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 
             if (canListOnMarketplace() && !isMarketplaceListingsFolder() && !isInboxFolder())
             {
-                items.push_back(std::string("Marketplace Separator"));
+                // <FS:PP> Submenus grouping (line commented out)
+                // items.push_back(std::string("Marketplace Separator"));
 
                 if (gMenuHolder->getChild<LLView>("MarketplaceListings")->getVisible())
                 {
-                    items.push_back(std::string("Marketplace Copy"));
-                    items.push_back(std::string("Marketplace Move"));
+                    // <FS:PP> Submenus grouping
+                    // items.push_back(std::string("Marketplace Copy"));
+                    // items.push_back(std::string("Marketplace Move"));
+                    add_context_submenu_entry(items, INVENTORY_SUBMENU_MARKETPLACE, "Marketplace Copy");
+                    add_context_submenu_entry(items, INVENTORY_SUBMENU_MARKETPLACE, "Marketplace Move");
+                    // </FS:PP>
                     if (!canListOnMarketplaceNow())
                     {
                         disabled_items.push_back(std::string("Marketplace Copy"));
@@ -1041,7 +1075,10 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
         // </FS:TT>
         )
     {
-        items.push_back(std::string("Paste As Link"));
+        // <FS:PP> Submenus grouping
+        // items.push_back(std::string("Paste As Link"));
+        add_context_submenu_entry(items, INVENTORY_SUBMENU_LINKS, "Paste As Link");
+        // </FS:PP>
         if (!isClipboardPasteableAsLink() || (flags & FIRST_SELECTED_ITEM) == 0)
         {
             disabled_items.push_back(std::string("Paste As Link"));
@@ -1192,6 +1229,7 @@ void LLInvFVBridge::addMarketplaceContextMenuOptions(U32 flags,
                                                 menuentry_vec_t &items,
                                                 menuentry_vec_t &disabled_items)
 {
+    items.emplace_back(INVENTORY_SUBMENU_MARKETPLACE); // <FS:PP> Submenus grouping
     S32 depth = depth_nesting_in_marketplace(mUUID);
     if (depth == 1)
     {
@@ -1310,7 +1348,8 @@ void LLInvFVBridge::addMarketplaceContextMenuOptions(U32 flags,
     }
 
     // Separator
-    items.push_back(std::string("Marketplace Listings Separator"));
+    // <FS:PP> Submenus grouping (line commented out)
+    // items.push_back(std::string("Marketplace Listings Separator"));
 }
 
 void LLInvFVBridge::addLinkReplaceMenuOption(menuentry_vec_t& items, menuentry_vec_t& disabled_items)
@@ -1319,7 +1358,10 @@ void LLInvFVBridge::addLinkReplaceMenuOption(menuentry_vec_t& items, menuentry_v
 
     if (isAgentInventory() && obj && obj->getType() != LLAssetType::AT_CATEGORY && obj->getType() != LLAssetType::AT_LINK_FOLDER)
     {
-        items.push_back(std::string("Replace Links"));
+        // <FS:PP> Submenus grouping
+        // items.push_back(std::string("Replace Links"));
+        add_context_submenu_entry(items, INVENTORY_SUBMENU_LINKS, "Replace Links");
+        // </FS:PP>
 
         if (mRoot->getSelectedCount() != 1)
         {
@@ -4931,7 +4973,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
     // <FS:Ansariel> FIRE-11628: Option to delete broken links from AO folder
     if (mUUID == AOEngine::instance().getAOFolder())
     {
-        items.push_back(std::string("Cleanup broken Links"));
+        add_context_submenu_entry(items, INVENTORY_SUBMENU_LINKS, "Cleanup broken Links");
     }
     // </FS:Ansariel>
 
@@ -5076,7 +5118,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
                 }
 
                 // <FS:Ansariel> FIRE-4595: Paste as Link missing for outfit folders
-                items.push_back(std::string("Paste As Link"));
+                add_context_submenu_entry(items, INVENTORY_SUBMENU_LINKS, "Paste As Link");
                 if (!isClipboardPasteableAsLink() || (flags & FIRST_SELECTED_ITEM) == 0)
                 {
                     disabled_items.push_back(std::string("Paste As Link"));
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index e8b6f93710..d86f7aec3b 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -39,6 +39,8 @@
 #include "llfolderviewitem.h"
 #include "llsettingsbase.h"
 
+#include <string_view> // <FS:PP> Submenus grouping
+
 class LLInventoryFilter;
 class LLInventoryPanel;
 class LLInventoryModel;
@@ -909,6 +911,12 @@ void hide_context_entries(LLMenuGL& menu,
                           const menuentry_vec_t &entries_to_show,
                           const menuentry_vec_t &disabled_entries);
 
+// <FS:PP> Submenus grouping
+inline constexpr std::string_view INVENTORY_SUBMENU_MARKETPLACE{ "Marketplace" };
+inline constexpr std::string_view INVENTORY_SUBMENU_LINKS{ "Links" };
+void add_context_submenu_entry(menuentry_vec_t& items, std::string_view submenu, std::string_view item);
+// </FS:PP>
+
 // Helper functions to classify actions.
 bool isAddAction(const std::string& action);
 bool isRemoveAction(const std::string& action);
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index e82c318aad..9cf578316d 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -719,7 +719,10 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
     {
         if (is_agent_inventory && (obj->getType() != LLAssetType::AT_LINK_FOLDER))
         {
-            items.push_back(std::string("Replace Links"));
+            // <FS:PP> Submenus grouping
+            // items.push_back(std::string("Replace Links"));
+            add_context_submenu_entry(items, INVENTORY_SUBMENU_LINKS, "Replace Links");
+            // </FS:PP>
         }
         if (obj->getType() == LLAssetType::AT_LANDMARK)
         {
@@ -790,7 +793,10 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
             static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryLinking", true);
             if (inventory_linking)
             {
-                items.push_back(std::string("Paste As Link"));
+                // <FS:PP> Submenus grouping
+                // items.push_back(std::string("Paste As Link"));
+                add_context_submenu_entry(items, INVENTORY_SUBMENU_LINKS, "Paste As Link");
+                // </FS:PP>
 
                 if (selected_item)
                 {
@@ -1083,9 +1089,13 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
 
         if (can_list)
         {
-            items.push_back(std::string("Marketplace Separator"));
-            items.push_back(std::string("Marketplace Copy"));
-            items.push_back(std::string("Marketplace Move"));
+            // <FS:PP> Submenus grouping
+            // items.push_back(std::string("Marketplace Separator"));
+            // items.push_back(std::string("Marketplace Copy"));
+            // items.push_back(std::string("Marketplace Move"));
+            add_context_submenu_entry(items, INVENTORY_SUBMENU_MARKETPLACE, "Marketplace Copy");
+            add_context_submenu_entry(items, INVENTORY_SUBMENU_MARKETPLACE, "Marketplace Move");
+            // </FS:PP>
 
             if (!can_list_on_marketplace(selected_id))
             {
diff --git a/indra/newview/skins/default/xui/az/menu_inventory.xml b/indra/newview/skins/default/xui/az/menu_inventory.xml
index ef226fe647..a563b64229 100644
--- a/indra/newview/skins/default/xui/az/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/az/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Siyahı yarat" name="Marketplace Create Listing"/>
-	<menu_item_call label="Siyahını bağla" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Siyahını (yeniləmək) almaq" name="Marketplace Get Listing"/>
-	<menu_item_call label="Xətalara yoxlanış" name="Marketplace Check Listing"/>
-	<menu_item_call label="Siyahını dəyişdir" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Nəşr etmək" name="Marketplace List"/>
-	<menu_item_call label="Nəşri ləğv etmək" name="Marketplace Unlist"/>
-	<menu_item_call label="Aktivləşdirmək" name="Marketplace Activate"/>
-	<menu_item_call label="Deaktivləşdirmək" name="Marketplace Deactivate"/>
 	<menu_item_call label="Paylaş" name="Share"/>
 	<menu_item_call label="Aç" name="Task Open"/>
 	<menu_item_call label="Oynat" name="Task Play"/>
@@ -91,11 +82,13 @@
 	<menu_item_call label="Köçürt" name="Copy"/>
 	<menu_item_call label="Kəs" name="Cut"/>
 	<menu_item_call label="Yapışdır" name="Paste"/>
-	<menu_item_call label="Keçid kimi yapışdır" name="Paste As Link"/>
-	<menu_item_call label="Bütün keçidləri tap" name="Find Links"/>
-	<menu_item_call label="Keçidləri əvəz et" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Keçid kimi yapışdır" name="Paste As Link"/>
+		<menu_item_call label="Bütün keçidləri tap" name="Find Links"/>
+		<menu_item_call label="Keçidləri əvəz et" name="Replace Links"/>
+		<menu_item_call label="İşləməyən keçidləri təmizlə" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="Sil" name="Delete"/>
-	<menu_item_call label="İşləməyən keçidləri təmizlə" name="Cleanup broken Links"/>
 	<menu_item_call label="Susmaya görə olan qovluğa daşı" name="Move to Default Folder"/>
 	<menu_item_call label="'İtmiş və tapılmış'-a daşı" name="Move to Lost And Found"/>
 	<menu_item_call label="Sistem qovluğunu sil" name="Delete System Folder"/>
@@ -127,7 +120,18 @@
 	<menu_item_call label="Çıxart" name="Take Off"/>
 	<menu_item_call name="Settings Apply Local" label="Yalnız özümə tətbiq et"/>
 	<menu_item_call name="Settings Apply Parcel" label="Sahəyə tətbiq et"/>
-	<menu_item_call label="Ticarət mərkəzinin məhsul siyahılarına köçürt" name="Marketplace Copy"/>
-	<menu_item_call label="Ticarət mərkəzinin məhsul siyahılarına daşı" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Siyahı yarat" name="Marketplace Create Listing"/>
+		<menu_item_call label="Siyahını bağla" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Siyahını (yeniləmək) almaq" name="Marketplace Get Listing"/>
+		<menu_item_call label="Xətalara yoxlanış" name="Marketplace Check Listing"/>
+		<menu_item_call label="Siyahını dəyişdir" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Nəşr etmək" name="Marketplace List"/>
+		<menu_item_call label="Nəşri ləğv etmək" name="Marketplace Unlist"/>
+		<menu_item_call label="Aktivləşdirmək" name="Marketplace Activate"/>
+		<menu_item_call label="Deaktivləşdirmək" name="Marketplace Deactivate"/>
+		<menu_item_call label="Ticarət mərkəzinin məhsul siyahılarına köçürt" name="Marketplace Copy"/>
+		<menu_item_call label="Ticarət mərkəzinin məhsul siyahılarına daşı" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--seçim yoxdur--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/de/menu_gallery_inventory.xml
index 6036bdc135..867af8ff35 100644
--- a/indra/newview/skins/default/xui/de/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_gallery_inventory.xml
@@ -23,8 +23,10 @@
 	<menu_item_call label="Kopieren" name="Copy"/>
 	<menu_item_call label="Name kopieren" name="Copy Name"/>
 	<menu_item_call label="Einfügen" name="Paste"/>
-	<menu_item_call label="Als Link einfügen" name="Paste As Link"/>
-	<menu_item_call label="Links ersetzen" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Als Link einfügen" name="Paste As Link"/>
+		<menu_item_call label="Links ersetzen" name="Replace Links"/>
+	</menu>
 	<menu_item_call label="Löschen" name="Delete"/>
 	<menu_item_call label="Systemordner löschen" name="Delete System Folder"/>
 	<menu_item_call label="Wiedergeben/Abspielen" name="Sound Play"/>
@@ -100,7 +102,9 @@
 		<menu_item_check label="Hochgeladene Modelle" name="Model uploads"/>
 		<menu_item_check label="Hochgeladene PBR-Materialien" name="PBR uploads"/>
 	</menu>
-	<menu_item_call label="In Marktplatz-Auflistungen kopieren" name="Marketplace Copy"/>
-	<menu_item_call label="In Marktplatz-Auflistungen verschieben" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="In Marktplatz-Auflistungen kopieren" name="Marketplace Copy"/>
+		<menu_item_call label="In Marktplatz-Auflistungen verschieben" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--keine Optionen--" name="--no options--"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index cf1ab53d53..8ce67529be 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Auflistung erstellen" name="Marketplace Create Listing"/>
-	<menu_item_call label="Auflistung verknüpfen" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Auflistung abrufen (aktualisieren)" name="Marketplace Get Listing"/>
-	<menu_item_call label="Auf Fehler prüfen" name="Marketplace Check Listing"/>
-	<menu_item_call label="Auflistung bearbeiten" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Auflisten" name="Marketplace List"/>
-	<menu_item_call label="Entfernen" name="Marketplace Unlist"/>
-	<menu_item_call label="Aktivieren" name="Marketplace Activate"/>
-	<menu_item_call label="Deaktivieren" name="Marketplace Deactivate"/>
 	<menu_item_call label="Teilen" name="Share"/>
 	<menu_item_call label="Öffnen" name="Task Open"/>
 	<menu_item_call label="Abspielen" name="Task Play"/>
@@ -98,11 +89,13 @@
 	<menu_item_call label="Name kopieren" name="Copy Name"/>
 	<menu_item_call label="Ausschneiden" name="Cut"/>
 	<menu_item_call label="Einfügen" name="Paste"/>
-	<menu_item_call label="Als Link einfügen" name="Paste As Link"/>
-	<menu_item_call label="Alle Links suchen" name="Find Links"/>
-	<menu_item_call label="Links ersetzen" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Als Link einfügen" name="Paste As Link"/>
+		<menu_item_call label="Alle Links suchen" name="Find Links"/>
+		<menu_item_call label="Links ersetzen" name="Replace Links"/>
+		<menu_item_call label="Defekte Links aufräumen" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="Löschen" name="Delete"/>
-	<menu_item_call label="Defekte Links aufräumen" name="Cleanup broken Links"/>
 	<menu_item_call label="In Standardordner verschieben" name="Move to Default Folder"/>
 	<menu_item_call label="In Fundbüro verschieben" name="Move to Lost And Found"/>
 	<menu_item_call label="Systemordner löschen" name="Delete System Folder"/>
@@ -141,7 +134,18 @@
 	<menu_item_call label="Ausziehen" name="Take Off"/>
 	<menu_item_call label="Nur auf mich anwenden" name="Settings Apply Local"/>
 	<menu_item_call label="Auf Parzelle anwenden" name="Settings Apply Parcel"/>
-	<menu_item_call label="In Marktplatz-Auflistungen kopieren" name="Marketplace Copy"/>
-	<menu_item_call label="In Marktplatz-Auflistungen verschieben" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Auflistung erstellen" name="Marketplace Create Listing"/>
+		<menu_item_call label="Auflistung verknüpfen" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Auflistung abrufen (aktualisieren)" name="Marketplace Get Listing"/>
+		<menu_item_call label="Auf Fehler prüfen" name="Marketplace Check Listing"/>
+		<menu_item_call label="Auflistung bearbeiten" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Auflisten" name="Marketplace List"/>
+		<menu_item_call label="Entfernen" name="Marketplace Unlist"/>
+		<menu_item_call label="Aktivieren" name="Marketplace Activate"/>
+		<menu_item_call label="Deaktivieren" name="Marketplace Deactivate"/>
+		<menu_item_call label="In Marktplatz-Auflistungen kopieren" name="Marketplace Copy"/>
+		<menu_item_call label="In Marktplatz-Auflistungen verschieben" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--keine Optionen--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index 25e3afe264..af71e736d9 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -197,6 +197,10 @@
          function="Inventory.DoToSelected"
          parameter="paste" />
     </menu_item_call>
+    <menu
+     label="Links"
+     layout="topleft"
+     name="Links">
     <menu_item_call
      label="Paste As Link"
      layout="topleft"
@@ -213,6 +217,7 @@
          function="Inventory.DoToSelected"
          parameter="replace_links" />
     </menu_item_call>
+    </menu>
     <menu_item_separator
      layout="topleft" 
      name="Paste Separator" />
@@ -841,9 +846,10 @@
        parameter="def_pbr_material" />
     </menu_item_check>
   </menu>
-	<menu_item_separator
-	 layout="topleft"
-	 name="Marketplace Separator" />
+	<menu
+        label="Marketplace"
+        layout="topleft"
+        name="Marketplace">
 	<menu_item_call
         label="Copy to Marketplace Listings"
         layout="topleft"
@@ -860,6 +866,7 @@
         function="Inventory.DoToSelected"
         parameter="move_to_marketplace_listings" />
 	</menu_item_call>
+	</menu>
 	<menu_item_call
      label="--no options--"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 4d6edd9524..4d8ae66041 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -4,81 +4,6 @@
  layout="topleft"
  name="Popup"
  visible="false">
-	<menu_item_call
-        label="Create listing"
-        layout="topleft"
-        name="Marketplace Create Listing">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_create_listing" />
-	</menu_item_call>
-	<menu_item_call
-        label="Associate listing"
-        layout="topleft"
-        name="Marketplace Associate Listing">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_associate_listing" />
-	</menu_item_call>
-	<menu_item_call
-        label="Get (Refresh) listing"
-        layout="topleft"
-        name="Marketplace Get Listing">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_get_listing" />
-	</menu_item_call>
-	<menu_item_call
-        label="Check for errors"
-        layout="topleft"
-        name="Marketplace Check Listing">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_check_listing" />
-	</menu_item_call>
-	<menu_item_call
-        label="Edit listing"
-        layout="topleft"
-        name="Marketplace Edit Listing">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_edit_listing" />
-	</menu_item_call>
-	<menu_item_call
-        label="List"
-        layout="topleft"
-        name="Marketplace List">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_list" />
-	</menu_item_call>
-	<menu_item_call
-        label="Unlist"
-        layout="topleft"
-        name="Marketplace Unlist">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_unlist" />
-	</menu_item_call>
-	<menu_item_call
-        label="Activate"
-        layout="topleft"
-        name="Marketplace Activate">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_activate" />
-	</menu_item_call>
-	<menu_item_call
-        label="Deactivate"
-        layout="topleft"
-        name="Marketplace Deactivate">
-		<menu_item_call.on_click
-        function="Inventory.DoToSelected"
-        parameter="marketplace_deactivate" />
-	</menu_item_call>
-	<menu_item_separator
-    layout="topleft"
-    name="Marketplace Listings Separator" />
     <menu_item_call
      label="Share"
      layout="topleft"
@@ -788,6 +713,10 @@
          function="Inventory.DoToSelected"
          parameter="paste" />
     </menu_item_call>
+    <menu
+     label="Links"
+     layout="topleft"
+     name="Links">
     <menu_item_call
      label="Paste As Link"
      layout="topleft"
@@ -812,6 +741,15 @@
          function="Inventory.DoToSelected"
          parameter="replace_links" />
     </menu_item_call>
+    <menu_item_call
+     label="Cleanup broken Links"
+     layout="topleft"
+     name="Cleanup broken Links">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="cleanup_broken_links"/>
+    </menu_item_call>
+    </menu>
     <menu_item_separator
      layout="topleft" 
      name="Paste Separator" />
@@ -823,14 +761,6 @@
          function="Inventory.DoToSelected"
          parameter="delete" />
     </menu_item_call>
-    <menu_item_call
-     label="Cleanup broken Links"
-     layout="topleft"
-     name="Cleanup broken Links">
-        <menu_item_call.on_click
-         function="Inventory.DoToSelected"
-         parameter="cleanup_broken_links"/>
-    </menu_item_call>
     <menu_item_call
      label="Move to Default Folder"
      layout="topleft"
@@ -1125,9 +1055,82 @@
                 function="Inventory.DoToSelected"
                 parameter="apply_settings_parcel" />
     </menu_item_call>
-	<menu_item_separator
-	 layout="topleft"
-	 name="Marketplace Separator" />
+	<menu
+        label="Marketplace"
+        layout="topleft"
+        name="Marketplace">
+	<menu_item_call
+        label="Create listing"
+        layout="topleft"
+        name="Marketplace Create Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_create_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Associate listing"
+        layout="topleft"
+        name="Marketplace Associate Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_associate_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Get (Refresh) listing"
+        layout="topleft"
+        name="Marketplace Get Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_get_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Check for errors"
+        layout="topleft"
+        name="Marketplace Check Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_check_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="Edit listing"
+        layout="topleft"
+        name="Marketplace Edit Listing">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_edit_listing" />
+	</menu_item_call>
+	<menu_item_call
+        label="List"
+        layout="topleft"
+        name="Marketplace List">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_list" />
+	</menu_item_call>
+	<menu_item_call
+        label="Unlist"
+        layout="topleft"
+        name="Marketplace Unlist">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_unlist" />
+	</menu_item_call>
+	<menu_item_call
+        label="Activate"
+        layout="topleft"
+        name="Marketplace Activate">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_activate" />
+	</menu_item_call>
+	<menu_item_call
+        label="Deactivate"
+        layout="topleft"
+        name="Marketplace Deactivate">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="marketplace_deactivate" />
+	</menu_item_call>
 	<menu_item_call
         label="Copy to Marketplace Listings"
         layout="topleft"
@@ -1144,6 +1147,7 @@
         function="Inventory.DoToSelected"
         parameter="move_to_marketplace_listings" />
 	</menu_item_call>
+	</menu>
 	<menu_item_call
      label="--no options--"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 70289ccd21..cfe6ecef7f 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Crear artículos" name="Marketplace Create Listing"/>
-	<menu_item_call label="Asociar artículos" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Obtener (actualizar) artículos" name="Marketplace Get Listing"/>
-	<menu_item_call label="Comprobar errores" name="Marketplace Check Listing"/>
-	<menu_item_call label="Editar artículos" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Incluir en la lista" name="Marketplace List"/>
-	<menu_item_call label="Retirar de la lista" name="Marketplace Unlist"/>
-	<menu_item_call label="Activar" name="Marketplace Activate"/>
-	<menu_item_call label="Desactivar" name="Marketplace Deactivate"/>
 	<menu_item_call label="Compartir" name="Share"/>
 	<menu_item_call label="Abrir" name="Task Open"/>
 	<menu_item_call label="Ejecutar" name="Task Play"/>
@@ -85,7 +76,9 @@
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Cortar" name="Cut"/>
 	<menu_item_call label="Pegar" name="Paste"/>
-	<menu_item_call label="Pegar como enlace" name="Paste As Link"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Pegar como enlace" name="Paste As Link"/>
+	</menu>
 	<menu_item_call label="Borrar" name="Delete"/>
 	<menu_item_call label="Mover a Objetos Perdidos" name="Move to Lost And Found"/>
 	<menu_item_call label="Borrar carpeta del sistema" name="Delete System Folder"/>
@@ -111,7 +104,18 @@
 	<menu_item_call label="Quitarse" name="Take Off"/>
 	<menu_item_call label="Aplicar sólo a Mi mismo" name="Settings Apply Local"/>
 	<menu_item_call label="Aplicar a la Parcela" name="Settings Apply Parcel"/>
-	<menu_item_call label="Copiar en artículos del Mercado" name="Marketplace Copy"/>
-	<menu_item_call label="Mover a artículos del Mercado" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Crear artículos" name="Marketplace Create Listing"/>
+		<menu_item_call label="Asociar artículos" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Obtener (actualizar) artículos" name="Marketplace Get Listing"/>
+		<menu_item_call label="Comprobar errores" name="Marketplace Check Listing"/>
+		<menu_item_call label="Editar artículos" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Incluir en la lista" name="Marketplace List"/>
+		<menu_item_call label="Retirar de la lista" name="Marketplace Unlist"/>
+		<menu_item_call label="Activar" name="Marketplace Activate"/>
+		<menu_item_call label="Desactivar" name="Marketplace Deactivate"/>
+		<menu_item_call label="Copiar en artículos del Mercado" name="Marketplace Copy"/>
+		<menu_item_call label="Mover a artículos del Mercado" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--sin opciones--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/fr/menu_gallery_inventory.xml
index e36cc2dc7a..79de57e7de 100644
--- a/indra/newview/skins/default/xui/fr/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_gallery_inventory.xml
@@ -22,8 +22,10 @@
 	<menu_item_call label="Couper" name="Cut"/>
 	<menu_item_call label="Copier" name="Copy"/>
 	<menu_item_call label="Coller" name="Paste"/>
-	<menu_item_call label="Coller en tant que lien" name="Paste As Link"/>
-	<menu_item_call label="Remplacer les liens" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Coller en tant que lien" name="Paste As Link"/>
+		<menu_item_call label="Remplacer les liens" name="Replace Links"/>
+	</menu>
 	<menu_item_call label="Supprimer" name="Delete"/>
 	<menu_item_call label="Supprimer le dossier système" name="Delete System Folder"/>
 	<menu_item_call label="Jouer" name="Sound Play"/>
@@ -60,7 +62,9 @@
 		<menu_item_check label="Le chargement de modèles" name="Model uploads"/>
 		<menu_item_check label="Chargements de matériaux PBR" name="PBR uploads"/>
 	</menu>
-	<menu_item_call label="Copier dans la liste de Marketplace" name="Marketplace Copy"/>
-	<menu_item_call label="Déplacer vers la liste de Marketplace" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Copier dans la liste de Marketplace" name="Marketplace Copy"/>
+		<menu_item_call label="Déplacer vers la liste de Marketplace" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--pas d'options--" name="--no options--"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index ba255431cb..2132184f83 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Créer une annonce" name="Marketplace Create Listing"/>
-	<menu_item_call label="Associer l&apos;annonce" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Obtenir (actualiser) l&apos;annonce" name="Marketplace Get Listing"/>
-	<menu_item_call label="Consultez les erreurs" name="Marketplace Check Listing"/>
-	<menu_item_call label="Modifier l&apos;annonce" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Publier" name="Marketplace List"/>
-	<menu_item_call label="Ne plus publier" name="Marketplace Unlist"/>
-	<menu_item_call label="Activer" name="Marketplace Activate"/>
-	<menu_item_call label="Désactiver" name="Marketplace Deactivate"/>
 	<menu_item_call label="Partager" name="Share"/>
 	<menu_item_call label="Ouvrir" name="Task Open"/>
 	<menu_item_call label="Jouer" name="Task Play"/>
@@ -99,11 +90,13 @@
 	<menu_item_call label="Couper" name="Cut"/>
 	<menu_item_call label="Copier" name="Copy"/>
 	<menu_item_call label="Coller" name="Paste"/>
-	<menu_item_call label="Coller comme lien" name="Paste As Link"/>
-	<menu_item_call label="Trouver tous les liens" name="Find Links"/>
-	<menu_item_call label="Remplacer les liens" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Coller comme lien" name="Paste As Link"/>
+		<menu_item_call label="Trouver tous les liens" name="Find Links"/>
+		<menu_item_call label="Remplacer les liens" name="Replace Links"/>
+		<menu_item_call label="Nettoyer les liens cassés" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="Supprimer" name="Delete"/>
-	<menu_item_call label="Nettoyer les liens cassés" name="Cleanup broken Links"/>
 	<menu_item_call label="Déplacer vers le dossier par défaut" name="Move to Default Folder"/>
 	<menu_item_call label="Supprimer le dossier système" name="Delete System Folder"/>
 	<menu_item_call label="Créer un dossier à partir de la sélection" name="New folder from selected"/>
@@ -134,7 +127,18 @@
 	<menu_item_call label="Enlever" name="Take Off"/>
 	<menu_item_call label="Appliquer uniquement à moi-même" name="Settings Apply Local"/>
 	<menu_item_call label="Appliquer à la parcelle" name="Settings Apply Parcel"/>
-	<menu_item_call label="Copier dans les annonces Place du marché" name="Marketplace Copy"/>
-	<menu_item_call label="Déplacer dans les annonces Place du marché" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Créer une annonce" name="Marketplace Create Listing"/>
+		<menu_item_call label="Associer l&apos;annonce" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Obtenir (actualiser) l&apos;annonce" name="Marketplace Get Listing"/>
+		<menu_item_call label="Consultez les erreurs" name="Marketplace Check Listing"/>
+		<menu_item_call label="Modifier l&apos;annonce" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Publier" name="Marketplace List"/>
+		<menu_item_call label="Ne plus publier" name="Marketplace Unlist"/>
+		<menu_item_call label="Activer" name="Marketplace Activate"/>
+		<menu_item_call label="Désactiver" name="Marketplace Deactivate"/>
+		<menu_item_call label="Copier dans les annonces Place du marché" name="Marketplace Copy"/>
+		<menu_item_call label="Déplacer dans les annonces Place du marché" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--aucune option--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml
index 8bbddef8a0..204a572d45 100644
--- a/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_gallery_inventory.xml
@@ -22,8 +22,10 @@
 	<menu_item_call label="Copia" name="Copy"/>
 	<menu_item_call label="Taglia" name="Cut"/>
 	<menu_item_call label="Incolla" name="Paste"/>
-	<menu_item_call label="Incolla come link" name="Paste As Link"/>
-	<menu_item_call label="Sostituisci link" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Incolla come link" name="Paste As Link"/>
+		<menu_item_call label="Sostituisci link" name="Replace Links"/>
+	</menu>
 	<menu_item_call label="Elimina" name="Delete"/>
 	<menu_item_call label="Elimina cartella di sistema" name="Delete System Folder" />
 	<menu_item_call label="Suona" name="Sound Play"/>
@@ -91,7 +93,9 @@
 		<menu_item_check label="Modelli mesh caricati" name="Model uploads"/>
 		<menu_item_check label="Materiali PBR caricati" name="PBR uploads"/>
 	</menu>
-	<menu_item_call label="Copia negli annunci Marketplace" name="Marketplace Copy"/>
-	<menu_item_call label="Sposta negli annunci Marketplace" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Copia negli annunci Marketplace" name="Marketplace Copy"/>
+		<menu_item_call label="Sposta negli annunci Marketplace" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--nessuna opzione--" name="--no options--"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
index 55dedb3d5a..bfa1380b43 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Crea annuncio" name="Marketplace Create Listing"/>
-	<menu_item_call label="Associa annuncio" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Visualizza annuncio (aggiorna)" name="Marketplace Get Listing"/>
-	<menu_item_call label="Controlla che non ci siano errori" name="Marketplace Check Listing"/>
-	<menu_item_call label="Modifica annuncio" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Elenca" name="Marketplace List"/>
-	<menu_item_call label="Rimuovi annuncio" name="Marketplace Unlist"/>
-	<menu_item_call label="Attiva" name="Marketplace Activate"/>
-	<menu_item_call label="Disattiva" name="Marketplace Deactivate"/>
 	<menu_item_call label="Condividi" name="Share"/>
 	<menu_item_call label="Apri" name="Task Open"/>
 	<menu_item_call label="Esegui" name="Task Play"/>
@@ -97,11 +88,13 @@
 	<menu_item_call label="Copia" name="Copy"/>
 	<menu_item_call label="Taglia" name="Cut"/>
 	<menu_item_call label="Incolla" name="Paste"/>
-	<menu_item_call label="Incolla come link" name="Paste As Link"/>
-	<menu_item_call label="Trova tutti i link" name="Find Links"/>
-	<menu_item_call label="Sostituisci link" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Incolla come link" name="Paste As Link"/>
+		<menu_item_call label="Trova tutti i link" name="Find Links"/>
+		<menu_item_call label="Sostituisci link" name="Replace Links"/>
+		<menu_item_call label="Elimina link interrotti" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="Elimina" name="Delete"/>
-	<menu_item_call label="Elimina link interrotti" name="Cleanup broken Links"/>
 	<menu_item_call label="Sposta nella cartella predefinita" name="Move to Default Folder"/>
 	<menu_item_call label="Sposta in Oggetti smarriti" name="Move to Lost And Found"/>
 	<menu_item_call label="Elimina cartella di sistema" name="Delete System Folder"/>
@@ -133,7 +126,18 @@
 	<menu_item_call label="Togli" name="Take Off"/>
 	<menu_item_call label="Applica solo a me stesso" name="Settings Apply Local" />
 	<menu_item_call label="Applica al lotto" name="Settings Apply Parcel" />
-	<menu_item_call label="Copia negli annunci Marketplace" name="Marketplace Copy"/>
-	<menu_item_call label="Sposta negli annunci Marketplace" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Crea annuncio" name="Marketplace Create Listing"/>
+		<menu_item_call label="Associa annuncio" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Visualizza annuncio (aggiorna)" name="Marketplace Get Listing"/>
+		<menu_item_call label="Controlla che non ci siano errori" name="Marketplace Check Listing"/>
+		<menu_item_call label="Modifica annuncio" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Elenca" name="Marketplace List"/>
+		<menu_item_call label="Rimuovi annuncio" name="Marketplace Unlist"/>
+		<menu_item_call label="Attiva" name="Marketplace Activate"/>
+		<menu_item_call label="Disattiva" name="Marketplace Deactivate"/>
+		<menu_item_call label="Copia negli annunci Marketplace" name="Marketplace Copy"/>
+		<menu_item_call label="Sposta negli annunci Marketplace" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--nessuna opzione--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/ja/menu_gallery_inventory.xml
index c9084a6037..3cf850faf5 100644
--- a/indra/newview/skins/default/xui/ja/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gallery_inventory.xml
@@ -22,8 +22,10 @@
 	<menu_item_call label="カット" name="Cut"/>
 	<menu_item_call label="コピー" name="Copy"/>
 	<menu_item_call label="ペースト" name="Paste"/>
-	<menu_item_call label="リンクとしてペースト" name="Paste As Link"/>
-	<menu_item_call label="リンクを置き換え" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="リンクとしてペースト" name="Paste As Link"/>
+		<menu_item_call label="リンクを置き換え" name="Replace Links"/>
+	</menu>
 	<menu_item_call label="削除" name="Delete"/>
 	<menu_item_call label="システムフォルダを削除" name="Delete System Folder"/>
 	<menu_item_call label="再生" name="Sound Play"/>
@@ -101,7 +103,9 @@
 		<menu_item_check label="アップロードしたモデル" name="Model uploads"/>
 		<menu_item_check label="アップロードしたＰＢＲマテリアル" name="PBR uploads"/>
 	</menu>
-	<menu_item_call label="マーケットプレイスの出品リストにコピー" name="Marketplace Copy"/>
-	<menu_item_call label="マーケットプレイスの出品リストに移動" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="マーケットプレイスの出品リストにコピー" name="Marketplace Copy"/>
+		<menu_item_call label="マーケットプレイスの出品リストに移動" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="‐オプション無し‐" name="--no options--"/>
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 3d6bfb0193..581f991a20 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="出品リストを作成" name="Marketplace Create Listing"/>
-	<menu_item_call label="出品リストを関連付け" name="Marketplace Associate Listing"/>
-	<menu_item_call label="出品リストを取得 (更新)" name="Marketplace Get Listing"/>
-	<menu_item_call label="エラーを確認" name="Marketplace Check Listing"/>
-	<menu_item_call label="出品リストを編集" name="Marketplace Edit Listing"/>
-	<menu_item_call label="出品リスト" name="Marketplace List"/>
-	<menu_item_call label="出品リストから取り除く" name="Marketplace Unlist"/>
-	<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 Open"/>
 	<menu_item_call label="再生" name="Task Play"/>
@@ -92,12 +83,14 @@
 	<menu_item_call label="カット" name="Cut"/>
 	<menu_item_call label="コピー" name="Copy"/>
 	<menu_item_call label="ペースト" name="Paste"/>
-	<menu_item_call label="リンクとしてペースト" name="Paste As Link"/>
-	<menu_item_call label="すべてのリンクを探す" name="Find Links"/>
-	<menu_item_call label="リンクを置き換える" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="リンクとしてペースト" name="Paste As Link"/>
+		<menu_item_call label="すべてのリンクを探す" name="Find Links"/>
+		<menu_item_call label="リンクを置き換える" name="Replace Links"/>
+		<menu_item_call label="破損したリンクをクリーンアップ" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="最後の位置に復元" name="Restore to Last Position"/>
 	<menu_item_call label="削除" name="Delete"/>
-	<menu_item_call label="破損したリンクをクリーンアップ" name="Cleanup broken Links"/>
 	<menu_item_call label="デフォルトのフォルダに移動" name="Move to Default Folder"/>
 	<menu_item_call label="遺失物に移動" name="Move to Lost And Found"/>
 	<menu_item_call label="システムフォルダを削除" name="Delete System Folder"/>
@@ -139,7 +132,18 @@
 		<menu_item_check label="モデルのアップロード" name="Model uploads"/>
 		<menu_item_check label="ＰＢＲマテリアルのアップロード" name="PBR uploads"/>
 	</menu>
-	<menu_item_call label="マーケットプレイスの出品リストにコピー" name="Marketplace Copy"/>
-	<menu_item_call label="マーケットプレイスの出品リストに移動" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="出品リストを作成" name="Marketplace Create Listing"/>
+		<menu_item_call label="出品リストを関連付け" name="Marketplace Associate Listing"/>
+		<menu_item_call label="出品リストを取得 (更新)" name="Marketplace Get Listing"/>
+		<menu_item_call label="エラーを確認" name="Marketplace Check Listing"/>
+		<menu_item_call label="出品リストを編集" name="Marketplace Edit Listing"/>
+		<menu_item_call label="出品リスト" name="Marketplace List"/>
+		<menu_item_call label="出品リストから取り除く" name="Marketplace Unlist"/>
+		<menu_item_call label="有効化" name="Marketplace Activate"/>
+		<menu_item_call label="無効化" name="Marketplace Deactivate"/>
+		<menu_item_call label="マーケットプレイスの出品リストにコピー" name="Marketplace Copy"/>
+		<menu_item_call label="マーケットプレイスの出品リストに移動" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="－オプション無し－" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml
index a84c0618a3..e7e92d3fe2 100644
--- a/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_gallery_inventory.xml
@@ -23,8 +23,10 @@
 	<menu_item_call label="Kopiuj" name="Copy" />
 	<menu_item_call label="Kopiuj nazwę" name="Copy Name" />
 	<menu_item_call label="Wklej" name="Paste" />
-	<menu_item_call label="Wklej jako link" name="Paste As Link" />
-	<menu_item_call label="Zastępowanie linków" name="Replace Links" />
+	<menu label="Linki" name="Links">
+		<menu_item_call label="Wklej jako link" name="Paste As Link" />
+		<menu_item_call label="Zastępowanie linków" name="Replace Links" />
+	</menu>
 	<menu_item_call label="Usuń" name="Delete" />
 	<menu_item_call label="Usuń folder systemowy" name="Delete System Folder" />
 	<menu_item_call label="Odtwarzaj" name="Sound Play" />
@@ -102,7 +104,9 @@
 		<menu_item_check label="Dla nowych modeli" name="Model uploads" />
 		<menu_item_check label="Dla nowych materiałów PBR" name="PBR uploads" />
 	</menu>
-	<menu_item_call label="Kopiuj do rzeczy Marketplace" name="Marketplace Copy" />
-	<menu_item_call label="Przenieś do rzeczy Marketplace" name="Marketplace Move" />
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Kopiuj do rzeczy Marketplace" name="Marketplace Copy" />
+		<menu_item_call label="Przenieś do rzeczy Marketplace" name="Marketplace Move" />
+	</menu>
 	<menu_item_call label="--brak opcji--" name="--no options--" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
index 1eba45f84d..af9c5f1763 100644
--- a/indra/newview/skins/default/xui/pl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Utwórz nową rzecz" name="Marketplace Create Listing"/>
-	<menu_item_call label="Przypisz rzecz" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Pobierz ponownie (odśwież)" name="Marketplace Get Listing"/>
-	<menu_item_call label="Sprawdź pod kątem błędów" name="Marketplace Check Listing"/>
-	<menu_item_call label="Edytuj rzecz" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Dodaj na listę" name="Marketplace List"/>
-	<menu_item_call label="Usuń z listy" name="Marketplace Unlist"/>
-	<menu_item_call label="Aktywuj" name="Marketplace Activate"/>
-	<menu_item_call label="Dezaktywuj" name="Marketplace Deactivate"/>
 	<menu_item_call label="Udostępnij" name="Share"/>
 	<menu_item_call label="Otwórz" name="Task Open"/>
 	<menu_item_call label="Odtwarzaj" name="Task Play"/>
@@ -100,11 +91,13 @@
 	<menu_item_call label="Kopiuj nazwę" name="Copy Name" />
 	<menu_item_call label="Wytnij" name="Cut"/>
 	<menu_item_call label="Wklej" name="Paste"/>
-	<menu_item_call label="Wklej jako link" name="Paste As Link"/>
-	<menu_item_call label="Znajdź wszystkie linki" name="Find Links"/>
-	<menu_item_call label="Zastępowanie linków" name="Replace Links"/>
+	<menu label="Linki" name="Links">
+		<menu_item_call label="Wklej jako link" name="Paste As Link"/>
+		<menu_item_call label="Znajdź wszystkie linki" name="Find Links"/>
+		<menu_item_call label="Zastępowanie linków" name="Replace Links"/>
+		<menu_item_call label="Wyczyść zepsute linki" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="Usuń" name="Delete"/>
-	<menu_item_call label="Wyczyść zepsute linki" name="Cleanup broken Links"/>
 	<menu_item_call label="Przenieś do domyślnego folderu" name="Move to Default Folder"/>
 	<menu_item_call label="Przenieś do Zagubionych i odnalezionych" name="Move to Lost And Found"/>
 	<menu_item_call label="Usuń folder systemowy" name="Delete System Folder"/>
@@ -139,7 +132,18 @@
 	<menu_item_call label="Zdejmij" name="Take Off"/>
 	<menu_item_call name="Settings Apply Local" label="Stosuj tylko dla mnie" />
 	<menu_item_call name="Settings Apply Parcel" label="Stosuj dla działki" />
-	<menu_item_call label="Kopiuj do rzeczy Marketplace" name="Marketplace Copy"/>
-	<menu_item_call label="Przenieś do rzeczy Marketplace" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Utwórz nową rzecz" name="Marketplace Create Listing"/>
+		<menu_item_call label="Przypisz rzecz" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Pobierz ponownie (odśwież)" name="Marketplace Get Listing"/>
+		<menu_item_call label="Sprawdź pod kątem błędów" name="Marketplace Check Listing"/>
+		<menu_item_call label="Edytuj rzecz" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Dodaj na listę" name="Marketplace List"/>
+		<menu_item_call label="Usuń z listy" name="Marketplace Unlist"/>
+		<menu_item_call label="Aktywuj" name="Marketplace Activate"/>
+		<menu_item_call label="Dezaktywuj" name="Marketplace Deactivate"/>
+		<menu_item_call label="Kopiuj do rzeczy Marketplace" name="Marketplace Copy"/>
+		<menu_item_call label="Przenieś do rzeczy Marketplace" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--brak opcji--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/pt/menu_gallery_inventory.xml
index c4426efb42..a8752b7f3c 100644
--- a/indra/newview/skins/default/xui/pt/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_gallery_inventory.xml
@@ -22,8 +22,10 @@
 	<menu_item_call label="Recortar" name="Cut"/>
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Colar" name="Paste"/>
-	<menu_item_call label="Colar como link" name="Paste As Link"/>
-	<menu_item_call label="Substituir links" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Colar como link" name="Paste As Link"/>
+		<menu_item_call label="Substituir links" name="Replace Links"/>
+	</menu>
 	<menu_item_call label="Excluir" name="Delete"/>
 	<menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/>
 	<menu_item_call label="Reproduzir" name="Sound Play"/>
@@ -101,7 +103,9 @@
 		<menu_item_check label="Uploads de modelos" name="Model uploads"/>
 		<menu_item_check label="Uploads de material PBR" name="PBR uploads"/>
 	</menu>
-	<menu_item_call label="Copiar para listagens do Marketplace" name="Marketplace Copy"/>
-	<menu_item_call label="Mover para listagens do Marketplace" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Copiar para listagens do Marketplace" name="Marketplace Copy"/>
+		<menu_item_call label="Mover para listagens do Marketplace" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--sem opções--" name="--no options--"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index b0bcfb577a..7cd4840f9d 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Criar listagem" name="Marketplace Create Listing"/>
-	<menu_item_call label="Associar listagem" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Obter (atualizar) listagem" name="Marketplace Get Listing"/>
-	<menu_item_call label="Verificar erros" name="Marketplace Check Listing"/>
-	<menu_item_call label="Editar listagem" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Listar" name="Marketplace List"/>
-	<menu_item_call label="Remover da listagem" name="Marketplace Unlist"/>
-	<menu_item_call label="Ativar" name="Marketplace Activate"/>
-	<menu_item_call label="Desativar" name="Marketplace Deactivate"/>
 	<menu_item_call label="Compartilhar" name="Share"/>
 	<menu_item_call label="Abrir" name="Task Open"/>
 	<menu_item_call label="Reproduzir" name="Task Play"/>
@@ -97,11 +88,13 @@
 	<menu_item_call label="Recortar" name="Cut"/>
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Colar" name="Paste"/>
-	<menu_item_call label="Colar como link" name="Paste As Link"/>
-	<menu_item_call label="Encontrar todos os links" name="Find Links"/>
-	<menu_item_call label="Substituir links" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Colar como link" name="Paste As Link"/>
+		<menu_item_call label="Encontrar todos os links" name="Find Links"/>
+		<menu_item_call label="Substituir links" name="Replace Links"/>
+		<menu_item_call label="Limpar links quebrados" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="Excluir" name="Delete"/>
-	<menu_item_call label="Limpar links quebrados" name="Cleanup broken Links"/>
 	<menu_item_call label="Mover para a pasta padrão" name="Move to Default Folder"/>
 	<menu_item_call label="Mover para Achados e Perdidos" name="Move to Lost And Found"/>
 	<menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/>
@@ -140,7 +133,18 @@
 	<menu_item_call label="Tirar" name="Take Off"/>
 	<menu_item_call label="Aplicar somente a mim" name="Settings Apply Local"/>
 	<menu_item_call label="Aplicar à parcela" name="Settings Apply Parcel"/>
-	<menu_item_call label="Copiar para listagens do Marketplace" name="Marketplace Copy"/>
-	<menu_item_call label="Mover para listagens do Marketplace" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Criar listagem" name="Marketplace Create Listing"/>
+		<menu_item_call label="Associar listagem" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Obter (atualizar) listagem" name="Marketplace Get Listing"/>
+		<menu_item_call label="Verificar erros" name="Marketplace Check Listing"/>
+		<menu_item_call label="Editar listagem" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Listar" name="Marketplace List"/>
+		<menu_item_call label="Remover da listagem" name="Marketplace Unlist"/>
+		<menu_item_call label="Ativar" name="Marketplace Activate"/>
+		<menu_item_call label="Desativar" name="Marketplace Deactivate"/>
+		<menu_item_call label="Copiar para listagens do Marketplace" name="Marketplace Copy"/>
+		<menu_item_call label="Mover para listagens do Marketplace" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--sem opções--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/ru/menu_gallery_inventory.xml
index 584d58adaf..6b9d3903ab 100644
--- a/indra/newview/skins/default/xui/ru/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/menu_gallery_inventory.xml
@@ -22,8 +22,10 @@
 	<menu_item_call label="Вырезать" name="Cut"/>
 	<menu_item_call label="Копировать" name="Copy"/>
 	<menu_item_call label="Вставить" name="Paste"/>
-	<menu_item_call label="Вставить как ссылку" name="Paste As Link"/>
-	<menu_item_call label="Заменить ссылку" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Вставить как ссылку" name="Paste As Link"/>
+		<menu_item_call label="Заменить ссылку" name="Replace Links"/>
+	</menu>
 	<menu_item_call label="Удалить" name="Delete"/>
 	<menu_item_call label="Удалить Системную папку" name="Delete System Folder"/>
 	<menu_item_call label="Воспроизвести" name="Sound Play"/>
@@ -68,7 +70,9 @@
 		<menu_item_check label="Загрузки модели" name="Model uploads"/>
 		<menu_item_check label="Загрузки PBR материала" name="PBR uploads"/>
 	</menu>
-	<menu_item_call label="Копировать в списки торговой площадки" name="Marketplace Copy"/>
-	<menu_item_call label="Перейти в списки торговой площадки" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Копировать в списки торговой площадки" name="Marketplace Copy"/>
+		<menu_item_call label="Перейти в списки торговой площадки" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--no options--" name="--no options--" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml
index 262ef719fd..d903c985a2 100644
--- a/indra/newview/skins/default/xui/ru/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Создать список" name="Marketplace Create Listing"/>
-	<menu_item_call label="Связать список" name="Marketplace Associate Listing"/>
-	<menu_item_call label="Получить (обновить) список" name="Marketplace Get Listing"/>
-	<menu_item_call label="Проверка на ошибки" name="Marketplace Check Listing"/>
-	<menu_item_call label="Изменить список" name="Marketplace Edit Listing"/>
-	<menu_item_call label="Опубликовать" name="Marketplace List"/>
-	<menu_item_call label="Отменить публикацию" name="Marketplace Unlist"/>
-	<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 Open"/>
 	<menu_item_call label="Проиграть" name="Task Play"/>
@@ -97,11 +88,13 @@
 	<menu_item_call label="Копировать" name="Copy"/>
 	<menu_item_call label="Вырезать" name="Cut"/>
 	<menu_item_call label="Вставить" name="Paste"/>
-	<menu_item_call label="Вставить как ссылку" name="Paste As Link"/>
-	<menu_item_call label="Найти все ссылки" name="Find Links"/>
-	<menu_item_call label="Заменить ссылки" name="Replace Links"/>
+	<menu label="Links" name="Links">
+		<menu_item_call label="Вставить как ссылку" name="Paste As Link"/>
+		<menu_item_call label="Найти все ссылки" name="Find Links"/>
+		<menu_item_call label="Заменить ссылки" name="Replace Links"/>
+		<menu_item_call label="Очистить неработающие ссылки" name="Cleanup broken Links"/>
+	</menu>
 	<menu_item_call label="Удалить" name="Delete"/>
-	<menu_item_call label="Очистить неработающие ссылки" name="Cleanup broken Links"/>
 	<menu_item_call label="Переместить в папку по умолчанию" name="Move to Default Folder"/>
 	<menu_item_call label="Переместить в 'Потерянное и найденное'" name="Move to Lost And Found"/>
 	<menu_item_call label="Удалить системную папку" name="Delete System Folder"/>
@@ -135,7 +128,18 @@
 	<menu_item_call label="Снять" name="Take Off"/>
 	<menu_item_call name="Settings Apply Local" label="Применить только к себе"/>
 	<menu_item_call name="Settings Apply Parcel" label="Применить к Участку"/>
-	<menu_item_call label="Копировать в списки товаров торгового центра" name="Marketplace Copy"/>
-	<menu_item_call label="Переместить в списки товаров торгового центра" name="Marketplace Move"/>
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="Создать список" name="Marketplace Create Listing"/>
+		<menu_item_call label="Связать список" name="Marketplace Associate Listing"/>
+		<menu_item_call label="Получить (обновить) список" name="Marketplace Get Listing"/>
+		<menu_item_call label="Проверка на ошибки" name="Marketplace Check Listing"/>
+		<menu_item_call label="Изменить список" name="Marketplace Edit Listing"/>
+		<menu_item_call label="Опубликовать" name="Marketplace List"/>
+		<menu_item_call label="Отменить публикацию" name="Marketplace Unlist"/>
+		<menu_item_call label="Активировать" name="Marketplace Activate"/>
+		<menu_item_call label="Деактивировать" name="Marketplace Deactivate"/>
+		<menu_item_call label="Копировать в списки товаров торгового центра" name="Marketplace Copy"/>
+		<menu_item_call label="Переместить в списки товаров торгового центра" name="Marketplace Move"/>
+	</menu>
 	<menu_item_call label="--нет опций--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml
index b43e81fd51..ace0eb4ded 100644
--- a/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gallery_inventory.xml
@@ -23,8 +23,10 @@
 	<menu_item_call label="複製" name="Copy" />
 	<menu_item_call label="複製名稱" name="Copy Name" />
 	<menu_item_call label="黏貼" name="Paste" />
-	<menu_item_call label="黏貼為聯結" name="Paste As Link" />
-	<menu_item_call label="替換聯結" name="Replace Links" />
+	<menu label="Links" name="Links">
+		<menu_item_call label="黏貼為聯結" name="Paste As Link" />
+		<menu_item_call label="替換聯結" name="Replace Links" />
+	</menu>
 	<menu_item_call label="移除" name="Delete" />
 	<menu_item_call label="移除系統檔案夾" name="Delete System Folder" />
 	<menu_item_call label="播放聲音" name="Sound Play" />
@@ -102,7 +104,9 @@
 		<menu_item_check label="上傳模型" name="Model uploads" />
 		<menu_item_check label="上傳PBR材質" name="PBR uploads" />
 	</menu>
-	<menu_item_call label="複製到市場刊登" name="Marketplace Copy" />
-	<menu_item_call label="移到市場刊登" name="Marketplace Move" />
+	<menu label="Marketplace" name="Marketplace">
+		<menu_item_call label="複製到市場刊登" name="Marketplace Copy" />
+		<menu_item_call label="移到市場刊登" name="Marketplace Move" />
+	</menu>
 	<menu_item_call label="--無選項--" name="--no options--" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index a4d1f7cf34..0724630a4e 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="建立刊登" name="Marketplace Create Listing" />
-	<menu_item_call label="關聯刊登" name="Marketplace Associate Listing" />
-	<menu_item_call label="取得（更新）刊登" name="Marketplace Get Listing" />
-	<menu_item_call label="檢查是否有誤" name="Marketplace Check Listing" />
-	<menu_item_call label="編輯刊登" name="Marketplace Edit Listing" />
-	<menu_item_call label="刊登" name="Marketplace List" />
-	<menu_item_call label="停止刊登" name="Marketplace Unlist" />
-	<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 Open" />
 	<menu_item_call label="播放" name="Task Play" />
@@ -98,11 +89,13 @@
 	<menu_item_call label="複製" name="Copy" />
 	<menu_item_call label="複製名稱" name="Copy Name" />
 	<menu_item_call label="黏貼" name="Paste" />
-	<menu_item_call label="以聯結格式黏貼" name="Paste As Link" />
-	<menu_item_call label="尋找所有聯結" name="Find Links" />
-	<menu_item_call label="替換聯結" name="Replace Links" />
+	<menu label="Links" name="Links">
+		<menu_item_call label="以聯結格式黏貼" name="Paste As Link" />
+		<menu_item_call label="尋找所有聯結" name="Find Links" />
+		<menu_item_call label="替換聯結" name="Replace Links" />
+		<menu_item_call label="清理損壞的聯結" name="Cleanup broken Links" />
+	</menu>
 	<menu_item_call label="刪除" name="Delete" />
-	<menu_item_call label="清理損壞的聯結" name="Cleanup broken Links" />
 	<menu_item_call label="移至預設檔案夾" name="Move to Default Folder" />
 	<menu_item_call label="移至失物招領" name="Move to Lost And Found" />
 	<menu_item_call label="刪除系統檔案夾" name="Delete System Folder" />
@@ -141,7 +134,18 @@
 	<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 label="Marketplace" name="Marketplace">
+		<menu_item_call label="建立刊登" name="Marketplace Create Listing" />
+		<menu_item_call label="關聯刊登" name="Marketplace Associate Listing" />
+		<menu_item_call label="取得（更新）刊登" name="Marketplace Get Listing" />
+		<menu_item_call label="檢查是否有誤" name="Marketplace Check Listing" />
+		<menu_item_call label="編輯刊登" name="Marketplace Edit Listing" />
+		<menu_item_call label="刊登" name="Marketplace List" />
+		<menu_item_call label="停止刊登" name="Marketplace Unlist" />
+		<menu_item_call label="啟用" name="Marketplace Activate" />
+		<menu_item_call label="停用" name="Marketplace Deactivate" />
+		<menu_item_call label="複製到市場刊登" name="Marketplace Copy" />
+		<menu_item_call label="移到市場刊登" name="Marketplace Move" />
+	</menu>
 	<menu_item_call label="--無選項--" name="--no options--" />
 </menu>
\ No newline at end of file