merge with latest mcc

1 files changed, 121 insertions, 152 deletions

diff --git a/po/drakconf.pot b/po/drakconf.pot
index 866a8348..8c5c931d 100644
--- a/po/drakconf.pot
+++ b/po/drakconf.pot
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-12-21 17:52+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-29 17:58+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -157,31 +158,31 @@ msgid "Loading... Please wait"
 msgstr ""
 
 #: ../control-center_.c:106
-msgid "DrakAutoInst helps you produce an Auto Install floppy"
+msgid "Auto Install floppy"
 msgstr ""
 
 #: ../control-center_.c:107
-msgid "DrakBackup helps you configure backups"
+msgid "Backups"
 msgstr ""
 
 #: ../control-center_.c:108
-msgid "DrakBoot helps you set up how your system boots"
+msgid "Bootstrapping"
 msgstr ""
 
 #: ../control-center_.c:109
-msgid "DrakFloppy helps you produce your own boot floppy"
+msgid "Boot floppy"
 msgstr ""
 
 #: ../control-center_.c:110
-msgid "DrakGw helps you share your Internet connection"
+msgid "Internet connection sharing"
 msgstr ""
 
 #: ../control-center_.c:111
-msgid "Set up a new connection"
+msgid "New connection"
 msgstr ""
 
 #: ../control-center_.c:112
-msgid "Manage existing connections"
+msgid "Manage connections"
 msgstr ""
 
 #: ../control-center_.c:113
@@ -189,88 +190,87 @@ msgid "Monitor connections"
 msgstr ""
 
 #: ../control-center_.c:114
-msgid "Set up internet access"
+msgid "Internet access"
 msgstr ""
 
 #: ../control-center_.c:116
-msgid "Open a console"
+msgid "Console"
 msgstr ""
 
 #: ../control-center_.c:118
-msgid "Set date and time"
+msgid "Date and time"
 msgstr ""
 
 #: ../control-center_.c:119
-msgid "Choose the display manager"
+msgid "Display manager"
 msgstr ""
 
 #: ../control-center_.c:120
-msgid "DrakFirewall helps you set up a personal firewall"
+msgid "Firewall"
 msgstr ""
 
 #: ../control-center_.c:121
-msgid "DrakFont helps you add and remove fonts, including Windows fonts"
+msgid "Fonts"
 msgstr ""
 
 #: ../control-center_.c:122
-msgid "XFdrake helps you set up the  graphical server"
+msgid "Graphical server"
 msgstr ""
 
 #: ../control-center_.c:123
-msgid "DiskDrake helps you define and resize hard disk partitions"
+msgid "Partitions"
 msgstr ""
 
-#: ../control-center_.c:124
-msgid "HardDrake lists and helps you set up your hardware"
+#: ../control-center_.c:124 ../control-center_.c:160
+msgid "Hardware"
 msgstr ""
 
 #: ../control-center_.c:125
-msgid "RpmDrake helps you install software packages"
+msgid "Install"
 msgstr ""
 
 #: ../control-center_.c:126
-msgid "KeyboardDrake helps you to set your keyboard layout"
+msgid "Keyboard"
 msgstr ""
 
-#: ../control-center_.c:127
-msgid "LogDrake helps you view and search system logs"
+#: ../control-center_.c:127 ../control-center_.c:535
+msgid "Logs"
 msgstr ""
 
 #: ../control-center_.c:128
-msgid ""
-"Mandrake Update helps you apply any fixes or upgrades to installed packages"
+msgid "Updates"
 msgstr ""
 
 #: ../control-center_.c:129
-msgid "MenuDrake helps you change what programs are shown on the menu"
+msgid "Menus"
 msgstr ""
 
 #: ../control-center_.c:130
-msgid "Configure your monitor"
+msgid "Monitor"
 msgstr ""
 
 #: ../control-center_.c:131
