shrink strings before string freeze for future mcc interface

1 files changed, 60 insertions, 61 deletions

diff --git a/control-center b/control-center
index c74e338e..aea8f540 100755
--- a/control-center
+++ b/control-center
@@ -103,49 +103,49 @@ $::isWebAdmin = -e "/usr/bin/mdkwebadmin";
 # gtkplug meaning: -1 => not embedded, 0 => external x11 app, 1 => proper embedding
 my $exec_hash =
 {
-    "Auto Install" => [ "drakautoinst", "$sbindir/drakautoinst", 1, N("DrakAutoInst helps you produce an Auto Install floppy") ],
-    "Backups" => [ "drakbackup", "$sbindir/drakbackup", 1, N("DrakBackup helps you configure backups") ],
-    "Boot Config" => [ "drakboot", "$sbindir/drakboot", 1, N("DrakBoot helps you set up how your system boots") ],
-    "Boot Disk" => [ "drakfloppy", "$sbindir/drakfloppy", 1, N("DrakFloppy helps you produce your own boot floppy") ],
-    "Connection Sharing" => [ "drakgw", "$sbindir/drakgw", 1, N("DrakGw helps you share your Internet connection") ],
-    "Add Connection" => [ "drakconnect", "$sbindir/drakconnect --wizard", 1, N("Set up a new connection") ],
-    "Manage Connection" => [ "drakconnect", "$sbindir/drakconnect --skip-wizard", 1, N("Manage existing connections") ],
+    "Auto Install" => [ "drakautoinst", "$sbindir/drakautoinst", 1, N("Auto Install floppy") ],
+    "Backups" => [ "drakbackup", "$sbindir/drakbackup", 1, N("Backups") ],
+    "Boot Config" => [ "drakboot", "$sbindir/drakboot", 1, N("Bootstrapping") ],
+    "Boot Disk" => [ "drakfloppy", "$sbindir/drakfloppy", 1, N("Boot floppy") ],
+    "Connection Sharing" => [ "drakgw", "$sbindir/drakgw", 1, N("Internet connection sharing") ],
+    "Add Connection" => [ "drakconnect", "$sbindir/drakconnect --wizard", 1, N("New connection") ],
+    "Manage Connection" => [ "drakconnect", "$sbindir/drakconnect --skip-wizard", 1, N("Manage connections") ],
     "Monitor Connection" => [ "net_monitor", "$sbindir/net_monitor", 1, N("Monitor connections") ],
-    "Configure Internet" => [ "drakconnect", "$sbindir/drakconnect --internet", 1, N("Set up internet access") ],
+    "Configure Internet" => [ "drakconnect", "$sbindir/drakconnect --internet", 1, N("Internet access") ],
     # little workaround to avoid drakconf freeze
     "Console" => [ "rxvt", "$xbindir/rxvt", -1, N("Open a console") ], #The Console will help you to solve issues
 #    "Console" => [ "rxvt", [ "$xbindir/rxvt", "rxvt", 1 ], 0, N("Open a console") ], #The Console will help you to solve issues
-    "Date & Time" => [ "clock", "$sbindir/clock.pl", 1, N("Set date and time") ],
-    "Display Manager chooser" =>  [ "drakedm",  "$sbindir/drakedm", 1, N("Choose the display manager") ],
-    "Firewall" => [ "drakfirewall", "$sbindir/drakfirewall", 1, N("DrakFirewall helps you set up a personal firewall") ],
-    "Fonts" => [ "drakfont", "$sbindir/drakfont", 1, N("DrakFont helps you add and remove fonts, including Windows fonts") ],
-    "Graphical server configuration" => [ "XFdrake", "$sbindir/XFdrake", 1, N("XFdrake helps you set up the  graphical server") ],
-    "Hard Drives" => [ "diskdrake", "$sbindir/diskdrake --hd", 1, N("DiskDrake helps you define and resize hard disk partitions") ],
-    "Hardware List" => [ "harddrake", "$sbindir/harddrake2", 1, N("HardDrake lists and helps you set up your hardware") ],
-    "Install Software" => [ "rpmdrake", "$sbindir/rpmdrake", -1, N("RpmDrake helps you install software packages") ],
-    "Keyboard" => [ "keyboarddrake", "$sbindir/keyboarddrake", 1, N("KeyboardDrake helps you to set your keyboard layout") ],
-    "Logs" => [ "logdrake", "$sbindir/logdrake", 1, N("LogDrake helps you view and search system logs") ],
-    "Mandrake Update" => [ "rpmdrake", "$sbindir/MandrakeUpdate", -1, N("Mandrake Update helps you apply any fixes or upgrades to installed packages") ],
-    "Menus" => [ "menudrake", "$bindir/menudrake", -1,  N("MenuDrake helps you change what programs are shown on the menu"), "$bindir/menudrake" ],
-    "Monitor" => [ "XFdrake", "$sbindir/XFdrake monitor", 1, N("Configure your monitor") ],
-    "Mouse" => [ "mousedrake", "$sbindir/mousedrake", 1, N("MouseDrake helps you set up your mouse") ],
-    "NFS mount points" => [ "diskdrake", "$sbindir/diskdrake --nfs", 1, N("Set NFS mount points") ],
-    "Partition Sharing" => [ "diskdrake", "$sbindir/diskdrake --fileshare", 1, N("Set up sharing of your hard disk partitions") ],
-    "Printer" => [ "printerdrake", "$sbindir/printerdrake", -1, N("PrinterDrake helps you set up your printer, job queues ...."), "$sbindir/printerdrake" ],
-    "Programs scheduling" => [ "drakcronat", "/usr/X11R6/bin/drakcronat", 1, N("DrakCronAt helps you run programs or scripts at certain times") ], #DrakCronAt enables to schedule Programs execution through crond and atd daemons
-    "Proxy Configuration" => [ "drakproxy", "$sbindir/drakproxy", 1, N("DrakProxy helps you set up proxy servers") ], #for files and web browsing
+    "Date & Time" => [ "clock", "$sbindir/clock.pl", 1, N("Date and time") ],
+    "Display Manager chooser" =>  [ "drakedm",  "$sbindir/drakedm", 1, N("Display manager") ],
+    "Firewall" => [ "drakfirewall", "$sbindir/drakfirewall", 1, N("Firewall") ],
+    "Fonts" => [ "drakfont", "$sbindir/drakfont", 1, N("Fonts") ],
+    "Graphical server configuration" => [ "XFdrake", "$sbindir/XFdrake", 1, N("Graphical server") ],
+    "Hard Drives" => [ "diskdrake", "$sbindir/diskdrake --hd", 1, N("Partitions") ],
+    "Hardware List" => [ "harddrake", "$sbindir/harddrake2", 1, N("Hardware") ],
+    "Install Software" => [ "rpmdrake", "$sbindir/rpmdrake", -1, N("Install") ],
+    "Keyboard" => [ "keyboarddrake", "$sbindir/keyboarddrake", 1, N("Keyboard") ],
+    "Logs" => [ "logdrake", "$sbindir/logdrake", 1, N("Logs") ],
+    "Mandrake Update" => [ "rpmdrake", "$sbindir/MandrakeUpdate", -1, N("Updates") ],
+    "Menus" => [ "menudrake", "$bindir/menudrake", -1,  N("Menus"), "$bindir/menudrake" ],
+    "Monitor" => [ "XFdrake", "$sbindir/XFdrake monitor", 1, N("Monitor") ],
+    "Mouse" => [ "mousedrake", "$sbindir/mousedrake", 1, N("Mouse") ],
+    "NFS mount points" => [ "diskdrake", "$sbindir/diskdrake --nfs", 1, N("NFS mount points") ],
+    "Partition Sharing" => [ "diskdrake", "$sbindir/diskdrake --fileshare", 1, N("Local disk sharing") ],
+    "Printer" => [ "printerdrake", "$sbindir/printerdrake", -1, N("Printers"), "$sbindir/printerdrake" ],
+    "Programs scheduling" => [ "drakcronat", "/usr/X11R6/bin/drakcronat", 1, N("Scheduled tasks") ], #DrakCronAt enables to schedule Programs execution through crond and atd daemons
+    "Proxy Configuration" => [ "drakproxy", "$sbindir/drakproxy", 1, N("Proxy") ], #for files and web browsing
     "Remove Interface" => [ "drakconnect", "$sbindir/drakconnect --del", 1, N("Remove a connection") ],
-    "Remove Software" => [ "rpmdrake", "$sbindir/rpmdrake-remove", -1, N("RpmDrake helps you remove software packages") ],
-    "Resolution" => [ "XFdrake", "$sbindir/XFdrake resolution", 1, N("Change your screen resolution") ],
-    "Samba mount points" => [ "diskdrake", "$sbindir/diskdrake --smb", 1, N("Set Samba mount points") ],
-    "Scanner" => [ "scannerdrake", "$sbindir/scannerdrake", 1, N("ScannerDrake helps you set up your scanner") ],
-    "Security Level" => [ "draksec", "$sbindir/draksec", 1, N("DrakSec helps you set the system security level") ],
-    "Security Permissions" => [ "drakperm",  "$sbindir/drakperm", 1, N("DrakPerm helps you fine-tune the system security level and permissions") ],
-    "Services" => [ "drakxservices", "$sbindir/drakxservices", 1, N("DrakXServices helps you enable or disable services") ],
-    "Software Media Manager" => [ "rpmdrake", "$sbindir/edit-urpm-sources.pl", -1, N("Software Media Manager helps you define where software packages are downloaded from") ],
-    "TV Cards" => [ "drakxtv", "$sbindir/drakxtv", 1, N("DrakxTV helps you set up your TV card") ],
-    "Users" => [ "userdrake", "$bindir/userdrake", -1, N("UserDrake helps you add, remove or change users of your system") ], # too big
-    "WebDAV mount points" => [ "diskdrake", "$sbindir/diskdrake --dav", 1, N("Set WebDAV mount points") ],
+    "Remove Software" => [ "rpmdrake", "$sbindir/rpmdrake-remove", -1, N("Remove") ],
+    "Resolution" => [ "XFdrake", "$sbindir/XFdrake resolution", 1, N("Screen esolution") ],
+    "Samba mount points" => [ "diskdrake", "$sbindir/diskdrake --smb", 1, N("Samba mount points") ],
+    "Scanner" => [ "scannerdrake", "$sbindir/scannerdrake", 1, N("Scanners") ],
+    "Security Level" => [ "draksec", "$sbindir/draksec", 1, N("Level and checks") ],
+    "Security Permissions" => [ "drakperm",  "$sbindir/drakperm", 1, N("Permissions") ],
+    "Services" => [ "drakxservices", "$sbindir/drakxservices", 1, N("Services") ],
+    "Software Media Manager" => [ "rpmdrake", "$sbindir/edit-urpm-sources.pl", -1, N("Media Manager") ],
+    "TV Cards" => [ "drakxtv", "$sbindir/drakxtv", 1, N("TV card") ],
+    "Users" => [ "userdrake", "$bindir/userdrake", -1, N("Users and groups") ], # too big
+    "WebDAV mount points" => [ "diskdrake", "$sbindir/diskdrake --dav", 1, N("WebDAV mount points") ],
 };
 
 # [ [ class_label, class icon name, [ [ program_label, program icon name ] ... ] ] ]
