merge "Install Software", "Installed Software", "Remove Software" as

they basically are the same software in different views

we keep MandrivaUpdate for now since it offers to update media

1 files changed, 0 insertions, 24 deletions

diff --git a/control-center b/control-center
index c008b3cd..3be3d52f 100755
--- a/control-center
+++ b/control-center
@@ -359,17 +359,6 @@ my %programs =
    },
 
 
-   "Installed Software" =>
-   {
-    binary => "$sbindir/rpmdrake-remove",
-    embedded => 1,
-    description => N("Installed Software"),
-    icon => 'rpmdrake-remove',
-    application_driven_menu => 1,
-    hidden => 1,
-   },
-
-
    "Invictus Firewall" =>
    {
     binary => "$sbindir/drakinvictus",
@@ -605,17 +594,6 @@ my %programs =
    },
 
 
-   "Remove Software" =>
-   {
-    binary => "$sbindir/rpmdrake-remove",
-    embedded => 1,
-    description => N("Remove"),
-    long_description => N("Look at installed software and uninstall software packages"),
-    icon => 'rpmdrake-remove',
-    application_driven_menu => 1,
-   },
-
-
    "Roaming" =>
    {
     binary => "$sbindir/drakroam",
@@ -779,8 +757,6 @@ my @tree =
            [
             if_($isRpmDrake,
                 "Install Software",
-                "Installed Software",
-                "Remove Software",
                 "Mandriva Update",
                 "Software Media Manager",
                ),