-msgid "MouseDrake helps you set up your mouse"
+msgid "Mouse"
 msgstr ""
 
 #: ../control-center_.c:132
-msgid "Set NFS mount points"
+msgid "NFS mount points"
 msgstr ""
 
 #: ../control-center_.c:133
-msgid "Set up sharing of your hard disk partitions"
+msgid "Local disk sharing"
 msgstr ""
 
 #: ../control-center_.c:134
-msgid "PrinterDrake helps you set up your printer, job queues ...."
+msgid "Printers"
 msgstr ""
 
 #: ../control-center_.c:135
-msgid "DrakCronAt helps you run programs or scripts at certain times"
+msgid "Scheduled tasks"
 msgstr ""
 
 #: ../control-center_.c:136
-msgid "DrakProxy helps you set up proxy servers"
+msgid "Proxy"
 msgstr ""
 
 #: ../control-center_.c:137
@@ -278,59 +278,53 @@ msgid "Remove a connection"
 msgstr ""
 
 #: ../control-center_.c:138
-msgid "RpmDrake helps you remove software packages"
+msgid "Remove"
 msgstr ""
 
 #: ../control-center_.c:139
-msgid "Change your screen resolution"
+msgid "Screen esolution"
 msgstr ""
 
 #: ../control-center_.c:140
-msgid "Set Samba mount points"
+msgid "Samba mount points"
 msgstr ""
 
 #: ../control-center_.c:141
-msgid "ScannerDrake helps you set up your scanner"
+msgid "Scanners"
 msgstr ""
 
 #: ../control-center_.c:142
-msgid "DrakSec helps you set the system security level"
+msgid "Level and checks"
 msgstr ""
 
 #: ../control-center_.c:143
-msgid "DrakPerm helps you fine-tune the system security level and permissions"
+msgid "Permissions"
 msgstr ""
 
 #: ../control-center_.c:144
-msgid "DrakXServices helps you enable or disable services"
+msgid "Services"
 msgstr ""
 
 #: ../control-center_.c:145
-msgid ""
-"Software Media Manager helps you define where software packages are "
-"downloaded from"
+msgid "Media Manager"
 msgstr ""
 
 #: ../control-center_.c:146
-msgid "DrakxTV helps you set up your TV card"
+msgid "TV card"
 msgstr ""
 
 #: ../control-center_.c:147
-msgid "UserDrake helps you add, remove or change users of your system"
+msgid "Users and groups"
 msgstr ""
 
 #: ../control-center_.c:148
-msgid "Set WebDAV mount points"
+msgid "WebDAV mount points"
 msgstr ""
 
 #: ../control-center_.c:153
 msgid "Boot"
 msgstr ""
 
-#: ../control-center_.c:160
-msgid "Hardware"
-msgstr ""
-
 #: ../control-center_.c:173
 msgid "Mount Points"
 msgstr ""
@@ -339,16 +333,12 @@ msgstr ""
 msgid "CD-ROM"
 msgstr ""
 
-#: ../control-center_.c:188
-msgid "Set where your CD-ROM drive is mounted"
-msgstr ""
-
 #: ../control-center_.c:189
 msgid "DVD"
 msgstr ""
 
 #: ../control-center_.c:189
-msgid "Set where your DVD-ROM drive is mounted"
+msgid "DVD-ROM"
 msgstr ""
 
 #: ../control-center_.c:190
@@ -356,7 +346,7 @@ msgid "CD Burner"
 msgstr ""
 
 #: ../control-center_.c:190
-msgid "Set where your CD/DVD burner is mounted"
+msgid "CD/DVD"
 msgstr ""
 
 #: ../control-center_.c:191
@@ -364,11 +354,11 @@ msgid "Floppy"
 msgstr ""
 
 #: ../control-center_.c:191
-msgid "Set where your floppy drive is mounted"
+msgid "Floppy drive"
 msgstr ""
 
 #: ../control-center_.c:192