@@ -185,11 +185,11 @@ my @tree =
             foreach (detect_devices::cdroms()) {
                 my $type = detect_devices::isBurner($_) ? 'burner' : detect_devices::isDvdDrive($_) ? 'DVD' : 'cdrom';
                 push @{$cdroms_by_type{$type}}, $_;
-            } ([ 'cdrom', N("CD-ROM"), sub { @{$cdroms_by_type{cdrom} || []} }, N("Set where your CD-ROM drive is mounted") ],
-               [ 'dvd', N("DVD"), sub { @{$cdroms_by_type{DVD} || []} }, N("Set where your DVD-ROM drive is mounted") ],
-               [ 'cdwriter', N("CD Burner"), sub { @{$cdroms_by_type{burner} || []} }, N("Set where your CD/DVD burner is mounted") ],
-               [ 'floppy', N("Floppy"), \&detect_devices::floppies, N("Set where your floppy drive is mounted") ],
-               [ 'zip', N("Zip"), \&detect_devices::zips, N("Set where your ZIP drive is mounted") ],
+            } ([ 'cdrom', N("CD-ROM"), sub { @{$cdroms_by_type{cdrom} || []} }, N("CD-ROM") ],
+               [ 'dvd', N("DVD"), sub { @{$cdroms_by_type{DVD} || []} }, N("DVD-ROM") ],
+               [ 'cdwriter', N("CD Burner"), sub { @{$cdroms_by_type{burner} || []} }, N("CD/DVD") ],
+               [ 'floppy', N("Floppy"), \&detect_devices::floppies, N("Floppy drive") ],
+               [ 'zip', N("Zip"), \&detect_devices::zips, N("ZIP drive") ],
                ),
         }),
         [ "NFS mount points", 'diskdrake_nfs',  ],
