add long descriptions

1 files changed, 126 insertions, 27 deletions

diff --git a/control-center b/control-center
index e476db31..cbb5f736 100755
--- a/control-center
+++ b/control-center
@@ -60,8 +60,10 @@ $h{LOGS} ||= bool2text($class{CLASS} eq 'expert' ? 1 : 0);
 $h{EXPERT_WIZARD} ||= 0;
 $h{HEIGTH} ||= $default_heigth;
 $h{WIDTH}  ||= $default_width;
+$h{USE_LONG_DESCRIPTIONS} ||= 'yes';
 
 my %option_values;
+$option_values{use_long_dscr} = text2bool($h{USE_LONG_DESCRIPTIONS});
 $option_values{show_log} = text2bool($h{LOGS});
 my $theme = $h{THEME};
 $theme = $1 if "@ARGV" =~ /--theme (\w+)/;
@@ -135,6 +137,7 @@ my %programs =
     description =>
     #-PO: this message is already translated in drakx domain from which MCC will searchs it:
     N("Authentication"),
+    long_description => N("Select the authentication method (local, NIS, LDAP, Windows Domain, ...)"),
     icon => 'drakauth-mdk',
    },
 
@@ -144,6 +147,7 @@ my %programs =
     binary => "$sbindir/drakautoinst",
     embedded => 1,
     description => N("Auto Install floppy"),
+    long_description => N("Generate an Auto Install floppy"),
     icon => 'drakautoinst-mdk',
    },
 
@@ -153,6 +157,7 @@ my %programs =
     binary => "$sbindir/drakboot",
     embedded => 1,
     description => N("Autologin"),
+    long_description => N("Enable autologin and select the user to automatically log in"),
     icon => 'autologin-mdk',
    },
 
@@ -162,6 +167,7 @@ my %programs =
     binary => "$sbindir/drakbackup",
     embedded => 1,
     description => N("Backups"),
+    long_description => N("Configure backups of the system and of the users' data"),
     icon => 'backup-mdk',
    },
 
@@ -171,6 +177,7 @@ my %programs =
     binary => "$sbindir/drakboot --boot",
     embedded => 1,
     description => N("Boot loader"),
+    long_description => N("Set up how the system boots"),
     icon => 'drakboot-mdk',
    },
 
@@ -180,6 +187,7 @@ my %programs =
     binary => "$sbindir/drakboot --splash",
     embedded => 1,
     description => N("Boot theme"),
+    long_description => N("Select the graphical theme of the system while booting"),
     icon => 'boot-theme-mdk',
    },
 
@@ -189,6 +197,7 @@ my %programs =
     binary => "$sbindir/drakfloppy",
     embedded => 1,
     description => N("Boot floppy"),
+    long_description => N("Generate a standalone boot floppy"),
     icon => 'drakfloppy-mdk',
    },
 
@@ -198,6 +207,7 @@ my %programs =
     binary => "$sbindir/drakgw",
     embedded => 1,
     description => N("Internet connection sharing"),
+    long_description => N("Share the Internet connection with other local machines"),
     icon => 'drakgw-mdk',
    },
 
@@ -207,6 +217,7 @@ my %programs =
     binary => "$sbindir/drakconnect --wizard",
     embedded => 1,
     description => N("New connection"),
+    long_description => N("Set up a new network interface (LAN, ISDN, ADSL, ..."),
     icon => 'new-connection-mdk',
    },
 
@@ -216,6 +227,7 @@ my %programs =
     binary => "$sbindir/drakconnect --internet",
     embedded => 1,
     description => N("Internet access"),
+    long_description => N("Alter miscellaneous internet settings"),
     icon => 'internet-access-mdk',
    },
 
@@ -225,7 +237,9 @@ my %programs =
     binary => "$sbindir/drakconsole",
     embedded => 1,
     description => N("Console"),
+    long_description => N("Open a console"),
     icon => 'console-mdk',
+   #The Console will help you to solve issues
    },
 
 
@@ -234,7 +248,7 @@ my %programs =
     binary => "$sbindir/clock.pl",
     embedded => 1,
     description => N("Date and time"),