-msgid "Set where your ZIP drive is mounted"
+msgid "ZIP drive"
 msgstr ""
 
 #: ../control-center_.c:192
@@ -392,199 +382,182 @@ msgid "Software Management"
 msgstr ""
 
 #: ../control-center_.c:244
-msgid "Server Configuration"
+msgid "Server wizards"
 msgstr ""
 
 #: ../control-center_.c:251
-msgid ""
-"The DHCP wizard will help you configuring the DHCP services of your server"
+msgid "Configure DHCP"
 msgstr ""
 
 #: ../control-center_.c:252
-msgid ""
-"The DNS Client wizard will help you in adding a new client in your local DNS"
+msgid "Add a DNS client"
 msgstr ""
 
 #: ../control-center_.c:253
-msgid ""
-"The DNS wizard will help you configuring the DNS services of your server."
+msgid "Configure DNS"
 msgstr ""
 
 #: ../control-center_.c:254
-msgid ""
-"The FTP wizard will help you configuring the FTP Server for your network"
+msgid "Configure FTP"
 msgstr ""
 
 #: ../control-center_.c:255
-msgid ""
-"The News wizard will help you configuring the Internet News services for "
-"your network"
+msgid "Configure news"
 msgstr ""
 
 #: ../control-center_.c:256
-msgid ""
-"The Postfix wizard will help you configuring the Internet Mail services for "
-"your network"
+msgid "Configure mail"
 msgstr ""
 
 #: ../control-center_.c:257
-msgid "The Proxy wizard will help you configuring a web caching proxy server"
+msgid "Configure proxy"
 msgstr ""
 
 #: ../control-center_.c:258
-msgid ""
-"The Samba wizard will help you configuring your server to behave as a file "
-"and print server for workstations running non-Linux systems"
+msgid "Configure Samba"
 msgstr ""
 
 #: ../control-center_.c:259
-msgid ""
-"The Time wizard will help you to set the time of your server synchronized "
-"with an external time server"
+msgid "Configure time"
 msgstr ""
 
-#: ../control-center_.c:261
-msgid ""
-"The Web wizard will help you configuring the Web Server for your network"
+#: ../control-center_.c:260
+msgid "Configure web"
 msgstr ""
 
-#: ../control-center_.c:266
+#: ../control-center_.c:265
 msgid "Online Administration"
 msgstr ""
 
-#: ../control-center_.c:273
-msgid "Configure the local machine via web interface"
+#: ../control-center_.c:272
+msgid "Local administration"
 msgstr ""
 
 #: ../control-center_.c:273
-msgid "You don't seem to have webmin intalled. Local config is disabled"
+msgid "Remote administration"
 msgstr ""
 
-#: ../control-center_.c:274
-msgid "Click here if you want to configure a remote box via Web interface"
-msgstr ""
-
-#: ../control-center_.c:302
+#: ../control-center_.c:301
 msgid "/Display _Logs"
 msgstr ""
 
 #. -PO Translators, please keep all "/" charaters !!!
-#: ../control-center_.c:302 ../control-center_.c:303 ../control-center_.c:304
-#: ../control-center_.c:323
+#: ../control-center_.c:301 ../control-center_.c:302 ../control-center_.c:303
+#: ../control-center_.c:322
 msgid "/_Options"
 msgstr ""
 
-#: ../control-center_.c:303
+#: ../control-center_.c:302
 msgid "/_Embedded Mode"
 msgstr ""
 
-#: ../control-center_.c:304
+#: ../control-center_.c:303
 msgid "/Expert mode in _wizards"
 msgstr ""
 
-#: ../control-center_.c:308
+#: ../control-center_.c:307
 msgid "/_Profiles"
 msgstr ""
 
-#: ../control-center_.c:309
+#: ../control-center_.c:308
 msgid "/_Delete"
 msgstr ""
 