@@ -241,27 +241,26 @@ my @tree =
             ]
            ]),
      if_($::isWiz,
-         [ N("Server Configuration"), 'wizard-mdk',
+         [ N("Server wizards"), 'wizard-mdk',
            [
             (map {
                 my ($id, $wizard, $icon, $description) = @$_;
                 $exec_hash->{$id} = [ "drakwizard", "$sbindir/drakwizard $wizard", 1, $description ];
                 [ $id, $icon ];
-         } (# [ id, wizard file name, icon, description ]
-            [ "DHCP wizard",       "dhcp", 'dhcp_server-mdk', N("The DHCP wizard will help you configuring the DHCP services of your server") ],
-            [ "DNS Client wizard", "bind_client", 'dns_client-mdk', N("The DNS Client wizard will help you in adding a new client in your local DNS") ],
-            [ "DNS wizard",        "bind", 'dns_server-mdk', N("The DNS wizard will help you configuring the DNS services of your server.") ],
-            [ "FTP wizard",        "proftpd", 'ftp-mdk', N("The FTP wizard will help you configuring the FTP Server for your network") ],
-            [ "News wizard",       "inn", 'news-mdk', N("The News wizard will help you configuring the Internet News services for your network") ],
-            [ "Postfix wizard",    "postfix", 'postfix-mdk', N("The Postfix wizard will help you configuring the Internet Mail services for your network") ],
-            [ "Squid wizard",      "squid", 'drakproxy-mdk.png', N("The Proxy wizard will help you configuring a web caching proxy server") ],
-            [ "Samba wizard",      "samba", 'samba_server-mdk', N("The Samba wizard will help you configuring your server to behave as a file and print server for workstations running non-Linux systems") ],
-            [ "Time wizard",       "ntp", 'ntp_server-mdk', N("The Time wizard will help you to set the time of your server synchronized with an external time server") ],
-
-            [ "Web wizard",        "apache2", 'web_server-mdk', N("The Web wizard will help you configuring the Web Server for your network") ]            )
-	)
-            ]
-           ]),
+            } (# [ id, wizard file name, icon, description ]
+               [ "DHCP wizard",       "dhcp", 'dhcp_server-mdk', N("Configure DHCP") ],
+               [ "DNS Client wizard", "bind_client", 'dns_client-mdk', N("Add a DNS client") ],
+               [ "DNS wizard",        "bind", 'dns_server-mdk', N("Configure DNS") ],
+               [ "FTP wizard",        "proftpd", 'ftp-mdk', N("Configure FTP") ],
+               [ "News wizard",       "inn", 'news-mdk', N("Configure news") ],
+               [ "Postfix wizard",    "postfix", 'postfix-mdk', N("Configure mail") ],
+               [ "Squid wizard",      "squid", 'drakproxy-mdk.png', N("Configure proxy") ],
+               [ "Samba wizard",      "samba", 'samba_server-mdk', N("Configure Samba") ],
+               [ "Time wizard",       "ntp", 'ntp_server-mdk', N("Configure time") ],
+               [ "Web wizard",        "apache2", 'web_server-mdk', N("Configure web") ])
+            )
+           ]
+         ]),
      if_($::isWebAdmin,
          [ N("Online Administration"), 'net-mdk',
            [
@@ -270,8 +269,8 @@ my @tree =
                 $exec_hash->{$id} = [ "mdkwebadmin", "$bindir/mdkwebadmin.pl $op", -1, $description ];
                 [ $id, $icon ];
          } (# [ id, wizard file name, icon, description ]
-            [ "Local Admin", 'XFdrake-mdk', '--direct', -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", 'drakconnect-mdk', '--link', N("Click here if you want to configure a remote box via Web interface") ])
+            [ "Local Admin", 'XFdrake-mdk', '--direct', N("Local administration via web") ],
+            [ "Remote Admin", 'drakconnect-mdk', '--link', N("Remote administration via web") ])
           )
             ]
            ]),