-   #The Console will help you to solve issues
+    long_description => N("Adjust the date and the time"),
     icon => 'time-mdk',
    },
 
@@ -244,6 +258,7 @@ my %programs =
     binary => "$sbindir/drakedm",
     embedded => 1,
     description => N("Display manager"),
+    long_description => N("Choose the display manager that enable to select which user to log in"),
     icon => 'drakedm-mdk',
    },
 
@@ -253,6 +268,7 @@ my %programs =
     binary => "$sbindir/drakfax_server",
     embedded => 1,
     description => N("Fax"),
+    long_description => N("Configure a fax server"),
     icon => 'drakfax-mdk',
    },
 
@@ -262,6 +278,7 @@ my %programs =
     binary => "$sbindir/drakfirewall",
     embedded => 1,
     description => N("Firewall"),
+    long_description => N("Set up a personal firewall in order to protect the computer and the network"),
     icon => 'firewall-mdk',
    },
 
@@ -271,6 +288,7 @@ my %programs =
     binary => "$sbindir/drakfont",
     embedded => 1,
     description => N("Fonts"),
+    long_description => N("Manage, add and remove fonts. Import Windows(TM) fonts"),
     icon => 'drakfont-mdk',
    },
 
@@ -280,6 +298,7 @@ my %programs =
     binary => "$sbindir/XFdrake",
     embedded => 1,
     description => N("Graphical server"),
+    long_description => N("Set up the graphical server"),
     icon => 'XFdrake-mdk'
    },
 
@@ -289,6 +308,7 @@ my %programs =
     binary => "$sbindir/diskdrake --hd",
     embedded => 1,
     description => N("Partitions"),
+    long_description => N("Create, delete and resize hard disk partitions"),
     icon => 'diskdrake_hd',
    },
 
@@ -298,6 +318,7 @@ my %programs =
     binary => "$sbindir/harddrake2",
     embedded => 1,
     description => N("Hardware"),
+    long_description => N("Look at and configure the hardware"),
     icon => 'harddrake-mdk',
     application_driven_menu => 1,
    },
@@ -308,6 +329,7 @@ my %programs =
     binary => "$sbindir/rpmdrake",
     embedded => 1,
     description => N("Install"),
+    long_description => N("Look at installable software and install software packages"),
     icon => 'rpmdrake',
     application_driven_menu => 1,
    },
@@ -328,6 +350,7 @@ my %programs =
     binary => "$sbindir/keyboarddrake",
     embedded => 1,
     description => N("Keyboard"),
+    long_description => N("Set up the keyboard layout"),
     icon => 'keyboard-mdk',
    },
 
@@ -337,6 +360,7 @@ my %programs =
     binary => "$sbindir/kolab",
     embedded => 1,
     description => N("Kolab"),
+    long_description => N("Set up a groupware server"),
    },
 
 
@@ -349,6 +373,7 @@ my %programs =
     N("Language") . " - " .
     #-PO: this message is already translated in drakx domain from which MCC will searchs it:
     N("Country / Region"),
+    long_description => N("Select the language and the country or region of the system"),
    },
 
 
@@ -357,6 +382,7 @@ my %programs =
     binary => "$sbindir/logdrake",
     embedded => 1,
     description => N("Logs"),
+    long_description => N("View and search system logs"),
     icon => 'logdrake-mdk',
    },
 
@@ -366,6 +392,7 @@ my %programs =
     binary => "$sbindir/drakconnect --skip-wizard",
     embedded => 1,
     description => N("Manage connections"),
+    long_description => N("Reconfigure a network interface"),
     icon => 'manage-connections-mdk',
    },
 
@@ -375,6 +402,7 @@ my %programs =
     binary => "$sbindir/park-rpmdrake",
     embedded => 1,
     description => N("Manage computer group"),
+    long_description => N("Manage installed software packages on a group of computers"),
     icon => 'drakpark-mdk',
    },
 
@@ -384,6 +412,7 @@ my %programs =
     binary => "$sbindir/MandrakeUpdate",
     embedded => 1,
     description => N("Updates"),