-#: ../control-center_.c:310
+#: ../control-center_.c:309
 msgid "/_New"
 msgstr ""
 
-#: ../control-center_.c:321 ../control-center_.c:322
+#: ../control-center_.c:320 ../control-center_.c:321
 msgid "/_File"
 msgstr ""
 
-#: ../control-center_.c:322
+#: ../control-center_.c:321
 msgid "/_Quit"
 msgstr ""
 
-#: ../control-center_.c:322
+#: ../control-center_.c:321
 msgid "<control>Q"
 msgstr ""
 
-#: ../control-center_.c:322
+#: ../control-center_.c:321
 msgid "Quit"
 msgstr ""
 
-#: ../control-center_.c:344 ../control-center_.c:347 ../control-center_.c:360
+#: ../control-center_.c:343 ../control-center_.c:346 ../control-center_.c:359
 msgid "/_Themes"
 msgstr ""
 
-#: ../control-center_.c:350
+#: ../control-center_.c:349
 msgid ""
 "This action will restart the control center.\n"
 "Any change not applied will be lost."
 msgstr ""
 
-#: ../control-center_.c:360
+#: ../control-center_.c:359
 msgid "/_More themes"
 msgstr ""
 
-#: ../control-center_.c:365
+#: ../control-center_.c:363
 msgid "New profile..."
 msgstr ""
 
-#: ../control-center_.c:368
+#: ../control-center_.c:366
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
 msgstr ""
 
-#: ../control-center_.c:372 ../control-center_.c:405 ../control-center_.c:528
+#: ../control-center_.c:370 ../control-center_.c:403 ../control-center_.c:527
 msgid "Cancel"
 msgstr ""
 
-#: ../control-center_.c:374 ../control-center_.c:406
+#: ../control-center_.c:372 ../control-center_.c:404
 msgid "Ok"
 msgstr ""
 
-#: ../control-center_.c:380
+#: ../control-center_.c:378
 msgid "Error"
 msgstr ""
 
-#: ../control-center_.c:380
+#: ../control-center_.c:378
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr ""
 
-#: ../control-center_.c:398
+#: ../control-center_.c:396
 msgid "Delete profile"
 msgstr ""
 
-#: ../control-center_.c:400
+#: ../control-center_.c:398
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../control-center_.c:409 ../control-center_.c:470 ../control-center_.c:1023
+#: ../control-center_.c:407 ../control-center_.c:468 ../control-center_.c:1024
 msgid "Warning"
 msgstr ""
 
-#: ../control-center_.c:409
+#: ../control-center_.c:407
 msgid "You can not delete the current profile"
 msgstr ""
 
-#: ../control-center_.c:425 ../control-center_.c:426 ../control-center_.c:427
-#: ../control-center_.c:428
+#: ../control-center_.c:423 ../control-center_.c:424 ../control-center_.c:425
+#: ../control-center_.c:426
 msgid "/_Help"
 msgstr ""
 
-#: ../control-center_.c:426
+#: ../control-center_.c:424
 msgid "Help"
 msgstr ""
 
-#: ../control-center_.c:427
+#: ../control-center_.c:425
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../control-center_.c:428
+#: ../control-center_.c:426
 msgid "/_About..."
 msgstr ""
 
-#: ../control-center_.c:471
+#: ../control-center_.c:469
 #, c-format
 msgid ""
 "We are about to switch from the \"%s\" profile to the \"%s\" profile.\n"
@@ -592,24 +565,20 @@ msgid ""
 "Are you sure you want to do the switch."
 msgstr ""
 
-#: ../control-center_.c:525
+#: ../control-center_.c:524
 msgid "Please wait..."
 msgstr ""
 
-#: ../control-center_.c:536
-msgid "Logs"
-msgstr ""
-
-#: ../control-center_.c:545
+#: ../control-center_.c:544
 #, c-format
 msgid "Mandrake Control Center %s"
 msgstr ""
 