+    long_description => N("Look at availlable updates and apply any fixes or upgrades to installed packages"),
     icon => 'MandrakeUpdate',
    },
 
@@ -393,6 +422,7 @@ my %programs =
     binary => "$bindir/menudrake",
     embedded => -1,
     description => N("Menus"),
+    long_description => N("Select the application menu layout and change which programs are shown on the menu"),
     icon => 'menudrake-mdk',
    },
 
@@ -402,6 +432,7 @@ my %programs =
     binary => "$sbindir/XFdrake monitor",
     embedded => 1,
     description => N("Monitor"),
+    long_description => N("Configure your monitor"),
     icon => 'configure-monitor-mdk',
    },
 
@@ -411,6 +442,7 @@ my %programs =
     binary => "$sbindir/net_monitor",
     embedded => 1,
     description => N("Monitor connections"),
+    long_description => N("Monitor the network connections"),
     icon => 'net_monitor-mdk',
    },
 
@@ -420,6 +452,7 @@ my %programs =
     binary => "$sbindir/mousedrake",
     embedded => 1,
     description => N("Mouse"),
+    long_description => N("Set up the pointer device (mouse, touchpad)"),
     icon => 'mousedrake-mdk',
    },
 
@@ -429,6 +462,7 @@ my %programs =
     binary => "$sbindir/diskdrake --nfs",
     embedded => 1,
     description => N("NFS mount points"),
+    long_description => N("Set NFS mount points"),
     icon => 'diskdrake_nfs',
    },
 
@@ -438,6 +472,7 @@ my %programs =
     binary => "$bindir/drakstats",
     embedded => 1,
     description => N("Package Stats"),
+    long_description => N("Show statistics about usage of installed software packages"),
     icon => 'source-manager',
    },
 
@@ -447,6 +482,7 @@ my %programs =
     binary => "$sbindir/diskdrake --fileshare",
     embedded => 1,
     description => N("Local disk sharing"),
+    long_description => N("Set up sharing of your hard disk partitions"),
     icon => 'diskdrake_fileshare',
    },
 
@@ -457,6 +493,7 @@ my %programs =
     embedded => 1,
     description => N("Printers"),
     icon => 'printer-mcc-mdk',
+    long_description => N("Set up the printer(s), the print job queues, ..."),
     application_driven_menu => 1,
    },
  
@@ -466,6 +503,7 @@ my %programs =
     binary => "/usr/X11R6/bin/drakcronat",
     embedded => 1,
     description => N("Scheduled tasks"),
+    long_description => N("Schedule programs to run periodically or at given times"),
     #DrakCronAt enables to schedule Programs execution through crond and atd daemons
     icon => 'drakcronat-mdk',
    },
@@ -475,7 +513,7 @@ my %programs =
     binary => "$sbindir/drakproxy",
     embedded => 1,
     description => N("Proxy"),
-    #for files and web browsing
+    long_description => N("Set up a proxy server for files and web browsing"),
     icon => 'drakproxy-mdk',
    },
 
@@ -484,6 +522,7 @@ my %programs =
     binary => "$xbindir/rfbdrake",
     embedded => 1,
     description => N("Remote Control (Linux/Unix, Windows)"),
+    long_description => N("Remote Control of another machine (Linux/Unix, Windows)"),
     icon => 'internet-access-mdk',
    },
 
@@ -493,6 +532,7 @@ my %programs =
     binary => "$sbindir/drakconnect --del",
     embedded => 1,
     description => N("Remove a connection"),
+    long_description => N("Delete a network interface"),
     icon => 'remove-connection-mdk',
    },
 
@@ -502,6 +542,7 @@ my %programs =
     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,
    },
@@ -512,6 +553,7 @@ my %programs =
     binary => "$sbindir/XFdrake resolution",
     embedded => 1,
     description => N("Screen resolution"),
+    long_description => N("Change the screen resolution"),
     icon => 'resolution-mdk',
    },
 
@@ -521,6 +563,7 @@ my %programs =
     binary => "$sbindir/diskdrake --smb",
     embedded => 1,
     description => N("Samba mount points"),
+    long_description => N("Set Samba mount points"),
     icon => 'diskdrake_samba',
    },
 
@@ -530,6 +573,7 @@ my %programs =
     binary => "$sbindir/scannerdrake",
     embedded => 1,
     description => N("Scanners"),
+    long_description => N("Set up scanner"),
     icon => 'scanner-mdk',
    },
 
@@ -539,6 +583,7 @@ my %programs =
     binary => "$sbindir/draksec",
     embedded => 1,
     description => N("Level and checks"),
+    long_description => N("Set the system security level and the periodic security audit"),
     icon => 'draksec-mdk',
    },
 
@@ -548,6 +593,7 @@ my %programs =
     binary => "$sbindir/drakperm",
     embedded => 1,
     description => N("Permissions"),
+    long_description => N("Fine-tune the security permissions of the system"),
     icon => 'drakperm-mdk',
    },
 
@@ -557,6 +603,7 @@ my %programs =
     binary => "$sbindir/drakxservices",
     embedded => 1,
     description => N("Services"),
+    long_description => N("Enable or disable the system services"),
     icon => 'service-mdk',
    },
 
@@ -566,6 +613,7 @@ my %programs =
     binary => "$sbindir/edit-urpm-sources.pl",
     embedded => 1,
     description => N("Media Manager"),
+    long_description => N("Select from where software packages are downloaded when updating the system"),
     icon => 'source-manager',
    },
 
@@ -575,6 +623,7 @@ my %programs =
     binary => "$sbindir/drakxtv",
     embedded => 1,
     description => N("TV card"),
+    long_description => N("Set up TV card"),
     icon =>, 'tv-mdk',
    },
 
@@ -584,6 +633,9 @@ my %programs =
     binary => "$sbindir/drakups --wizard",
     embedded => 1,
     description => N("UPS"),
+    long_description =>
+    #-PO: here power means electrical power
+    N("Set up an UPS for power monitoring"),
     icon => 'drakups-mdk',
    },
 
@@ -594,6 +646,7 @@ my %programs =
     binary => "$bindir/userdrake",
     embedded => 1,
     description => N("Users and groups"),
+    long_description => N("Add, remove or change users of the system"),
     icon => 'user-mdk',
     application_driven_menu => 1,
    },
@@ -604,6 +657,7 @@ my %programs =
     binary => "$sbindir/diskdrake --dav",
     embedded => 1,
     description => N("WebDAV mount points"),
+    long_description => N("Set WebDAV mount points"),
     icon => 'webdav-mdk',
    },
 