-#: ../control-center_.c:560
+#: ../control-center_.c:559
 msgid "Welcome to the Mandrake Control Center"
 msgstr ""
 
-#: ../control-center_.c:563
+#: ../control-center_.c:562
 msgid ""
 "Mandrake Control Center is Mandrake Linux's main configuration\n"
 "tool. It enables the system administrator to configure the hardware\n"
@@ -621,102 +590,102 @@ msgid ""
 "evil command line."
 msgstr ""
 
-#: ../control-center_.c:697
+#: ../control-center_.c:696
 msgid "The modifications done in the current module won't be saved."
 msgstr ""
 
-#: ../control-center_.c:882
+#: ../control-center_.c:883
 #, c-format
 msgid "cannot fork: %s"
 msgstr ""
 
-#: ../control-center_.c:891
+#: ../control-center_.c:892
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr ""
 
-#: ../control-center_.c:1014
+#: ../control-center_.c:1015
 msgid "This program has exited abnormally"
 msgstr ""
 
-#: ../control-center_.c:1033
+#: ../control-center_.c:1034
 msgid "Close"
 msgstr ""
 
-#: ../control-center_.c:1040
+#: ../control-center_.c:1041
 msgid "More themes"
 msgstr ""
 
-#: ../control-center_.c:1042
+#: ../control-center_.c:1043
 msgid "Getting new themes"
 msgstr ""
 
-#: ../control-center_.c:1043
+#: ../control-center_.c:1044
 msgid "Additional themes"
 msgstr ""
 
-#: ../control-center_.c:1045
+#: ../control-center_.c:1046
 msgid "Get additional themes on www.damz.net"
 msgstr ""
 
-#: ../control-center_.c:1053
+#: ../control-center_.c:1054
 msgid "About - Mandrake Control Center"
 msgstr ""
 
-#: ../control-center_.c:1063
+#: ../control-center_.c:1064
 msgid "Authors: "
 msgstr ""
 
-#: ../control-center_.c:1064
+#: ../control-center_.c:1065
 msgid "(original C version)"
 msgstr ""
 
 #. -PO "perl" here is the programming language
-#: ../control-center_.c:1066 ../control-center_.c:1069
+#: ../control-center_.c:1067 ../control-center_.c:1070
 msgid "(perl version)"
 msgstr ""
 
-#: ../control-center_.c:1071
+#: ../control-center_.c:1072
 msgid "Artwork: "
 msgstr ""
 
-#: ../control-center_.c:1072
+#: ../control-center_.c:1073
 msgid "(design)"
 msgstr ""
 
 #. -PO If your language allows it, use eacute for first "e" and egrave for 2nd one.
-#: ../control-center_.c:1074
+#: ../control-center_.c:1075
 msgid "Helene Durosini"
 msgstr ""
 
 #. -PO Add your Name here to find it in the About section in your language.
-#: ../control-center_.c:1088
+#: ../control-center_.c:1089
 msgid "~ * ~"
 msgstr ""
 
 #. -PO Add your E-Mail address here if you want to show it in the about doialog.
-#: ../control-center_.c:1090
+#: ../control-center_.c:1091
 msgid "~ @ ~"
 msgstr ""
 
-#: ../control-center_.c:1092
+#: ../control-center_.c:1093
 msgid "Translator: "
 msgstr ""
 
-#: ../control-center_.c:1098
+#: ../control-center_.c:1099
 #, c-format
 msgid "Mandrake Control Center %s\n"
 msgstr ""
 
-#: ../control-center_.c:1099
+#: ../control-center_.c:1100
 msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
 msgstr ""
 
-#: ../control-center_.c:1103
+#: ../control-center_.c:1104
 msgid "Authors"
 msgstr ""
 
-#: ../control-center_.c:1104
+#: ../control-center_.c:1105
 msgid "Mandrake Linux Contributors"
 msgstr ""