@@ -611,12 +665,13 @@ my %programs =
 
 sub wizard_format {
     map {
-        my ($id, $wizard, $icon, $description) = @$_;
+        my ($id, $wizard, $icon, $description, $long_description) = @$_;
         $programs{$id} =
           {
            binary => "$sbindir/drakwizard $wizard",
            embedded => 1,
            description => $description,
+           long_description => $long_description,
            icon => $icon,
           };
         
@@ -646,10 +701,18 @@ my @tree =
          [ N("Sharing"), 'wizard-mdk',
            [
             (wizard_format(# [ id, wizard file name, icon, description ]
-               [ "FTP wizard",        "proftpd", 'ftp-mdk', N("Configure FTP") ],
-               [ "Samba wizard",      "samba", 'samba_server-mdk', N("Configure Samba") ],
-               [ "Web wizard",        "apache2", 'web_server-mdk', N("Configure web server") ],
-               [ "Installation server wizard",    "installsrv", 'wizard-mdk', N("Configure installation server") ],
+               [ "FTP wizard",        "proftpd", 'ftp-mdk', N("Configure FTP"),
+                 N("Set up a FTP server"),
+               ],
+               [ "Samba wizard",      "samba", 'samba_server-mdk', N("Configure Samba"),
+                 N("Set up a file and print server for workstations running Linux and non-Linux systems"),
+               ],
+               [ "Web wizard",        "apache2", 'web_server-mdk', N("Configure web server"),
+                 N("Set up a web server"),
+               ],
+               [ "Installation server wizard",    "installsrv", 'wizard-mdk', N("Configure installation server"),
+                 N("Set up server for network installations of Mandrakelinux"),
+               ],
                ),
             ),
            ]
@@ -657,10 +720,18 @@ my @tree =
          [ N("Network Services"), 'wizard-mdk',
            [
             (wizard_format(# [ id, wizard file name, icon, description ]
-               [ "DHCP wizard",       "dhcp", 'dhcp_server-mdk', N("Configure DHCP") ],
-               [ "DNS wizard",        "bind", 'dns_server-mdk', N("Configure DNS") ],
-               [ "Squid wizard",      "squid", 'drakproxy-mdk', N("Configure proxy") ],
-               [ "Time wizard",       "ntp", 'ntp_server-mdk', N("Configure time") ],
+               [ "DHCP wizard",       "dhcp", 'dhcp_server-mdk', N("Configure DHCP"),
+                 N("Set up a DHCP server"),
+               ],
+               [ "DNS wizard",        "bind", 'dns_server-mdk', N("Configure DNS"),
+                 N("Set up a DNS server (network name resolution)"),
+               ],
+               [ "Squid wizard",      "squid", 'drakproxy-mdk', N("Configure proxy"),
+                 N("Configure a web caching proxy server"),
+               ],
+               [ "Time wizard",       "ntp", 'ntp_server-mdk', N("Configure time"),
+                 N("Set the time of the server to be synchronized with an external time server"),
+               ],
                ),
             ),
            ]
@@ -669,8 +740,12 @@ my @tree =
            [
             "Authentication",
             (wizard_format(# [ id, wizard file name, icon, description ]
-               [ 'Nis+autofs wizard',        "nisautofs",  'nisautofs', N("Configure NIS and Autofs") ],
-               [ "LDAP wizard",             "ldap", "ldap-mdk", N("Configure LDAP") ],
+               [ 'Nis+autofs wizard',        "nisautofs",  'nisautofs', N("Configure NIS and Autofs"),
+                 N("Configure the NIS and Autofs services"),
+               ],
+               [ "LDAP wizard",             "ldap", "ldap-mdk", N("Configure LDAP"),
+                 N("Configure the LDAP directory services"),
+               ],
                ),
             ),
            ]
@@ -678,9 +753,15 @@ my @tree =
          [ N("Groupware"), 'wizard-mdk',
            [
             (wizard_format(# [ id, wizard file name, icon, description ]
-               [ "News wizard",       "inn", 'news-mdk', N("Configure news") ],
-               [ "Kolab wizard",             "kolab", "kolab-mdk", N("Configure groupware") ],
-               [ "Postfix wizard",    "postfix", 'postfix-mdk', N("Configure mail") ],
+               [ "News wizard",       "inn", 'news-mdk', N("Configure news"),
+                 N("Configure a newsgroup server"),
+               ],
+               [ "Kolab wizard",             "kolab", "kolab-mdk", N("Configure groupware"),
+                 N("Configure a groupware server"),
+               ],
+               [ "Postfix wizard",    "postfix", 'postfix-mdk', N("Configure mail"),
+                 N("Configure the Internet Mail services"),
+               ],
                ),
             ),
            ]
@@ -692,19 +773,24 @@ my @tree =
            [
 	    if_($isWebAdmin,
 		(map {
-		    my ($id, $icon, $op, $description) = @$_;
+		    my ($id, $icon, $op, $description, $long_description) = @$_;
                 $programs{$id} =
                   {
                    binary => "$bindir/mdkwebadmin.pl $op",
                    embedded => -1, # too big
                    description => $description,
+                   long_description => $long_description,
                    icon => $icon,
                   };
 
 		    $id;
 		} (# [ id, wizard file name, icon, description ]
-		   [ "Local Admin", 'local-administration-mdk', '--direct', N("Local administration") ],
-		   [ "Remote Admin", 'remote-administration-mdk', '--link', N("Remote administration") ])
+		   [ "Local Admin", 'local-administration-mdk', '--direct', N("Local administration"),
+               (-e "/usr/bin/webmin" ? N("Configure the local machine via web interface") : N("You don't seem to have webmin intalled. Local config is disabled"))
+               ],
+		   [ "Remote Admin", 'remote-administration-mdk', '--link', N("Remote administration"),
+               N("Click here if you want to configure a remote box via Web interface"),
+             ])
 		)
 	       ),
 	    if_($isRfbDrake, 
@@ -761,7 +847,7 @@ my @tree =
        [
         "Hard Drives",
         (map {
-            my ($type, $scan, $text) = @$_;
+            my ($type, $scan, $text, $long_text) = @$_;
             map_index {
                 my $full_name = $text . ($::i ? $::i + 1 : '');
                 $programs{$full_name} =
@@ -769,6 +855,7 @@ my @tree =
                    binary => "$sbindir/diskdrake --removable=$_->{device}",
                    embedded => 1,
                    description => $text,
+                   long_description => $long_text,
                    icon => "diskdrake_$type",
                   };
                 $full_name,
@@ -778,11 +865,21 @@ my @tree =
             foreach (detect_devices::cdroms()) {
                 my $type = detect_devices::isBurner($_) ? 'burner' : detect_devices::isDvdDrive($_) ? 'DVD' : 'cdrom';
                 push @{$cdroms_by_type{$type}}, $_;
-            } ([ 'cdrom', sub { @{$cdroms_by_type{cdrom} || []} }, N("CD-ROM") ],
-               [ 'dvd', sub { @{$cdroms_by_type{DVD} || []} }, N("DVD-ROM") ],
-               [ 'cdwriter', sub { @{$cdroms_by_type{burner} || []} }, N("CD/DVD burner") ],
-               [ 'floppy', \&detect_devices::floppies, N("Floppy drive") ],
-               [ 'zip', \&detect_devices::zips, N("ZIP drive") ],
+            } ([ 'cdrom', sub { @{$cdroms_by_type{cdrom} || []} }, N("CD-ROM"),
+                 N("Set where your CD-ROM drive is mounted"),
+               ],
+               [ 'dvd', sub { @{$cdroms_by_type{DVD} || []} }, N("DVD-ROM"),
+                 N("Set where your DVD-ROM drive is mounted"),
+               ],
+               [ 'cdwriter', sub { @{$cdroms_by_type{burner} || []} }, N("CD/DVD burner"),
+                 N("Set where your CD/DVD burner is mounted"),
+               ],
+               [ 'floppy', \&detect_devices::floppies, N("Floppy drive"),
+                 N("Set where your floppy drive is mounted"),
+               ],
+               [ 'zip', \&detect_devices::zips, N("ZIP drive"),
+                 N("Set where your ZIP drive is mounted"),
+               ],
 	      ),
         }),
         "NFS mount points",,
@@ -1140,7 +1237,9 @@ foreach (@tree) {
     my $tbl = create_packtable({ col_spacings => $spacing, row_spacings => $spacing, homogeneous => 1, mcc => 1 },
                       group_by3(map {
                        my $label = $_;
-                       my ($icon, $text) = @{$programs{$label}}{qw(icon description)};
+                       my $icon = $programs{$label}{icon};
+                       my $text = $option_values{use_long_dscr} ? $programs{$label}{long_description} : $programs{$label}{description};
+
                        die "$label 's icon is missing" if !$programs{$label} && $::testing;
                        my $event_box;
                        $tool_callbacks{$label} = sub { 
@@ -1180,7 +1279,7 @@ my %icons = (
 
 # manage tools not present in MCC (localedrake, drakauth, ...):
 foreach my $label (difference2([ keys %programs ], [ keys %tool_callbacks ])) {
-    my $text = $programs{$label}{description};
+    my $text = $option_values{use_long_dscr} ? $programs{$label}{long_description} : $programs{$label}{description};
     $tool_callbacks{$label} = sub { compute_exec_string($label, undef, $icons{$label} || 'wizard-mdk', $text, $programs{$label}) };
     $tool_feedback{$label} = sub {};
 }