updated Welsh, French, Latvian and Chinese files

4 files changed, 7158 insertions, 5209 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 3b211b4a4..06ab6addd 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2002-09-12 13:54+0200\n"
-"PO-Revision-Date: 2002-09-04 22:03-0000\n"
+"POT-Creation-Date: 2002-09-13 22:00+0200\n"
+"PO-Revision-Date: 2002-09-13 22:13-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@ntlworld.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -195,8 +195,8 @@ msgid "Ok"
 msgstr "Iawn"
 
 #: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3184
-#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:224
+#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3203
+#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
 msgid "Quit"
 msgstr "Gadael"
 
@@ -303,7 +303,7 @@ msgstr "Cerdyn graffeg: %s"
 #: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195
 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
 #: ../../my_gtk.pm_.c:158 ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
-#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2150
+#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2169
 #: ../../security/main.pm_.c:295 ../../standalone/drakautoinst_.c:203
 #: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
 #: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
@@ -312,8 +312,8 @@ msgstr "Cerdyn graffeg: %s"
 #: ../../standalone/drakbackup_.c:4184 ../../standalone/drakconnect_.c:115
 #: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
 #: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:234 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:224
+#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
+#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:225
 #: ../../ugtk.pm_.c:296
 msgid "Cancel"
 msgstr "Diddymu"
@@ -506,7 +506,7 @@ msgstr "Oedi cyn cychwyn y ddelwedd rhagosodedig"
 #: ../../any.pm_.c:170 ../../any.pm_.c:789
 #: ../../diskdrake/smbnfs_gtk.pm_.c:179
 #: ../../install_steps_interactive.pm_.c:1094 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:850 ../../printerdrake.pm_.c:965
+#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
 #: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
 #: ../../standalone/drakconnect_.c:649
 msgid "Password"
@@ -614,7 +614,7 @@ msgstr "Ychwanegu"
 #: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
 #: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
 #: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printerdrake.pm_.c:3184 ../../standalone/drakbackup_.c:2774
+#: ../../printerdrake.pm_.c:3203 ../../standalone/drakbackup_.c:2774
 msgid "Done"
 msgstr "Gorffen"
 
@@ -886,8 +886,8 @@ msgstr "Derbyn defnyddiwr"
 msgid "Real name"
 msgstr "Enw cywir"
 
-#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:849
-#: ../../printerdrake.pm_.c:964
+#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:979
 msgid "User name"
 msgstr "Enw defnyddiwr"
 
@@ -947,7 +947,7 @@ msgstr "Caniatáu pob defnyddiwr"
 msgid "No sharing"
 msgstr "Dim rhannu"
 
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1198 ../../standalone.pm_.c:58
+#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:59
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Rhaid i becyn %s gael ei osod. Ydych chi am ei osod?"
@@ -959,7 +959,7 @@ msgstr ""
 "Medrwch allforio gan ddefnyddio NFS neu Samba. Pa un hoffech chi ei "
 "ddefnyddio"
 
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1203 ../../standalone.pm_.c:63
+#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:64
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Mae pecyn gorfodol %s ar goll"
@@ -1186,18 +1186,18 @@ msgid "Boot Style Configuration"
 msgstr "Ffurfweddu'r Math o Gychwyn"
 
 #: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:81
-#: ../../standalone/logdrake_.c:101
+#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:82
+#: ../../standalone/logdrake_.c:102
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:82
-#: ../../standalone/logdrake_.c:107
+#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:83
+#: ../../standalone/logdrake_.c:108
 msgid "/File/_Quit"
 msgstr "/Ffeil/_Gadael"
 
 #: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:63
-#: ../../standalone/drakfloppy_.c:82 ../../standalone/logdrake_.c:107
+#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:108
 msgid "<control>Q"
 msgstr "<control>Q"
 
@@ -1511,6 +1511,11 @@ msgid ""
 "configured as a WebDAV server). If you would like to add WebDAV mount\n"
 "points, select \"New\"."
 msgstr ""
+"Protocol yw WebDAV sy'n eich caniatáu i chi osod gwasanaethwr gwe'n lleol\n"
+"a'i drin fel system ffeilio lleol ( ar yr amod bod y gwasanaethwr lleol wedi "
+"ei\n"
+"ffurfweddi fel gwasanaethwr WebDAV). Os hoffech ychwanegu pwyntiau\n"
+"gosod WebDAV, dewiswch \"Newydd\""
 
 #: ../../diskdrake/dav.pm_.c:27
 msgid "New"
@@ -2012,7 +2017,7 @@ msgstr "Dewisiadau gosod"
 msgid "Various"
 msgstr "Amrywiol"
 
-#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:103
+#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:104
 msgid "device"
 msgstr "dyfais"
 
@@ -2393,7 +2398,7 @@ msgid "server"
 msgstr "Gwasanaethwr"
 
 #: ../../fsedit.pm_.c:240
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
@@ -2402,7 +2407,7 @@ msgid ""
 "\n"
 "Do you agree to loose all the partitions?\n"
 msgstr ""
-"Nid wyf yn medru darllen eich tabl rhaniad, mae'n rhy lygredig. :(\n"
+"Nid wyf yn medru darllen tabl rhaniad %s, mae'n rhy lygredig. :(\n"
 "Mae modd i mi fynd ymlaen i ddiystyru rhaniadau gwael (Bydd yr\n"
 "HOLL DDATA'n cael ei golli!).  Yr ateb arall yw peidio gadael i\n"
 "DrakX newid y tabl rhaniad. (y gwall yw %s)\n"
@@ -2466,11 +2471,13 @@ msgid "No alternative driver"
 msgstr "Dim gyrwyr eraill"
 
 #: ../../harddrake/sound.pm_.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
-msgstr "Nid oes gyrrwr OSS/ALSA  hysbys ar gyfer eich cerdyn sain (%s)"
+msgstr ""
+"Nid oes gyrrwr OSS/ALSA  arall hysbys ar gyfer eich cerdyn sain (%s) sy'n "
+"defnyddio \"%s\" ar hyn o bryd"
 
 #: ../../harddrake/sound.pm_.c:171
 msgid "Sound configuration"
@@ -2493,6 +2500,10 @@ msgid ""
 "Your card currently use the %s\"%s\" driver (default driver for your card is "
 "\"%s\")"
 msgstr ""
+"\n"
+"\n"
+"Mae eich cerdyn yn defnyddio'r gyrrwr %s\"%s\" ar hyn o bryd ( y gyrrwr "
+"arferol ar ei gyfer yw \"%s\")"
 
 #: ../../harddrake/sound.pm_.c:176
 msgid "Driver:"
@@ -2510,7 +2521,7 @@ msgstr "Cymorth"
 
 #: ../../harddrake/sound.pm_.c:183
 msgid "Switching between ALSA and OSS help"
-msgstr ""
+msgstr "Newid o gymorth ALSA i OSS"
 
 #: ../../harddrake/sound.pm_.c:184
 msgid ""
@@ -2530,6 +2541,21 @@ msgid ""
 "- the new ALSA api that provides many enhanced features but requires using "
 "the ALSA library.\n"
 msgstr ""
+"OSS (Open Sound System) oedd yr API sain cyntaf. Mae'n API sail annibynnol o "
+"systemau gweithredu ( mae ar gael ar gyfer y rhan fwyaf o systemau unices) "
+"on mae'n API elfennol iawn a chyfyng.\n"
+"Mae gyrwyr OSS hefyd yn ail ddyfeisio'r hyn sy'n bod eisoes.\n"
+"\n"
+"Mae ALSA (Advanced Linux Sound Architecture) yn bensaerniaeth fodiwlaidd "
+"sy'n \n"
+"cynnal ystod eang o gardiau ISA, USB a PCI.\n"
+"\n"
+"Mae hefyd yn darparu API llawer uwch na OSS.\n"
+"\n"
+"I ddefnyddio alsa, mae modd defnyddio un ai:\n"
+"- hen api OSS cydweddus\n"
+"-api ALSA newydd sy'n darparu llawer o nodweddion gell ond sydd angen "
+"defnyddio llyfrgell ALSA.\n"
 
 #: ../../harddrake/sound.pm_.c:200
 #, c-format
@@ -2540,6 +2566,11 @@ msgid ""
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
+"Mae'r hen yrrwr \"%s\" wedi ei wahardd.\n"
+"\n"
+"Mae'n effeithio'n andwyol ar y cnewyllyn\n"
+"\n"
+"Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn"
 
 #: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301
 msgid "Please Wait... Applying the configuration"
@@ -2620,7 +2651,7 @@ msgstr "Dosbarth y cyfrwng"
 msgid "class of hardware device"
 msgstr "dosbarth y dyfais caledwedd"
 
-#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1543
+#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1562
 msgid "Description"
 msgstr "Disgrifiad"
 
@@ -2692,7 +2723,7 @@ msgstr "/_Gadael"
 
 #: ../../harddrake/ui.pm_.c:64 ../../harddrake/ui.pm_.c:65
 #: ../../harddrake/ui.pm_.c:71 ../../harddrake/ui.pm_.c:73
-#: ../../standalone/logdrake_.c:110
+#: ../../standalone/logdrake_.c:111
 msgid "/_Help"
 msgstr "/_Cymorth"
 
@@ -2772,7 +2803,7 @@ msgstr "Rhedeg \"%s\"..."
 #: ../../harddrake/ui.pm_.c:180
 #, c-format
 msgid "Probing %s class\n"
-msgstr ""
+msgstr "Canfod dosbarth %s\n"
 
 #: ../../harddrake/ui.pm_.c:201
 msgid "primary"
@@ -2843,30 +2874,37 @@ msgstr "galluogi cynnal radio"
 msgid ""
 "GNU/Linux is a multiuser system, and this means that each user can have his\n"
 "own preferences, his own files and so on. You can read the ``User Guide''\n"
-"to learn more. But unlike \"root\", which is the administrator, the users\n"
-"you add here will not be entitled to change anything except their own files\n"
-"and their own configuration. You will have to create at least one regular\n"
-"user for yourself. That account is where you should log in for routine use.\n"
-"Although it is very practical to log in as \"root\" everyday, it may also\n"
-"be very dangerous! The slightest mistake could mean that your system would\n"
-"not work any more. If you make a serious mistake as a regular user, you may\n"
-"only lose some information, but not the entire system.\n"
-"\n"
-"First, you have to enter your real name. This is not mandatory, of course -\n"
-"as you can actually enter whatever you want. DrakX will then take the first\n"
-"word you have entered in the box and will bring it over to the \"User\n"
+"to learn more this concept. But unlike \"root\", which is the\n"
+"administrator, the users you add here will not be entitled to change\n"
+"anything except their own files and their own configurations. You will have\n"
+"to create at least one regular user for yourself. That account is where you\n"
+"should log in for routine use. Although it is very practical to log in as\n"
+"\"root\" everyday, it may also be very dangerous! The slightest mistake\n"
+"could mean that your system would not work any more. If you make a serious\n"
+"mistake as a regular user, you may only lose some information, but not the\n"
+"entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course\n"
+"-- as you can actually enter whatever you want. DrakX will then take the\n"
+"first word you have entered in the box and will bring it over to the \"User\n"
 "name\". This is the name this particular user will use to log onto the\n"
 "system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as the \"root\"'\n"
+"non-privileged (regular) user's password is not as crucial as the \"root\"\n"
 "one from a security point of view, but that is no reason to neglect it:\n"
 "after all, your files are at risk.\n"
 "\n"
 "If you click on \"Accept user\", you can then add as many as you want. Add\n"
-"a user for each one of your friends: your father or your sister, for\n"
-"example. When you finish adding all the users you want, select \"Done\".\n"
+"a user for each one of the people meant to use that computer. When you are\n"
+"finish adding all the users you want, select \"Done\".\n"
 "\n"
 "Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default)."
+"for that user (bash by default).\n"
+"\n"
+"When you are finished adding all users, you will be proposed to choose a\n"
+"user which can automatically log into the system when the computer boots\n"
+"up. If you are interested in that feature (and do not care much about local\n"
+"security), choose the desired user and window manager, then click \"Yes\".\n"
+"If you are not interested in this feature, click \"No\"."
 msgstr ""
 "Mae GNU/Linux yn system aml-ddefnyddiwr, ac mae hyn yn golygu bod pob\n"
 "defyddiwr yn medru cael ei ddewisiadau ei hun, ei ffeiliau ei hun ac yn y "
@@ -2904,14 +2942,14 @@ msgstr ""
 "rhagosodedig\n"
 "ar gyfer y defnyddiwr hwnnw (bash yw'r rhagosodedig)."
 
-#: ../../help.pm_.c:41
+#: ../../help.pm_.c:48
 msgid ""
 "Listed above are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, they are good for most common\n"
 "installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
 "able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a partition for \"/home\"\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
 "(only possible if you have more than one Linux partition available).\n"
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
@@ -2970,7 +3008,7 @@ msgstr ""
 "golygu\n"
 "\"ID SCSI ail isaf\", ag ati."
 
-#: ../../help.pm_.c:72
+#: ../../help.pm_.c:79
 msgid ""
 "The Mandrake Linux installation is spread out over several CD-ROMs. DrakX\n"
 "knows if a selected package is located on another CD-ROM and will eject the\n"
@@ -2980,7 +3018,7 @@ msgstr ""
 "yn gwybod os yw pecyn penodol wedi ei leoli ar CD-ROM arall a bydd yn bwrw\n"
 "allan y CD cyfredol a gofyn am y llall."
 
-#: ../../help.pm_.c:77
+#: ../../help.pm_.c:84
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
 "system. There are thousands of packages available for Mandrake Linux, and\n"
@@ -3013,7 +3051,7 @@ msgid ""
 "installation (by opposition to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the fewer packages possible to have a working\n"
+" * \"With X\": install the fewest packages possible to have a working\n"
 "graphical desktop;\n"
 "\n"
 " * \"With basic documentation\": installs the base system plus basic\n"
@@ -3029,8 +3067,8 @@ msgid ""
 "total control over what will be installed.\n"
 "\n"
 "If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"groups to avoid installing any new package. This is useful to repair or\n"
+"update an existing system."
 msgstr ""
 "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"
 "system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrake Linux, ond\n"
@@ -3083,7 +3121,7 @@ msgstr ""
 "eisoes.\n"
 " "
 
-#: ../../help.pm_.c:128
+#: ../../help.pm_.c:135
 msgid ""
 "Finally, depending on whether or not you chose to be able to select\n"
 "individual packages, you will be presented a tree containing all packages\n"
@@ -3094,9 +3132,9 @@ msgid ""
 "right. When your selection is finished, click the \"Install\" button which\n"
 "will then launch the installation process. Depending on the speed of your\n"
 "hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. An estimate of the time it will take to\n"
-"install everything is displayed on the screen, to help you gauge if there\n"
-"is sufficient time to enjoy a cup of coffee.\n"
+"a while to complete the process. An installation time estimate is displayed\n"
+"on the screen, to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
 "!! If a server package has been selected, either intentionally or because\n"
 "it was part of a whole group, you will be asked to confirm that you really\n"
@@ -3117,8 +3155,8 @@ msgid ""
 "The tiny floppy disk icon at the bottom of the list allows to load the\n"
 "package list chosen during a previous installation. Clicking on this icon\n"
 "will ask you to insert a floppy disk previously created at the end of\n"
-"another installation. See the second tip of last step on how to create such\n"
-"a floppy."
+"another installation. See the second tip of the previous step on how to\n"
+"create such a floppy disk."
 msgstr ""
 "Yn olaf, yn dibynnu ar eich dewis o becynnau unigol, bydd coeden yn cynnwys\n"
 "yr holl becynnau wedi eu dosbarthu yn ôl grwp ac is grwp. Wrth bori'r "
@@ -3157,12 +3195,12 @@ msgstr ""
 "ddiwedd gosodiad arall. Gwelwch yr ail neges o'r cam diwethaf ar sut i\n"
 "greu disg meddal o'r fath."
 
-#: ../../help.pm_.c:164
+#: ../../help.pm_.c:171
 msgid ""
 "You are now able to set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"OK\".\n"
 "The autodetection of network devices and modem will be launched. If this\n"
-"detection fails, uncheck the \"Use auto detection\" box next time. You may\n"
+"detection fails, uncheck the \"Use auto-detection\" box next time. You may\n"
 "also choose not to configure the network, or do it later; in that case,\n"
 "simply click the \"Cancel\" button.\n"
 "\n"
@@ -3173,8 +3211,8 @@ msgid ""
 "all the parameters from your Internet Service Provider or system\n"
 "administrator.\n"
 "\n"
-"You can consult the ``User Guide'' chapter about Internet connections for\n"
-"details about the configuration, or simply wait until your system is\n"
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection.\n"
 "\n"
 "If you wish to configure the network later after installation, or if you\n"
@@ -3203,13 +3241,13 @@ msgstr ""
 "os ydych wedi gorffen ffurfweddi eich cyswllt a'r rhwydwaith, yna cliciwch\n"
 "\" Diddymu.\"."
 
-#: ../../help.pm_.c:186
+#: ../../help.pm_.c:193
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
-"Here are presented all the services available with the current\n"
-"installation. Review them carefully and uncheck those which are not always\n"
-"needed at boot time.\n"
+"Here are listed all the services available with the current installation.\n"
+"Review them carefully and uncheck those which are not always needed at boot\n"
+"time.\n"
 "\n"
 "You can get a short explanatory text about a service by selecting a\n"
 "specific service. However, if you are not sure whether a service is useful\n"
@@ -3239,7 +3277,7 @@ msgstr ""
 "mae'n well dewis dim ond y gwasanaethau mae'n rhaid eu cael.\n"
 "!!"
 
-#: ../../help.pm_.c:203
+#: ../../help.pm_.c:210
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
 "local time according to the time zone you selected. It is however possible\n"
@@ -3268,16 +3306,16 @@ msgstr ""
 "o ddewis yn medru cael ei ddefnyddio gan beiriannau eraill ar eich "
 "rhwydwaith."
 
-#: ../../help.pm_.c:217
+#: ../../help.pm_.c:224
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX\n"
-"will try to configure X automatically.\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
 "\n"
-"It is extremely rare for it to fail, unless the hardware is very old (or\n"
-"very new). If it succeeds, it will start X automatically with the best\n"
-"resolution possible, depending on the size of the monitor. A window will\n"
+"You will be presented the list of available resolutions and color depth\n"
+"available for your hardware. Choose the one that best suit your needs (you\n"
+"will be able to change that after installation though). When you are\n"
+"satisfied with the sample shown in the monitor, click \"OK\". A window will\n"
 "then appear and ask you if you can see it.\n"
 "\n"
 "If you are doing an \"Expert\" installation, you will enter the X\n"
@@ -3287,7 +3325,7 @@ msgid ""
 "If you can see the message during the test, and answer \"Yes\", then DrakX\n"
 "will proceed to the next step. If you cannot see the message, it simply\n"
 "means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen. Refer then to the Video\n"
+"after 10 seconds, restoring the screen. Refer then to the video\n"
 "configuration section of the user guide for more information on how to\n"
 "configure your display."
 msgstr ""
@@ -3310,7 +3348,7 @@ msgstr ""
 "bod y ffurfweddiad yn anghywir a daw i ben ymhen 10 eiliad, gan adfer y "
 "sgrin."
 
-#: ../../help.pm_.c:239
+#: ../../help.pm_.c:246
 msgid ""
 "Finally, you will be asked whether you want to see the graphical interface\n"
 "at boot. Note this question will be asked even if you chose not to test the\n"
@@ -3324,19 +3362,19 @@ msgstr ""
 "am ateb \"Na\" os yw eich peiriant i weithredu fel gwasanaethwr, neu os\n"
 "nad oeddech yn llwyddiannus yn cael eich dangosydd i ffurfweddu'n gywir.."
 
-#: ../../help.pm_.c:246
+#: ../../help.pm_.c:253
 msgid ""
 "The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
 "booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
 "at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
 "should come back to this step for help in at least two situations:\n"
 "\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows in\n"
-"your system). If you need to reinstall Windows, the Microsoft install\n"
-"process will rewrite the boot sector, and then you will not be able to\n"
-"start GNU/Linux!\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (\n"
+"MBR) of your main disk (unless you are using another boot manager), to\n"
+"allow you to start up with either Windows or GNU/Linux (assuming you have\n"
+"Windows in your system). If you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector, and then you will not be able\n"
+"to start GNU/Linux!\n"
 "\n"
 " * if a problem arises and you cannot start up GNU/Linux from the hard\n"
 "disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
@@ -3378,14 +3416,13 @@ msgstr ""
 "dim\n"
 "angen ei fformatio gan y bydd DrakX yn ailysgrifennu'r holl ddisg."
 
-#: ../../help.pm_.c:270
+#: ../../help.pm_.c:277
 msgid ""
-"At this point, you need to choose where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space, you will\n"
-"need to partition it. Basically, partitioning a hard drive consists of\n"
-"logically dividing it to create space to install your new Mandrake Linux\n"
-"system.\n"
+"You now need to choose where you want to install the Mandrake Linux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "Because the partitioning process' effects are usually irreversible,\n"
 "partitioning can be intimidating and stressful if you are an inexperienced\n"
@@ -3394,9 +3431,9 @@ msgid ""
 "\n"
 "If you are running the installation in Expert mode, you will enter\n"
 "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
-"fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
-"From the installation interface, you can use the wizards as described here\n"
-"by clicking the dialog's \"Wizard\" button.\n"
+"fine-tune your partitions. See the DiskDrake section in the ``Starter\n"
+"Guide''. From the installation interface, you can use the wizards as\n"
+"described here by clicking the dialog's \"Wizard\" button.\n"
 "\n"
 "If partitions have already been defined, either from a previous\n"
 "installation or from another partitioning tool, simply select those to\n"
@@ -3404,7 +3441,7 @@ msgid ""
 "\n"
 "If partitions are not defined, you will need to create them using the\n"
 "wizard. Depending on your hard drive configuration, several options are\n"
-"available:\n"
+"available.\n"
 "\n"
 " * \"Use free space\": this option will simply lead to an automatic\n"
 "partitioning of your blank drive(s). You will not be prompted further;\n"
@@ -3415,9 +3452,9 @@ msgid ""
 "each of the partitions. The legacy mount points are selected by default,\n"
 "and you should generally keep them.\n"
 "\n"
-" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
-"is installed on your hard drive and takes all the space available on it,\n"
-"you have to create free space for Linux data. To do so, you can delete your\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
 "Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
 "mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
 "be performed without the loss of any data, provided you previously\n"
@@ -3444,10 +3481,10 @@ msgid ""
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"your hard drive. Be careful -- it is a powerful but dangerous option. You\n"
 "can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing. To know how do use the DiskDrake utility used\n"
-"here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+"know what you are doing. To know how to use the DiskDrake utility used\n"
+"here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
 "Guide''''"
 msgstr ""
 "Yn awr mae angen i chi ddewis lle ar eich disg caled i osod eich\n"
@@ -3522,9 +3559,9 @@ msgstr ""
 "beth\n"
 "ydych yn ei wneud."
 
-#: ../../help.pm_.c:341
+#: ../../help.pm_.c:347
 msgid ""
-"There you are. Installation is now complete and your GNU/Linux system is\n"
+"There you are. Installation is now completed and your GNU/Linux system is\n"
 "ready to use. Just click \"OK\" to reboot the system. You can start\n"
 "GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
 "soon as the computer has booted up again.\n"
@@ -3588,10 +3625,10 @@ msgstr ""
 "Linux,\n"
 "teipiwch \"mformat a:\")"
 
-#: ../../help.pm_.c:372
+#: ../../help.pm_.c:378
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a filesystem).\n"
+"(formatting means creating a filesystem on it).\n"
 "\n"
 "At this time, you may wish to reformat some already existing partitions to\n"
 "erase any data they contain. If you wish to do that, please select those\n"
@@ -3605,7 +3642,7 @@ msgid ""
 "\n"
 "Please be careful when selecting partitions. After formatting, all data on\n"
 "the selected partitions will be deleted and you will not be able to recover\n"
-"any of it.\n"
+"it.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
@@ -3640,7 +3677,7 @@ msgstr ""
 "Cliciwch \"Uwch\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
 "gwallus ar y ddisg."
 
-#: ../../help.pm_.c:398
+#: ../../help.pm_.c:404
 msgid ""
 "Your new Mandrake Linux operating system is currently being installed.\n"
 "Depending on the number of packages you will be installing and the speed of\n"
@@ -3655,7 +3692,7 @@ msgstr ""
 "\n"
 "Amynedd..."
 
-#: ../../help.pm_.c:406
+#: ../../help.pm_.c:412
 msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Some bugs may have\n"
@@ -3681,20 +3718,20 @@ msgstr ""
 "pecynnau yn ymddangos: Wedi i chi benderfynu ar eich dewis, cliciwch\n"
 "\"Gosod\" i estyn a gosod y pecynnau hynny neu \"Diddymu\" i beidio."
 
-#: ../../help.pm_.c:419
+#: ../../help.pm_.c:425
 msgid ""
 "Before continuing, you should read carefully the terms of the license. It\n"
 "covers the whole Mandrake Linux distribution, and if you do not agree with\n"
-"all the terms in it, click on the \"Refuse\" button which will immediately\n"
-"terminate the installation. To continue with the installation, click on the\n"
-"\"Accept\" button."
+"all the terms included in it, click on the \"Refuse\" button which will\n"
+"immediately terminate the installation. To continue with the installation,\n"
+"click on the \"Accept\" button."
 msgstr ""
 "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"
 "â holl ddosbarthiad Mandrake Linux, ac os nad ydych yn cytuno â'r holl\n"
 "amodau, cliciwch ar fotwm \"Gwrthod\" fydd yn terfynu'r gosodiad yn syth.\n"
 "I barhau gyda'r gosodiad, cliciwch fotwm \"Derbyn\"."
 
-#: ../../help.pm_.c:426
+#: ../../help.pm_.c:432
 msgid ""
 "At this point, it is time to choose the security level desired for the\n"
 "machine. As a rule of thumb, the more exposed the machine is, and the more\n"
@@ -3713,7 +3750,7 @@ msgstr ""
 "\n"
 "Os nad ydych yn siwr beth i'w ddewis, dewiswch y rhagosodedig."
 
-#: ../../help.pm_.c:436
+#: ../../help.pm_.c:442
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
@@ -3731,16 +3768,16 @@ msgid ""
 "drive;\n"
 "\n"
 " * \"Auto allocate\": this option enables to automatically create ext3 and\n"
-"swap partitions in free space of your hard drive;\n"
+"swap partitions on your hard drive's free space;\n"
 "\n"
 "\"More\": gives access to additional features:\n"
 "\n"
 " * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery if necessary. It is strongly recommended\n"
-"to perform this step;\n"
+"for later partition-table recovery, if necessary. It is strongly\n"
+"recommended to perform this step;\n"
 "\n"
 " * \"Restore partition table\": allows to restore a previously saved\n"
-"partition table from floppy disk;\n"
+"partition table from a floppy disk;\n"
 "\n"
 " * \"Rescue partition table\": if your partition table is damaged, you can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
@@ -3862,7 +3899,7 @@ msgstr ""
 "gyfer\n"
 " sefyllfaoedd cychwyn argyfyngus!"
 
-#: ../../help.pm_.c:507
+#: ../../help.pm_.c:513
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one you want to resize in order to install your new\n"
@@ -3924,47 +3961,45 @@ msgstr ""
 "Mae \"Enw Windows\" yn cyfeirio at y llythyren y disg caled o dan\n"
 " Windows (\"C:\" yw'r ddisg  neu raniad cyntaf)."
 
-#: ../../help.pm_.c:538
+#: ../../help.pm_.c:544
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Amynedd... Gall y weithred hon gymryd rhai munudau."
 
-#: ../../help.pm_.c:541
+#: ../../help.pm_.c:547
 msgid ""
 "DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\"). You can\n"
-"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
-"system:\n"
+"installation or if you want to have greater control (\"Expert\") over your\n"
+"installation. You can also choose to do a new installation or upgrade your\n"
+"existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": completely wipes out the old system, however, depending on\n"
+" * \"Install\": completely wipes out the old system. However, depending on\n"
 "what is currently installed on your machine, you may be able to keep some\n"
 "old partitions (Linux or otherwise) unchanged;\n"
 "\n"
 " * \"Upgrade\": this installation class allows to simply update the\n"
-"packages currently installed on your Mandrake Linux system. It keeps the\n"
-"current partitions of your hard drives as well as user configurations. All\n"
-"other configuration steps remain available, similar to a normal\n"
-"installation;\n"
+"packages currently installed on your Mandrake Linux system. It keeps your\n"
+"hard drives' current partitions as well as user configurations. All other\n"
+"configuration steps remain available, similar to a normal installation;\n"
 "\n"
 " * \"Upgrade Packages Only\": this new installation class allows you to\n"
 "upgrade an existing Mandrake Linux system while keeping all system\n"
 "configurations unchanged. Adding new packages to the current installation\n"
 "is also possible.\n"
 "\n"
-"Upgrades should work fine on Mandrake Linux systems containing version\n"
-"\"8.1\" or later.\n"
+"Upgrades should work fine on Mandrake Linux systems using version \"8.1\"\n"
+"or later.\n"
 "\n"
-"Depending on your knowledge of GNU/Linux, select one of the following\n"
-"choices:\n"
+"Depending on your GNU/Linux knowledge, select one of the following choices:\n"
 "\n"
 " * Recommended: choose this if you have never installed a GNU/Linux\n"
 "operating system. The installation will be very easy and you will only be\n"
 "asked a few questions;\n"
 "\n"
-" * Expert: if you have a good understanding of GNU/Linux, you may wish to\n"
+" * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
 "perform a highly customized installation. Some of the decisions you will\n"
-"have to make may be difficult if you do not have good knowledge of\n"
-"GNU/Linux, so it is not recommended that those without a fair amount of\n"
-"experience select this installation class."
+"have to make may be difficult if you do not have good GNU/Linux knowledge,\n"
+"so it is not recommended that those without a fair amount of experience\n"
+"select this installation class."
 msgstr ""
 "Mae DrakX am wybod a ydych am wneud gosodiad rhagosodedig.\n"
 "Hwn sy'n cael ei (\"Argymell\") neu a ydych eisiau mwy o reolaeth\n"
@@ -4000,7 +4035,7 @@ msgstr ""
 "oes gennych wybodaeth drylwyr o GNU/Linux, felly peidiwch â dewis hwn os\n"
 " nad ydych yn gwybod beth rydych yn ei wneud."
 
-#: ../../help.pm_.c:578
+#: ../../help.pm_.c:582
 msgid ""
 "Normally, DrakX selects the right keyboard for you (depending on the\n"
 "language you have chosen). However, you might not have a keyboard that\n"
@@ -4014,8 +4049,8 @@ msgid ""
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
-"asked on next dialog to choose the key binding that will switch the\n"
-"keyboard layout between the latin and non latin layouts."
+"asked in the next dialog to choose the key binding that will switch the\n"
+"keyboard layout between the latin and non-latin layouts."
 msgstr ""
 "Fel arfer mae DrakX yn dewis y bysellfwrdd cywir ar eich cyfer ( gan "
 "ddibynnu pa\n"
@@ -4034,7 +4069,7 @@ msgstr ""
 " cynnal.\n"
 " "
 
-#: ../../help.pm_.c:594
+#: ../../help.pm_.c:598
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -4043,12 +4078,16 @@ msgid ""
 "Clicking on the \"Advanced\" button will allow you to select other\n"
 "languages to be installed on your workstation. Selecting other languages\n"
 "will install the language-specific files for system documentation and\n"
-"applications. For example, if you will host users from Spain on your\n"
-"machine, select English as the main language in the tree view and in the\n"
-"Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
+"applications. For example, if you host users from Spain on your machine,\n"
+"select English as the main language in the tree view and in the Advanced\n"
+"section, click on the box corresponding to \"Spanish|Spain\".\n"
 "\n"
 "Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales, click the \"OK\" button to continue."
+"additional locales, click the \"OK\" button to continue.\n"
+"\n"
+"To switch from one language to the other, you can launch the\n"
+"\"/usr/sbin/localedrake\" command as \"root\" to change the whole system\n"
+"language, or as a simple user to only change that user's default language."
 msgstr ""
 "Dewiswch eich dewis iaith ar gyfer y gosod a'r defnydd o'r system\n"
 "\n"
@@ -4065,14 +4104,14 @@ msgstr ""
 "Sylwer bod modd gosod myw nag un iaith. Unwaith i chi ddewis unrhyw \n"
 "leoleiddiad ychwanegol cliciwch y botwm \"Iawn\" i barhau."
 
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:617
 msgid ""
-"DrakX generally detects the number of buttons your mouse has. If not, it\n"
-"assumes you have a two-button mouse and will set it up for third-button\n"
+"DrakX generally detects the number of buttons your mouse possesses. If not,\n"
+"it assumes you have a two-button mouse and will set it up for third-button\n"
 "emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
 "USB mouse.\n"
 "\n"
-"If you wish to specify a different type of mouse select the appropriate\n"
+"If you wish to specify a different type of mouse, select the appropriate\n"
 "type from the provided list.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
@@ -4080,12 +4119,12 @@ msgid ""
 "correct. If the mouse is not working well, press the space bar or [Return]\n"
 "to \"Cancel\" and choose again.\n"
 "\n"
-"Wheel mouses are sometimes not automatically detected. You will need to\n"
+"Sometimes, wheel mouses are not automatically detected. You will need to\n"
 "manually select it in the list. Be sure to select the one corresponding to\n"
 "the correct port it is attached to. After you have pressed the \"OK\"\n"
-"button, a mouse image is displayed. You then need to move the wheel of your\n"
-"mouse to activate it correctly. Then test all buttons and movements are\n"
-"correct."
+"button, a mouse image will be displayed. You then need to move the wheel of\n"
+"your mouse to activate it correctly. Then test that all buttons and\n"
+"movements are correct."
 msgstr ""
 "Drwy ragosodiad mae DrakX yn cymryd bod gennych lygoden dau fotwm\n"
 "a bydd yn ei osod i efelychu botwm tri. Bydd DrakX yn gwybod yn awtomatig\n"
@@ -4108,7 +4147,7 @@ msgstr ""
 "llygoden yn cael ei ddangos. Bydd angen i chi symud olwyn y llygoden iddo \n"
 "weithio'n gywir.Yna profwch fod pob botwm a symudiad yn gywir."
 
-#: ../../help.pm_.c:630
+#: ../../help.pm_.c:638
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
@@ -4117,23 +4156,23 @@ msgstr ""
 "yn\n"
 "\"ttyS0\" yn GNU/Linux, e.e."
 
-#: ../../help.pm_.c:634
-msgid ""
-"This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
-"change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
-"choose not to enter a password, but we strongly advise you against this if\n"
-"only for one reason: do not think that because you booted GNU/Linux that\n"
-"your other operating systems are safe from mistakes. Since \"root\" can\n"
-"overcome all limitations and unintentionally erase all data on partitions\n"
-"by carelessly accessing the partitions themselves, it is important for it\n"
-"to be difficult to become \"root\".\n"
+#: ../../help.pm_.c:642
+msgid ""
+"This is the most crucial decision in regards with the security of your\n"
+"GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the\n"
+"system administrator and is the only one authorized to make updates, add\n"
+"users, change the overall system configuration, and so on. In short,\n"
+"\"root\" can do everything! That is why you must choose a password that is\n"
+"difficult to guess -- DrakX will tell you if it is too easy. As you can\n"
+"see, you can choose not to enter a password, but we strongly advise you\n"
+"against this if only for one reason: do not think that because you booted\n"
+"GNU/Linux that your other operating systems are safe from mistakes. Since\n"
+"\"root\" can overcome all limitations and unintentionally erase all data on\n"
+"partitions by carelessly accessing the partitions themselves, it is\n"
+"important for it to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password - it makes it too\n"
+"characters long. Never write down the \"root\" password -- it makes it too\n"
 "easy to compromise a system.\n"
 "\n"
 "However, please do not make the password too long or complicated because\n"
@@ -4147,9 +4186,9 @@ msgid ""
 "In Expert mode, you will be asked if you will be connecting to an\n"
 "authentication server, like NIS or LDAP.\n"
 "\n"
-"If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
-"authentication services, select the appropriate one as \"authentication\".\n"
-"If you do not know, ask your network administrator.\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one as \"authentication\". If you have no\n"
+"clue, ask your network administrator.\n"
 "\n"
 "If your computer is not connected to any administrated network, you will\n"
 "want to choose \"Local files\" for authentication."
@@ -4198,11 +4237,11 @@ msgstr ""
 "weinyddu,\n"
 " byddwch angen dewis \"Ffeiliau lleol\" ar gyfer dilysu."
 
-#: ../../help.pm_.c:670
+#: ../../help.pm_.c:678
 msgid ""
-"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
+"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. In fact, DrakX analyzes the disk boot sector and acts\n"
-"accordingly, depending on what it finds here:\n"
+"accordingly, depending on what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
 "boot sector. Hence, you will be able to load either GNU/Linux or another\n"
@@ -4211,14 +4250,14 @@ msgid ""
 " * if a grub or LILO boot sector is found, it will replace it with a new\n"
 "one.\n"
 "\n"
-"If in doubt, DrakX will display a dialog with various options.\n"
+"if in doubt, DrakX will display a dialog with various options.\n"
 "\n"
 " * \"Bootloader to use\": you have three choices:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"GRUB\": if you prefer grub (text menu);\n"
 "\n"
 "    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"interface;\n"
 "\n"
 "    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
 "interface.\n"
@@ -4228,7 +4267,7 @@ msgid ""
 "second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
 " * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose - in the bootloader menu,\n"
+"this is the delay granted to the user to choose -- in the bootloader menu,\n"
 "another boot entry than the default one.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
@@ -4286,7 +4325,7 @@ msgstr ""
 "uwch,\n"
 "sydd yn cael eu cadw ar gyfer y defnyddiwr arbenigol."
 
-#: ../../help.pm_.c:710
+#: ../../help.pm_.c:718
 msgid ""
 "After you have configured the general bootloader parameters, the list of\n"
 "boot options which will be available at boot time will be displayed.\n"
@@ -4294,7 +4333,7 @@ msgid ""
 "If there is another operating system installed on your machine, it will\n"
 "automatically be added to the boot menu. Here, you can choose to fine-tune\n"
 "the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"remove it. \"Add\" creates a new entry. and \"Done\" goes on to the next\n"
 "installation step.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
@@ -4315,10 +4354,10 @@ msgstr ""
 "disg\n"
 " cychwyn ar gyfer y systemau gweithredu rheini!"
 
-#: ../../help.pm_.c:724
+#: ../../help.pm_.c:732
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
-"to GNU/Linux.\n"
+"GNU/Linux.\n"
 "\n"
 "Unless you know exactly what you are doing, choose \"First sector of drive\n"
 "(MBR)\"."
@@ -4328,34 +4367,26 @@ msgstr ""
 "Os nad ydych yn gwybod yn union beth rydych yn ei wneud, dewiswch \"First\n"
 "sector of drive (MBR)\"."
 
-#: ../../help.pm_.c:731
+#: ../../help.pm_.c:739
 msgid ""
-"Here, we select a printing system for your computer. Other OSs may offer\n"
-"you one, but Mandrake Linux offers three.\n"
+"Here, we select a printing system for your computer. Other OSes may offer\n"
+"you one, but Mandrake Linux offers two.\n"
 "\n"
-" * \"pdq\" - which means ``print, don't queue'', is the choice if you have\n"
+" * \"pdq\" -- which means ``print, don't queue'', is the choice if you have\n"
 "a direct connection to your printer and you want to be able to panic out of\n"
 "printer jams, and you do not have networked printers. It will handle only\n"
 "very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
-"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+"if this is your first voyage to GNU/Linux. You can change your choices\n"
 "after installation by running PrinterDrake from the Mandrake Control Center\n"
 "and clicking the expert button.\n"
 "\n"
-" * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing to\n"
+" * \"CUPS\" -- ``Common Unix Printing System'', is excellent at printing to\n"
 "your local printer and also halfway-around the planet. It is simple and can\n"
 "act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
 "it is compatible with the systems that went before. It can do many tricks,\n"
 "but the basic setup is almost as easy as \"pdq\". If you need this to\n"
 "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
-"graphical front-ends for printing or choosing printer options.\n"
-"\n"
-" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
-"approximately the same things the others can do, but it will print to\n"
-"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
-"and it can print directly to shell commands. If you have need of Novell or\n"
-"printing to commands without using a separate pipe construct, use lprNG.\n"
-"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
-"networks."
+"graphical front-ends for printing or choosing printer options."
 msgstr ""
 "Yma byddwn yn dewis system argraffu i'ch cyfrifiadur ei ddefnyddio. Efallai\n"
 "bod systemau eraill yn cynnig un i chi, ond mae Mandrake yn cynnig tri.\n"
@@ -4395,7 +4426,7 @@ msgstr ""
 
 #: ../../help.pm_.c:759
 msgid ""
-"DrakX now detects any IDE devices present in your computer. It will also\n"
+"DrakX now detects any IDE device present in your computer. It will also\n"
 "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
@@ -4405,7 +4436,7 @@ msgid ""
 "be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
 "have no SCSI hardware. If you are unsure, you can check the list of\n"
 "hardware detected in your machine by selecting \"See hardware info\" and\n"
-"clicking \"OK\". Examine the list of hardware and then click on the \"OK\"\n"
+"clicking \"OK\". Examine the hardware list and then click on the \"OK\"\n"
 "button to return to the SCSI interface question.\n"
 "\n"
 "If you have to manually specify your adapter, DrakX will ask if you want to\n"
@@ -4414,12 +4445,7 @@ msgid ""
 "usually works well.\n"
 "\n"
 "If DrakX is not able to probe for the options which need to be passed, you\n"
-"will need to provide options to the driver manually. Please review the\n"
-"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
-"Hardware'' section) for hints on retrieving the parameters required from\n"
-"hardware documentation, from the manufacturer's web site (if you have\n"
-"Internet access) or from Microsoft Windows (if you used this hardware with\n"
-"Windows on your system)."
+"will need to manually provide options to the driver."
 msgstr ""
 "Mae DrakX yn canfod unrhyw ddyfais IDE sydd ar eich cyfrifiadur. Bydd yn\n"
 "chwilio am un neu fwy o gardiau SCSI PCI ar eich system. Os oes Cerdyn\n"
@@ -4453,12 +4479,12 @@ msgstr ""
 "(os\n"
 " ydych wedi defnyddio'r caledwedd gyda Windows ar eich system)."
 
-#: ../../help.pm_.c:786
+#: ../../help.pm_.c:781
 msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
+"For other OSes, the entry consists only of a label and the \"root\"\n"
 "partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
@@ -4489,7 +4515,7 @@ msgid ""
 "need to allocate a large ramdisk, this option can be used;\n"
 "\n"
 " * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
+"read-only, to allow a filesystem check before the system becomes ``live''.\n"
 "Here, you can override this option;\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
@@ -4554,7 +4580,7 @@ msgstr ""
 "chi\n"
 " bwyso ar [Tab] i weld dewisiadau'r cychwyn."
 
-#: ../../help.pm_.c:833
+#: ../../help.pm_.c:828
 msgid ""
 "Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
 "either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
@@ -4625,10 +4651,10 @@ msgstr ""
 " * System Weithredu Rhagosodedig: mae modd dewis pa system weithredu fydd\n"
 "yn cychwyn drwy ragosodiad pan ddaw'r Open Firmware i ben."
 
-#: ../../help.pm_.c:865
+#: ../../help.pm_.c:860
 msgid ""
 "Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may - or not, see the following entries:\n"
+"your installed hardware, you may (or may not), see the following entries:\n"
 "\n"
 " * \"Mouse\": check the current mouse configuration and click on the button\n"
 "to change it if necessary;\n"
@@ -4643,19 +4669,19 @@ msgid ""
 "order to configure the clock according to the time zone you are in;\n"
 "\n"
 " * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``User\n"
+"configuration wizard. Consult the correpsonding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation;\n"
+"presented there is similar to the one used at installation time;\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
+" * \"Sound card\": if a sound card is detected on your system, it will be\n"
 "displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. No modification possible at installation time;\n"
+" * \"TV card\": if a TV card is detected on your system, it will be\n"
+"displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
 "displayed here. You can click on the button to change the parameters\n"
-"associated with it."
+"associated to it."
 msgstr ""
 "Dyma amrywiol baramedrau ynghylch eich peiriant. Yn ddibynnol ar eich\n"
 "caledwedd, mae'n bosibl i chi weld y rhain, neu beidio\n"
@@ -4692,7 +4718,7 @@ msgstr ""
 " yn cael ei ddangos yma. Mae modd clicio ar y botwm i newid y paramedrau\n"
 " cysylltiedig."
 
-#: ../../help.pm_.c:896
+#: ../../help.pm_.c:891
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
 "Mandrake Linux partition. Be careful, all data present on it will be lost\n"
@@ -4702,14 +4728,14 @@ msgstr ""
 "Mandrake Linux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
 "cael ei ddileu ac ni fydd modd ei adfer!"
 
-#: ../../help.pm_.c:901
+#: ../../help.pm_.c:896
 msgid ""
 "Click on \"OK\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
 "to recover any data and partitions present on this hard drive, including\n"
 "any Windows data.\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"Click on \"Cancel\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
 "Cliciwch \"Iawn\" os ydych am ddileu'r holl ddata a rhaniadau sy'n bresennol "
@@ -4736,7 +4762,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Rhaid fformatio %s hefyd"
 
-#: ../../install_any.pm_.c:424
+#: ../../install_any.pm_.c:423
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4759,7 +4785,7 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gosod y gwasanaethwyr hyn?\n"
 
-#: ../../install_any.pm_.c:442
+#: ../../install_any.pm_.c:441
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4773,20 +4799,20 @@ msgstr ""
 "\n"
 "Ydych chi am dynnu'r pecynnau hyn?\n"
 
-#: ../../install_any.pm_.c:472
+#: ../../install_any.pm_.c:471
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Methu defnyddio darlledu heb barth NIS"
 
-#: ../../install_any.pm_.c:869
+#: ../../install_any.pm_.c:870
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Rhowch ddisg meddal wedi ei fformatio i FAT yng ngyrrwr %s"
 
-#: ../../install_any.pm_.c:873
+#: ../../install_any.pm_.c:874
 msgid "This floppy is not FAT formatted"
 msgstr "Nid yw 'r disg meddal hwn wedi ei fformatio i FAT"
 
-#: ../../install_any.pm_.c:885
+#: ../../install_any.pm_.c:886
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -4794,12 +4820,12 @@ msgstr ""
 "I ddefnyddio'r dewis o becynnau wedi eu cadw, cychwynnwch y gosodiad gyda "
 "``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:908 ../../partition_table.pm_.c:767
+#: ../../install_any.pm_.c:909 ../../partition_table.pm_.c:767
 #, c-format
 msgid "Error reading file %s"
 msgstr "Gwall wrth ddarllen ffeil %s"
 
-#: ../../install_any.pm_.c:1030
+#: ../../install_any.pm_.c:1031
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -5041,7 +5067,7 @@ msgstr ""
 msgid "Welcome to %s"
 msgstr "Croeso i %s"
 
-#: ../../install_steps.pm_.c:531 ../../install_steps.pm_.c:770
+#: ../../install_steps.pm_.c:542 ../../install_steps.pm_.c:781
 msgid "No floppy drive available"
 msgstr "Does dim gyrrwr disg meddal ar gael"
 
@@ -5980,8 +6006,8 @@ msgstr "Llygoden"
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2966
-#: ../../printerdrake.pm_.c:3055
+#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2985
+#: ../../printerdrake.pm_.c:3074
 msgid "Printer"
 msgstr "Argraffydd"
 
@@ -6037,7 +6063,7 @@ msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Mae'r cyfrinair yn rhy syml ( rhaid iddo fod o leiaf %d nod o hyd)"
 
 #: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:49
-#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:172
+#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
 msgid "Authentication"
 msgstr "Dilysu"
 
@@ -6143,7 +6169,7 @@ msgstr "Gyrrwr disg meddal cyntaf"
 msgid "Second floppy drive"
 msgstr "Ail ddisg meddal"
 
-#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2496
+#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2515
 msgid "Skip"
 msgstr "Hepgor"
 
@@ -6379,7 +6405,7 @@ msgid "Basic"
 msgstr "Elfennol"
 
 #: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:158
-#: ../../printerdrake.pm_.c:2150
+#: ../../printerdrake.pm_.c:2169
 msgid "<- Previous"
 msgstr "<- Cynt"
 
@@ -6988,7 +7014,7 @@ msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
 msgid "Finish"
 msgstr "Gorffen"
 
-#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2152
+#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2171
 msgid "Next ->"
 msgstr "Nesaf ->"
 
@@ -7251,7 +7277,7 @@ msgstr "Pa brotocol ydych chi eisiau ei ddefnyddio?"
 #: ../../network/isdn.pm_.c:200
 #, c-format
 msgid "Found \"%s\" interface do you want to use it ?"
-msgstr ""
+msgstr "Wedi canfod rhyngwyneb \"%s\", hoffech chi ei ddefnyddio?"
 
 #: ../../network/isdn.pm_.c:207
 msgid "What kind of card do you have?"
@@ -7463,13 +7489,13 @@ msgstr "Dewiswch broffil i'w ffurfweddu"
 msgid "Use auto detection"
 msgstr "Defnyddio awto ganfod"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3180
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3199
 #: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
-#: ../../standalone/drakfloppy_.c:145
+#: ../../standalone/drakfloppy_.c:146
 msgid "Expert Mode"
 msgstr "Modd Uwch"
 
-#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:386
+#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:399
 msgid "Detecting devices..."
 msgstr "Canfod dyfeisiadau..."
 
@@ -7639,7 +7665,7 @@ msgstr "IP awtomatig"
 msgid "Start at boot"
 msgstr "Cychwyn y peiriant"
 
-#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:860
+#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:875
 msgid "IP address should be in format 1.2.3.4"
 msgstr "dylai cyfeiriad IP fod mewn fformat  1.2.3.4"
 
@@ -7669,14 +7695,12 @@ msgid "Gateway device"
 msgstr "Dyfais mynedfa"
 
 #: ../../network/network.pm_.c:376
-#, fuzzy
 msgid "DNS server address should be in format 1.2.3.4"
-msgstr "dylai cyfeiriad IP fod mewn fformat  1.2.3.4"
+msgstr "Dylai cyfeiriad DNS fod mewn fformat  1.2.3.4"
 
 #: ../../network/network.pm_.c:380
-#, fuzzy
 msgid "Gateway address should be in format 1.2.3.4"
-msgstr "dylai cyfeiriad IP fod mewn fformat  1.2.3.4"
+msgstr "Dylai cyfeiriad Porth fod mewn fformat  1.2.3.4"
 
 #: ../../network/network.pm_.c:394
 msgid "Proxies configuration"
@@ -7897,7 +7921,7 @@ msgstr "LPD - Line Printer Daemon"
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue"
 
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1134
+#: ../../printer.pm_.c:34 ../../printer.pm_.c:1144
 msgid "CUPS"
 msgstr "CUPS"
 
@@ -7925,7 +7949,7 @@ msgstr "Argraffydd pell"
 msgid "Printer on remote CUPS server"
 msgstr "Argraffydd ar wasanaethwr CUPS pell"
 
-#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:883
+#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:898
 msgid "Printer on remote lpd server"
 msgstr "Argraffydd ar wasanaethwr lpd pell"
 
@@ -7941,7 +7965,7 @@ msgstr "Argraffydd ar wasanaethwr SMB/Windows 95/98/NT"
 msgid "Printer on NetWare server"
 msgstr "Argraffydd ar wasanaethwr NetWare"
 
-#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:887
+#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:902
 msgid "Enter a printer device URI"
 msgstr "Rhowch URI dyfais argraffydd"
 
@@ -7949,102 +7973,102 @@ msgstr "Rhowch URI dyfais argraffydd"
 msgid "Pipe job into a command"
 msgstr "Peipio'r gwaith i orchymyn"
 
-#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:542
+#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:552
 msgid "Unknown Model"
 msgstr "Model anhysbys"
 
-#: ../../printer.pm_.c:744 ../../printer.pm_.c:935 ../../printer.pm_.c:1327
-#: ../../printerdrake.pm_.c:2286 ../../printerdrake.pm_.c:3443
+#: ../../printer.pm_.c:754 ../../printer.pm_.c:945 ../../printer.pm_.c:1337
+#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3462
 msgid "Unknown model"
 msgstr "Model anhysbys"
 
-#: ../../printer.pm_.c:772
+#: ../../printer.pm_.c:782
 msgid "Local Printers"
 msgstr "Argraffyddion Lleol"
 
-#: ../../printer.pm_.c:774 ../../printer.pm_.c:1135
+#: ../../printer.pm_.c:784 ../../printer.pm_.c:1145
 msgid "Remote Printers"
 msgstr "Argraffyddion Pell"
 
-#: ../../printer.pm_.c:781 ../../printerdrake.pm_.c:404
+#: ../../printer.pm_.c:791 ../../printerdrake.pm_.c:417
 #, c-format
 msgid " on parallel port \\/*%s"
 msgstr " ar borth paralel \\/\"%s"
 
-#: ../../printer.pm_.c:784 ../../printerdrake.pm_.c:406
+#: ../../printer.pm_.c:794 ../../printerdrake.pm_.c:419
 #, c-format
 msgid ", USB printer \\/*%s"
 msgstr ", argraffydd USB \\/\"%s"
 
-#: ../../printer.pm_.c:789
+#: ../../printer.pm_.c:799
 #, c-format
 msgid ", multi-function device on parallel port \\/*%s"
 msgstr ", dyfais amlbwrpas ar borth paralel \\/\"%s"
 
-#: ../../printer.pm_.c:792
+#: ../../printer.pm_.c:802
 msgid ", multi-function device on USB"
 msgstr ", dyfais amlbwrpas ar USB"
 
-#: ../../printer.pm_.c:794
+#: ../../printer.pm_.c:804
 msgid ", multi-function device on HP JetDirect"
 msgstr ", dyfais amlbwrpas ar HP JetDirect"
 
-#: ../../printer.pm_.c:796
+#: ../../printer.pm_.c:806
 msgid ", multi-function device"
 msgstr ",dyfais amlbwrpas"
 
-#: ../../printer.pm_.c:799
+#: ../../printer.pm_.c:809
 #, c-format
 msgid ", printing to %s"
 msgstr ", argraffu i %s"
 
-#: ../../printer.pm_.c:801
+#: ../../printer.pm_.c:811
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr "ar wasanaethwr LPD  \"%s\", argraffydd \"%s\""
 
-#: ../../printer.pm_.c:803
+#: ../../printer.pm_.c:813
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", gwesteiwr TCP/IP  \"%s\", porth %s"
 
-#: ../../printer.pm_.c:807
+#: ../../printer.pm_.c:817
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr "ar wasanaethwr SMB/Windows  \"%s\", rhannu \"%s\""
 
-#: ../../printer.pm_.c:811
+#: ../../printer.pm_.c:821
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr "ar wasanaethwr Novell \"%s\", argraffydd \"%s\""
 
-#: ../../printer.pm_.c:813
+#: ../../printer.pm_.c:823
 #, c-format
 msgid ", using command %s"
 msgstr ", defnyddio gorchymyn %s"
 
-#: ../../printer.pm_.c:932 ../../printerdrake.pm_.c:1682
+#: ../../printer.pm_.c:942 ../../printerdrake.pm_.c:1701
 msgid "Raw printer (No driver)"
 msgstr "Argraffydd crai (dim gyrrwr)"
 
-#: ../../printer.pm_.c:1104
+#: ../../printer.pm_.c:1114
 #, c-format
 msgid "(on %s)"
 msgstr "(ar %s)"
 
-#: ../../printer.pm_.c:1106
+#: ../../printer.pm_.c:1116
 msgid "(on this machine)"
 msgstr "(ar y peiriant hwn)"
 
-#: ../../printer.pm_.c:1131
+#: ../../printer.pm_.c:1141
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "Ar wasanaethwr CUPS \"%s\""
 
-#: ../../printer.pm_.c:1137 ../../printerdrake.pm_.c:3100
-#: ../../printerdrake.pm_.c:3111 ../../printerdrake.pm_.c:3332
-#: ../../printerdrake.pm_.c:3384 ../../printerdrake.pm_.c:3410
-#: ../../printerdrake.pm_.c:3585 ../../printerdrake.pm_.c:3587
+#: ../../printer.pm_.c:1147 ../../printerdrake.pm_.c:3119
+#: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3351
+#: ../../printerdrake.pm_.c:3403 ../../printerdrake.pm_.c:3429
+#: ../../printerdrake.pm_.c:3604 ../../printerdrake.pm_.c:3606
 msgid " (Default)"
 msgstr "(Rhagosodedig)"
 
@@ -8070,11 +8094,11 @@ msgstr ""
 msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
 msgstr "Awtoganfod argraffydd (Argraffyddion lleol, TCP/Socket, ac SMB)"
 
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3164
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3183
 msgid "CUPS configuration"
 msgstr "Furfweddiad CUPS"
 
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3165
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3184
 msgid "Specify CUPS server"
 msgstr "Enwch wasanaethwr CUPS"
 
@@ -8118,7 +8142,7 @@ msgstr ""
 msgid "The IP address should look like 192.168.1.20"
 msgstr "Dylai cyfeiriad IP edrych fel 192.168.1.20"
 
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1094
+#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1109
 msgid "The port number should be an integer!"
 msgstr "Dylai rhif porth fod yn gyfanrif!"
 
@@ -8126,7 +8150,7 @@ msgstr "Dylai rhif porth fod yn gyfanrif!"
 msgid "CUPS server IP"
 msgstr "IP gwasanaethwr CUPS"
 
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1114
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1129
 msgid "Port"
 msgstr "Porth"
 
@@ -8135,19 +8159,19 @@ msgid "Automatic CUPS configuration"
 msgstr "Furfweddiad CUPS Awtomatig"
 
 #: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
-#: ../../printerdrake.pm_.c:1555 ../../printerdrake.pm_.c:1559
-#: ../../printerdrake.pm_.c:1677 ../../printerdrake.pm_.c:2229
-#: ../../printerdrake.pm_.c:2382 ../../printerdrake.pm_.c:2441
-#: ../../printerdrake.pm_.c:2514 ../../printerdrake.pm_.c:2535
-#: ../../printerdrake.pm_.c:2728 ../../printerdrake.pm_.c:2769
-#: ../../printerdrake.pm_.c:2774 ../../printerdrake.pm_.c:2808
-#: ../../printerdrake.pm_.c:2813 ../../printerdrake.pm_.c:2850
-#: ../../printerdrake.pm_.c:2903 ../../printerdrake.pm_.c:2923
-#: ../../printerdrake.pm_.c:2937 ../../printerdrake.pm_.c:2971
-#: ../../printerdrake.pm_.c:3017 ../../printerdrake.pm_.c:3035
-#: ../../printerdrake.pm_.c:3124 ../../printerdrake.pm_.c:3198
-#: ../../printerdrake.pm_.c:3500 ../../printerdrake.pm_.c:3555
-#: ../../printerdrake.pm_.c:3608 ../../standalone/printerdrake_.c:57
+#: ../../printerdrake.pm_.c:1574 ../../printerdrake.pm_.c:1578
+#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
+#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
+#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
+#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2788
+#: ../../printerdrake.pm_.c:2793 ../../printerdrake.pm_.c:2827
+#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2869
+#: ../../printerdrake.pm_.c:2922 ../../printerdrake.pm_.c:2942
+#: ../../printerdrake.pm_.c:2956 ../../printerdrake.pm_.c:2990
+#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3054
+#: ../../printerdrake.pm_.c:3143 ../../printerdrake.pm_.c:3217
+#: ../../printerdrake.pm_.c:3519 ../../printerdrake.pm_.c:3574
+#: ../../printerdrake.pm_.c:3627 ../../standalone/printerdrake_.c:57
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
@@ -8266,12 +8290,13 @@ msgstr ""
 "NODYN: Yn dibynnu ar yr argraffydd a'r system argraffu bydd hyd at %d MB o "
 "feddalwedd ychwanegol yn cael ei osod."
 
-#: ../../printerdrake.pm_.c:269 ../../printerdrake.pm_.c:278
-#: ../../printerdrake.pm_.c:3146 ../../printerdrake.pm_.c:3271
+#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
+#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3165
+#: ../../printerdrake.pm_.c:3290
 msgid "Add a new printer"
 msgstr "Ychwanegu argraffydd newydd"
 
-#: ../../printerdrake.pm_.c:270
+#: ../../printerdrake.pm_.c:280
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8294,7 +8319,7 @@ msgstr ""
 "yn rhoi mynediad i'r holl yrwyr argraffyddion sydd ar gael, dewisiadau "
 "gyrwyr a mathau o gysylltiadau argraffyddion."
 
-#: ../../printerdrake.pm_.c:280
+#: ../../printerdrake.pm_.c:293
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8334,7 +8359,7 @@ msgstr ""
 "Cliciwch \"Nesaf\" pan ydych yn barod, a \"Diddymu\" os nad ydych am osod "
 "eich argraffydd(ion) ar hyn o bryd."
 
-#: ../../printerdrake.pm_.c:289 ../../printerdrake.pm_.c:306
+#: ../../printerdrake.pm_.c:302 ../../printerdrake.pm_.c:319
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8359,7 +8384,7 @@ msgstr ""
 "Cliciwch \"Nesaf\" pan ydych yn barod, a \"Diddymu\" os nad ydych am osod "
 "eich argraffydd(ion) ar hyn o bryd."
 
-#: ../../printerdrake.pm_.c:297
+#: ../../printerdrake.pm_.c:310
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8396,28 +8421,23 @@ msgstr ""
 "Cliciwch \"Nesaf\" pan ydych yn barod, a \"Diddymu\" os nad ydych am osod "
 "eich argraffydd(ion) ar hyn o bryd."
 
-#: ../../printerdrake.pm_.c:315
+#: ../../printerdrake.pm_.c:328
 msgid "Auto-detect printers connected to this machine"
 msgstr "Awto ganfod argraffyddion sy'n gysylltiedig a'r peiriant hwn"
 
-#: ../../printerdrake.pm_.c:318
+#: ../../printerdrake.pm_.c:331
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 "Awtoganfod argraffyddion sy'n gysylltiedig yn uniongyrchol â'r rhwydwaith "
 "lleol"
 
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:334
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Awtoganfod argraffyddion sy'n gysylltiedig â pheiriannau'n rhedeg Microsoft "
 "Windows"
 
-#: ../../printerdrake.pm_.c:348 ../../printerdrake.pm_.c:562
-#: ../../printerdrake.pm_.c:587
-msgid "Local Printer"
-msgstr "Argraffydd Lleol"
-
-#: ../../printerdrake.pm_.c:349
+#: ../../printerdrake.pm_.c:362
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -8437,49 +8457,53 @@ msgstr ""
 "gosodiadau dewis rhagosodedig (mewnflwch papur, ansawdd y printiad,...0, "
 "dewiswch \"Argraffydd\" yn adran \"Caledwedd\" Canolfan Rheoli Mandrake."
 
-#: ../../printerdrake.pm_.c:386 ../../printerdrake.pm_.c:577
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:590
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Printer auto-detection"
 msgstr "Awto ganfod argraffydd"
 
-#: ../../printerdrake.pm_.c:408
+#: ../../printerdrake.pm_.c:421
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", rhwydwaith argraffu \"%s\", porth %s"
 
-#: ../../printerdrake.pm_.c:410
+#: ../../printerdrake.pm_.c:423
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", argraffydd \"%s\" ar wasanaethwr  SMB/Windows \"%s\""
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:429
 #, c-format
 msgid "Detected %s"
 msgstr "Canfyddwyd %s"
 
-#: ../../printerdrake.pm_.c:420 ../../printerdrake.pm_.c:451
-#: ../../printerdrake.pm_.c:470
+#: ../../printerdrake.pm_.c:433 ../../printerdrake.pm_.c:464
+#: ../../printerdrake.pm_.c:483
 #, c-format
 msgid "Printer on parallel port \\/*%s"
 msgstr "Argraffydd ar borth paralel \\/\"%s"
 
-#: ../../printerdrake.pm_.c:422 ../../printerdrake.pm_.c:453
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:435 ../../printerdrake.pm_.c:466
+#: ../../printerdrake.pm_.c:488
 #, c-format
 msgid "USB printer \\/*%s"
 msgstr "Argraffydd USB \\/\"%s"
 
-#: ../../printerdrake.pm_.c:424
+#: ../../printerdrake.pm_.c:437
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Argraffydd rhwydwaith \"%s\", porth %s"
 
-#: ../../printerdrake.pm_.c:426
+#: ../../printerdrake.pm_.c:439
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Argraffydd  \"%s\" ar wasanaethwr SMB/Windows \"%s\""
 
-#: ../../printerdrake.pm_.c:563
+#: ../../printerdrake.pm_.c:575 ../../printerdrake.pm_.c:600
+msgid "Local Printer"
+msgstr "Argraffydd Lleol"
+
+#: ../../printerdrake.pm_.c:576
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
 "file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
@@ -8491,19 +8515,19 @@ msgstr ""
 "dev/,...., cyfatebol i LPT1:, LPT2,..., argraffydd USB 1af: /dev/usb/lp0,  "
 "ail argraffydd USB: /dev/usb/lp1,...)."
 
-#: ../../printerdrake.pm_.c:567
+#: ../../printerdrake.pm_.c:580
 msgid "You must enter a device or file name!"
 msgstr "Rhaid cynnig enw dyfais neu ffeil!"
 
-#: ../../printerdrake.pm_.c:578
+#: ../../printerdrake.pm_.c:591
 msgid "No printer found!"
 msgstr "Heb ganfood argraffydd!"
 
-#: ../../printerdrake.pm_.c:588
+#: ../../printerdrake.pm_.c:601
 msgid "Available printers"
 msgstr "Argraffyddion ar gael"
 
-#: ../../printerdrake.pm_.c:592
+#: ../../printerdrake.pm_.c:605
 msgid ""
 "The following printer was auto-detected, if it is not the one you want to "
 "configure, enter a device name/file name in the input line"
@@ -8511,7 +8535,7 @@ msgstr ""
 "Cafodd yr argraffydd canlynol ei awto ganfod, os nad hwn yw'r un rydych am "
 "ei ffurfweddu, rhowch enw dyfais/enw ffeil ar y llinell mewnbwn."
 
-#: ../../printerdrake.pm_.c:593
+#: ../../printerdrake.pm_.c:606
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up or enter a device name/file name in the input line"
@@ -8520,7 +8544,7 @@ msgstr ""
 "argraffydd rydych am ei osod neu rhowch enw dyfais/ffeil yn y llinell "
 "mewnbwn."
 
-#: ../../printerdrake.pm_.c:595
+#: ../../printerdrake.pm_.c:608
 msgid ""
 "The following printer was auto-detected. The configuration of the printer "
 "will work fully automatically. If your printer was not correctly detected or "
@@ -8532,7 +8556,7 @@ msgstr ""
 "byddai'n well gennych ffurfweddiad unigryw i'ch argraffydd, cychwynnwch "
 "\"Ffurfweddiad gyda Llaw\"."
 
-#: ../../printerdrake.pm_.c:596
+#: ../../printerdrake.pm_.c:609
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up. The configuration of the printer will work fully "
@@ -8545,7 +8569,7 @@ msgstr ""
 "well gennych ffurfweddiad unigryw i'ch argraffydd, cychwynnwch "
 "\"Ffurfweddiad gyda Llaw\"."
 
-#: ../../printerdrake.pm_.c:598
+#: ../../printerdrake.pm_.c:611
 msgid ""
 "Please choose the port where your printer is connected to or enter a device "
 "name/file name in the input line"
@@ -8553,11 +8577,11 @@ msgstr ""
 "Dewiswch y porth y mae eich argraffydd wedi cysylltu iddo neurhowch enw "
 "dyfais/ffeil ar y ninell mewnbwn"
 
-#: ../../printerdrake.pm_.c:599
+#: ../../printerdrake.pm_.c:612
 msgid "Please choose the port where your printer is connected to."
 msgstr "Dewiswch y porth mae'r argraffydd wedi cysylltu iddo."
 
-#: ../../printerdrake.pm_.c:601
+#: ../../printerdrake.pm_.c:614
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
@@ -8565,19 +8589,19 @@ msgstr ""
 " (Pyrth paralel: /dev/lp0, /dev/lp1, ..., yn cyfateb i LPT1:, LPT2:, ..., "
 "argraffydd USB cyntaf: /dev/usb/lp0, ail argraffydd USB : /dev/usb/lp1, ...)."
 
-#: ../../printerdrake.pm_.c:606
+#: ../../printerdrake.pm_.c:619
 msgid "You must choose/enter a printer/device!"
 msgstr "Rhaid dewis/rhoi argraffydd/dyfais!"
 
-#: ../../printerdrake.pm_.c:626
+#: ../../printerdrake.pm_.c:639
 msgid "Manual configuration"
 msgstr "Ffurfweddiad gyda llaw"
 
-#: ../../printerdrake.pm_.c:680
+#: ../../printerdrake.pm_.c:693
 msgid "Remote lpd Printer Options"
 msgstr "Dewisiadau Argraffydd lpd Pell"
 
-#: ../../printerdrake.pm_.c:681
+#: ../../printerdrake.pm_.c:694
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
@@ -8585,46 +8609,46 @@ msgstr ""
 "I ddefnyddio argraffydd lpd pell, rhaid darparu enw gwesteiwr gwasanaethwr "
 "yr argraffydd ac enw'r argraffydd ar y gwasanaethwr hwnnw."
 
-#: ../../printerdrake.pm_.c:682
+#: ../../printerdrake.pm_.c:695
 msgid "Remote host name"
 msgstr "Enw gwesteiwr pell"
 
-#: ../../printerdrake.pm_.c:683
+#: ../../printerdrake.pm_.c:696
 msgid "Remote printer name"
 msgstr "Enw'r argraffydd pell"
 
-#: ../../printerdrake.pm_.c:686
+#: ../../printerdrake.pm_.c:699
 msgid "Remote host name missing!"
 msgstr "Mae enw'r gwesteiwr pell ar goll!"
 
-#: ../../printerdrake.pm_.c:690
+#: ../../printerdrake.pm_.c:703
 msgid "Remote printer name missing!"
 msgstr "Mae enw'r argraffydd pell ar goll!"
 
-#: ../../printerdrake.pm_.c:712 ../../printerdrake.pm_.c:1225
+#: ../../printerdrake.pm_.c:727 ../../printerdrake.pm_.c:1244
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Canfyddwyd model %s %s"
 
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Scanning network..."
 msgstr "Chwilio'r rhwydwaith..."
 
-#: ../../printerdrake.pm_.c:799 ../../printerdrake.pm_.c:820
+#: ../../printerdrake.pm_.c:814 ../../printerdrake.pm_.c:835
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", argraffydd \"%s\" ar wasanaethwr \"%s\""
 
-#: ../../printerdrake.pm_.c:802 ../../printerdrake.pm_.c:823
+#: ../../printerdrake.pm_.c:817 ../../printerdrake.pm_.c:838
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Argraffydd \"%s\" ar wasanaethwr \"%s\""
 
-#: ../../printerdrake.pm_.c:843
+#: ../../printerdrake.pm_.c:858
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Dewisiadau Argraffydd SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:844
+#: ../../printerdrake.pm_.c:859
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
 "may be different from its TCP/IP hostname!) and possibly the IP address of "
@@ -8637,7 +8661,7 @@ msgstr ""
 "rydych am gael mynediad iddo ac unrhyw enw defnyddiwr, cyfrinair a "
 "gwybodaeth am grwp gwaith perthynol."
 
-#: ../../printerdrake.pm_.c:845
+#: ../../printerdrake.pm_.c:860
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
@@ -8645,39 +8669,39 @@ msgstr ""
 "Os cafodd yr argraffydd ei awtoganfod, dewiswch ef o'r rhestr ac ychwanegu "
 "enw defnyddiwr, cyfrinair a/neu grwp gwaith yn ôl yr angen."
 
-#: ../../printerdrake.pm_.c:846
+#: ../../printerdrake.pm_.c:861
 msgid "SMB server host"
 msgstr "Gwasanaethwr gwesteiwr SMB"
 
-#: ../../printerdrake.pm_.c:847
+#: ../../printerdrake.pm_.c:862
 msgid "SMB server IP"
 msgstr "IP Gwasanaethwr SMB"
 
-#: ../../printerdrake.pm_.c:848
+#: ../../printerdrake.pm_.c:863
 msgid "Share name"
 msgstr "Rhannu enw"
 
-#: ../../printerdrake.pm_.c:851
+#: ../../printerdrake.pm_.c:866
 msgid "Workgroup"
 msgstr "Grwp gwaith"
 
-#: ../../printerdrake.pm_.c:853
+#: ../../printerdrake.pm_.c:868
 msgid "Auto-detected"
 msgstr "Awto ganfyddwyd"
 
-#: ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:879
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Rhaid rhoi un ai enw'r gwasanaethwr neu IP'r gwasanaethwr!"
 
-#: ../../printerdrake.pm_.c:868
+#: ../../printerdrake.pm_.c:883
 msgid "Samba share name missing!"
 msgstr "Mae enw rhannu Samba ar goll!"
 
-#: ../../printerdrake.pm_.c:874
+#: ../../printerdrake.pm_.c:889
 msgid "SECURITY WARNING!"
 msgstr "RHYBUDD DIOGELWCH!"
 
-#: ../../printerdrake.pm_.c:875
+#: ../../printerdrake.pm_.c:890
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -8721,7 +8745,7 @@ msgstr ""
 "Printerdrake.\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:885
+#: ../../printerdrake.pm_.c:900
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -8733,7 +8757,7 @@ msgstr ""
 "IPP a gosod argraffu o'r peiriant hwn gyda'r \"%s\" yn Printerdrake.\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:888
+#: ../../printerdrake.pm_.c:903
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
 "connect to it as a client.\n"
@@ -8745,11 +8769,11 @@ msgstr ""
 "\n"
 "Ydych chi am barhau i osod yr argraffydd hwn?"
 
-#: ../../printerdrake.pm_.c:960
+#: ../../printerdrake.pm_.c:975
 msgid "NetWare Printer Options"
 msgstr "Dewisiadau Argraffydd NetWare"
 
-#: ../../printerdrake.pm_.c:961
+#: ../../printerdrake.pm_.c:976
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
 "name (Note! it may be different from its TCP/IP hostname!) as well as the "
@@ -8761,37 +8785,37 @@ msgstr ""
 "â'r rhes waith argraffu am yr argraffydd rydych am gael mynediad iddo ac "
 "unrhyw enw defnyddiwr a chyfrinair perthnasol."
 
-#: ../../printerdrake.pm_.c:962
+#: ../../printerdrake.pm_.c:977
 msgid "Printer Server"
 msgstr "Gwasanaethwr Argraffydd"
 
-#: ../../printerdrake.pm_.c:963
+#: ../../printerdrake.pm_.c:978
 msgid "Print Queue Name"
 msgstr "Enw Rhes Argraffu"
 
-#: ../../printerdrake.pm_.c:968
+#: ../../printerdrake.pm_.c:983
 msgid "NCP server name missing!"
 msgstr "Mae enw gwasanaethwr NCP ar goll!"
 
-#: ../../printerdrake.pm_.c:972
+#: ../../printerdrake.pm_.c:987
 msgid "NCP queue name missing!"
 msgstr "Mae enw rhes NCP ar goll"
 
-#: ../../printerdrake.pm_.c:1039 ../../printerdrake.pm_.c:1059
+#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1074
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", gwesteiwr \"%s\", porth %s"
 
-#: ../../printerdrake.pm_.c:1042 ../../printerdrake.pm_.c:1062
+#: ../../printerdrake.pm_.c:1057 ../../printerdrake.pm_.c:1077
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ",Gwesteiwr  \"%s\", porth %s"
 
-#: ../../printerdrake.pm_.c:1082
+#: ../../printerdrake.pm_.c:1097
 msgid "TCP/Socket Printer Options"
 msgstr "Dewisiadau Argraffydd TCP/Soced"
 
-#: ../../printerdrake.pm_.c:1084
+#: ../../printerdrake.pm_.c:1099
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) into the input fields."
@@ -8800,7 +8824,7 @@ msgstr ""
 "yr enw gwesteiwr neu IP a'r rhif porth dewisol (9100 yw'r rhagosodedig) i'r "
 "meysydd mewnbwn."
 
-#: ../../printerdrake.pm_.c:1085
+#: ../../printerdrake.pm_.c:1100
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
 "of the printer and optionally the port number (default is 9100). On HP "
@@ -8812,19 +8836,19 @@ msgstr ""
 "wasanaethwyr HP JetDirect rhif y porth, fel rheol, yw 9100, gall amrywio ar "
 "wasanaethwyr eraill. Gweler llawlyfr eich caledwedd"
 
-#: ../../printerdrake.pm_.c:1090
+#: ../../printerdrake.pm_.c:1105
 msgid "Printer host name or IP missing!"
 msgstr "Mae enw'r gwesteiwr argraffu neu IP ar goll!"
 
-#: ../../printerdrake.pm_.c:1112
+#: ../../printerdrake.pm_.c:1127
 msgid "Printer host name or IP"
 msgstr "Enw'r gwesteiwr neu IP yr argraffydd"
 
-#: ../../printerdrake.pm_.c:1160 ../../printerdrake.pm_.c:1162
+#: ../../printerdrake.pm_.c:1177 ../../printerdrake.pm_.c:1179
 msgid "Printer Device URI"
 msgstr "URI Dyfais Argraffu"
 
-#: ../../printerdrake.pm_.c:1161
+#: ../../printerdrake.pm_.c:1178
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
@@ -8834,11 +8858,11 @@ msgstr ""
 "gyflawni manylyn un ai CUPS neu Foomatic. Sylwer nad yw pob math o URI cyn "
 "cael eu cynnal gan bob sbwlydd ."
 
-#: ../../printerdrake.pm_.c:1176
+#: ../../printerdrake.pm_.c:1193
 msgid "A valid URI must be entered!"
 msgstr "Rhaid cynnig URI dilys!"
 
-#: ../../printerdrake.pm_.c:1541
+#: ../../printerdrake.pm_.c:1560
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
@@ -8846,27 +8870,27 @@ msgstr ""
 "Mae pob argraffydd angen enw (e.e. \"argraffydd\". Nid oes angen llanw "
 "meysydd Disgrifiad a Lleoliad. Lle ar gyfer sylwadau'r defnyddiwr sydd yma."
 
-#: ../../printerdrake.pm_.c:1542
+#: ../../printerdrake.pm_.c:1561
 msgid "Name of printer"
 msgstr "Enw'r argraffydd"
 
-#: ../../printerdrake.pm_.c:1544
+#: ../../printerdrake.pm_.c:1563
 msgid "Location"
 msgstr "Lleoliad"
 
-#: ../../printerdrake.pm_.c:1556 ../../printerdrake.pm_.c:1678
+#: ../../printerdrake.pm_.c:1575 ../../printerdrake.pm_.c:1697
 msgid "Reading printer database..."
 msgstr "Darllen cronfa ddata argraffydd..."
 
-#: ../../printerdrake.pm_.c:1560
+#: ../../printerdrake.pm_.c:1579
 msgid "Preparing printer database..."
 msgstr "Paratoi cronfa ddata argraffydd..."
 
-#: ../../printerdrake.pm_.c:1657
+#: ../../printerdrake.pm_.c:1676
 msgid "Your printer model"
 msgstr "Model eich argraffydd"
 
-#: ../../printerdrake.pm_.c:1658
+#: ../../printerdrake.pm_.c:1677
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -8892,24 +8916,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../printerdrake.pm_.c:1663 ../../printerdrake.pm_.c:1666
+#: ../../printerdrake.pm_.c:1682 ../../printerdrake.pm_.c:1685
 msgid "The model is correct"
 msgstr "Mae'r model yn gywir"
 
-#: ../../printerdrake.pm_.c:1664 ../../printerdrake.pm_.c:1665
-#: ../../printerdrake.pm_.c:1668
+#: ../../printerdrake.pm_.c:1683 ../../printerdrake.pm_.c:1684
+#: ../../printerdrake.pm_.c:1687
 msgid "Select model manually"
 msgstr "Dewiswch y model gyda llaw"
 
-#: ../../printerdrake.pm_.c:1685
+#: ../../printerdrake.pm_.c:1704
 msgid "Printer model selection"
 msgstr "Dewis model yr argraffydd"
 
-#: ../../printerdrake.pm_.c:1686
+#: ../../printerdrake.pm_.c:1705
 msgid "Which printer model do you have?"
 msgstr "Pa fath o argraffydd sydd gennych?"
 
-#: ../../printerdrake.pm_.c:1687
+#: ../../printerdrake.pm_.c:1706
 msgid ""
 "\n"
 "\n"
@@ -8923,7 +8947,7 @@ msgstr ""
 "Chwiliwch am y model cywir pan fo'r cyrchwr yn sefyll ar y model anghywir "
 "neu ar \"Argraffydd bras\"."
 
-#: ../../printerdrake.pm_.c:1690
+#: ../../printerdrake.pm_.c:1709
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
@@ -8931,11 +8955,11 @@ msgstr ""
 "Nid yw eich argraffydd wedi ei rhestri, dewiswch un cyfatebol (gw. llawlyfr "
 "eich argraffydd) neu un tebyg."
 
-#: ../../printerdrake.pm_.c:1767
+#: ../../printerdrake.pm_.c:1786
 msgid "OKI winprinter configuration"
 msgstr "Ffurfweddiad OKI winprinter "
 
-#: ../../printerdrake.pm_.c:1768
+#: ../../printerdrake.pm_.c:1787
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
 "use a very special communication protocol and therefore they work only when "
@@ -8952,11 +8976,11 @@ msgstr ""
 "brawf. Os na wnewch chi hynny, ni fydd yr argraffydd yn gweithio. Bydd eich "
 "gosodiad ynghylch ymath o gysylltiad yn cael ei anwybyddu gan y gyrrwr."
 
-#: ../../printerdrake.pm_.c:1811 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1857
 msgid "Lexmark inkjet configuration"
 msgstr "Ffurfweddiad inkjet Lexmark"
 
-#: ../../printerdrake.pm_.c:1812
+#: ../../printerdrake.pm_.c:1831
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
 "no printers on remote machines or print server boxes. Please connect your "
@@ -8967,7 +8991,7 @@ msgstr ""
 "argraffyddion lleol, yn unig. Cysylltwch eich argraffydd i borth lleol neu "
 "ffurfweddwch ef i'r peiriant mae'n gysylltiedig ag ef."
 
-#: ../../printerdrake.pm_.c:1839
+#: ../../printerdrake.pm_.c:1858
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
 "need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
@@ -8988,11 +9012,11 @@ msgstr ""
 "dudalennau'r alinio'r pen argraffu gyda \"lexmarkmaintain\" a newid "
 "gosodiadau aliniad y pen gyda'r rhaglen."
 
-#: ../../printerdrake.pm_.c:1842
+#: ../../printerdrake.pm_.c:1861
 msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
 msgstr "GDI Laser Printer yn defnyddio Zenographics ZJ-Stream Format"
 
-#: ../../printerdrake.pm_.c:1843
+#: ../../printerdrake.pm_.c:1862
 msgid ""
 "Your printer belongs to the group of GDI laser printers (winprinters) sold "
 "by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -9033,7 +9057,7 @@ msgstr ""
 "Mae modd i unrhyw ddefnyddiwr wneud y gorchymyn cyntaf, rhaid i'r ail fod "
 "fel gwraidd. wedi gwneud hyn mae modd argraffu fel arfer\n"
 
-#: ../../printerdrake.pm_.c:2066
+#: ../../printerdrake.pm_.c:2085
 msgid ""
 "Printer default settings\n"
 "\n"
@@ -9050,22 +9074,22 @@ msgstr ""
 "argraffiad ansawdd/cydraniad uchel iawn yn medru arafu'r argraffu'n "
 "sylweddol.."
 
-#: ../../printerdrake.pm_.c:2075
+#: ../../printerdrake.pm_.c:2094
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Rhaid i ddewis %s fod yn gyfanrif"
 
-#: ../../printerdrake.pm_.c:2079
+#: ../../printerdrake.pm_.c:2098
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Rhaid i ddewis %s fod yn rhif!"
 
-#: ../../printerdrake.pm_.c:2084
+#: ../../printerdrake.pm_.c:2103
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Dewis %s allan o amrediad!"
 
-#: ../../printerdrake.pm_.c:2123
+#: ../../printerdrake.pm_.c:2142
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -9074,11 +9098,11 @@ msgstr ""
 "Ydych chi am osod argraffydd  (\"%s\")\n"
 "fel yr argraffydd rhagosodedig?"
 
-#: ../../printerdrake.pm_.c:2146
+#: ../../printerdrake.pm_.c:2165
 msgid "Test pages"
 msgstr "Tudalennau prawf"
 
-#: ../../printerdrake.pm_.c:2147
+#: ../../printerdrake.pm_.c:2166
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed and on "
@@ -9090,39 +9114,39 @@ msgstr ""
 "ei argraffu ac ar argraffydd laser heb lawer o gof mae'n bosibl na ddaw o "
 "gwbl. Yn y rhan fwyaf o achosion, mae'r prawf tudalen safonol yn ddigonol."
 
-#: ../../printerdrake.pm_.c:2151
+#: ../../printerdrake.pm_.c:2170
 msgid "No test pages"
 msgstr "Dim tudalennau prawf"
 
-#: ../../printerdrake.pm_.c:2152
+#: ../../printerdrake.pm_.c:2171
 msgid "Print"
 msgstr "Argraffu"
 
-#: ../../printerdrake.pm_.c:2209
+#: ../../printerdrake.pm_.c:2228
 msgid "Standard test page"
 msgstr "Tudalen prawf safonnol"
 
-#: ../../printerdrake.pm_.c:2212
+#: ../../printerdrake.pm_.c:2231
 msgid "Alternative test page (Letter)"
 msgstr "Prawf tudalen arall (Llythyr)"
 
-#: ../../printerdrake.pm_.c:2215
+#: ../../printerdrake.pm_.c:2234
 msgid "Alternative test page (A4)"
 msgstr "Prawf tudalen arall (A4)"
 
-#: ../../printerdrake.pm_.c:2217
+#: ../../printerdrake.pm_.c:2236
 msgid "Photo test page"
 msgstr "Tudalen prawf llun"
 
-#: ../../printerdrake.pm_.c:2221
+#: ../../printerdrake.pm_.c:2240
 msgid "Do not print any test page"
 msgstr "Peidiwch argraffu tudalennau prawf"
 
-#: ../../printerdrake.pm_.c:2230 ../../printerdrake.pm_.c:2383
+#: ../../printerdrake.pm_.c:2249 ../../printerdrake.pm_.c:2402
 msgid "Printing test page(s)..."
 msgstr "Argraffu tudalen(nau) prawf..."
 
-#: ../../printerdrake.pm_.c:2255
+#: ../../printerdrake.pm_.c:2274
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -9137,7 +9161,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2259
+#: ../../printerdrake.pm_.c:2278
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
@@ -9145,15 +9169,15 @@ msgstr ""
 "Mae tudalen(nau) prawf wedi eu hanfon at yr argraffydd.\n"
 "Gall gymryd amser cyn i'r argraffydd gychwyn.\n"
 
-#: ../../printerdrake.pm_.c:2266
+#: ../../printerdrake.pm_.c:2285
 msgid "Did it work properly?"
 msgstr "A weithiodd hwnnw'n iawn?"
 
-#: ../../printerdrake.pm_.c:2288 ../../printerdrake.pm_.c:3445
+#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3464
 msgid "Raw printer"
 msgstr "Argraffydd bras"
 
-#: ../../printerdrake.pm_.c:2314
+#: ../../printerdrake.pm_.c:2333
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -9166,7 +9190,7 @@ msgstr ""
 "\"xpp <file>\" neu \"kprinter <file>\". Mae'r offeryn graffigol yn caniatáu "
 "chi ddefnyddio'r argraffydd ac i newid gosodiadau dewis yn hawdd.\n"
 
-#: ../../printerdrake.pm_.c:2316
+#: ../../printerdrake.pm_.c:2335
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications, but here do not supply the file name "
@@ -9176,8 +9200,8 @@ msgstr ""
 "deialogau argraffu mewn nifer o raglenni, ond  yma nid ydynt yn darparu'r "
 "enw ffeil am fod y ffeil i'r argraffydd yn cael ei ddarparu gan y rhaglen.\n"
 
-#: ../../printerdrake.pm_.c:2319 ../../printerdrake.pm_.c:2336
-#: ../../printerdrake.pm_.c:2346
+#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:2365
 #, c-format
 msgid ""
 "\n"
@@ -9190,7 +9214,7 @@ msgstr ""
 "tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r llinell "
 "gorchymyn, e.e \"%s <file>\". "
 
-#: ../../printerdrake.pm_.c:2322 ../../printerdrake.pm_.c:2362
+#: ../../printerdrake.pm_.c:2341 ../../printerdrake.pm_.c:2381
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -9202,7 +9226,7 @@ msgstr ""
 "dewis argraffu\"%s%s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2326
+#: ../../printerdrake.pm_.c:2345
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
@@ -9211,7 +9235,7 @@ msgstr ""
 "presennol:\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2331 ../../printerdrake.pm_.c:2341
+#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2360
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -9220,8 +9244,8 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynnell) defnyddiwch "
 "orchymyn \"%s <file>\".\n"
 
-#: ../../printerdrake.pm_.c:2333 ../../printerdrake.pm_.c:2343
-#: ../../printerdrake.pm_.c:2353
+#: ../../printerdrake.pm_.c:2352 ../../printerdrake.pm_.c:2362
+#: ../../printerdrake.pm_.c:2372
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications. But here do not supply the file name "
@@ -9231,7 +9255,7 @@ msgstr ""
 "nifer o raglenni. Ond peidiwch â rhoi'r enw ffeil yma oherwydd bod y ffeil "
 "i'w argraffu wedi ei ddarparu gan y rhaglen.\n"
 
-#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2348
+#: ../../printerdrake.pm_.c:2357 ../../printerdrake.pm_.c:2367
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
@@ -9239,7 +9263,7 @@ msgstr ""
 "I edrych ar y rhestr o'r dewisiadau sydd ar gael ar gyfer yr argraffydd "
 "cyfredol cliciwch ar fotwm \"Rhestr dewisiadau argraffu\"."
 
-#: ../../printerdrake.pm_.c:2351
+#: ../../printerdrake.pm_.c:2370
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -9248,7 +9272,7 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynnell) defnyddiwch y "
 "gorchymyn \"%s <file>\" or \"%s <file>\".\n"
 
-#: ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:2374
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
 "handling printing jobs.\n"
@@ -9265,7 +9289,7 @@ msgstr ""
 "fydd yn stopio 'r holl waith argraffu'n syth pan fyddwch yn ei glicio. Mae "
 "hyn yn ddefnyddiol pan fydd y papur wedi mynd yn sownd, ag ati.\n"
 
-#: ../../printerdrake.pm_.c:2359
+#: ../../printerdrake.pm_.c:2378
 #, c-format
 msgid ""
 "\n"
@@ -9278,40 +9302,40 @@ msgstr ""
 "ar gyfer tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r "
 "llinell gorchymyn, e.e \"%s <file>\".\n"
 
-#: ../../printerdrake.pm_.c:2369
+#: ../../printerdrake.pm_.c:2388
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Argraffu/Sganio/Cardiau Llun ar  \"%s\""
 
-#: ../../printerdrake.pm_.c:2370
+#: ../../printerdrake.pm_.c:2389
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Argraffu/Sganio ar  \"%s\""
 
-#: ../../printerdrake.pm_.c:2372
+#: ../../printerdrake.pm_.c:2391
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Argraffu/Mynediad Cardiau Llun ar  \"%s\""
 
-#: ../../printerdrake.pm_.c:2373
+#: ../../printerdrake.pm_.c:2392
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Argraffu ar argraffydd \"%s\""
 
-#: ../../printerdrake.pm_.c:2376 ../../printerdrake.pm_.c:2379
-#: ../../printerdrake.pm_.c:2380 ../../printerdrake.pm_.c:2381
-#: ../../printerdrake.pm_.c:3429 ../../standalone/drakTermServ_.c:248
+#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
+#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
+#: ../../printerdrake.pm_.c:3448 ../../standalone/drakTermServ_.c:248
 #: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
 #: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
 #: ../../standalone/drakfont_.c:1014
 msgid "Close"
 msgstr "Cau"
 
-#: ../../printerdrake.pm_.c:2379
+#: ../../printerdrake.pm_.c:2398
 msgid "Print option list"
 msgstr "Rhestr ddewis argraffu"
 
-#: ../../printerdrake.pm_.c:2399
+#: ../../printerdrake.pm_.c:2418
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -9334,7 +9358,7 @@ msgstr ""
 "\n"
 "Peidiwch defnyddio \"scannerdrake\" ar gyfer y ddyfais hon."
 
-#: ../../printerdrake.pm_.c:2420
+#: ../../printerdrake.pm_.c:2439
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
 "card drives from your PC. Now you can access your photo cards using the "
@@ -9355,17 +9379,17 @@ msgstr ""
 "argraffydd HP gyda gyrwyr cerdyn llun. Yn MToolsFM\" mae modd newid rhwng "
 "llythrennau gyrwyr drwy'r maes ar ben uchaf de'r rhestr."
 
-#: ../../printerdrake.pm_.c:2442 ../../printerdrake.pm_.c:2904
-#: ../../printerdrake.pm_.c:3199
+#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2923
+#: ../../printerdrake.pm_.c:3218
 msgid "Reading printer data..."
 msgstr "Darllen data argraffydd..."
 
-#: ../../printerdrake.pm_.c:2462 ../../printerdrake.pm_.c:2490
-#: ../../printerdrake.pm_.c:2525
+#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2509
+#: ../../printerdrake.pm_.c:2544
 msgid "Transfer printer configuration"
 msgstr "Trosglwyddo ffurfweddiad yr argraffydd"
 
-#: ../../printerdrake.pm_.c:2463
+#: ../../printerdrake.pm_.c:2482
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -9380,7 +9404,7 @@ msgstr ""
 "cael eu trosi, ond ni fydd y gwaith argraffu'n cael eu trosi.\n"
 "Ni fydd yr holl waith argraffu'n cael eu trosi, am y rhesymau canlynol:\n"
 
-#: ../../printerdrake.pm_.c:2466
+#: ../../printerdrake.pm_.c:2485
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
@@ -9388,18 +9412,18 @@ msgstr ""
 "Nid yw CUPS yn cefnogi argraffyddion ar wasanaethwyr Novell neu "
 "argraffyddion sy'n anfon data mewn gorchymyn ffurf -rhydd.\n"
 
-#: ../../printerdrake.pm_.c:2468
+#: ../../printerdrake.pm_.c:2487
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
 "Mae PDQ yn cynnal argraffyddion lleol,  LDP pell, a Socket/TCP, yn unig.\n"
 
-#: ../../printerdrake.pm_.c:2470
+#: ../../printerdrake.pm_.c:2489
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "Nid yw LPD na LPRng yn cynnal argraffyddion IPP.\n"
 
-#: ../../printerdrake.pm_.c:2472
+#: ../../printerdrake.pm_.c:2491
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
@@ -9407,7 +9431,7 @@ msgstr ""
 "Yn ogystal, nid oes modd trosglwyddo rhesi grewyd gan y rhaglen hon na "
 "\"foomatic-configure\"."
 
-#: ../../printerdrake.pm_.c:2473
+#: ../../printerdrake.pm_.c:2492
 msgid ""
 "\n"
 "Also printers configured with the PPD files provided by their manufacturers "
@@ -9417,7 +9441,7 @@ msgstr ""
 "Hefyd nid oes modd trosglwyddo argraffyddion ffurfweddwyd gyda ffeiliau PPD "
 "ddarparwyd gan eu gwneuthurwyr na gyrrwyr CUPS brodorol."
 
-#: ../../printerdrake.pm_.c:2474
+#: ../../printerdrake.pm_.c:2493
 msgid ""
 "\n"
 "Mark the printers which you want to transfer and click \n"
@@ -9427,15 +9451,15 @@ msgstr ""
 "Nodwch yr argraffydd rydych am ei drosglwddo a chliciwch\n"
 "\"Trosglwyddo\"."
 
-#: ../../printerdrake.pm_.c:2477
+#: ../../printerdrake.pm_.c:2496
 msgid "Do not transfer printers"
 msgstr "Peidio trosglwyddo argraffydd"
 
-#: ../../printerdrake.pm_.c:2478 ../../printerdrake.pm_.c:2495
+#: ../../printerdrake.pm_.c:2497 ../../printerdrake.pm_.c:2514
 msgid "Transfer"
 msgstr "Trosglwyddo"
 
-#: ../../printerdrake.pm_.c:2491
+#: ../../printerdrake.pm_.c:2510
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -9446,12 +9470,12 @@ msgstr ""
 "Cliciwch \"Trosglwyddo\" i ysgrifennu drosto.\n"
 "Mae modd i chi osod enw newydd arno neu ei hepgor."
 
-#: ../../printerdrake.pm_.c:2499
+#: ../../printerdrake.pm_.c:2518
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 "Dylai enw'r argraffydd gynnwys llythrennau, rhifau a'r tanlinellu, yn unig"
 
-#: ../../printerdrake.pm_.c:2504
+#: ../../printerdrake.pm_.c:2523
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -9460,16 +9484,16 @@ msgstr ""
 "Mae argraffydd \"%s\" yn bodoli eisoes,\n"
 "ydych chi wir eisiau ailysgrifennu ei ffurfweddiad?"
 
-#: ../../printerdrake.pm_.c:2512
+#: ../../printerdrake.pm_.c:2531
 msgid "New printer name"
 msgstr "Enw'r argraffydd newydd"
 
-#: ../../printerdrake.pm_.c:2515
+#: ../../printerdrake.pm_.c:2534
 #, c-format
 msgid "Transferring %s..."
 msgstr "Trosglwyddo %s..."
 
-#: ../../printerdrake.pm_.c:2526
+#: ../../printerdrake.pm_.c:2545
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -9479,29 +9503,29 @@ msgstr ""
 "(\"%s\"). A ddylai fod yn argraffydd rhagosodedig y system argraffu newydd %"
 "s ?"
 
-#: ../../printerdrake.pm_.c:2536
+#: ../../printerdrake.pm_.c:2555
 msgid "Refreshing printer data..."
 msgstr "Adnewyddu data'r argraffydd..."
 
-#: ../../printerdrake.pm_.c:2544 ../../printerdrake.pm_.c:2619
-#: ../../printerdrake.pm_.c:2631
+#: ../../printerdrake.pm_.c:2563 ../../printerdrake.pm_.c:2638
+#: ../../printerdrake.pm_.c:2650
 msgid "Configuration of a remote printer"
 msgstr "Ffurfweddiad argraffydd pell"
 
-#: ../../printerdrake.pm_.c:2545
+#: ../../printerdrake.pm_.c:2564
 msgid "Starting network..."
 msgstr "Cychwyn y rhwydwaith..."
 
-#: ../../printerdrake.pm_.c:2580 ../../printerdrake.pm_.c:2584
-#: ../../printerdrake.pm_.c:2586
+#: ../../printerdrake.pm_.c:2599 ../../printerdrake.pm_.c:2603
+#: ../../printerdrake.pm_.c:2605
 msgid "Configure the network now"
 msgstr "Ffurfweddwch y rhwydwaith"
 
-#: ../../printerdrake.pm_.c:2581
+#: ../../printerdrake.pm_.c:2600
 msgid "Network functionality not configured"
 msgstr "Nid yw swyddogaethau'r rhwydwaith wedi ei ffurfweddu"
 
-#: ../../printerdrake.pm_.c:2582
+#: ../../printerdrake.pm_.c:2601
 msgid ""
 "You are going to configure a remote printer. This needs working network "
 "access, but your network is not configured yet. If you go on without network "
@@ -9513,11 +9537,11 @@ msgstr ""
 "fynd ymlaen heb ffurfweddiad rhwydwaith, ni bydd modd i chi ddefnyddio'r "
 "argraffydd rydych yn ei ffurfweddu ar hyn o bryd. Beth ydych am ei wneud?"
 
-#: ../../printerdrake.pm_.c:2585
+#: ../../printerdrake.pm_.c:2604
 msgid "Go on without configuring the network"
 msgstr "Mynd yn eich blaen heb ffurfweddu'r rhwydwaith"
 
-#: ../../printerdrake.pm_.c:2621
+#: ../../printerdrake.pm_.c:2640
 msgid ""
 "The network configuration done during the installation cannot be started "
 "now. Please check whether the network gets accessable after booting your "
@@ -9533,7 +9557,7 @@ msgstr ""
 "argraffydd, eto gan ddefnyddio Canolfan Rheoli Mandrake, adran \"Caledwedd\"/"
 "\"Argraffydd\""
 
-#: ../../printerdrake.pm_.c:2622
+#: ../../printerdrake.pm_.c:2641
 msgid ""
 "The network access was not running and could not be started. Please check "
 "your configuration and your hardware. Then try to configure your remote "
@@ -9543,24 +9567,24 @@ msgstr ""
 "Gwiriwch eich ffurfweddiad a'ch caledwedd. Yna ceisiwch ail ffurfweddi eich "
 "argraffydd."
 
-#: ../../printerdrake.pm_.c:2632
+#: ../../printerdrake.pm_.c:2651
 msgid "Restarting printing system..."
 msgstr "Ailgychwyn system argraffu..."
 
-#: ../../printerdrake.pm_.c:2670
+#: ../../printerdrake.pm_.c:2689
 msgid "high"
 msgstr "uchel"
 
-#: ../../printerdrake.pm_.c:2670
+#: ../../printerdrake.pm_.c:2689
 msgid "paranoid"
 msgstr "Paranoia"
 
-#: ../../printerdrake.pm_.c:2671
+#: ../../printerdrake.pm_.c:2690
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Gosod system argraffu yn lefel diogelwch %s"
 
-#: ../../printerdrake.pm_.c:2672
+#: ../../printerdrake.pm_.c:2691
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -9584,11 +9608,11 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau ffurfweddu argraffu ar y peiriant hwn?"
 
-#: ../../printerdrake.pm_.c:2704
+#: ../../printerdrake.pm_.c:2723
 msgid "Starting the printing system at boot time"
 msgstr "Cychwyn y system argraffu wrth gychwyn y cyfrifiadur"
 
-#: ../../printerdrake.pm_.c:2705
+#: ../../printerdrake.pm_.c:2724
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -9610,59 +9634,59 @@ msgstr ""
 "\n"
 "Ydych chi am i'r cychwyn awtomatig gael ei droi ymlaen eto?"
 
-#: ../../printerdrake.pm_.c:2729 ../../printerdrake.pm_.c:2770
-#: ../../printerdrake.pm_.c:2809 ../../printerdrake.pm_.c:2851
-#: ../../printerdrake.pm_.c:2972
+#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2789
+#: ../../printerdrake.pm_.c:2828 ../../printerdrake.pm_.c:2870
+#: ../../printerdrake.pm_.c:2991
 msgid "Checking installed software..."
 msgstr "Gwirio'r meddalwedd sydd wedi ei osod..."
 
-#: ../../printerdrake.pm_.c:2775
+#: ../../printerdrake.pm_.c:2794
 msgid "Removing LPRng..."
 msgstr "Tynnu LPRng..."
 
-#: ../../printerdrake.pm_.c:2814
+#: ../../printerdrake.pm_.c:2833
 msgid "Removing LPD..."
 msgstr "Tynnu LPD..."
 
-#: ../../printerdrake.pm_.c:2887
+#: ../../printerdrake.pm_.c:2906
 msgid "Select Printer Spooler"
 msgstr "Dewiswch Sbwlydd Argraffydd"
 
-#: ../../printerdrake.pm_.c:2888
+#: ../../printerdrake.pm_.c:2907
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Pa system argraffu(sbwlydd) ydych chi am ei ddefnyddio?"
 
-#: ../../printerdrake.pm_.c:2924
+#: ../../printerdrake.pm_.c:2943
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Ffurfweddu argraffydd \"%s\" ..."
 
-#: ../../printerdrake.pm_.c:2938
+#: ../../printerdrake.pm_.c:2957
 msgid "Installing Foomatic..."
 msgstr "Gosod Foomatic..."
 
-#: ../../printerdrake.pm_.c:3008 ../../printerdrake.pm_.c:3049
-#: ../../printerdrake.pm_.c:3446 ../../printerdrake.pm_.c:3519
+#: ../../printerdrake.pm_.c:3027 ../../printerdrake.pm_.c:3068
+#: ../../printerdrake.pm_.c:3465 ../../printerdrake.pm_.c:3538
 msgid "Printer options"
 msgstr "Dewisiadau argraffydd"
 
-#: ../../printerdrake.pm_.c:3018
+#: ../../printerdrake.pm_.c:3037
 msgid "Preparing Printerdrake..."
 msgstr "Paratoi PrinterDrake..."
 
-#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3609
+#: ../../printerdrake.pm_.c:3055 ../../printerdrake.pm_.c:3628
 msgid "Configuring applications..."
 msgstr "Ffurfweddi'u rhaglenni"
 
-#: ../../printerdrake.pm_.c:3056
+#: ../../printerdrake.pm_.c:3075
 msgid "Would you like to configure printing?"
 msgstr "Hoffech chi ffurfweddu argraffu?"
 
-#: ../../printerdrake.pm_.c:3068
+#: ../../printerdrake.pm_.c:3087
 msgid "Printing system: "
 msgstr "System argraffu."
 
-#: ../../printerdrake.pm_.c:3128
+#: ../../printerdrake.pm_.c:3147
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; to view information about it; "
@@ -9674,7 +9698,7 @@ msgstr ""
 "amdano; neu i wneud argraffydd CUPS pell ar gael ar gyfer Star Office/"
 "OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3129
+#: ../../printerdrake.pm_.c:3148
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
@@ -9683,29 +9707,29 @@ msgstr ""
 "Mae'r argraffyddion canlynol wedi eu ffurfweddi. Cliciwch ar un i newid ei "
 "osodiadau; ei wneud yn argraffydd rhagosodedig; i edrych am wybodaeth amdano."
 
-#: ../../printerdrake.pm_.c:3156
+#: ../../printerdrake.pm_.c:3175
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Adnewyddu rhestr argraffyddion (dangos pob argraffydd CUPS pell sydd ar gael)"
 
-#: ../../printerdrake.pm_.c:3174
+#: ../../printerdrake.pm_.c:3193
 msgid "Change the printing system"
 msgstr "Newidiwch y system argraffu"
 
-#: ../../printerdrake.pm_.c:3179 ../../standalone/drakconnect_.c:277
+#: ../../printerdrake.pm_.c:3198 ../../standalone/drakconnect_.c:277
 msgid "Normal Mode"
 msgstr "Modd Arferol"
 
-#: ../../printerdrake.pm_.c:3339 ../../printerdrake.pm_.c:3389
-#: ../../printerdrake.pm_.c:3602
+#: ../../printerdrake.pm_.c:3358 ../../printerdrake.pm_.c:3408
+#: ../../printerdrake.pm_.c:3621
 msgid "Do you want to configure another printer?"
 msgstr "Ydych chi eisiau ffurfwedu argraffydd arall?"
 
-#: ../../printerdrake.pm_.c:3424
+#: ../../printerdrake.pm_.c:3443
 msgid "Modify printer configuration"
 msgstr "Newid ffurfweddiad yr argraffydd"
 
-#: ../../printerdrake.pm_.c:3426
+#: ../../printerdrake.pm_.c:3445
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -9714,69 +9738,69 @@ msgstr ""
 "Argraffydd %s\n"
 "Beth ydych am ei newid ar yr argraffydd hwn?"
 
-#: ../../printerdrake.pm_.c:3430
+#: ../../printerdrake.pm_.c:3449
 msgid "Do it!"
 msgstr "Gwna!!"
 
-#: ../../printerdrake.pm_.c:3435 ../../printerdrake.pm_.c:3490
+#: ../../printerdrake.pm_.c:3454 ../../printerdrake.pm_.c:3509
 msgid "Printer connection type"
 msgstr "Math o gyswllt argraffydd"
 
-#: ../../printerdrake.pm_.c:3436 ../../printerdrake.pm_.c:3494
+#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3513
 msgid "Printer name, description, location"
 msgstr "Enw'r argraffydd, disgrifiad, lleoliad"
 
-#: ../../printerdrake.pm_.c:3438 ../../printerdrake.pm_.c:3512
+#: ../../printerdrake.pm_.c:3457 ../../printerdrake.pm_.c:3531
 msgid "Printer manufacturer, model, driver"
 msgstr "Gwneuthurwr yr argraffydd, model, gyrrwr"
 
-#: ../../printerdrake.pm_.c:3439 ../../printerdrake.pm_.c:3513
+#: ../../printerdrake.pm_.c:3458 ../../printerdrake.pm_.c:3532
 msgid "Printer manufacturer, model"
 msgstr "Gwneuthurwr yr argraffydd, model"
 
-#: ../../printerdrake.pm_.c:3448 ../../printerdrake.pm_.c:3523
+#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3542
 msgid "Set this printer as the default"
 msgstr "Gosod yr argraffydd fel y rhagosodedig"
 
-#: ../../printerdrake.pm_.c:3450 ../../printerdrake.pm_.c:3528
+#: ../../printerdrake.pm_.c:3469 ../../printerdrake.pm_.c:3547
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Ychwanegwchyr argraffydd hwn i Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3451 ../../printerdrake.pm_.c:3537
+#: ../../printerdrake.pm_.c:3470 ../../printerdrake.pm_.c:3556
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Tynnwch yr argraffydd hwn o Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3452 ../../printerdrake.pm_.c:3546
+#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3565
 msgid "Print test pages"
 msgstr "Argraffu tudalennau prawf"
 
-#: ../../printerdrake.pm_.c:3453 ../../printerdrake.pm_.c:3548
+#: ../../printerdrake.pm_.c:3472 ../../printerdrake.pm_.c:3567
 msgid "Know how to use this printer"
 msgstr "Gwybod sut i ddefnyddio'r argraffydd"
 
-#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3550
+#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3569
 msgid "Remove printer"
 msgstr "Tynnu argraffydd"
 
-#: ../../printerdrake.pm_.c:3501
+#: ../../printerdrake.pm_.c:3520
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Tynnu hen argraffydd \"%s\"..."
 
-#: ../../printerdrake.pm_.c:3526
+#: ../../printerdrake.pm_.c:3545
 msgid "Default printer"
 msgstr "Argraffydd rhagosodedig"
 
-#: ../../printerdrake.pm_.c:3527
+#: ../../printerdrake.pm_.c:3546
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Mae argraffydd \"%s\" wedi ei osod fel yr argraffydd rhagosodedig."
 
-#: ../../printerdrake.pm_.c:3531 ../../printerdrake.pm_.c:3534
+#: ../../printerdrake.pm_.c:3550 ../../printerdrake.pm_.c:3553
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Ychwanegu argraffydd i Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3532
+#: ../../printerdrake.pm_.c:3551
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
@@ -9784,17 +9808,17 @@ msgstr ""
 "Mae argraffydd \"%s\" wedi ei ychwanegu'n llwyddiannus i Star Office/"
 "OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3535
+#: ../../printerdrake.pm_.c:3554
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr ""
 "Wedi methu ag ychwanegu argraffydd \"%s\" i Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3540 ../../printerdrake.pm_.c:3543
+#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Tynnu'r argraffydd o Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3541
+#: ../../printerdrake.pm_.c:3560
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
@@ -9803,18 +9827,18 @@ msgstr ""
 "Cafodd argraffydd \"%s\" ei dynnu'n llwyddiannus o Star Office/OpenOffice."
 "org."
 
-#: ../../printerdrake.pm_.c:3544
+#: ../../printerdrake.pm_.c:3563
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr "Methwyd â thynnu argraffydd \"%s\" o Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3552
+#: ../../printerdrake.pm_.c:3571
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Ydych chi wir eisiau tynnu argraffydd \"%s\""
 
-#: ../../printerdrake.pm_.c:3556
+#: ../../printerdrake.pm_.c:3575
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Tynnu argraffydd \"%s\"..."
@@ -9939,24 +9963,41 @@ msgid ""
 "be sent to this user (username or\n"
 "\t       email)"
 msgstr ""
+"Safonol: Dyma'r safon diogelwch sy'n cael ei argymell ar gyfer cyfrifiadur "
+"i'w ddefnyddio i gysylltu â'r Rhyngrwyd fel cleient.\n"
+"\n"
+"Uchel:      Mae rhai cyfyngiadau eisoes, ac mae gwiriadau'n cael eu rhedeg "
+"bob nos.\n"
+"\n"
+"Uchaf:      Mae diogelwch yn ddigon uchel i ddefnyddio'r system fel "
+"gwasanaethwr sy'n medru derbyn\n"
+"                 cysylltiadau o nifer o gleientiau. Os mai eich peiriant "
+"yw'r unig gleient ar y Rhyngrwyd, dylech\t              ddewis lefel is.\n"
+"\n"
+"Paranoia:  Mae'n debyg i'r lefel blaenorol ond mae'r system wedi ei gau'n "
+"llwyr a nodweddion diogelwch ar eu heithaf.\n"
+"\n"
+"Gweinyddwr Diogelwch:\n"
+"                 Os yw'r dewis 'Rhybuddion Diogelwch' wedi ei ddewis, bydd "
+"rhybuddion diogelwch yn cael eu\t              anfon i'r defnyddiwr hwn (enw "
+"defnyddiwr neu e-bost)"
 
 #: ../../security/main.pm_.c:66
 msgid "Security Level:"
 msgstr "Lefel diogelwch:"
 
 #: ../../security/main.pm_.c:74
-#, fuzzy
 msgid "Security Alerts:"
-msgstr "Lefel diogelwch"
+msgstr "Rhybuddion Diogelwch:"
 
 #: ../../security/main.pm_.c:83
 msgid "Security Administrator:"
 msgstr "Gweinyddwr Diogelwch:"
 
 #: ../../security/main.pm_.c:114 ../../security/main.pm_.c:150
-#, fuzzy, c-format
+#, c-format
 msgid " (default: %s)"
-msgstr "(Rhagosodedig)"
+msgstr "(rhagosodedig: %s)"
 
 #: ../../security/main.pm_.c:118 ../../security/main.pm_.c:154
 #: ../../security/main.pm_.c:179
@@ -9964,30 +10005,28 @@ msgid ""
 "The following options can be set to customize your\n"
 "system security. If you need explanations, click on Help.\n"
 msgstr ""
+"Mae modd gosod y dewisiadau canlynol i addasu\n"
+"diogelwch eich system. Os oes arnoch esboniadau, cliciwch ar Cymorth.\n"
 
 #: ../../security/main.pm_.c:226
-#, fuzzy
 msgid "Network Options"
-msgstr "Dewisiadau Eraill"
+msgstr "Dewisiadau Rhwydwaith"
 
 #: ../../security/main.pm_.c:235
-#, fuzzy
 msgid "System Options"
-msgstr "Dewisiadau Eraill"
+msgstr "Dewisiadau System"
 
 #: ../../security/main.pm_.c:242
 msgid "Periodic Checks"
-msgstr ""
+msgstr "Gwirydd Cyfnodol"
 
 #: ../../security/main.pm_.c:256
-#, fuzzy
 msgid "Please wait, setting security level..."
-msgstr "Dewiswch lefel diogelwch"
+msgstr "Arhoswch, gosod lefle diogelwch..."
 
 #: ../../security/main.pm_.c:262
-#, fuzzy
 msgid "Please wait, setting security options..."
-msgstr "Arhoswch, paratoi'r gosodiad"
+msgstr "Arhoswch, gosod dewisiadau diogelwch..."
 
 #: ../../services.pm_.c:14
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
@@ -10407,7 +10446,7 @@ msgstr ""
 
 #: ../../share/advertising/04-multimedia.pl_.c:9
 msgid "Discover the most up-to-date graphical and multimedia tools!"
-msgstr ""
+msgstr "Darganfyddwch yr offer graffigol ac amlgyfrwng mwyaf diweddar!"
 
 #: ../../share/advertising/04-multimedia.pl_.c:10
 msgid "Push multimedia to its limits!"
@@ -10456,6 +10495,8 @@ msgid ""
 "Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully "
 "modified: KDE 3, Gnome 2, WindowMaker, ..."
 msgstr ""
+"Mae Mandrake Linux 9.0 yn darparu 11 rhyngwyneb defnyddiwr y mae modd eu "
+"newid yn helaeth:  KDE 3, Gnome 2, WindowMaker, ..."
 
 #: ../../share/advertising/08-development.pl_.c:9
 msgid "Development simplified"
@@ -10531,6 +10572,9 @@ msgid ""
 "solutions compatible with Mandrake Linux. A list of these partners is "
 "available on the MandrakeStore"
 msgstr ""
+"Mane Mandrake Linux yn cydweithio gyda dewis o gwmniau yn cynnig atebion "
+"proffesiynnol sy'n cydweddu â Mandrake Linux Mae rhestr o 'r partneriaid hyn "
+"i'w cael yn MandrakeStore"
 
 #: ../../share/advertising/13-mdkcampus.pl_.c:9
 msgid "Discover MandrakeSoft's training catalogue Linux-Campus"
@@ -10541,6 +10585,8 @@ msgid ""
 "The training program has been created to respond to the needs of both end "
 "users and experts (Network and System administrators)"
 msgstr ""
+"Mae'r rhaglen hyfforddiant yma wedi ei greu i ymateb i anghenion y "
+"defnyddiwr a'r arbennigwr (Gweinyddwyr Rhwydwaith a System0"
 
 #: ../../share/advertising/13-mdkcampus.pl_.c:11
 msgid "Certify yourself on Linux"
@@ -10566,6 +10612,8 @@ msgid ""
 "Find the solutions of your problems via MandrakeSoft's online support "
 "platform"
 msgstr ""
+"Dewch o hyd i ateb eich anhawsterau drwy blatfform cefnogaeth ar-lein "
+"MandrakeSoft."
 
 #: ../../share/advertising/14-mdkexpert.pl_.c:11
 msgid ""
@@ -10573,6 +10621,9 @@ msgid ""
 "your knowledge and help others by becoming a recognized Expert on the online "
 "technical support website:"
 msgstr ""
+"Ymunwch â'r timau cefnogi MandrakeSoft a'r Linux Community ar-lein i rannu "
+"eich gwybodaeth ac i helpu eraill drwy ddod yn Arbenigwr cydnabyddedig ar y "
+"safle cefnogaeth dechnegol."
 
 #: ../../share/advertising/15-mdkexpert-corporate.pl_.c:9
 msgid "MandrakeExpert Corporate"
@@ -10592,7 +10643,7 @@ msgstr ""
 
 #: ../../share/advertising/17-mdkclub.pl_.c:9
 msgid "Discover MandrakeClub and Mandrake Corporate Club"
-msgstr ""
+msgstr "Darganfyddwch MandrakeClub a'r mandrake Corporate Club"
 
 #: ../../share/advertising/17-mdkclub.pl_.c:10
 msgid ""
@@ -10603,8 +10654,13 @@ msgid ""
 "competititve edge, if you want to support Mandrake Linux development, join "
 "MandrakeClub!"
 msgstr ""
+"Crewyd MandrakeClub a MandrakeCorporateClub ar gyfer defnyddwyr preifat a "
+"busnes Mandrake Linux fyddai'n hoffi cefnogi eu hoff ddosbarthiad Linux "
+"tra'n derbyn breintiau arbennig. Os ydych yn mwynhau ein cynnyrch, os yw "
+"eich cwmni'n manteisio o'n cynnyrch i gael y blaen ar eraill, os hoffech "
+"gefnogi datblygiad Linux mandrake, yna ymunwch â MandrakeClub!"
 
-#: ../../standalone.pm_.c:41
+#: ../../standalone.pm_.c:42
 msgid "Installing packages..."
 msgstr "Gosod pecynnau..."
 
@@ -10702,9 +10758,8 @@ msgid "<-- Del User"
 msgstr "<-- Dileu Defndyddiwr"
 
 #: ../../standalone/drakTermServ_.c:694
-#, fuzzy
 msgid "No net boot images created!"
-msgstr "Delweddau Cychwyn y Rhwyd"
+msgstr "Heb greu delweddau cychwyn y rhwyd!"
 
 #: ../../standalone/drakTermServ_.c:710
 msgid "Add Client -->"
@@ -10719,15 +10774,16 @@ msgid "dhcpd Config..."
 msgstr "Ffurfweddu dhcpd..."
 
 #: ../../standalone/drakTermServ_.c:873
-#, fuzzy
 msgid "dhcpd Server Configuration"
-msgstr "Ffurfweddiad Uwch"
+msgstr "Ffurfweddiad Gwasanaethwr dhcpd"
 
 #: ../../standalone/drakTermServ_.c:874
 msgid ""
 "Most of these values were extracted\n"
 "from your running system. You can modify as needed."
 msgstr ""
+"Tynnwyd y rhanfwyaf o'r gwerthoedd\n"
+"hyn o'ch system ar waith. Medrwch eu newid yn ôl y galw."
 
 #: ../../standalone/drakTermServ_.c:875
 msgid "Write Config"
@@ -11183,11 +11239,12 @@ msgstr ""
 "Nawr"
 
 #: ../../standalone/drakbackup_.c:1786
-#, fuzzy
 msgid ""
 "Other (not drakbackup)\n"
 "keys in place already"
-msgstr "Allewddi yn eu lle yn barod"
+msgstr ""
+"Allweddi eraill (nid drakbackup)\n"
+"yn eu lle yn barod"
 
 #: ../../standalone/drakbackup_.c:1790
 msgid "Please enter the host name or IP."
@@ -11854,7 +11911,7 @@ msgid "Previous"
 msgstr "Cynt"
 
 #: ../../standalone/drakbackup_.c:3941 ../../standalone/drakbackup_.c:4027
-#: ../../standalone/logdrake_.c:223
+#: ../../standalone/logdrake_.c:224
 msgid "Save"
 msgstr "Gorffen"
 
@@ -12744,93 +12801,93 @@ msgstr "Cerdyn Ethernet"
 msgid "DHCP Client"
 msgstr "Cleient DHCP"
 
-#: ../../standalone/drakfloppy_.c:63
+#: ../../standalone/drakfloppy_.c:64
 msgid "usage: drakfloppy\n"
 msgstr "defnydd: drakfloppy\n"
 
-#: ../../standalone/drakfloppy_.c:67
+#: ../../standalone/drakfloppy_.c:68
 msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Module name"
 msgstr "Enw'r modiwl"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Size"
 msgstr "Maint"
 
-#: ../../standalone/drakfloppy_.c:73
+#: ../../standalone/drakfloppy_.c:74
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: ../../standalone/drakfloppy_.c:90
+#: ../../standalone/drakfloppy_.c:91
 msgid "boot disk creation"
 msgstr "creu disg cychwyn"
 
-#: ../../standalone/drakfloppy_.c:98 ../../standalone/drakfloppy_.c:111
+#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
 msgid "default"
 msgstr "rhagosodedig"
 
-#: ../../standalone/drakfloppy_.c:114
+#: ../../standalone/drakfloppy_.c:115
 #, c-format
 msgid "DrakFloppy Error: %s"
 msgstr "Gwall Drakfloppy: %s"
 
-#: ../../standalone/drakfloppy_.c:125
+#: ../../standalone/drakfloppy_.c:126
 msgid "kernel version"
 msgstr "fersiwn cnewyllyn"
 
-#: ../../standalone/drakfloppy_.c:131
+#: ../../standalone/drakfloppy_.c:132
 msgid "General"
 msgstr "Cyffredinol"
 
-#: ../../standalone/drakfloppy_.c:136
+#: ../../standalone/drakfloppy_.c:137
 msgid "Expert Area"
 msgstr "Maes Uwch"
 
-#: ../../standalone/drakfloppy_.c:139
+#: ../../standalone/drakfloppy_.c:140
 msgid "mkinitrd optional arguments"
 msgstr "ymresymiad dewisol mkinitrd"
 
-#: ../../standalone/drakfloppy_.c:140
+#: ../../standalone/drakfloppy_.c:141
 msgid "Add a module"
 msgstr "Ychwanegu modiwl"
 
-#: ../../standalone/drakfloppy_.c:160
+#: ../../standalone/drakfloppy_.c:161
 msgid "force"
 msgstr "grym"
 
-#: ../../standalone/drakfloppy_.c:161
+#: ../../standalone/drakfloppy_.c:162
 msgid "if needed"
 msgstr "os oes angen"
 
-#: ../../standalone/drakfloppy_.c:162
+#: ../../standalone/drakfloppy_.c:163
 msgid "omit scsi modules"
 msgstr "peidio cynnwys modiwlau scsi"
 
-#: ../../standalone/drakfloppy_.c:163
+#: ../../standalone/drakfloppy_.c:164
 msgid "omit raid modules"
 msgstr "peidio cynnwys modiwlau raid"
 
-#: ../../standalone/drakfloppy_.c:199
+#: ../../standalone/drakfloppy_.c:200
 msgid "Remove a module"
 msgstr "Tynnu modiwl"
 
-#: ../../standalone/drakfloppy_.c:221
+#: ../../standalone/drakfloppy_.c:222
 msgid "Output"
 msgstr "Allbwn"
 
-#: ../../standalone/drakfloppy_.c:233
+#: ../../standalone/drakfloppy_.c:234
 msgid "Build the disk"
 msgstr "Adeiladu'r ddisg"
 
-#: ../../standalone/drakfloppy_.c:376
+#: ../../standalone/drakfloppy_.c:377
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Gwnewch yn siwr fod y deunydd ar gael ar gyfer y ddyfais %s"
 
-#: ../../standalone/drakfloppy_.c:381
+#: ../../standalone/drakfloppy_.c:382
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -12839,12 +12896,12 @@ msgstr ""
 "Does dim cyfrwng neu mae wedi ei amddiffyn rhag ysgrifennu i'r dyfais %s.\n"
 "Rhowch un i mewn.."
 
-#: ../../standalone/drakfloppy_.c:383
+#: ../../standalone/drakfloppy_.c:384
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Methu fforchio: %s"
 
-#: ../../standalone/drakfloppy_.c:387
+#: ../../standalone/drakfloppy_.c:388
 #, c-format
 msgid ""
 "Unable to close properly mkbootdisk: \n"
@@ -13332,50 +13389,44 @@ msgstr ""
 "Cliciwch Ffurfweddu i gychwyn y dewin gosod."
 
 #: ../../standalone/drakperm_.c:42
-#, fuzzy
 msgid "group"
-msgstr "Grwp gwaith"
+msgstr "grwp"
 
 #: ../../standalone/drakperm_.c:42
 msgid "path"
-msgstr ""
+msgstr "llwybr"
 
 #: ../../standalone/drakperm_.c:42
-#, fuzzy
 msgid "permissions"
-msgstr "rhaniad %s"
+msgstr "caniatadau"
 
 #: ../../standalone/drakperm_.c:42
-#, fuzzy
 msgid "user"
-msgstr "Defnyddiwr"
+msgstr "defnyddiwr"
 
 #: ../../standalone/drakperm_.c:49
 msgid "Up"
-msgstr ""
+msgstr "I fyny"
 
 #: ../../standalone/drakperm_.c:50
-#, fuzzy
 msgid "delete"
-msgstr "Dileu"
+msgstr "dileu"
 
 #: ../../standalone/drakperm_.c:51
 msgid "edit"
-msgstr ""
+msgstr "golygu"
 
 #: ../../standalone/drakperm_.c:52
-#, fuzzy
 msgid "Down"
-msgstr "Gorffen"
+msgstr "I lawr"
 
 #: ../../standalone/drakperm_.c:53
-#, fuzzy
 msgid "add a rule"
-msgstr "Ychwanegu modiwl"
+msgstr "ychwanegu rheol"
 
 #: ../../standalone/drakperm_.c:54
 msgid "select perm file to see/edit"
-msgstr ""
+msgstr "dewis ffeil perm i weld/golygu"
 
 #: ../../standalone/drakperm_.c:57
 msgid ""
@@ -13383,101 +13434,95 @@ msgid ""
 "and groups via msec.\n"
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
+"Mae Drakperm yn cael ei ddefnyddio i weld ffeiliau i'w defnyddio i drwsio "
+"caniatad, perchnogion, a grwpiau drwy msec.\n"
+"Mae modd i chi olygu eich rheolau eich hunfydd yn ysgrifennu droe y rheolau "
+"rhagosodedig."
 
 #: ../../standalone/drakperm_.c:62
-#, fuzzy
 msgid "Add a new rule at the end"
-msgstr "Ychwanegu argraffydd newydd"
+msgstr "Ychwanegu rheol newydd ar y diwedd"
 
 #: ../../standalone/drakperm_.c:63
 msgid "Edit curent rule"
-msgstr ""
+msgstr "Golygu'r rheol bresennol"
 
 #: ../../standalone/drakperm_.c:64
-#, fuzzy
 msgid "Up selected rule one level"
-msgstr "Dad ddewis Popeth"
+msgstr "Symud rheol i fyny un lefel"
 
 #: ../../standalone/drakperm_.c:65
 msgid "Down selected rule one level"
-msgstr ""
+msgstr "I lawr rheol hwn un lefel"
 
 #: ../../standalone/drakperm_.c:66
-#, fuzzy
 msgid "Delete selected rule"
-msgstr ""
-"Adfer y Dewis\n"
-"Ffeiliau"
+msgstr "Dileu'r rheol hwn"
 
 #: ../../standalone/drakperm_.c:237
 msgid "browse"
 msgstr "pori"
 
 #: ../../standalone/drakperm_.c:244
-#, fuzzy
 msgid "Current user"
-msgstr "Derbyn defnyddiwr"
+msgstr "Derbyn presennol"
 
 #: ../../standalone/drakperm_.c:249
-#, fuzzy
 msgid "Permissions"
-msgstr "Fersiwn: %s\n"
+msgstr "Caniatadau"
 
 #: ../../standalone/drakperm_.c:250
 msgid "Path"
-msgstr ""
+msgstr "Llwybr"
 
 #: ../../standalone/drakperm_.c:251
-#, fuzzy
 msgid "Property"
-msgstr "Porth"
+msgstr "Eiddo"
 
 #: ../../standalone/drakperm_.c:253
 msgid "sticky-bit"
-msgstr ""
+msgstr "sticky-bit"
 
 #: ../../standalone/drakperm_.c:254
 msgid "Set-UID"
-msgstr ""
+msgstr "Set-UID"
 
 #: ../../standalone/drakperm_.c:255
 msgid "Set-GID"
-msgstr ""
+msgstr "Set-GID"
 
 #: ../../standalone/drakperm_.c:310
 msgid ""
 "Used for directory:\n"
 " only owner of directory or file in this directory can delete it"
 msgstr ""
+"Defnydd cyfeiriadur:\n"
+" dim ond perchennog y cyfeiriadur neu ffeil yn y cyfeiriadur hwn fydd yn "
+"cael ei ddileu."
 
 #: ../../standalone/drakperm_.c:311
-#, fuzzy
 msgid "Use owner id for execution"
-msgstr "Defnyddio awto ganfod"
+msgstr "Defnyddio enw perchennog i weithredu"
 
 #: ../../standalone/drakperm_.c:312
-#, fuzzy
 msgid "Use group id for execution"
-msgstr "Defnyddio awto ganfod"
+msgstr "Defnyddio enw grwp i weithredu"
 
 #: ../../standalone/drakperm_.c:313
 msgid "when checked, owner and group won't be changed"
-msgstr ""
+msgstr "wedi ei dicio, nid fydd y perchennog a'r grwp yn cael ei newid"
 
 #: ../../standalone/drakperm_.c:318
-#, fuzzy
 msgid "Path selection"
-msgstr "Dewis sgrin croeso"
+msgstr "Dewis llwybr"
 
 #: ../../standalone/drakperm_.c:364
-#, fuzzy
 msgid "user :"
-msgstr "Defnyddiwr"
+msgstr "defnyddiwr :"
 
 #: ../../standalone/drakperm_.c:366
-#, fuzzy
 msgid "group :"
-msgstr "Grwp gwaith"
+msgstr "grwp:"
 
 #: ../../standalone/draksound_.c:47
 msgid "No Sound Card detected!"
@@ -13511,13 +13556,19 @@ msgid ""
 "Note: if you've an ISA PnP sound card, you'll have to use the sndconfig "
 "program.  Just type \"sndconfig\" in a console."
 msgstr ""
+"\n"
+"\n"
+"\n"
+"Nodyn: os oes gennych gerdyn sain ISA PnP, bydd rhaid i chi ddefnyddio "
+"rhaglen sndconfig. Teipiwch \"sndconfig\" mewn consol."
 
 #: ../../standalone/draksplash_.c:34
-#, fuzzy
 msgid ""
 "package 'ImageMagick' is required for correct working.\n"
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
-msgstr "i weithio'n iawn mae angen ImageMagick"
+msgstr ""
+"i weithio'n iawn mae angen 'ImageMagick'\n"
+"Cliciwch \"Iawn\" i osod 'Image Magick' neu \"Diddymu\" i orffen"
 
 #: ../../standalone/draksplash_.c:78
 msgid "first step creation"
@@ -13536,9 +13587,8 @@ msgid "Theme name"
 msgstr "Enw Thema"
 
 #: ../../standalone/draksplash_.c:85
-#, fuzzy
 msgid "Browse"
-msgstr "pori"
+msgstr "Pori"
 
 #: ../../standalone/draksplash_.c:99 ../../standalone/draksplash_.c:162
 msgid "Configure bootsplash picture"
@@ -13639,9 +13689,9 @@ msgstr "Cynhyrchu rhagolwg..."
 
 #. -PO  First %s is theme name, second %s (in parenthesis) is resolution
 #: ../../standalone/draksplash_.c:511
-#, fuzzy, c-format
+#, c-format
 msgid "%s BootSplash (%s) preview"
-msgstr "Methu creu rhagolwg Croeso Cychwyn"
+msgstr "%s Rhagolwg Croeso Cychwyn (%s)"
 
 #: ../../standalone/drakxtv_.c:49
 msgid ""
@@ -13837,128 +13887,128 @@ msgstr ""
 "Mae'r newid wedi ei gyflawni, ond i fod yn effeithiol mae'n rhaid i chi "
 "allgofnodi"
 
-#: ../../standalone/logdrake_.c:85 ../../ugtk.pm_.c:285
+#: ../../standalone/logdrake_.c:86 ../../ugtk.pm_.c:285
 msgid "logdrake"
 msgstr "logdrake"
 
-#: ../../standalone/logdrake_.c:95
+#: ../../standalone/logdrake_.c:96
 msgid "Show only for the selected day"
 msgstr "Dangos ar y diwrnod penodol yn unig"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "/File/_New"
 msgstr "/Ffeil/_Newydd"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "/File/_Open"
 msgstr "/Ffeil/_Agor"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "/File/_Save"
 msgstr "/Ffeil/_Cawd"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:106
 msgid "/File/Save _As"
 msgstr "/Ffeil/Cawd _fel"
 
-#: ../../standalone/logdrake_.c:106
+#: ../../standalone/logdrake_.c:107
 msgid "/File/-"
 msgstr "/Ffeil/-"
 
-#: ../../standalone/logdrake_.c:108
+#: ../../standalone/logdrake_.c:109
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../../standalone/logdrake_.c:109
+#: ../../standalone/logdrake_.c:110
 msgid "/Options/Test"
 msgstr "/Dewisiadau/Test"
 
-#: ../../standalone/logdrake_.c:111
+#: ../../standalone/logdrake_.c:112
 msgid "/Help/_About..."
 msgstr "/Cymorth/_Ynghylch..."
 
-#: ../../standalone/logdrake_.c:118
+#: ../../standalone/logdrake_.c:119
 msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:119
+#: ../../standalone/logdrake_.c:120
 msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:173
+#: ../../standalone/logdrake_.c:174
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: ../../standalone/logdrake_.c:174
+#: ../../standalone/logdrake_.c:175
 msgid "Messages"
 msgstr "Negeseuon"
 
-#: ../../standalone/logdrake_.c:175
+#: ../../standalone/logdrake_.c:176
 msgid "Syslog"
 msgstr "Syslog"
 
-#: ../../standalone/logdrake_.c:176
+#: ../../standalone/logdrake_.c:177
 msgid "Mandrake Tools Explanations"
 msgstr "Esboniadau Offer Mandrake"
 
-#: ../../standalone/logdrake_.c:179
+#: ../../standalone/logdrake_.c:180
 msgid "search"
 msgstr "chwilio"
 
-#: ../../standalone/logdrake_.c:185
+#: ../../standalone/logdrake_.c:186
 msgid "A tool to monitor your logs"
 msgstr "Offeryn i fonitro eich cofnodion"
 
-#: ../../standalone/logdrake_.c:186
+#: ../../standalone/logdrake_.c:187
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: ../../standalone/logdrake_.c:191
+#: ../../standalone/logdrake_.c:192
 msgid "matching"
 msgstr "cydweddu"
 
-#: ../../standalone/logdrake_.c:192
+#: ../../standalone/logdrake_.c:193
 msgid "but not matching"
 msgstr "ond heb fod yn cydweddu"
 
-#: ../../standalone/logdrake_.c:196
+#: ../../standalone/logdrake_.c:197
 msgid "Choose file"
 msgstr "Dewis ffeil"
 
-#: ../../standalone/logdrake_.c:201
+#: ../../standalone/logdrake_.c:202
 msgid "Calendar"
 msgstr "Calendr"
 
-#: ../../standalone/logdrake_.c:211
+#: ../../standalone/logdrake_.c:212
 msgid "Content of the file"
 msgstr "Cynnwys y ffeil"
 
-#: ../../standalone/logdrake_.c:215 ../../standalone/logdrake_.c:391
+#: ../../standalone/logdrake_.c:216 ../../standalone/logdrake_.c:392
 msgid "Mail alert"
 msgstr "Rhybudd e-bost"
 
-#: ../../standalone/logdrake_.c:267
+#: ../../standalone/logdrake_.c:268
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "arhoswch, dosbarthu ffeil: %s"
 
-#: ../../standalone/logdrake_.c:408
+#: ../../standalone/logdrake_.c:409
 msgid "Mail alert configuration"
 msgstr "Ffurfweddiad rhybudd e-bost"
 
-#: ../../standalone/logdrake_.c:409
+#: ../../standalone/logdrake_.c:410
 msgid ""
 "Welcome to the mail configuration utility.\n"
 "\n"
@@ -13968,64 +14018,64 @@ msgstr ""
 "\n"
 "Yma bydd modd i chi osod y system rhybuddio.\n"
 
-#: ../../standalone/logdrake_.c:416
+#: ../../standalone/logdrake_.c:417
 msgid "Apache World Wide Web Server"
 msgstr "Gwasanaethwr Gwe Fyd Eang Apache"
 
-#: ../../standalone/logdrake_.c:417
+#: ../../standalone/logdrake_.c:418
 msgid "Domain Name Resolver"
 msgstr "Datrysydd Enw Parth"
 
-#: ../../standalone/logdrake_.c:418
+#: ../../standalone/logdrake_.c:419
 msgid "Ftp Server"
 msgstr "Gwasanaethwr Ftp"
 
-#: ../../standalone/logdrake_.c:419
+#: ../../standalone/logdrake_.c:420
 msgid "Postfix Mail Server"
 msgstr "Gwasanaethwr E-bost Postfix"
 
-#: ../../standalone/logdrake_.c:420
+#: ../../standalone/logdrake_.c:421
 msgid "Samba Server"
 msgstr "Gwasanaethwr Samba"
 
-#: ../../standalone/logdrake_.c:421
+#: ../../standalone/logdrake_.c:422
 msgid "SSH Server"
 msgstr "Gwasanaethwr SSH"
 
-#: ../../standalone/logdrake_.c:422
+#: ../../standalone/logdrake_.c:423
 msgid "Webmin Service"
 msgstr "Gwasanaethau Webmin"
 
-#: ../../standalone/logdrake_.c:423
+#: ../../standalone/logdrake_.c:424
 msgid "Xinetd Service"
 msgstr "Gwasanaeth Xinetd"
 
-#: ../../standalone/logdrake_.c:430
+#: ../../standalone/logdrake_.c:431
 msgid "service setting"
 msgstr "gosodiad gwasanaeth"
 
-#: ../../standalone/logdrake_.c:431
+#: ../../standalone/logdrake_.c:432
 msgid ""
 "You will receive an alert if one of the selected services is no more running"
 msgstr "Byddwch yn derbyn rhybudd os na fydd un o'r gwasanaethu hyn yn rhedeg"
 
-#: ../../standalone/logdrake_.c:443
+#: ../../standalone/logdrake_.c:444
 msgid "load setting"
 msgstr "gosodiad llwyth"
 
-#: ../../standalone/logdrake_.c:444
+#: ../../standalone/logdrake_.c:445
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Byddwch yn derbyn rhybudd os yw'r llwyth yn uwch na'r gwerth hwn"
 
-#: ../../standalone/logdrake_.c:457
+#: ../../standalone/logdrake_.c:458
 msgid "alert configuration"
 msgstr "ffurfweddiad rhybudd"
 
-#: ../../standalone/logdrake_.c:458
+#: ../../standalone/logdrake_.c:459
 msgid "Please enter your email address below "
 msgstr "Rhowch eich cyfeiriad e-bost islaw"
 
-#: ../../standalone/logdrake_.c:497
+#: ../../standalone/logdrake_.c:498
 msgid "Save as.."
 msgstr "Cadw fel..."
 
@@ -14115,11 +14165,8 @@ msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "Cafodd rhai dyfeisiau yn nosbarth caledwedd\"%s\" eu tynnu:\n"
 
 #: ../../standalone/service_harddrake_.c:48
-#, fuzzy
 msgid "Some devices were added:\n"
-msgstr ""
-"\n"
-"Cafodd rhai dyfeisiau yn nosbarth %s eu hychwanegu:\n"
+msgstr "Cafodd rhai dyfeisiau eu hychwanegu:\n"
 
 #: ../../steps.pm_.c:14
 msgid "Choose your language"
@@ -14445,113 +14492,1865 @@ msgid "Scientific Workstation"
 msgstr "Gweithfan Gwyddonol"
 
 #~ msgid ""
+#~ "GNU/Linux is a multiuser system, and this means that each user can have "
+#~ "his\n"
+#~ "own preferences, his own files and so on. You can read the ``User "
+#~ "Guide''\n"
+#~ "to learn more. But unlike \"root\", which is the administrator, the "
+#~ "users\n"
+#~ "you add here will not be entitled to change anything except their own "
+#~ "files\n"
+#~ "and their own configuration. You will have to create at least one "
+#~ "regular\n"
+#~ "user for yourself. That account is where you should log in for routine "
+#~ "use.\n"
+#~ "Although it is very practical to log in as \"root\" everyday, it may "
+#~ "also\n"
+#~ "be very dangerous! The slightest mistake could mean that your system "
+#~ "would\n"
+#~ "not work any more. If you make a serious mistake as a regular user, you "
+#~ "may\n"
+#~ "only lose some information, but not the entire system.\n"
+#~ "\n"
+#~ "First, you have to enter your real name. This is not mandatory, of course "
+#~ "-\n"
+#~ "as you can actually enter whatever you want. DrakX will then take the "
+#~ "first\n"
+#~ "word you have entered in the box and will bring it over to the \"User\n"
+#~ "name\". This is the name this particular user will use to log onto the\n"
+#~ "system. You can change it. You then have to enter a password here. A\n"
+#~ "non-privileged (regular) user's password is not as crucial as the \"root"
+#~ "\"'\n"
+#~ "one from a security point of view, but that is no reason to neglect it:\n"
+#~ "after all, your files are at risk.\n"
+#~ "\n"
+#~ "If you click on \"Accept user\", you can then add as many as you want. "
+#~ "Add\n"
+#~ "a user for each one of your friends: your father or your sister, for\n"
+#~ "example. When you finish adding all the users you want, select \"Done\".\n"
+#~ "\n"
+#~ "Clicking the \"Advanced\" button allows you to change the default \"shell"
+#~ "\"\n"
+#~ "for that user (bash by default)."
+#~ msgstr ""
+#~ "Mae GNU/Linux yn system aml-ddefnyddiwr, ac mae hyn yn golygu bod pob\n"
+#~ "defyddiwr yn medru cael ei ddewisiadau ei hun, ei ffeiliau ei hun ac yn y "
+#~ "blaen.\n"
+#~ "Gallwch ddarllen yr \"User Guide\" i ddysgu mwy. Ond yn anhebyg i "
+#~ "\"gwraidd\", sef\n"
+#~ "y gweinyddwr, ni fydd modd i'r defnyddiwr fyddwch yn eu creu yma'n medru\n"
+#~ "newid dim ond eu ffeiliau a'u ffurfweddiad ei hun. Bydd rhaid i chi greu "
+#~ "un\n"
+#~ "defnyddiwr cyffredin ar gyfer chi eich hun. Dyma'r cyfrif ddylech "
+#~ "mewngofnodi\n"
+#~ "iddo ar gyfer defnydd bob dydd. Er ei fod yn ymarferol iawn i fewngofnodi "
+#~ "fel\n"
+#~ "\"root\" gall fod yn beryglus iawn!. Gall y camgymeriad lleiaf olygu nad "
+#~ "yw eic\n"
+#~ "system yn gweithio ragor. Os wnewch chi gamgymeriad mawr  fel defnyddiwr\n"
+#~ "cyffredin, byddwch ond yn colli rhywfaint o wybodaeth, ac nid y system "
+#~ "gyfan.\n"
+#~ "Yn gyntaf rhowch eich enw go iawn. Dose dim rhaid, wrth gwrs  - mae modd\n"
+#~ "i chi rhoi beth bynnag hoffech chi. Bydd DraX yn cymryd yr enw cyntafa'i "
+#~ "roi yn\n"
+#~ "yr \"Enw defnyddiwr\" Dyma'r enw bydd y defnyddwr hwn yn ei ddefnyddio i\n"
+#~ "fewngofnodi i'r system. Mae modd ei newid.  Yna rhowch gyfrinair. Nid yw\n"
+#~ "cyfrianair defnyddiwr cyffredin mor bwysig ag un \"gwraidd\" o safbwynt "
+#~ "diogelwch\n"
+#~ "ond nid yw hynny'n rheswm i'w esgeuluso - wedi'r cyfan mae eich ffeiliau "
+#~ "mewn\n"
+#~ "perygl\n"
+#~ "\n"
+#~ "Os wnewch chi glicio \"Derbyn Defnyddiwr\", bydd modd ychwanegu fanint\n"
+#~ "fynnoch. Ychwanegwch ddefnyddiwr ar gyfer pob un o'ch ffrindiau: eich "
+#~ "tad\n"
+#~ "neu eich chwaer, e.e. Ao ôl ychwanegu'r holl ddefnyddwyr, cliciwch "
+#~ "\"Gorffen\".\n"
+#~ "\n"
+#~ "Bydd clicio'r botwm \"Uwch\" yn caniatáu i chi newid y \"gragen\" "
+#~ "rhagosodedig\n"
+#~ "ar gyfer y defnyddiwr hwnnw (bash yw'r rhagosodedig)."
+
+#~ msgid ""
+#~ "Listed above are the existing Linux partitions detected on your hard "
+#~ "drive.\n"
+#~ "You can keep the choices made by the wizard, they are good for most "
+#~ "common\n"
+#~ "installations. If you make any changes, you must at least define a root\n"
+#~ "partition (\"/\"). Do not choose too small a partition or you will not "
+#~ "be\n"
+#~ "able to install enough software. If you want to store your data on a\n"
+#~ "separate partition, you will also need to create a partition for \"/home"
+#~ "\"\n"
+#~ "(only possible if you have more than one Linux partition available).\n"
 #~ "\n"
+#~ "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 #~ "\n"
-#~ "To submit a bug report, click on the button report.\n"
-#~ "This will open  a web browser window  on https://www.bugzilla.com\n"
-#~ " where you'll find a form to fill in.The information displayed above will "
-#~ "be \n"
-#~ "transferred to that server\n"
+#~ "\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+#~ "\"partition number\" (for example, \"hda1\").\n"
 #~ "\n"
+#~ "\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive "
+#~ "and\n"
+#~ "\"sd\" if it is a SCSI hard drive.\n"
+#~ "\n"
+#~ "\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+#~ "hard drives:\n"
+#~ "\n"
+#~ " * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+#~ "\n"
+#~ " * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+#~ "\n"
+#~ " * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+#~ "\n"
+#~ " * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+#~ "\n"
+#~ "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+#~ "\"second lowest SCSI ID\", etc."
 #~ msgstr ""
+#~ "Dyma'r rhaniadau Linux sydd wedi canfod ar eich disg caled\n"
+#~ "Gallwch gadw'r dewisiadau sydd wedi eu gwneud gan y dewin, mae'n nhw'n "
+#~ "iawn\n"
+#~ "ar gyfer y rhan fwyaf o osodiadau. Os ydych am wneud newidiadau, rhaid i "
+#~ "chi ol eiaf\n"
+#~ "ddiffinio rhaniad gwraidd (\"/\"). Peidiwch dewis rhaniad sy'n rhy fach "
+#~ "neu fyddwch\n"
+#~ "yn methu llwytho digon o feddalwedd. Os hoffech gadw eich data ar raniad "
+#~ "arall,\n"
+#~ "bydd angen i chi greu rhaniad ar gyfer \"/home\"( ond dim ond os oes mwy "
+#~ "nag un\n"
+#~ "rhaniad Linux ar gael)\n"
+#~ "Mae pob rhaniad yn cael ei restri fel hyn: \"Enw\", \"Maint\".\n"
+#~ "\n"
+#~ "Mae \"Enw\" yn cael ei drefnu: \"math o ddisg caled\", rhif y disg caled"
+#~ "\",\n"
+#~ "\"rhif rhaniad\" (e.e, \"hda1\").\n"
+#~ "\n"
+#~ "\"Math o ddisg caled\" yw \"hdos mai disg caled IDE sydd gennych a\n"
+#~ "\"sd\" os mai SCSI yw'r disg caled.\n"
 #~ "\n"
+#~ "Mae \"Rhif Disg Caled\" yn llythyren ar ôl \"hd\" neu \"sd\". Ar gyfer\n"
+#~ "disg caled IDE mae:\n"
 #~ "\n"
-#~ "I gyflwyno adroddiad gwall, cliciwch ar y botwm adroddiad.\n"
-#~ "Bydd hyn yn agor ffenestr porwr gwe yn https://www.bugzilla.com\n"
-#~ " lle welwch ffurflen i'w llenwi. Bydd yr wybodaeth rhowch arno'n cael ei\n"
-#~ "drosglwyddo i'r gwasanaethwr\n"
+#~ " * \"a\" yn golygu \"prif ddisg caled ar y rheolwr IDE cyntaf\",\n"
 #~ "\n"
+#~ " * \"b\" yn golygu \"disg caled gwas ar y rheolwr IDE cyntaf\",\n"
+#~ "\n"
+#~ " * \"c\" yn golygu \"prif ddisg caled ar yr ail reolwr IDE\",\n"
+#~ "\n"
+#~ " * \"d\" yn golygu \"disg caled gwas ar yr ail reolwr IDE\".\n"
+#~ "\n"
+#~ "Gyda disgiau caled SCSI, mae \"a\" yn golygu \"ID SCSI isaf \", a \"b\" "
+#~ "yn golygu\n"
+#~ "\"ID SCSI ail isaf\", ag ati."
 
-#~ msgid "Make bootsplash step 2"
-#~ msgstr "make bootsplash step 2"
+#~ msgid ""
+#~ "It is now time to specify which programs you wish to install on your\n"
+#~ "system. There are thousands of packages available for Mandrake Linux, "
+#~ "and\n"
+#~ "you are not supposed to know them all by heart.\n"
+#~ "\n"
+#~ "If you are performing a standard installation from a CD-ROM, you will "
+#~ "first\n"
+#~ "be asked to specify the CDs you currently have (in Expert mode only). "
+#~ "Check\n"
+#~ "the CD labels and highlight the boxes corresponding to the CDs you have\n"
+#~ "available for installation. Click \"OK\" when you are ready to continue.\n"
+#~ "\n"
+#~ "Packages are sorted in groups corresponding to a particular use of your\n"
+#~ "machine. The groups themselves are sorted into four sections:\n"
+#~ "\n"
+#~ " * \"Workstation\": if you plan to use your machine as a workstation,\n"
+#~ "select one or more of the corresponding groups;\n"
+#~ "\n"
+#~ " * \"Development\": if your machine is to be used for programming, "
+#~ "choose\n"
+#~ "the desired group(s);\n"
+#~ "\n"
+#~ " * \"Server\": if your machine is intended to be a server, you will be "
+#~ "able\n"
+#~ "to select which of the most common services you wish to install on your\n"
+#~ "machine;\n"
+#~ "\n"
+#~ " * \"Graphical Environment\": finally, this is where you will choose "
+#~ "your\n"
+#~ "preferred graphical environment. At least one must be selected if you "
+#~ "want\n"
+#~ "to have a graphical workstation!\n"
+#~ "\n"
+#~ "Moving the mouse cursor over a group name will display a short "
+#~ "explanatory\n"
+#~ "text about that group. If you unselect all groups when performing a "
+#~ "regular\n"
+#~ "installation (by opposition to an upgrade), a dialog will pop up "
+#~ "proposing\n"
+#~ "different options for a minimal installation:\n"
+#~ "\n"
+#~ " * \"With X\": install the fewer packages possible to have a working\n"
+#~ "graphical desktop;\n"
+#~ "\n"
+#~ " * \"With basic documentation\": installs the base system plus basic\n"
+#~ "utilities and their documentation. This installation is suitable for\n"
+#~ "setting up a server;\n"
+#~ "\n"
+#~ " * \"Truly minimal install\": will install the strict minimum necessary "
+#~ "to\n"
+#~ "get a working Linux system, in command line only. This installation is\n"
+#~ "about 65Mb large.\n"
+#~ "\n"
+#~ "You can check the \"Individual package selection\" box, which is useful "
+#~ "if\n"
+#~ "you are familiar with the packages being offered or if you want to have\n"
+#~ "total control over what will be installed.\n"
+#~ "\n"
+#~ "If you started the installation in \"Upgrade\" mode, you can unselect "
+#~ "all\n"
+#~ "groups to avoid installing any new package. This is useful for repairing "
+#~ "or\n"
+#~ "updating an existing system."
+#~ msgstr ""
+#~ "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"
+#~ "system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrake Linux, ond\n"
+#~ "does dim disgwyl i chi wybod amdanyn nhw i gyd.\n"
+#~ "\n"
+#~ "Os ydych chi'n gwneud gosodiad safonol o'r CD-ROM, bydd gofyn i chi\n"
+#~ "ddweud pa CDau sydd gennych. Gwiriwch labeli'r CDau ac amlygu'r blychau\n"
+#~ "sy'n cyfateb i'r CDau sydd gennych ar gyfer y gosodiad. Cliciwch \"Iawn"
+#~ "\"\n"
+#~ "pan ydych yn barod i barhau.\n"
+#~ "\n"
+#~ "Mae'r pecynnau wedi eu didoli yn grwpiau sy'n cyfateb i ddefnydd penodol\n"
+#~ "ar eich peiriant. Mae'r grwpiau wedi eu rhannu yn bedair adran:\n"
+#~ "\n"
+#~ " * \"Man Gwaith\": os ydych yn bwriadu defnyddio eich peiriant fel man\n"
+#~ "gwaith yna dewiswch un o'r grwpiau cyfatebol.\n"
+#~ "\n"
+#~ " * \"Datblygiadol\": os yw'r peiriant yn cael ei ddefnyddio i raglenni, "
+#~ "dewiswch\n"
+#~ " y grwpiau perthnasol\n"
+#~ "\n"
+#~ " * \"Gwasanaethwr\": os ydych am i'r peiriant gael ei ddefnyddio fel\n"
+#~ "gwasanaethwr bydd modd i chi ddewis y gwasanaethau cyffredin rydych am\n"
+#~ "eu cael ar eich peiriant.\n"
+#~ "\n"
+#~ " * \"Amgylchedd Graffigol\": dyma'r lle i ddewis eich amgylchedd "
+#~ "graffigol.\n"
+#~ "Rhaid dewis o leiaf un er mwyn cael man gwaith graffigol!\n"
+#~ "\n"
+#~ "Bydd symud cyrchwr y llygoden dros enw grwp yn amlygu esboniad byr am y\n"
+#~ "grwp hwnnw. Os ydych wedi dad-ddewis pob grwp wrth wneud gosodiad\n"
+#~ "arferol ac nid uwchraddiad), bydd dialog yn ymddangos a chynnig\n"
+#~ "dewisiadau amrywiol ar gyfer y gosodiad lleiaf\n"
+#~ "\n"
+#~ " * \"Gyda X\" Gosod y nifer lleiaf o becynnau i gael penbwrdd graffigol\n"
+#~ "i weithio.\n"
+#~ "\n"
+#~ " * \"Gyda dogfennaeth elfennol\" Gosod y system sylfaenol yn ogystal\n"
+#~ "a gwasanaethau elfennol a'u dogfennau. Mae'r gosodiad hwn yn addas\n"
+#~ "ar gyfer gosod gwasanaethwr.\n"
+#~ "\n"
+#~ " * \"Gosodiad bychan iawn\" Gosod y lleiafswm posibl i greu system Linux\n"
+#~ "llinell orchymyn weithredol. Tua 65MB o faint.\n"
+#~ "\n"
+#~ "Mae clicio blwch \"Dewis pecynnau unigol\". yn ddefnyddiol os ydych\n"
+#~ "yn gyfarwydd gyda'r pecynnau sy'n cael eu cynnig neu os ydych eisiau\n"
+#~ "rheolaeth lwyr dros yr hyn sy'n cael ei osod\n"
+#~ "\n"
+#~ "Os ydych wedi cychwyn y gosodiad ym modd \"Diweddaru\", bydd modd i\n"
+#~ " chi ddad-ddewis pob grwp er mwyn osgoi gosod unrhyw becyn newydd.\n"
+#~ "Mae hyn yn ddefnyddiol ar gyfer trwsio neu ddiweddaru system sy'n bod "
+#~ "eisoes.\n"
+#~ " "
 
-#~ msgid "Go to lilosplash configuration"
-#~ msgstr "mynd i fffurfweddiad lilosplash"
+#~ msgid ""
+#~ "Finally, depending on whether or not you chose to be able to select\n"
+#~ "individual packages, you will be presented a tree containing all "
+#~ "packages\n"
+#~ "classified by groups and subgroups. While browsing the tree, you can "
+#~ "select\n"
+#~ "entire groups, subgroups, or individual packages.\n"
+#~ "\n"
+#~ "Whenever you select a package on the tree, a description appears on the\n"
+#~ "right. When your selection is finished, click the \"Install\" button "
+#~ "which\n"
+#~ "will then launch the installation process. Depending on the speed of "
+#~ "your\n"
+#~ "hardware and the number of packages that need to be installed, it may "
+#~ "take\n"
+#~ "a while to complete the process. An estimate of the time it will take to\n"
+#~ "install everything is displayed on the screen, to help you gauge if "
+#~ "there\n"
+#~ "is sufficient time to enjoy a cup of coffee.\n"
+#~ "\n"
+#~ "!! If a server package has been selected, either intentionally or "
+#~ "because\n"
+#~ "it was part of a whole group, you will be asked to confirm that you "
+#~ "really\n"
+#~ "want those servers to be installed. Under Mandrake Linux, any installed\n"
+#~ "servers are started by default at boot time. Even if they are safe and "
+#~ "have\n"
+#~ "no known issues at the time the distribution was shipped, it may happen\n"
+#~ "that security holes are discovered after this version of Mandrake Linux "
+#~ "was\n"
+#~ "finalized. If you do not know what a particular service is supposed to "
+#~ "do\n"
+#~ "or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
+#~ "install the listed services and they will be started automatically by\n"
+#~ "default. !!\n"
+#~ "\n"
+#~ "The \"Automatic dependencies\" option simply disables the warning dialog\n"
+#~ "which appears whenever the installer automatically selects a package. "
+#~ "This\n"
+#~ "occurs because it has determined that it needs to satisfy a dependency "
+#~ "with\n"
+#~ "another package in order to successfully complete the installation.\n"
+#~ "\n"
+#~ "The tiny floppy disk icon at the bottom of the list allows to load the\n"
+#~ "package list chosen during a previous installation. Clicking on this "
+#~ "icon\n"
+#~ "will ask you to insert a floppy disk previously created at the end of\n"
+#~ "another installation. See the second tip of last step on how to create "
+#~ "such\n"
+#~ "a floppy."
+#~ msgstr ""
+#~ "Yn olaf, yn dibynnu ar eich dewis o becynnau unigol, bydd coeden yn "
+#~ "cynnwys\n"
+#~ "yr holl becynnau wedi eu dosbarthu yn ôl grwp ac is grwp. Wrth bori'r "
+#~ "goeden,\n"
+#~ "gallwch ddewis grwp cyfan, isgrwp neu becyn unigol.\n"
+#~ "\n"
+#~ "Pryd bynnag fyddwch wedi dewis pecyn ar y goeden, bydd disgrifiad yn\n"
+#~ "ymddangos ar y dde. Pan fyddwch wedi gorffen dewis , cliciwch y botwm\n"
+#~ " \"Gosod\" fydd yn cychwyn y drefn osod. Gan ddibynnu ar gyflymder eich\n"
+#~ "caledwedd a'r nifer o becynnau i'w gosod, gall gymryd peth amser i'w "
+#~ "gwblhau.\n"
+#~ "Bydd amser tan orffen yn cael ei ddangos ar y sgrin er mwyn i chi weld a "
+#~ "oes\n"
+#~ "amser i wneud paned!\n"
+#~ "\n"
+#~ "!! Os oes pecyn gwasanaethwr wedi ei ddewis yn fwriadol neu am ei fod yn "
+#~ "rhan\n"
+#~ "o grwp cyfan, bydd angen i chi gadarnhau eich bod eisiau i'r "
+#~ "gwasanaethwyr\n"
+#~ "gael eu gosod. Ym Mandrake Linux mae unrhyw wasanaethwr sydd wedi ei\n"
+#~ "osod yn cael ei gychwyn fel rhagosodiad wrth gychwyn. Hyd yn oed os "
+#~ "ydynt\n"
+#~ "yn ddiogel a doedd dim materion pryder pan gafodd y dosbarthiad ei "
+#~ "ryddhau,\n"
+#~ "mae'n bosibl i fylchau diogelwch gael eu darganfod wedi i'r fersiwn hwn "
+#~ "o\n"
+#~ "Mandrake Linux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
+#~ "gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna "
+#~ "cliciwch\n"
+#~ "\"Na\". Bydd clicio \"Iawn\" yn gosod y gwasanaethau hynny a byddant yn\n"
+#~ "cael eu cychwyn yn ddiofyn drwy ragosodiad!!\n"
+#~ "\n"
+#~ "Mae'r dewis \"Dibyniad Awtomatig\"yn analluogi'r deialog rhybudd sy'n\n"
+#~ "ymddangos bob tro fydd y gosodwr yn dewis pecyn yn awtomatig.\n"
+#~ "Mae hyn yn digwydd am ei fod wedi penderfynu ei fod angen bodloni\n"
+#~ "dibyniad gyda phecyn arall er mwyn cwblhau'r gosodiad yn llwyddiannus\n"
+#~ "\n"
+#~ "Mae'r eicon disg medal bychan ar waelod y rhestr yn caniatáu llwytho'r\n"
+#~ "rhestr pecynnau dewiswyd yn ystod gosodiad blaenorol. Bydd clicio\n"
+#~ "ar yr eicon hwn yn gofyn i chi osod yn y peiriant disg meddal grëwyd ar\n"
+#~ "ddiwedd gosodiad arall. Gwelwch yr ail neges o'r cam diwethaf ar sut i\n"
+#~ "greu disg meddal o'r fath."
 
-#~ msgid "Go back"
-#~ msgstr "mynd nôl"
+#~ msgid ""
+#~ "You are now able to set up your Internet/network connection. If you wish "
+#~ "to\n"
+#~ "connect your computer to the Internet or to a local network, click \"OK"
+#~ "\".\n"
+#~ "The autodetection of network devices and modem will be launched. If this\n"
+#~ "detection fails, uncheck the \"Use auto detection\" box next time. You "
+#~ "may\n"
+#~ "also choose not to configure the network, or do it later; in that case,\n"
+#~ "simply click the \"Cancel\" button.\n"
+#~ "\n"
+#~ "Available connections are: traditional modem, ISDN modem, ADSL "
+#~ "connection,\n"
+#~ "cable modem, and finally a simple LAN connection (Ethernet).\n"
+#~ "\n"
+#~ "Here, we will not detail each configuration. Simply make sure that you "
+#~ "have\n"
+#~ "all the parameters from your Internet Service Provider or system\n"
+#~ "administrator.\n"
+#~ "\n"
+#~ "You can consult the ``User Guide'' chapter about Internet connections "
+#~ "for\n"
+#~ "details about the configuration, or simply wait until your system is\n"
+#~ "installed and use the program described there to configure your "
+#~ "connection.\n"
+#~ "\n"
+#~ "If you wish to configure the network later after installation, or if you\n"
+#~ "are finished configuring your network connection, click \"Cancel\"."
+#~ msgstr ""
+#~ "Dyma eich cyfle i gysylltu gyda'r rhyngrwyd/rhwydwaith.Os hoffech chi\n"
+#~ "gysylltu eich cyfrifiadur i'r Rhyngrwyd neu i rwydwaith lleol, cliciwch\n"
+#~ "\"Iawn\" . Bydd awtoganfod dyfeisiadan rhwwydwaith a modem yn\n"
+#~ "cychwyn. Os yw'r canfod yn methu, dad-diciwch y blwch \"Defnyddiwch\n"
+#~ "awto ganfod\" y tro nesaf. Mae gennych y dewis i beidio ffurfweddi eich\n"
+#~ "rhwydwaith, neu i'w wneud rhywbryd eto. Os fell, cliciwch y botwm  "
+#~ "\"Diddymu\".\n"
+#~ "\n"
+#~ "Cysylltiadau posib: modem traddodiadol,modem IDSN, cyswllt ADSL,\n"
+#~ "modem cable ac yn olaf cyswllt LAN syml (Ethernet).\n"
+#~ "\n"
+#~ "Byddwn ni ddim yn mynd i fanylion y ffurfweddiad yma. Gwnewch yn siwr\n"
+#~ "fod gennych yr holl fanylion gan eich darparwr gwasanaeth rhyngrwyd "
+#~ "(ISP)\n"
+#~ "neu weinyddwr system\n"
+#~ "\n"
+#~ "Mae modd i chi edrych ar bennawd yn y llawlyfr ar gyswllt a'r Rhyngrwyd "
+#~ "am\n"
+#~ "fanylion ffurfweddiad, neu aros nes i'ch system gael ei osod a "
+#~ "defnyddio'r\n"
+#~ "rhaglen sydd yno i ffurfweddu eich cyswllt.\n"
+#~ "\n"
+#~ "Os ydych am ffurfweddu eich rhwydwaith yn hwyrach ar ôl y gosodiad neu\n"
+#~ "os ydych wedi gorffen ffurfweddi eich cyswllt a'r rhwydwaith, yna "
+#~ "cliciwch\n"
+#~ "\" Diddymu.\"."
 
 #~ msgid ""
-#~ "There's no known OSS/ALSA alternative driver for your sound card (%s)"
-#~ msgstr "Nid oes gyrrwr OSS/ALSA  hysbys ar gyfer eich cerdyn sain (%s)"
+#~ "You may now choose which services you wish to start at boot time.\n"
+#~ "\n"
+#~ "Here are presented all the services available with the current\n"
+#~ "installation. Review them carefully and uncheck those which are not "
+#~ "always\n"
+#~ "needed at boot time.\n"
+#~ "\n"
+#~ "You can get a short explanatory text about a service by selecting a\n"
+#~ "specific service. However, if you are not sure whether a service is "
+#~ "useful\n"
+#~ "or not, it is safer to leave the default behavior.\n"
+#~ "\n"
+#~ "!! At this stage, be very careful if you intend to use your machine as a\n"
+#~ "server: you will probably not want to start any services which you do "
+#~ "not\n"
+#~ "need. Please remember that several services can be dangerous if they are\n"
+#~ "enabled on a server. In general, select only the services you really "
+#~ "need.\n"
+#~ "!!"
+#~ msgstr ""
+#~ "Mae modd i chi ddewis pa wasanaethau rydych am eu cychwyn\n"
+#~ "wrth gychwyn eich cyfrifiadur.\n"
+#~ "\n"
+#~ "Dyma'r holl wasanaethau sydd ar gael gyda'r gosodiad cyfredol. "
+#~ "Darllenwch\n"
+#~ "y rhestr yn ofalus a dad-diciwch y rhai nad oes eu hangen bob tro wrth "
+#~ "gychwyn.\n"
+#~ "\n"
+#~ "Mae modd cael esboniad byr am wasanaeth wrth eu dewis. Ond, os nad ydych\n"
+#~ "yn siwr a yw'r gwasanaeth o werth neu beidio, mae'n well cadw at y drefn\n"
+#~ "rhagosodedig\n"
+#~ "\n"
+#~ "!!Mae angen i chi fod yn ofalus iawn os ydych am ddefnyddio eich "
+#~ "peiriant\n"
+#~ "fel gwasanaethwr: mwy na thebyg na fyddwch eisiau cychwyn unrhyw\n"
+#~ "wasanaethau nad oes eu hangen. Cofiwch fod cael nifer o wasanaethau\n"
+#~ "wedi eu galluogi ar y gwasanaethwr, fod yn beryglus. Yn gyffredinol,\n"
+#~ "mae'n well dewis dim ond y gwasanaethau mae'n rhaid eu cael.\n"
+#~ "!!"
 
-#~ msgid "ECI Hi-Focus"
-#~ msgstr "ECI Hi-Focus"
+#~ msgid ""
+#~ "X (for X Window System) is the heart of the GNU/Linux graphical "
+#~ "interface\n"
+#~ "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
+#~ "WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, "
+#~ "DrakX\n"
+#~ "will try to configure X automatically.\n"
+#~ "\n"
+#~ "It is extremely rare for it to fail, unless the hardware is very old (or\n"
+#~ "very new). If it succeeds, it will start X automatically with the best\n"
+#~ "resolution possible, depending on the size of the monitor. A window will\n"
+#~ "then appear and ask you if you can see it.\n"
+#~ "\n"
+#~ "If you are doing an \"Expert\" installation, you will enter the X\n"
+#~ "configuration wizard. See the corresponding section of the manual for "
+#~ "more\n"
+#~ "information about this wizard.\n"
+#~ "\n"
+#~ "If you can see the message during the test, and answer \"Yes\", then "
+#~ "DrakX\n"
+#~ "will proceed to the next step. If you cannot see the message, it simply\n"
+#~ "means that the configuration was wrong and the test will automatically "
+#~ "end\n"
+#~ "after 10 seconds, restoring the screen. Refer then to the Video\n"
+#~ "configuration section of the user guide for more information on how to\n"
+#~ "configure your display."
+#~ msgstr ""
+#~ "X (am X Window System) yw calon rhag wyneb graffigol GNU/Linux\n"
+#~ "y mae pob amgylchedd graffig megis KDE, Gnome, AfterStep\n"
+#~ "WindowMaker ag ati, sydd o fewn Mandrake Linux, yn dibynnu. Yn yr\n"
+#~ "adran hon bydd DrakX yn ceisio ffurfweddu  X yn awtomatig.\n"
+#~ "\n"
+#~ "Mae'n anarferol iddo fethu oni bai bod y caledwedd yn hen iawn (neu yn\n"
+#~ "newydd iawn). Os yw'n llwyddo, bydd yn cychwyn X ar y  X cydraniad\n"
+#~ "gorau posibl yn ddibynnol ar faint y monitor. Bydd ffenestr yn ymddangos\n"
+#~ "gan ofyn os ydych yn ei weld.\n"
+#~ "\n"
+#~ "Os ydych yn gwneud gosodiad \"Arbenigwr\", byddwch yn defnyddio'r \n"
+#~ "dewin ffurfweddu  X. Gwelwch yr adran gyfatebol o'r llawlyfr am ragor o\n"
+#~ "wybodaeth am y dewin.\n"
+#~ "\n"
+#~ "Os ydych yn medru gweld y neges ac ateb \"Iawn\", yna bydd DrakX yn\n"
+#~ "mynd ymlaen i'r cam nesaf. Os nad ydych yn gweld y neges mae'n golygu\n"
+#~ "bod y ffurfweddiad yn anghywir a daw i ben ymhen 10 eiliad, gan adfer y "
+#~ "sgrin."
 
-#~ msgid "Proxy should be ftp://..."
-#~ msgstr "Dylai rhif porth fod yn ftp://..."
+#~ msgid ""
+#~ "The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it "
+#~ "by\n"
+#~ "booting from the CD-ROM, press the >>F1<< key at boot and type "
+#~ ">>rescue<<\n"
+#~ "at the prompt. But in case your computer cannot boot from the CD-ROM, "
+#~ "you\n"
+#~ "should come back to this step for help in at least two situations:\n"
+#~ "\n"
+#~ " * when installing the bootloader, DrakX will rewrite the boot sector "
+#~ "(MBR)\n"
+#~ "of your main disk (unless you are using another boot manager), to allow "
+#~ "you\n"
+#~ "to start up with either Windows or GNU/Linux (assuming you have Windows "
+#~ "in\n"
+#~ "your system). If you need to reinstall Windows, the Microsoft install\n"
+#~ "process will rewrite the boot sector, and then you will not be able to\n"
+#~ "start GNU/Linux!\n"
+#~ "\n"
+#~ " * if a problem arises and you cannot start up GNU/Linux from the hard\n"
+#~ "disk, this floppy disk will be the only means of starting up GNU/Linux. "
+#~ "It\n"
+#~ "contains a fair number of system tools for restoring a system, which has\n"
+#~ "crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+#~ "password, or any other reason.\n"
+#~ "\n"
+#~ "If you say \"Yes\", you will be asked to enter a disk inside the drive. "
+#~ "The\n"
+#~ "floppy disk you will insert must be empty or contain data which you do "
+#~ "not\n"
+#~ "need. You will not have to format it since DrakX will rewrite the whole\n"
+#~ "disk."
+#~ msgstr ""
+#~ "Mae gan yr CD-ROM Mandrake Linux modd achub. Gallwch ei gyrraedd drwy\n"
+#~ "gychwyn y peiriant o'r CD-ROM, gwasgu'r fysell >>F1<< o'r cychwyn a "
+#~ "theipio\n"
+#~ " >>rescue<<wrth yr anogwr. Ond os nad yw eich cyfrifiadur yn medru "
+#~ "cychwyn\n"
+#~ "drwy'r CD-ROM dylech ddod yn ôl i'r cam hwn am gymorth mewn o leiaf dwy "
+#~ "sefyllfa:\n"
+#~ "\n"
+#~ " *wrth lwytho'r llwythwr cychwyn, bydd DrakX yn ailysgrifennu'r adran "
+#~ "bwtio [MBR]\n"
+#~ "ar eich prif ddisg [oni bai eich bod yn defnyddio rheolwr cychwyn arall] "
+#~ "fel eich bod\n"
+#~ "yn medru cychwyn yn Windows neu GNU/Linux [gan gymryd bod gennych "
+#~ "Windows\n"
+#~ "ar eich system]. Os fyddwch angen ailosod Windows, bydd proses osod "
+#~ "Microsoft yn\n"
+#~ "ail ysgrifennu'r adran bwtio, ac felly ni fydd modd i chi gychwyn GNU/"
+#~ "Linux!\n"
+#~ "\n"
+#~ " * os oes anhawster yn codi ac nid ydych yn medru cychwyn GNU/Linux o'r "
+#~ "ddisg\n"
+#~ "caled, y ddisg feddal fydd yr unig ffordd i gychwyn GNU/Linux.Mae'n "
+#~ "cynnwys\n"
+#~ "nifer dda o offer i adfer y system, gwall teipio anffodus, camdeipio "
+#~ "cyfrinair neu\n"
+#~ "rhesymau eraill\n"
+#~ "\n"
+#~ "Pan fyddwch yn clicio ar y cam hwn, bydd gofyn i chi rhoi disg meddal yn "
+#~ "y gyrrwr.\n"
+#~ "Rhaid i'r ddisg fod yn wag neu fod dim gwahaniaeth colli'r data arno.Does "
+#~ "dim\n"
+#~ "angen ei fformatio gan y bydd DrakX yn ailysgrifennu'r holl ddisg."
 
-#~ msgid "quit"
-#~ msgstr "gadael"
+#~ msgid ""
+#~ "At this point, you need to choose where you want to install the Mandrake\n"
+#~ "Linux operating system on your hard drive. If your hard drive is empty "
+#~ "or\n"
+#~ "if an existing operating system is using all the available space, you "
+#~ "will\n"
+#~ "need to partition it. Basically, partitioning a hard drive consists of\n"
+#~ "logically dividing it to create space to install your new Mandrake Linux\n"
+#~ "system.\n"
+#~ "\n"
+#~ "Because the partitioning process' effects are usually irreversible,\n"
+#~ "partitioning can be intimidating and stressful if you are an "
+#~ "inexperienced\n"
+#~ "user. Fortunately, there is a wizard which simplifies this process. "
+#~ "Before\n"
+#~ "beginning, please consult the manual and take your time.\n"
+#~ "\n"
+#~ "If you are running the installation in Expert mode, you will enter\n"
+#~ "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
+#~ "fine-tune your partitions. See the DiskDrake section in the ``User "
+#~ "Guide''.\n"
+#~ "From the installation interface, you can use the wizards as described "
+#~ "here\n"
+#~ "by clicking the dialog's \"Wizard\" button.\n"
+#~ "\n"
+#~ "If partitions have already been defined, either from a previous\n"
+#~ "installation or from another partitioning tool, simply select those to\n"
+#~ "install your Linux system.\n"
+#~ "\n"
+#~ "If partitions are not defined, you will need to create them using the\n"
+#~ "wizard. Depending on your hard drive configuration, several options are\n"
+#~ "available:\n"
+#~ "\n"
+#~ " * \"Use free space\": this option will simply lead to an automatic\n"
+#~ "partitioning of your blank drive(s). You will not be prompted further;\n"
+#~ "\n"
+#~ " * \"Use existing partition\": the wizard has detected one or more "
+#~ "existing\n"
+#~ "Linux partitions on your hard drive. If you want to use them, choose "
+#~ "this\n"
+#~ "option. You will then be asked to choose the mount points associated to\n"
+#~ "each of the partitions. The legacy mount points are selected by default,\n"
+#~ "and you should generally keep them.\n"
+#~ "\n"
+#~ " * \"Use the free space on the Windows; partition\": if Microsoft "
+#~ "Windows\n"
+#~ "is installed on your hard drive and takes all the space available on it,\n"
+#~ "you have to create free space for Linux data. To do so, you can delete "
+#~ "your\n"
+#~ "Microsoft Windows partition and data (see ``Erase entire disk'' or "
+#~ "``Expert\n"
+#~ "mode'' solutions) or resize your Microsoft Windows partition. Resizing "
+#~ "can\n"
+#~ "be performed without the loss of any data, provided you previously\n"
+#~ "defragment the Windows partition. Backing up your data won't hurt "
+#~ "either..\n"
+#~ "This solution is recommended if you want to use both Mandrake Linux and\n"
+#~ "Microsoft Windows on the same computer.\n"
+#~ "\n"
+#~ "   Before choosing this option, please understand that after this\n"
+#~ "procedure, the size of your Microsoft Windows partition will be smaller\n"
+#~ "than at the present time. You will have less free space under Microsoft\n"
+#~ "Windows to store your data or to install new software;\n"
+#~ "\n"
+#~ " * \"Erase entire disk\": if you want to delete all data and all "
+#~ "partitions\n"
+#~ "present on your hard drive and replace them with your new Mandrake Linux\n"
+#~ "system, choose this option. Be careful with this solution because you "
+#~ "will\n"
+#~ "not be able to revert your choice after you confirm;\n"
+#~ "\n"
+#~ "   !! If you choose this option, all data on your disk will be lost. !!\n"
+#~ "\n"
+#~ " * \"Remove Windows\": this will simply erase everything on the drive "
+#~ "and\n"
+#~ "begin fresh, partitioning everything from scratch. All data on your disk\n"
+#~ "will be lost;\n"
+#~ "\n"
+#~ "   !! If you choose this option, all data on your disk will be lost. !!\n"
+#~ "\n"
+#~ " * \"Expert mode\": choose this option if you want to manually partition\n"
+#~ "your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+#~ "can very easily lose all your data. Hence, do not choose this unless you\n"
+#~ "know what you are doing. To know how do use the DiskDrake utility used\n"
+#~ "here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+#~ "Guide''''"
+#~ msgstr ""
+#~ "Yn awr mae angen i chi ddewis lle ar eich disg caled i osod eich\n"
+#~ "system weithredu Linux Mandrake. Os yw eich disg caled yn wag neu\n"
+#~ "os oes yna system weithredol eisoes yn cymryd yr holl le sydd ar gael,\n"
+#~ "bydd angen i chi greu rhaniadau arno.Yn y bon, mae rhannu disg caled\n"
+#~ "yn golygu ei rhannu'n rhesymegol i greu lle i osod eich system Mandrake\n"
+#~ "Linux newydd.\n"
+#~ "\n"
+#~ "Gan bo effaith y broses rannu'n ddidroi nôl gall creu rhaniadau fod yn "
+#~ "broses\n"
+#~ "bygythiol a straenus os ydych yn ddefnyddiwr dibrofiad. Yn ffodus, mae "
+#~ "na\n"
+#~ "ddewin sy'n symleiddio'r broses. Cyn cychwyn, darllenwch y llawlyfr a\n"
+#~ "cymerwch bwyll.\n"
+#~ "\n"
+#~ "Os ydych yn rhedeg y gosodiad ym modd Arbenigwr, byddwch yn agor\n"
+#~ "DiskDrake, rhaglen rhannu Mandrake Linux, sy'n caniatáu i chi wneud mân\n"
+#~ "newidiadau i'ch rhaniadau. Gw. pennawd DiskDrake yn y llawlyfr. O'r\n"
+#~ "rhyngwyneb gosod, gallwch ddefnyddio'r dewiniaid drwy glicio ar fotwm\n"
+#~ "\"Dewin\" yn y ddeialog.\n"
+#~ "\n"
+#~ "Os oes yna raniadau wedi eu diffinio, un ai o osodiad blaenorol neu\n"
+#~ "gan offeryn rhannu arall, dewiswch y rheini i osod eich system Linux.\n"
+#~ "\n"
+#~ "Os nad oes rhaniadau wedi eu diffinio, bydd angen i chi eu creu gan\n"
+#~ "ddefnyddio'r dewin. Gan ddibynnu ar ffurfweddiad eich disg caled, mae\n"
+#~ "nifer o ddewisiadau ar gael:\n"
+#~ "\n"
+#~ " * \"Defnyddiwch lle gwag\": mae'r dewis hwn yn arwain at greu rhaniadau\n"
+#~ "awtomatig o'ch disg(iau) caled. Bydd dim cwestiynau eraill.\n"
+#~ "\n"
+#~ " * \"Defnyddiwch y rhaniad cyfredol\": mae'r dewin wedi canfod un neu "
+#~ "fwy\n"
+#~ "o raniadau Linux cyfredol ar eich disg caled. Os ydych am eu defnyddio,\n"
+#~ "cliciwch y dewis hwn.\n"
+#~ "\n"
+#~ " * \"Defnyddiwch le gwag ar raniad Windows\": os yw Microsoft Windows ar\n"
+#~ "eich disg caled ac yn cymryd y lle i gyd, bydd rhaid i chi greu lle ar "
+#~ "gyfer data\n"
+#~ "Linux. I wneud hynny gallwch ddileu eich rhaniad a data Microsoft "
+#~ "Windows\n"
+#~ "(gw. atebion\"Dileu'r ddisg gyfan\" neu \"Modd Arbenigwr) neu ail-lunio "
+#~ "maint\n"
+#~ "rhaniad Microsoft Windows. Mae modd ail lunio maint y rhaniad heb golli "
+#~ "data.\n"
+#~ "Argymhellir gwneud hyn os ydych am ddefnyddio Mandrake Linux a Microsoft\n"
+#~ "Windows ar yr un cyfrifiadur.\n"
+#~ "\n"
+#~ "  Cyn gwneud y dewis hwn, cofiwch y bydd maint eich rhaniad Microsoft "
+#~ "Windows\n"
+#~ "yn llai nag yw ar hyn o bryd. Bydd gennych llai o le yn Microsoft Windows "
+#~ "i gadw\n"
+#~ "data neu i osod meddalwedd newydd.\n"
+#~ "\n"
+#~ " * \"Dileu'r holl ddisg\" os ydych am ddileu'r holl ddata a rhaniadau "
+#~ "presennol\n"
+#~ "ar eich disg caled a'u cyfnewid am system Mandrake Linux, yna dewiswch "
+#~ "hwn.\n"
+#~ "Byddwch yn ofalus wrth wneud hyn gan na fydd modd troi'n ôl ar ôl "
+#~ "cadarnhau.\n"
+#~ "\n"
+#~ "  !! Os ydych yn dewis hwn, byddwch yn colli'r holl ddata ar eich "
+#~ "disg.  !!\n"
+#~ "\n"
+#~ " * \"Tynnu Windows\": bydd hwn yn dileu popeth o'r disg caled a chychwyn "
+#~ "popeth\n"
+#~ "o'r newydd, gan gynnwys creu rhaniadau newydd. Bydd yr holl ddata ar y "
+#~ "ddisg yn\n"
+#~ "cael ei golli\n"
+#~ "\n"
+#~ "  !! Os ydych yn dewis hwn, byddwch yn colli'r holl ddata ar eich "
+#~ "disg.  !!\n"
+#~ "\n"
+#~ " * \"Modd Arbenigwr\": dewiswch hwn os ydych am rannu'r disg caled\n"
+#~ "gyda llaw. Byddwch ofalus - mae'n ddewis pwerus a pheryglus. Mae modd\n"
+#~ "i chi golli'ch holl ddata. Peidiwch dewis hwn oni bai eich bod yn gwybod "
+#~ "beth\n"
+#~ "ydych yn ei wneud."
 
 #~ msgid ""
-#~ "To share your own knowledge and help build Linux tools, join the "
-#~ "discussions forum you'll find on our \"Community\" webpages"
+#~ "There you are. Installation is now complete and your GNU/Linux system is\n"
+#~ "ready to use. Just click \"OK\" to reboot the system. You can start\n"
+#~ "GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+#~ "soon as the computer has booted up again.\n"
+#~ "\n"
+#~ "The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
+#~ "\n"
+#~ " * \"generate auto-install floppy\": to create an installation floppy "
+#~ "disk\n"
+#~ "which will automatically perform a whole installation without the help "
+#~ "of\n"
+#~ "an operator, similar to the installation you just configured.\n"
+#~ "\n"
+#~ "   Note that two different options are available after clicking the "
+#~ "button:\n"
+#~ "\n"
+#~ "    * \"Replay\". This is a partially automated installation as the\n"
+#~ "partitioning step (and only this one) remains interactive;\n"
+#~ "\n"
+#~ "    * \"Automated\". Fully automated installation: the hard disk is\n"
+#~ "completely rewritten, all data is lost.\n"
+#~ "\n"
+#~ "   This feature is very handy when installing a great number of similar\n"
+#~ "machines. See the Auto install section on our web site;\n"
+#~ "\n"
+#~ " * \"Save packages selection\"(*): saves the package selection as done\n"
+#~ "previously. Then, when doing another installation, insert the floppy "
+#~ "inside\n"
+#~ "the drive and run the installation going to the help screen by pressing "
+#~ "on\n"
+#~ "the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
+#~ "\n"
+#~ "(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+#~ "\"mformat a:\")"
 #~ msgstr ""
-#~ "Dewch i adnabod y gymuned Cod Agored a dewch yn aelod. Dysgwch, addysgwch "
-#~ "a chynorthwywch eraill drwy ymuno yn y grwpiau trafod niferus sydd i'w "
-#~ "cael yn ein tudalennau gwe \"Cymuned\""
+#~ "Dyna ni. Mae'r gosodiad wedi ei gwblhau ac mae eich system GNU/Linux\n"
+#~ "yn barod i'w ddefnyddio. Cliciwch \"Iawn\" i ailgychwyn y peiriant. Mae "
+#~ "modd\n"
+#~ "i chi gychwyn GNU/Linux neu Windows, prun bynnag sydd orau gennych\n"
+#~ "(os oes gennych y ddwy system ar eich peiriant), gynted ag y bydd eich\n"
+#~ "peiriant yn ail gychwyn. \n"
+#~ "\n"
+#~ "Mae'r botwm \"Uwch\" yn dangos dau fotwm:\n"
+#~ "\n"
+#~ " *\" creu disg meddal awto-gosod\": i greu disg meddal gosod fydd yn "
+#~ "creu\n"
+#~ "gosodiad cyflawn heb gymorth gweithredwr, yn debyg i'r gosodiad sydd\n"
+#~ "newydd ei ffurfweddu.\n"
+#~ "\n"
+#~ "Sylwer bod dau ddewis gwahanol i'w gael wedi clicio'r botwm:\n"
+#~ "\n"
+#~ " *\"Ail chwarae\". Gosodiad rhannol awtomatig gan bod y cam o greu "
+#~ "rhaniad\n"
+#~ "yn cael ei hepgor.\n"
+#~ "\n"
+#~ " *Awtomeiddio\".Gosodiad cwbl awtomatig: mae'r disg caled wedi ei\n"
+#~ "ailysgrifennu'n llwyr, a'r holl ddata wedi ei golli.\n"
+#~ "\n"
+#~ "Mae hwn yn nodwedd ddefnyddiol iawn pan yn gosod ar nifer fawr o "
+#~ "beiriannau\n"
+#~ "tebyg. Gw. yr adran Auto install ar ein safle gwe.\n"
+#~ "\n"
+#~ " *\"Cadw'r dewis o becynnau\": mae hyn yn cadw'r dewis o becynnau wnaed\n"
+#~ "cynt. Yna wrth wneud gosodiad arall, rhowch ddisg meddal yn y gyrrwr a "
+#~ "rhedeg\n"
+#~ "y gosodiad gan fynd i'r sgrin cymorth drwy wasgu'r fysell [F1], a "
+#~ "chyflwyno\n"
+#~ ">>linux defcfg=\"disg meddal\"<<.\n"
+#~ "\n"
+#~ "(*) Bydd angen disg meddal wedi ei fformatio fel FAT (i greu un yn GNU/"
+#~ "Linux,\n"
+#~ "teipiwch \"mformat a:\")"
 
-#~ msgid "Discover the most up-to-date graphics and multimedia tools!"
-#~ msgstr "Darganfyddwch yr offer graffigol ac amlgyfrwng mwyaf diweddar!"
+#~ msgid ""
+#~ "Any partitions that have been newly defined must be formatted for use\n"
+#~ "(formatting means creating a filesystem).\n"
+#~ "\n"
+#~ "At this time, you may wish to reformat some already existing partitions "
+#~ "to\n"
+#~ "erase any data they contain. If you wish to do that, please select those\n"
+#~ "partitions as well.\n"
+#~ "\n"
+#~ "Please note that it is not necessary to reformat all pre-existing\n"
+#~ "partitions. You must reformat the partitions containing the operating\n"
+#~ "system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
+#~ "reformat partitions containing data that you wish to keep (typically\n"
+#~ "\"/home\").\n"
+#~ "\n"
+#~ "Please be careful when selecting partitions. After formatting, all data "
+#~ "on\n"
+#~ "the selected partitions will be deleted and you will not be able to "
+#~ "recover\n"
+#~ "any of it.\n"
+#~ "\n"
+#~ "Click on \"OK\" when you are ready to format partitions.\n"
+#~ "\n"
+#~ "Click on \"Cancel\" if you want to choose another partition for your new\n"
+#~ "Mandrake Linux operating system installation.\n"
+#~ "\n"
+#~ "Click on \"Advanced\" if you wish to select partitions that will be "
+#~ "checked\n"
+#~ "for bad blocks on the disk."
+#~ msgstr ""
+#~ "Rhaid i bob rhaniad sydd newydd eu henwi gael eu fformatio ar gyfer eu\n"
+#~ "defnyddio (mae fformatio'n golygu creu system ffeilio)\n"
+#~ "\n"
+#~ "Efallai y byddwch eisiau ailfformatio rhai rhaniadau presennol i ddileu "
+#~ "data\n"
+#~ "sydd arnynt. Os ydych am wneud hynny, dewiswch y rhaniadau hynny hefyd.\n"
+#~ "\n"
+#~ "Sylwch nad oes angen ailfformatio'r holl raniadau sy'n bodoli eisoes. "
+#~ "Rhaid \n"
+#~ "ailfformatio'r rhaniadau sy'n cynnwys y system weithredu [megis \"/\","
+#~ "\"usr\"\n"
+#~ "neu \"/var\") ond nid oes rhaid i chi ail fformatio rhaniadau sy'n "
+#~ "cynnwys\n"
+#~ "data rydych am ei gadw (e.e. \"/home\").\n"
+#~ "\n"
+#~ "Byddwch ofalus wrth ddewis rhaniadau. Ar ôl fformatio bydd yr holl ddata "
+#~ "ar\n"
+#~ "y rhaniadau'n cael eu dileu ac ni fydd modd ei adfer.\n"
+#~ "\n"
+#~ "Cliciwch \"Iawn\" pan ydych yn barod i fformatio rhaniadau.\n"
+#~ "\n"
+#~ "Cliciwch \"Dileu\" os ydych am ddewis rhaniad arall ar gyfer eich "
+#~ "gosodiad\n"
+#~ "Mandrake Linux newydd\n"
+#~ "\n"
+#~ "Cliciwch \"Uwch\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
+#~ "gwallus ar y ddisg."
 
 #~ msgid ""
-#~ "Mandrake Linux 9.0 provides the best Open Source games - arcade, action, "
-#~ "cards, sports, strategy..."
+#~ "Before continuing, you should read carefully the terms of the license. "
+#~ "It\n"
+#~ "covers the whole Mandrake Linux distribution, and if you do not agree "
+#~ "with\n"
+#~ "all the terms in it, click on the \"Refuse\" button which will "
+#~ "immediately\n"
+#~ "terminate the installation. To continue with the installation, click on "
+#~ "the\n"
+#~ "\"Accept\" button."
 #~ msgstr ""
-#~ "Mae Mandrake Linux 9.0 yn darparu'r gemau Cod Agored gorau - arcêd,  "
-#~ "antur, cardiau, chwaraeon, strategaeth..."
+#~ "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"
+#~ "â holl ddosbarthiad Mandrake Linux, ac os nad ydych yn cytuno â'r holl\n"
+#~ "amodau, cliciwch ar fotwm \"Gwrthod\" fydd yn terfynu'r gosodiad yn "
+#~ "syth.\n"
+#~ "I barhau gyda'r gosodiad, cliciwch fotwm \"Derbyn\"."
 
 #~ msgid ""
-#~ "Mandrake Linux 9.0 provides 11 user interfaces that can be fully "
-#~ "modified: KDE 3, Gnome 2, WindowMaker..."
+#~ "At this point, you need to choose which partition(s) will be used for "
+#~ "the\n"
+#~ "installation of your Mandrake Linux system. If partitions have already "
+#~ "been\n"
+#~ "defined, either from a previous installation of GNU/Linux or from "
+#~ "another\n"
+#~ "partitioning tool, you can use existing partitions. Otherwise, hard "
+#~ "drive\n"
+#~ "partitions must be defined.\n"
+#~ "\n"
+#~ "To create partitions, you must first select a hard drive. You can select\n"
+#~ "the disk for partitioning by clicking on ``hda'' for the first IDE "
+#~ "drive,\n"
+#~ "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
+#~ "\n"
+#~ "To partition the selected hard drive, you can use these options:\n"
+#~ "\n"
+#~ " * \"Clear all\": this option deletes all partitions on the selected "
+#~ "hard\n"
+#~ "drive;\n"
+#~ "\n"
+#~ " * \"Auto allocate\": this option enables to automatically create ext3 "
+#~ "and\n"
+#~ "swap partitions in free space of your hard drive;\n"
+#~ "\n"
+#~ "\"More\": gives access to additional features:\n"
+#~ "\n"
+#~ " * \"Save partition table\": saves the partition table to a floppy. "
+#~ "Useful\n"
+#~ "for later partition-table recovery if necessary. It is strongly "
+#~ "recommended\n"
+#~ "to perform this step;\n"
+#~ "\n"
+#~ " * \"Restore partition table\": allows to restore a previously saved\n"
+#~ "partition table from floppy disk;\n"
+#~ "\n"
+#~ " * \"Rescue partition table\": if your partition table is damaged, you "
+#~ "can\n"
+#~ "try to recover it using this option. Please be careful and remember that "
+#~ "it\n"
+#~ "can fail;\n"
+#~ "\n"
+#~ " * \"Reload partition table\": discards all changes and loads your "
+#~ "initial\n"
+#~ "partition table;\n"
+#~ "\n"
+#~ " * \"Removable media automounting\": unchecking this option will force\n"
+#~ "users to manually mount and unmount removable medias such as floppies "
+#~ "and\n"
+#~ "CD-ROMs.\n"
+#~ "\n"
+#~ " * \"Wizard\": use this option if you wish to use a wizard to partition\n"
+#~ "your hard drive. This is recommended if you do not have a good knowledge "
+#~ "of\n"
+#~ "partitioning;\n"
+#~ "\n"
+#~ " * \"Undo\": use this option to cancel your changes;\n"
+#~ "\n"
+#~ " * \"Toggle to normal/expert mode\": allows additional actions on\n"
+#~ "partitions (type, options, format) and gives more information;\n"
+#~ "\n"
+#~ " * \"Done\": when you are finished partitioning your hard drive, this "
+#~ "will\n"
+#~ "save your changes back to disk.\n"
+#~ "\n"
+#~ "Note: you can reach any option using the keyboard. Navigate through the\n"
+#~ "partitions using [Tab] and [Up/Down] arrows.\n"
+#~ "\n"
+#~ "When a partition is selected, you can use:\n"
+#~ "\n"
+#~ " * Ctrl-c to create a new partition (when an empty partition is "
+#~ "selected);\n"
+#~ "\n"
+#~ " * Ctrl-d to delete a partition;\n"
+#~ "\n"
+#~ " * Ctrl-m to set the mount point.\n"
+#~ "\n"
+#~ "To get information about the different filesystem types available, "
+#~ "please\n"
+#~ "read the ext2FS chapter from the ``Reference Manual''.\n"
+#~ "\n"
+#~ "If you are installing on a PPC machine, you will want to create a small "
+#~ "HFS\n"
+#~ "``bootstrap'' partition of at least 1MB, which will be used by the "
+#~ "yaboot\n"
+#~ "bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
+#~ "may find it a useful place to store a spare kernel and ramdisk images "
+#~ "for\n"
+#~ "emergency boot situations."
 #~ msgstr ""
-#~ "Mae Mandrake 9.0 yn darpary 11 rhyngwyneb defnyddiwr y mae modd eu "
-#~ "haddasu'n llawn: KDE 3, Gnome 2, WindowMaker..."
+#~ "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer "
+#~ "gosodiad\n"
+#~ "eich system Mandrake Linux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
+#~ "ai drwy osodiad blaenorol o GNU/Linux neu gan offeryn rhannu arall, mae\n"
+#~ "modd i chi ddefnyddio'r rhaniadau presennol. Os nad, rhaid i' "
+#~ "rhaniadau'r\n"
+#~ "ddisg caled gael eu diffinio.\n"
+#~ "\n"
+#~ "I greu rhaniadau, rhaid yn gyntaf ddewis disg caled. Mae modd dewis disg\n"
+#~ "i'w rannu drwy glicio ar \"hda\" ar gyfer y ddisg IDE cyntaf., \"hdb\" "
+#~ "ar\n"
+#~ "gyfer yr ail, \"sda\" ar gyfer y ddisg SCSI cyntaf, ac yn y blaen.\n"
+#~ "\n"
+#~ "I greu'r rhaniad, mae modd defnyddio'r dewisiadau hyn:\n"
+#~ "\n"
+#~ " *\"Clirio'r cyfan\": mae'r dewis hwn yn dileu pob rhaniad ar ddisg.\n"
+#~ "\n"
+#~ " *\"Awto ddynodi\": mae'r dewis hwn yn caniatáu i chi greu'n awtomatig\n"
+#~ "Ext2 a rhaniadau cyfnewid mewn lle gwag ar eich disg.\n"
+#~ "\n"
+#~ " *\"Rhagor\": yn rhoi mynediad i ragor o nodweddion:\n"
+#~ "\n"
+#~ "   *\"Cadw'r tabl rhaniad\": mae hwn yn cadw'r tabl rhaniad i ddisg\n"
+#~ "meddal. Mae hyn yn ddefnyddiol ar gyfer adfer tabl rhaniad, os fydd "
+#~ "angen\n"
+#~ "\n"
+#~ "   \"Adfer y tabl rhaniad\": mae hyn yn caniatáu adfer tabl rhaniad "
+#~ "blaenorol\n"
+#~ "o ddisg meddal.\n"
+#~ "\n"
+#~ "   \"Achub y tabl rhaniad\": os yw eich tabl rhaniad wedi ei ddifrodi, "
+#~ "mae modd\n"
+#~ "ceisio ei  adfer drwy'r dewis yma. Byddwch ofalus a chofiwch fod modd "
+#~ "iddo\n"
+#~ "fethu.\n"
+#~ "\n"
+#~ "   \"Ai-lwytho'r tabl rhaniad\": mae hwn yn dileu pob newid ac yn ail "
+#~ "lwytho'r\n"
+#~ "tabl rhaniad gwreiddiol.\n"
+#~ "\n"
+#~ "   *\"Awto osod cyfrwng symudol\": dad-diciwch y dewis hwn i osod a dad "
+#~ "osod\n"
+#~ "gyda llaw, cyfryngau symudol megis disgiau meddal ac CD-ROMau\n"
+#~ "\n"
+#~ "   *\"Dewin\": defnyddiwch y dewis hwn os ydych am ddefnyddio'r dewin i "
+#~ "rannu\n"
+#~ "eich disg caled. Dyma'sydd orau os nad oes gennych wybodaeth sylweddol "
+#~ "ar\n"
+#~ "rhannu\n"
+#~ "\n"
+#~ "   *\"Dadwneud\": defnyddiwch y dewis hwn i ddileu eich newidiadau\n"
+#~ "\n"
+#~ "    *\"Newid o'r modd arferol/arbenigwr\": mae hwn yn caniatáu "
+#~ "gweithredoedd\n"
+#~ "pellach ar raniadau. (Math, dewisiadau, fformat) ac mae'n cynnig mwy o\n"
+#~ " wybodaeth.\n"
+#~ "\n"
+#~ "   *\"Gorffen\":pan fyddwch wedi gorffen rhannu eich disg, bydd hwn yn "
+#~ "cadw\n"
+#~ " eich newidiadau yn ôl i'r ddisg\n"
+#~ "\n"
+#~ "Sylwer: mae modd cyrraedd y dewisiadau drwy'r bysellfwrdd. Symudwch "
+#~ "drwy'r\n"
+#~ " rhaniadau gan ddefnyddio [Tab] a'r saethau [I Fyny/I Lawr].\n"
+#~ "\n"
+#~ "Pan fydd rhaniad wedi ei ddewis, medrwch ddefnyddio:\n"
+#~ "\n"
+#~ " *Ctrl-c i greu rhaniad newydd (pan fo rhaniad gwag yn cael ei ddewis);\n"
+#~ "\n"
+#~ " *Ctrl-d i ddileu rhaniad;\n"
+#~ "\n"
+#~ " *Ctrl-m i greu pwynt gosod;\n"
+#~ "\n"
+#~ "I dderbyn gwybodaeth am yr amrywiol systemau ffeil sydd ar gael, "
+#~ "darllenwch y\n"
+#~ " pennawd ar ext2fs yn y ``Reference Manual''.\n"
+#~ "\n"
+#~ "Os ydych yn gosod ar beiriant PPC, bydd angen i chi greu \"ymlwythwr\" "
+#~ "HFS\n"
+#~ " bychan o leiaf 1MB o faint, fydd yn cael ei ddefnyddio gan ymlwythwr "
+#~ "yaboot.\n"
+#~ "Os ydych yn dewis gwneud y rhaniad rhywfaint yn fwy, dyweder tua 50MB, "
+#~ "yna\n"
+#~ "gall fod yn le defnyddiol i gadw cnewyllyn sbâr a delweddau ramdisk ar "
+#~ "gyfer\n"
+#~ " sefyllfaoedd cychwyn argyfyngus!"
 
 #~ msgid ""
-#~ "Transform your machine into a powerful server with a few clicks of your "
-#~ "mouse: Web server, mail, firewall, router, file and print server..."
+#~ "DrakX now needs to know if you want to perform a default (\"Recommended"
+#~ "\")\n"
+#~ "installation or if you want to have greater control (\"Expert\"). You "
+#~ "can\n"
+#~ "also choose to do a new install or an upgrade of an existing Mandrake "
+#~ "Linux\n"
+#~ "system:\n"
+#~ "\n"
+#~ " * \"Install\": completely wipes out the old system, however, depending "
+#~ "on\n"
+#~ "what is currently installed on your machine, you may be able to keep "
+#~ "some\n"
+#~ "old partitions (Linux or otherwise) unchanged;\n"
+#~ "\n"
+#~ " * \"Upgrade\": this installation class allows to simply update the\n"
+#~ "packages currently installed on your Mandrake Linux system. It keeps the\n"
+#~ "current partitions of your hard drives as well as user configurations. "
+#~ "All\n"
+#~ "other configuration steps remain available, similar to a normal\n"
+#~ "installation;\n"
+#~ "\n"
+#~ " * \"Upgrade Packages Only\": this new installation class allows you to\n"
+#~ "upgrade an existing Mandrake Linux system while keeping all system\n"
+#~ "configurations unchanged. Adding new packages to the current "
+#~ "installation\n"
+#~ "is also possible.\n"
+#~ "\n"
+#~ "Upgrades should work fine on Mandrake Linux systems containing version\n"
+#~ "\"8.1\" or later.\n"
+#~ "\n"
+#~ "Depending on your knowledge of GNU/Linux, select one of the following\n"
+#~ "choices:\n"
+#~ "\n"
+#~ " * Recommended: choose this if you have never installed a GNU/Linux\n"
+#~ "operating system. The installation will be very easy and you will only "
+#~ "be\n"
+#~ "asked a few questions;\n"
+#~ "\n"
+#~ " * Expert: if you have a good understanding of GNU/Linux, you may wish "
+#~ "to\n"
+#~ "perform a highly customized installation. Some of the decisions you will\n"
+#~ "have to make may be difficult if you do not have good knowledge of\n"
+#~ "GNU/Linux, so it is not recommended that those without a fair amount of\n"
+#~ "experience select this installation class."
 #~ msgstr ""
-#~ "Trowch eich peiriant i fod yn wasanaethwr pwerus gydag ychydig gliciau ar "
-#~ "eich llygoden: gwasanaethwyr gwe, e-bost, mur gwarchod, llwybrydd, "
-#~ "gwasanaethwr ffeil ac argraffu..."
+#~ "Mae DrakX am wybod a ydych am wneud gosodiad rhagosodedig.\n"
+#~ "Hwn sy'n cael ei (\"Argymell\") neu a ydych eisiau mwy o reolaeth\n"
+#~ " (\"Arbenigwr\"). Mae gennych hefyd y dewis o wneud gosodiad newydd neu\n"
+#~ " uwchraddio system Mandrake Linux cyfredol.\n"
+#~ "\n"
+#~ " *\"Gosod\" Mae hwn yn dileu'r hen system yn llwyr. Mewn gwirionedd, yn\n"
+#~ "dibynnu ar ffurf eich peiriant, bydd modd cadw rhai hen raniadau (Linux "
+#~ "neu\n"
+#~ "eraill) heb eu newid.\n"
+#~ "\n"
+#~ " *\"Uwchraddio\" Mae'r gosodiad yn caniatáu i chi uwchraddio'r pecynnau\n"
+#~ "sydd wedi eu gosod ar eich system Mandrake Linux. Bydd yn cadw'r "
+#~ "rhaniadau\n"
+#~ "cyfredol ar eich disg caled yn ogystal â ffurfweddiad defnyddwyr. Mae "
+#~ "pob\n"
+#~ "cam ffurfweddiad arall ar gael fel mewn gosodiad arferol.\n"
+#~ "\n"
+#~ " *\"Uwchraddio Pecynnau'n Unig\" Mae hwn yn ddewis newydd i ganiatáu\n"
+#~ "uwchraddio system Mandrake Linux cyfredol tra'n cadw'r holl ffurfweddiad\n"
+#~ "system heb ei newid. Mae ychwanegu pecynnau newydd i'r system hefyd \n"
+#~ "yn bosibl.\n"
+#~ "\n"
+#~ "Dylai'r uwchraddiad weithio gyda systemau Mandrake Linux yn cychwyn\n"
+#~ "o rifyn \"8.1\" \n"
+#~ "\n"
+#~ "Gan ddibynnu ar eich gwybodaeth am GNH/Linux, dewiswch un o'r canlynol:\n"
+#~ "\n"
+#~ " *Argymhellir: dewiswch hwn os nad ydych wedi gosod system weithredu\n"
+#~ "GNU/Linux o'r blaen. Bydd y gosod yn hawdd a bydd ond rhaid i chi ateb\n"
+#~ "rhai cwestiynau\n"
+#~ "\n"
+#~ " *Arbenigwr: os oes gennych wybodaeth drylwyr am GNU/Linux, mae modd\n"
+#~ "i chi ddewis y math yma o osodiad. Bydd hwn yn caniatáu i chi osod y "
+#~ "system\n"
+#~ "yn ôl eich gofynion eich hun. Bydd ateb rhai o'r cwestiynau'n anodd os "
+#~ "nad\n"
+#~ "oes gennych wybodaeth drylwyr o GNU/Linux, felly peidiwch â dewis hwn os\n"
+#~ " nad ydych yn gwybod beth rydych yn ei wneud."
+
+#~ msgid ""
+#~ "Normally, DrakX selects the right keyboard for you (depending on the\n"
+#~ "language you have chosen). However, you might not have a keyboard that\n"
+#~ "corresponds exactly to your language: for example, if you are an English\n"
+#~ "speaking Swiss person, you may still want your keyboard to be a Swiss\n"
+#~ "keyboard. Or if you speak English but are located in Quebec, you may "
+#~ "find\n"
+#~ "yourself in the same situation. In both cases, you will have to go back "
+#~ "to\n"
+#~ "this installation step and select an appropriate keyboard from the list.\n"
+#~ "\n"
+#~ "Click on the \"More\" button to be presented with the complete list of\n"
+#~ "supported keyboards.\n"
+#~ "\n"
+#~ "If you choose a keyboard layout based on a non-latin alphabet, you will "
+#~ "be\n"
+#~ "asked on next dialog to choose the key binding that will switch the\n"
+#~ "keyboard layout between the latin and non latin layouts."
+#~ msgstr ""
+#~ "Fel arfer mae DrakX yn dewis y bysellfwrdd cywir ar eich cyfer ( gan "
+#~ "ddibynnu pa\n"
+#~ " iaith rydych wedi ei ddewis) ac ni fyddwch yn gweld y cam hwn. Er "
+#~ "hynny,\n"
+#~ "efallai nad oes gennych fysellfwrdd sy'n cyfateb yn union i'ch iaith: e."
+#~ "e., os ydych\n"
+#~ "yn Americanwr sy'n siarad Cymraeg, efallai eich bod am gadw eich "
+#~ "bysellfwrdd\n"
+#~ "Americanaidd. Neu os ydych yn siarad Cymraeg ac yn byw yn Hong Kong "
+#~ "mae'r\n"
+#~ " un sefyllfa'n codi. Yn y ddwy achos bydd angen i chi fynd yn ôl i'r cam "
+#~ "yma yn y\n"
+#~ " gosodiad a dewis y bysellfwrdd perthnasol o'r rhestr.\n"
+#~ "\n"
+#~ "Cliciwch ar fotwm \"Rhagor\" i dderbyn y rhestr lawn o fysellfyrddau sy'n "
+#~ "cael eu\n"
+#~ " cynnal.\n"
+#~ " "
+
+#~ msgid ""
+#~ "The first step is to choose your preferred language.\n"
+#~ "\n"
+#~ "Please choose your preferred language for installation and system usage.\n"
+#~ "\n"
+#~ "Clicking on the \"Advanced\" button will allow you to select other\n"
+#~ "languages to be installed on your workstation. Selecting other languages\n"
+#~ "will install the language-specific files for system documentation and\n"
+#~ "applications. For example, if you will host users from Spain on your\n"
+#~ "machine, select English as the main language in the tree view and in the\n"
+#~ "Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
+#~ "\n"
+#~ "Note that multiple languages may be installed. Once you have selected "
+#~ "any\n"
+#~ "additional locales, click the \"OK\" button to continue."
+#~ msgstr ""
+#~ "Dewiswch eich dewis iaith ar gyfer y gosod a'r defnydd o'r system\n"
+#~ "\n"
+#~ "Bydd clicio ar y botwm \"Uwch\" yn caniatáu i chi ddewis ieithoedd eraill "
+#~ "i'w\n"
+#~ " gosod ar eich peiriant gwaith. Bydd dewis ieithoedd eraill yn gosod "
+#~ "ffeiliau\n"
+#~ " penodol sy'n cynnwys dogfennaeth a rhaglenni yn yr ieithoedd hynny.\n"
+#~ "Er enghraifft, os ydych yn westeiwr ar gyfer defnyddwyr o Sbaen, "
+#~ "dewiswch \n"
+#~ " Gymraeg fel y brif iaith yn golwg coeden ac yn yr adran Uwch cliciwch ar "
+#~ "y \n"
+#~ "seren lwyd sy'n cyfateb i \"Spaeneg|Sbaen\". \n"
+#~ "\n"
+#~ "Sylwer bod modd gosod myw nag un iaith. Unwaith i chi ddewis unrhyw \n"
+#~ "leoleiddiad ychwanegol cliciwch y botwm \"Iawn\" i barhau."
 
 #~ msgid ""
-#~ "Our full range of Linux solutions, as well as special offers on products "
-#~ "and 'goodies', are available online at our e-store"
+#~ "DrakX generally detects the number of buttons your mouse has. If not, it\n"
+#~ "assumes you have a two-button mouse and will set it up for third-button\n"
+#~ "emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
+#~ "USB mouse.\n"
+#~ "\n"
+#~ "If you wish to specify a different type of mouse select the appropriate\n"
+#~ "type from the provided list.\n"
+#~ "\n"
+#~ "If you choose a mouse other than the default, a test screen will be\n"
+#~ "displayed. Use the buttons and wheel to verify that the settings are\n"
+#~ "correct. If the mouse is not working well, press the space bar or "
+#~ "[Return]\n"
+#~ "to \"Cancel\" and choose again.\n"
+#~ "\n"
+#~ "Wheel mouses are sometimes not automatically detected. You will need to\n"
+#~ "manually select it in the list. Be sure to select the one corresponding "
+#~ "to\n"
+#~ "the correct port it is attached to. After you have pressed the \"OK\"\n"
+#~ "button, a mouse image is displayed. You then need to move the wheel of "
+#~ "your\n"
+#~ "mouse to activate it correctly. Then test all buttons and movements are\n"
+#~ "correct."
+#~ msgstr ""
+#~ "Drwy ragosodiad mae DrakX yn cymryd bod gennych lygoden dau fotwm\n"
+#~ "a bydd yn ei osod i efelychu botwm tri. Bydd DrakX yn gwybod yn "
+#~ "awtomatig\n"
+#~ "p'un a'i yw'n lygoden PS/2, cyfresol neu USB.\n"
+#~ "\n"
+#~ " Os hoffech chi bennu math arall o lygoden, dewiswch y math priodol o'r "
+#~ "rhestr.\n"
+#~ "\n"
+#~ "Os byddwch yn dewis llygoden ar wahân i'r rhagosodedig, byddwch yn gweld\n"
+#~ "ffenestr profi'r llygoden. Defnyddiwch y botymau a'r olwyn i wneud yn "
+#~ "siwr fod\n"
+#~ "y gosodiadau'n gweithio. Os nad yw'r llygoden yn gweithio'n iawn pwyswch\n"
+#~ "ar y bylchwr neu [Return] i \"Dileu\" a dewis eto.\n"
+#~ "\n"
+#~ "Weithiau ni fydd llygod olwyn yn cael eu canfod yn awtomatig. Bydd rhaid "
+#~ "i chi\n"
+#~ "eu dewis o'r rhestr. Gwnewch yn siwr eich bod yn dewis yr un sy'n cyfateb "
+#~ "i'r porth\n"
+#~ "mae wedi ei gysylltu iddo. Wedi i chi wasgu'r botwm \"Iawn\" bydd "
+#~ "delwedd\n"
+#~ "llygoden yn cael ei ddangos. Bydd angen i chi symud olwyn y llygoden "
+#~ "iddo \n"
+#~ "weithio'n gywir.Yna profwch fod pob botwm a symudiad yn gywir."
+
+#~ msgid ""
+#~ "This is the most crucial decision point for the security of your GNU/"
+#~ "Linux\n"
+#~ "system: you have to enter the \"root\" password. \"root\" is the system\n"
+#~ "administrator and is the only one authorized to make updates, add users,\n"
+#~ "change the overall system configuration, and so on. In short, \"root\" "
+#~ "can\n"
+#~ "do everything! That is why you must choose a password that is difficult "
+#~ "to\n"
+#~ "guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+#~ "choose not to enter a password, but we strongly advise you against this "
+#~ "if\n"
+#~ "only for one reason: do not think that because you booted GNU/Linux that\n"
+#~ "your other operating systems are safe from mistakes. Since \"root\" can\n"
+#~ "overcome all limitations and unintentionally erase all data on "
+#~ "partitions\n"
+#~ "by carelessly accessing the partitions themselves, it is important for "
+#~ "it\n"
+#~ "to be difficult to become \"root\".\n"
+#~ "\n"
+#~ "The password should be a mixture of alphanumeric characters and at least "
+#~ "8\n"
+#~ "characters long. Never write down the \"root\" password - it makes it "
+#~ "too\n"
+#~ "easy to compromise a system.\n"
+#~ "\n"
+#~ "However, please do not make the password too long or complicated because\n"
+#~ "you must be able to remember it without too much effort.\n"
+#~ "\n"
+#~ "The password will not be displayed on screen as you type it in. Hence, "
+#~ "you\n"
+#~ "will have to type the password twice to reduce the chance of a typing\n"
+#~ "error. If you do happen to make the same typing error twice, this\n"
+#~ "``incorrect'' password will have to be used the first time you connect.\n"
+#~ "\n"
+#~ "In Expert mode, you will be asked if you will be connecting to an\n"
+#~ "authentication server, like NIS or LDAP.\n"
+#~ "\n"
+#~ "If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
+#~ "authentication services, select the appropriate one as \"authentication"
+#~ "\".\n"
+#~ "If you do not know, ask your network administrator.\n"
+#~ "\n"
+#~ "If your computer is not connected to any administrated network, you will\n"
+#~ "want to choose \"Local files\" for authentication."
 #~ msgstr ""
-#~ "Mae amrediad eang o ddarpariaeth Linux, yn ogystal â chynigion arbennig "
-#~ "ar gynnyrch a 'difyrrwch', ar gael ar-lein yn ein e-siop"
+#~ "Mae hwn yn fan pwysig ynghylch diogelwch eich system GNU/Linux; rhaid\n"
+#~ "rhoi cyfrinair \"root\".\"root\" yw gweinyddwr y system a'r unig un sydd "
+#~ "â'r hawl\n"
+#~ "i wneud diweddariadau, ychwanegu defnyddwyr, newid ffurfweddiad "
+#~ "cyffredinol\n"
+#~ "y system, ac yn y blaen. Yn fyr mae \"root\" yn medru gwneud popeth! "
+#~ "Dyna\n"
+#~ "pam mae'n rhaid dewis cyfrinair sy'n anodd ei ddyfalu - bydd DrakX yn "
+#~ "dweud\n"
+#~ " wrthych os yw'n rhy hawdd. Fel y gwelwch, mae modd peidio gorfod cynnig\n"
+#~ " cyfrinair, ond rydym yn argymell yn erbyn hyn, hyd yn oed am un rheswm:\n"
+#~ " peidiwch â meddwl bod eich systemau gweithredu eraill yn ddiogel rhag\n"
+#~ " camgymeriadau, gan eich bod wedi cychwyn o GNU/Linux. Gan fod \"root\" "
+#~ "yn\n"
+#~ " medru goresgyn unrhyw gyfyngiadau a dileu data'n anfwriadol ar bob "
+#~ "rhaniad,\n"
+#~ " drwy fynd at y rhaniadau'n ddi-hid, yna mae'n bwysig ei gwneud hi'n "
+#~ "anodd bod\n"
+#~ " yn \"root\".n\n"
+#~ "Dylai'r cyfrinair fod yn gyfuniad o rifau a llythrennau ac o leiaf 8 nod "
+#~ "o hyd.\n"
+#~ " Peidiwch ysgrifennu'r cyfrinair ar bapur - bydd yn ei gwneud hi'n rhy "
+#~ "hawdd\n"
+#~ " gwanhau'r system.\n"
+#~ "\n"
+#~ "Er hynny, peidiwch â gwneud y cyfrinair yn rhy hir neu gymhleth am fod "
+#~ "rhaid i\n"
+#~ "chi fedri ei gofio heb ormod o drafferth.\n"
+#~ "\n"
+#~ "Ni fydd y cyfrinair yn cael ei ddangos ar y sgrin wrth i chi ei deipio. "
+#~ "Felly bydd\n"
+#~ " rhaid i chi deipio'r cyfrinair ddwywaith i leihau'r siawns o deipio "
+#~ "gwall. Os ydych\n"
+#~ "yn digwydd gwneud yr un gwall teipio ddwywaith, bydd rhaid defnyddio'r "
+#~ "cyfrinair\n"
+#~ " \"anghywir\" i gychwyn y tro cyntaf.\n"
+#~ "\n"
+#~ "Yn y modd arbenigwr, bydd  gofyn os fyddwch yn cysylltu â gwasanaethwr\n"
+#~ "dilysu, megis NIS neu LDAPl\n"
+#~ "\n"
+#~ "Os yw eich rhwydwaith yn defnyddio protocol LDAP (neu NIS) ar gyfer "
+#~ "dilysu,\n"
+#~ " dewiswch \"LDAP\" (neu \"NIS\") fel dilyswr. Os nad ydych yn gwybod,\n"
+#~ " gofynnwch i'ch gweinyddwr system.\n"
+#~ "\n"
+#~ "Os nad yw eich cyfrifiadur wedi ei gysylltu i unrhyw rwydwaith wedi ei "
+#~ "weinyddu,\n"
+#~ " byddwch angen dewis \"Ffeiliau lleol\" ar gyfer dilysu."
 
 #~ msgid ""
-#~ "MandrakeSoft works alongside a selection of companies offering "
-#~ "professional solutions compatible with Mandrake Linux; a list of these "
-#~ "partners is available on the MandrakeStore"
+#~ "LILO and grub are GNU/Linux bootloaders. This stage, normally, is "
+#~ "totally\n"
+#~ "automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+#~ "accordingly, depending on what it finds here:\n"
+#~ "\n"
+#~ " * if a Windows boot sector is found, it will replace it with a grub/"
+#~ "LILO\n"
+#~ "boot sector. Hence, you will be able to load either GNU/Linux or another\n"
+#~ "OS;\n"
+#~ "\n"
+#~ " * if a grub or LILO boot sector is found, it will replace it with a new\n"
+#~ "one.\n"
+#~ "\n"
+#~ "If in doubt, DrakX will display a dialog with various options.\n"
+#~ "\n"
+#~ " * \"Bootloader to use\": you have three choices:\n"
+#~ "\n"
+#~ "    * \"GRUB\": if you prefer grub (text menu).\n"
+#~ "\n"
+#~ "    * \"LILO with graphical menu\": if you prefer LILO with its "
+#~ "graphical\n"
+#~ "interface.\n"
+#~ "\n"
+#~ "    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
+#~ "interface.\n"
+#~ "\n"
+#~ " * \"Boot device\": in most cases, you will not change the default\n"
+#~ "(\"/dev/hda\"), but if you prefer, the bootloader can be installed on "
+#~ "the\n"
+#~ "second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0"
+#~ "\");\n"
+#~ "\n"
+#~ " * \"Delay before booting the default image\": when rebooting the "
+#~ "computer,\n"
+#~ "this is the delay granted to the user to choose - in the bootloader "
+#~ "menu,\n"
+#~ "another boot entry than the default one.\n"
+#~ "\n"
+#~ "!! Beware that if you choose not to install a bootloader (by selecting\n"
+#~ "\"Cancel\" here), you must ensure that you have a way to boot your "
+#~ "Mandrake\n"
+#~ "Linux system! Also, be sure you know what you do before changing any of "
+#~ "the\n"
+#~ "options. !!\n"
+#~ "\n"
+#~ "Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+#~ "options, which are reserved for the expert user."
 #~ msgstr ""
-#~ "Mane Mandrake Linux yn cydweithio gyda dewis o gwmniau yn cynnig atebion "
-#~ "proffesiynnol sy'n cydfynd â Mandrake Linux: mae rhestr o 'r partneriaid "
-#~ "hyn i'w cael yn MandrakeStore"
+#~ "Mae LILO a grub yn llwythwyr cychwyn ar gyfer GNU/Linux. Fel rheol\n"
+#~ "mae'r cam yma'n gwbl awtomatig. Mewn gwirionedd mae DrakX yn\n"
+#~ "dadansoddi'r adran gychwyn ac yn gweithredu ar yr hyn mae'n ei ganfod\n"
+#~ "yma:\n"
+#~ " *os yw'n canfod adran gychwyn Windows mae'n gosod adran cychwyn\n"
+#~ "grub/LILO yno yn ei le. Felly bydd modd i chi gychwyn un ai GNU/Linux\n"
+#~ "neu system weithredu arall.\n"
+#~ "\n"
+#~ " *os fydd yn canfod adran gychwyn grub neu LILO, bydd yn gosod un mwy\n"
+#~ "diweddar yn ei le.\n"
+#~ "\n"
+#~ "Os oes amheuaeth, bydd DrakX yn dangos blwch deialog gyda dewisiadau.\n"
+#~ "\n"
+#~ " * \"Llwythwr cychwyn i'w ddefnyddio\": mae gennych dri dewis:\n"
+#~ "\n"
+#~ "    * \"GRUB\":os mae'n well gennych grub (dewislen testun)\n"
+#~ "\n"
+#~ "    * \"LILO\" gyda dewislen raffigol\": os mae'n well gennych LILO "
+#~ "gyda'i\n"
+#~ "rhagwyneb graffigol.\n"
+#~ "\n"
+#~ "    * \"LILO\" gyda dewislen raffigol\": os mae'n well gennych rhagwyneb "
+#~ "dewislen\n"
+#~ "testun.\n"
+#~ "\n"
+#~ " * \"Dyfais cychwyn\": yn y rhan fwyaf o achosion ni fyddwch yn newid\n"
+#~ "y rhagosodedig (\"/dev/hda\"), ond os mae'n well gennych, gall y "
+#~ "llwythwr\n"
+#~ "cychwyn gael ei osod ar yr ail ddisg caled (\"/dev/hdb\"), neu hyd yn oed "
+#~ "ar\n"
+#~ "ddisg meddal (\"/dev/fd0\")\n"
+#~ " * \"Oedi cyn cychwyn y ddelwedd rhagosodedig\": wrth ail gychwyn y "
+#~ "cyfrifiadur\n"
+#~ "dyma'r oedi sy'n caniatáu i'r defnyddiwr ddewis o fewn y ddewislen "
+#~ "llwythwr cychwyn,\n"
+#~ "llwythwr cychwyn arall yn lle'r un rhagosodedig.\n"
+#~ "\n"
+#~ "!!Gofalwch, os nad ydych yn gosod llwythwr cychwyn, (drwy ddewis \"Diddymu"
+#~ "\" yma),\n"
+#~ "rhaid i chi wneud yn siwr fod gennych fodd i gychwyn eich system Linux "
+#~ "Mandrake.\n"
+#~ "Hefyd, gwnewch yn siwr eich bod yn gwybod beth rydych yn ei wneud cyn "
+#~ "newid y\n"
+#~ "dewisiadau hyn!!\n"
+#~ "\n"
+#~ "Bydd clicio'r botwm \"Uwch\" yn y ddeialog yn cynnig nifer o ddewisiadau "
+#~ "uwch,\n"
+#~ "sydd yn cael eu cadw ar gyfer y defnyddiwr arbenigol."
 
 #~ msgid ""
-#~ "The training program has been create to respond to the needs of both "
-#~ "users and experts (Network and System administrations)"
+#~ "After you have configured the general bootloader parameters, the list of\n"
+#~ "boot options which will be available at boot time will be displayed.\n"
+#~ "\n"
+#~ "If there is another operating system installed on your machine, it will\n"
+#~ "automatically be added to the boot menu. Here, you can choose to fine-"
+#~ "tune\n"
+#~ "the existing options. Select an entry and click \"Modify\" to modify or\n"
+#~ "remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+#~ "installation step.\n"
+#~ "\n"
+#~ "You may also not want to give access to these other operating systems to\n"
+#~ "anyone. In which case, you can delete the corresponding entries. But "
+#~ "then,\n"
+#~ "you will need a boot disk in order to boot those other operating systems!"
 #~ msgstr ""
-#~ "Mae'r rhaglen hyfforddi wedi ei greu i ymateb i anghenion defnyddwyr ac "
-#~ "arbenigwyr (gweinyddiaethau Rhwydwaith a System)"
+#~ "Mae LILO (the LInux LOader) a grub yn llwythwyr cychwyn: maent yn medru\n"
+#~ "cychwyn un ai GNU/Linux neu unrhyw system weithredu arall sy'n bresennol\n"
+#~ "ar eich cyfrifiadur.\n"
+#~ "\n"
+#~ " Fel rheol mae'r systemau hyn wedi eu canfod a'u gosod yn\n"
+#~ "gywir. Os nad yw hyn yn gywir y tro yma, mae modd i chi ychwanegu cofnod\n"
+#~ " gyda llaw ar y sgrin hwn. Byddwch ofalus i ddewis y paramedrau cywir\n"
+#~ "\n"
+#~ "Efallai na fyddwch eisiau rhoi mynediad i'r systemau gweithredu hyn i neb "
+#~ "arall\n"
+#~ "Os felly, gallwch ddileu'r cofnodion perthnasol.Ond bydd rhaid i chi greu "
+#~ "disg\n"
+#~ " cychwyn ar gyfer y systemau gweithredu rheini!"
 
 #~ msgid ""
-#~ "Find the solutions to your problems via MandrakeSoft's online support "
-#~ "platform"
+#~ "You must indicate where you wish to place the information required to "
+#~ "boot\n"
+#~ "to GNU/Linux.\n"
+#~ "\n"
+#~ "Unless you know exactly what you are doing, choose \"First sector of "
+#~ "drive\n"
+#~ "(MBR)\"."
 #~ msgstr ""
-#~ "Dewch o hyd i'r atebion i'ch problemau drwy blatffornm cefnogaeth arlein "
-#~ "MandrakeSoft."
+#~ "Rhaid i chi ddangos lle rydych am osod yr wybodaeth angenrheidiol i "
+#~ "gychwyn\n"
+#~ "GNU/Linux\n"
+#~ "Os nad ydych yn gwybod yn union beth rydych yn ei wneud, dewiswch "
+#~ "\"First\n"
+#~ "sector of drive (MBR)\"."
 
 #~ msgid ""
-#~ "Sorry, perl-Expect is not installed/enabled. To use\n"
-#~ "this feature, install perl-Expect and comment lines 772-774,\n"
-#~ " as well as 788,789. Then uncomment line 787."
+#~ "Here, we select a printing system for your computer. Other OSs may offer\n"
+#~ "you one, but Mandrake Linux offers three.\n"
+#~ "\n"
+#~ " * \"pdq\" - which means ``print, don't queue'', is the choice if you "
+#~ "have\n"
+#~ "a direct connection to your printer and you want to be able to panic out "
+#~ "of\n"
+#~ "printer jams, and you do not have networked printers. It will handle "
+#~ "only\n"
+#~ "very simple network cases and is somewhat slow for networks. Pick \"pdq"
+#~ "\"\n"
+#~ "if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+#~ "after installation by running PrinterDrake from the Mandrake Control "
+#~ "Center\n"
+#~ "and clicking the expert button.\n"
+#~ "\n"
+#~ " * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing "
+#~ "to\n"
+#~ "your local printer and also halfway-around the planet. It is simple and "
+#~ "can\n"
+#~ "act as a server or a client for the ancient \"lpd\" printing system. "
+#~ "Hence,\n"
+#~ "it is compatible with the systems that went before. It can do many "
+#~ "tricks,\n"
+#~ "but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+#~ "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It "
+#~ "has\n"
+#~ "graphical front-ends for printing or choosing printer options.\n"
+#~ "\n"
+#~ " * \"lprNG\" - ``line printer daemon New Generation''. This system can "
+#~ "do\n"
+#~ "approximately the same things the others can do, but it will print to\n"
+#~ "printers mounted on a Novell Network, because it supports the IPX "
+#~ "protocol,\n"
+#~ "and it can print directly to shell commands. If you have need of Novell "
+#~ "or\n"
+#~ "printing to commands without using a separate pipe construct, use lprNG.\n"
+#~ "Otherwise, CUPS is preferable as it is simpler and better at working "
+#~ "over\n"
+#~ "networks."
 #~ msgstr ""
-#~ "Sorry, perl-Expect is not installed/enabled. To use\n"
-#~ "this feature, install perl-Expect and comment lines 772-774,\n"
-#~ " as well as 788,789. Then uncomment line 787."
+#~ "Yma byddwn yn dewis system argraffu i'ch cyfrifiadur ei ddefnyddio. "
+#~ "Efallai\n"
+#~ "bod systemau eraill yn cynnig un i chi, ond mae Mandrake yn cynnig tri.\n"
+#~ "\n"
+#~ " *pdq\" - sy'n golygu \"print, don't queue\", Hwn yw'r dewis os oes "
+#~ "gennych\n"
+#~ "gysylltiad uniongyrchol â'ch argraffydd a'ch bod eisiau medru tynnu allan "
+#~ "o waith\n"
+#~ "argraffu pan mae'r papur wedi mynd yn sownd ac nad oes gennych "
+#~ "argraffyddion\n"
+#~ "wedi eu cysylltu drwy rwydwaith. Mae'n medru trin rhwydweithiau syml ac "
+#~ "mae\n"
+#~ "rhywfaint yn araf ar gyfer rhwydweithiau. Dewiswch \"pdq\" os mai dyma yw "
+#~ "eich\n"
+#~ "tro cyntaf yn GNU/Linux., mae modd i chi newid eich dewis ar ôl gosod "
+#~ "drwy\n"
+#~ " ddefnyddio PrinterDrake o Ganolfan Rheoli Mandrake a chlicio botwm "
+#~ "arbenigwr\n"
+#~ "\n"
+#~ " *\"CUPS\" - \"Common Unix Printing System\". Mae hwn yn wych ar gyfer\n"
+#~ "argraffu i argraffyddion lleol a hanner ffordd rownd y byd. Mae'n "
+#~ "symlach, yn\n"
+#~ "medru gweithredu fel gwasanaethwr neu cleient ar gyfer yr hen system \"lpd"
+#~ "\"\n"
+#~ "felly mae'n cydweddi â'r systemau sydd wedi mynd o'i flaen. Mae'n gallu "
+#~ "gwneud\n"
+#~ "nifer o driciau, ond mae bron mor syml i'w osod  \"pdq\". Os ydych amgen "
+#~ "hwn\n"
+#~ "i efelychu gwasanaethwr \"lpd\", yna rhaid cychwyn daemon \"cups-lpd\".\n"
+#~ "Mae ganddo wyneb graffigol ar gyfer argraffu neu ddewis dewisiadau "
+#~ "argraffu.\n"
+#~ "\n"
+#~ " *\"lprNG\" - \"line printer daemon New Generation\" Mae'r system yma'n\n"
+#~ "medru gwneud yn fras yr un pethau a'r lleill, ond mae'n medru argraffu i\n"
+#~ "argraffyddion ar Novell Network, gan ei fod yn cynnal protocol IPX, ac\n"
+#~ "mae'n medru argraffu 'n uniongyrchol i orchmynion cragen.. Os oes\n"
+#~ "angen Novell neu argraffu i orchmynion heb luniad peipen ar wahân,\n"
+#~ "defnyddiwch lprNG. Yn gyffredinol, mae CUPS yn well am ei fod yn syml\n"
+#~ "ac yn well wrth weithio ar draws rhwydwaith."
+
+#~ msgid ""
+#~ "DrakX now detects any IDE devices present in your computer. It will also\n"
+#~ "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
+#~ "found, DrakX will automatically install the appropriate driver.\n"
+#~ "\n"
+#~ "Because hardware detection does not always detect a piece of hardware,\n"
+#~ "DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes"
+#~ "\"\n"
+#~ "if you know that there is a SCSI card installed in your machine. You "
+#~ "will\n"
+#~ "be presented with a list of SCSI cards to choose from. Click \"No\" if "
+#~ "you\n"
+#~ "have no SCSI hardware. If you are unsure, you can check the list of\n"
+#~ "hardware detected in your machine by selecting \"See hardware info\" and\n"
+#~ "clicking \"OK\". Examine the list of hardware and then click on the \"OK"
+#~ "\"\n"
+#~ "button to return to the SCSI interface question.\n"
+#~ "\n"
+#~ "If you have to manually specify your adapter, DrakX will ask if you want "
+#~ "to\n"
+#~ "specify options for it. You should allow DrakX to probe the hardware for\n"
+#~ "the card-specific options which the hardware needs to initialize. This\n"
+#~ "usually works well.\n"
+#~ "\n"
+#~ "If DrakX is not able to probe for the options which need to be passed, "
+#~ "you\n"
+#~ "will need to provide options to the driver manually. Please review the\n"
+#~ "``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
+#~ "Hardware'' section) for hints on retrieving the parameters required from\n"
+#~ "hardware documentation, from the manufacturer's web site (if you have\n"
+#~ "Internet access) or from Microsoft Windows (if you used this hardware "
+#~ "with\n"
+#~ "Windows on your system)."
+#~ msgstr ""
+#~ "Mae DrakX yn canfod unrhyw ddyfais IDE sydd ar eich cyfrifiadur. Bydd yn\n"
+#~ "chwilio am un neu fwy o gardiau SCSI PCI ar eich system. Os oes Cerdyn\n"
+#~ "SCSI'n cael ei ganfod bydd DrakX yn awtomatig yn gosod y gyrrwr priodol.\n"
+#~ "\n"
+#~ "Oherwydd nad yw canfod caledwedd bob tro'n canfod darn o galedwedd, bydd\n"
+#~ " DrakX yn gofyn i chi gadarnhau os oes cerdyn SCSI PCI yn bresennol. "
+#~ "Cliciwch\n"
+#~ "\"Oes\" os ydych yn gwybod bod cerdyn SCSI wedi ei osod ar eich "
+#~ "peiriant. \n"
+#~ "Bydd rhestr o gardiau SCSI'n ymddangos i chi ddewis un. Cliciwch \"Na\" "
+#~ "os\n"
+#~ "nad oes gennych galedwedd SCSI. Os nad ydych yn siwr, gallwch edrych ar "
+#~ "y\n"
+#~ " rhestr o galedwedd sydd wedi ei ganfod ar eich peiriant drwy ddewis\n"
+#~ " \"Gwybodaeth am galedwedd\" a chlicio \"Iawn\". Edrychwch yn fanwl ar y\n"
+#~ "rhestr a chlicio'r botwm \"Iawn\" i fynd yn ôl i'r cwestiwn rhag wyneb "
+#~ "SCSI.\n"
+#~ "\n"
+#~ "Os ydych wedi pennu eich addaswr gyda llaw, bydd DrakX yn gofyn i chi s\n"
+#~ " ydych am bennu dewisiadau ar ei gyfer. Dylech adael i DrakX ofyn i'r "
+#~ "cerdyn am\n"
+#~ " ddewisiadau penodol i'r cerdyn mae angen i'r caledwedd eu cychwyn. Mae "
+#~ "hyn\n"
+#~ "fel rheol yn gweithio'n dda\n"
+#~ "\n"
+#~ "Os nad yw DrakX yn medru holi am y dewisiadau sydd eu hangen, bydd rhaid "
+#~ "i\n"
+#~ " chi ddarparu'r dewisiadau gyda llaw. Darllenwch yr ``User "
+#~ "Guide'' (pennod3,\n"
+#~ " adran \"Collecting Information on Your Hardware\") am syniadau ar sut i "
+#~ "gael y\n"
+#~ " paramedrau angenrheidiol o ddogfennau'r caledwedd, o safle gwe'r "
+#~ "gwneuthurwr\n"
+#~ " (os oes gennych gysylltiad â'r Rhyngrwyd) neu oddi wrth Microsoft "
+#~ "Windows (os\n"
+#~ " ydych wedi defnyddio'r caledwedd gyda Windows ar eich system)."
+
+#~ msgid ""
+#~ "You can add additional entries for yaboot, either for other operating\n"
+#~ "systems, alternate kernels, or for an emergency boot image.\n"
+#~ "\n"
+#~ "For other OSs, the entry consists only of a label and the \"root\"\n"
+#~ "partition.\n"
+#~ "\n"
+#~ "For Linux, there are a few possible options:\n"
+#~ "\n"
+#~ " * Label: this is simply the name you will have to type at the yaboot\n"
+#~ "prompt to select this boot option;\n"
+#~ "\n"
+#~ " * Image: this would be the name of the kernel to boot. Typically, "
+#~ "vmlinux\n"
+#~ "or a variation of vmlinux with an extension;\n"
+#~ "\n"
+#~ " * Root: the \"root\" device or ``/'' for your Linux installation;\n"
+#~ "\n"
+#~ " * Append: on Apple hardware, the kernel append option is used quite "
+#~ "often\n"
+#~ "to assist in initializing video hardware, or to enable keyboard mouse\n"
+#~ "button emulation for the often lacking 2nd and 3rd mouse buttons on a "
+#~ "stock\n"
+#~ "Apple mouse. The following are some examples:\n"
+#~ "\n"
+#~ "         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
+#~ "hda=autotune\n"
+#~ "\n"
+#~ "         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
+#~ "\n"
+#~ " * Initrd: this option can be used either to load initial modules, "
+#~ "before\n"
+#~ "the boot device is available, or to load a ramdisk image for an "
+#~ "emergency\n"
+#~ "boot situation;\n"
+#~ "\n"
+#~ " * Initrd-size: the default ramdisk size is generally 4,096 bytes. If "
+#~ "you\n"
+#~ "need to allocate a large ramdisk, this option can be used;\n"
+#~ "\n"
+#~ " * Read-write: normally the \"root\" partition is initially brought up "
+#~ "in\n"
+#~ "read-only, to allow a file system check before the system becomes "
+#~ "``live''.\n"
+#~ "Here, you can override this option;\n"
+#~ "\n"
+#~ " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
+#~ "problematic, you can select this option to boot in ``novideo'' mode, "
+#~ "with\n"
+#~ "native frame buffer support;\n"
+#~ "\n"
+#~ " * Default: selects this entry as being the default Linux selection,\n"
+#~ "selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+#~ "also be highlighted with a ``*'', if you press [Tab] to see the boot\n"
+#~ "selections."
+#~ msgstr ""
+#~ "Mae modd i chi gynnig cofnodion eraill ar gyfer yaboot, un ai systemau\n"
+#~ " gweithredol eraill, cnewyll eraill, neu ddelwedd cychwyn argyfwng.\n"
+#~ "\n"
+#~ "Ar gyfer systemau gweithredu eraill, mae'r cofnod yn cynnwys label a'r "
+#~ "rhaniad\n"
+#~ " root yn unig\n"
+#~ "\n"
+#~ "Ar gyfer LInux, mae yna rhai dewisiadau:\n"
+#~ "\n"
+#~ " *Label:sef yr enw fyddwch yn ei deipio yn anogwr yaboot i ddewis y "
+#~ "dewis\n"
+#~ " cychwyn.\n"
+#~ "\n"
+#~ " *Image: hwn fydd enw'r cnewyllyn i'w gychwyn. Fel rheol, vimlinux neu\n"
+#~ "amrywiad ohono gydag estyniad\n"
+#~ "\n"
+#~ " *Root: y ddyfais \"root\" neu \"/\" ar gyfer eich gosodiad Linux.\n"
+#~ "\n"
+#~ " *Append: ar galedwedd Apple, mae dewis atodi cnewyllyn yn cael ei\n"
+#~ " ddefnyddio'n eithaf aml i gynorthwyo cychwyn caledwedd fideo neu i "
+#~ "alluogi\n"
+#~ " efelychiad o'r llygoden bysellfwrdd sydd ar goll ar yr ail a'r trydydd "
+#~ "botwm\n"
+#~ "llygoden llygod arferol Apple. Dyma rhai enghreifftiau:\n"
+#~ "\n"
+#~ "       video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+#~ "hda=autotune\n"
+#~ "\n"
+#~ "         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
+#~ "\n"
+#~ " * Initrd: mae modd defnyddio'r dewis hwn i un ai lwytho'r modiwlau "
+#~ "cychwynnol,\n"
+#~ " cydnabod y ddyfais cychwyn ar gael, neu i lwytho delwedd ramdisg ar "
+#~ "gyfer\n"
+#~ " cychwyn argyfwng.\n"
+#~ "\n"
+#~ " * Initrd-size: maint y ddelwedd ramdisg arferol yw 4,096bid. Os ydych "
+#~ "angen\n"
+#~ "dyrannu ramdisg mawr, mae modd defnyddio'r dewis hwn.\n"
+#~ "\n"
+#~ " * Read-write:fel rheol mae'r rhaniad \"root\" yn cael ei agor fel "
+#~ "darllern yn unig, i\n"
+#~ " ganiatáu gwiriad system ffeiliau cyn i'r system ddod yn \"fyw\". Yma mae "
+#~ "modd\n"
+#~ " diystyru'r dewis hwn.\n"
+#~ "\n"
+#~ " * NoVideo: petai caledwedd Apple yn profi i fod yn peri anawsterau "
+#~ "sylweddol,\n"
+#~ " mae modd i chi ddewis cychwyn mewn modd \"novideo\", gyda chynhaliaeth\n"
+#~ " ffrâm byffer cynhenid\n"
+#~ "\n"
+#~ " * Default: dyma'r cyflwr rhagosodedig, dewiswch hwn drwy bwyso ENTER at\n"
+#~ " anogwr yaboot. Bydd y cofnod hefyd wedi ei amlygu gyda \"*\", os wnewch "
+#~ "chi\n"
+#~ " bwyso ar [Tab] i weld dewisiadau'r cychwyn."
+
+#~ msgid ""
+#~ "Here are presented various parameters concerning your machine. Depending "
+#~ "on\n"
+#~ "your installed hardware, you may - or not, see the following entries:\n"
+#~ "\n"
+#~ " * \"Mouse\": check the current mouse configuration and click on the "
+#~ "button\n"
+#~ "to change it if necessary;\n"
+#~ "\n"
+#~ " * \"Keyboard\": check the current keyboard map configuration and click "
+#~ "on\n"
+#~ "the button to change that if necessary;\n"
+#~ "\n"
+#~ " * \"Timezone\": DrakX, by default, guesses your time zone from the\n"
+#~ "language you have chosen. But here again, as for the choice of a "
+#~ "keyboard,\n"
+#~ "you may not be in the country for which the chosen language should\n"
+#~ "correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+#~ "order to configure the clock according to the time zone you are in;\n"
+#~ "\n"
+#~ " * \"Printer\": clicking on the \"No Printer\" button will open the "
+#~ "printer\n"
+#~ "configuration wizard. Consult the corresponding chapter of the ``User\n"
+#~ "Guide'' for more information on how to setup a new printer. The "
+#~ "interface\n"
+#~ "presented there is similar to the one used during installation;\n"
+#~ "\n"
+#~ " * \"Sound card\": if a sound card is detected on your system, it is\n"
+#~ "displayed here. No modification possible at installation time;\n"
+#~ "\n"
+#~ " * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+#~ "here. No modification possible at installation time;\n"
+#~ "\n"
+#~ " * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+#~ "displayed here. You can click on the button to change the parameters\n"
+#~ "associated with it."
+#~ msgstr ""
+#~ "Dyma amrywiol baramedrau ynghylch eich peiriant. Yn ddibynnol ar eich\n"
+#~ "caledwedd, mae'n bosibl i chi weld y rhain, neu beidio\n"
+#~ "\n"
+#~ " *\"Llygoden\": edrychwch ar ffurfweddiad presennol y llygoden a "
+#~ "chliciwch ar y\n"
+#~ " botwm i'w newid os oes angen.\n"
+#~ "\n"
+#~ " *\"Bysellfwrdd\" edrychwch ar ffurfweddiad presennol y bysellfwrdd a "
+#~ "chliciwch\n"
+#~ "ar y\n"
+#~ " botwm i'w newid os oes angen.\n"
+#~ "\n"
+#~ " *\"Cylchfa amser\" Mae DrakX, yn dyfalu eich cylchfa amser o'r iaith "
+#~ "rydych\n"
+#~ " wedi ei dewis. Eto fel gyda bysellfwrdd efallai nad ydych yn y wlad sy'n "
+#~ "cyfateb i'r\n"
+#~ " dewis iaith. Felly, mae'n bosibl y bydd angen i chi glicio ar fotwm "
+#~ "\"Cylchfa\n"
+#~ " amser\" i ffurfweddi'r cloc yn ôl y gylchfa amser rydych ynddi.\n"
+#~ "\n"
+#~ " *\"Argraffydd\": bydd clicio ar y botwm \"Dim argraffydd\" yn agor y "
+#~ "dewin\n"
+#~ " ffurfweddi.\n"
+#~ "\n"
+#~ " *\"Cerdyn sain\": os oes cerdyn sain yn cael ei ganfod ar eich system, "
+#~ "bydd yn\n"
+#~ "cael ei ddangos yma. Nid oes modd creu newidiadau adeg y gosodiad.\n"
+#~ "\n"
+#~ " *\"Cerdyn teledu\": os oes cerdyn teledu yn cael ei ganfod ar eich "
+#~ "system, bydd\n"
+#~ " yn cael ei ddangos yma. Nid oes modd creu newidiadau adeg y gosodiad.\n"
+#~ "\n"
+#~ " *\"Cerdyn IDSN\":os oes cerdyn IDSN yn cael ei ganfod ar eich system, "
+#~ "bydd\n"
+#~ " yn cael ei ddangos yma. Mae modd clicio ar y botwm i newid y paramedrau\n"
+#~ " cysylltiedig."
+
+#~ msgid ""
+#~ "Click on \"OK\" if you want to delete all data and partitions present on\n"
+#~ "this hard drive. Be careful, after clicking on \"OK\", you will not be "
+#~ "able\n"
+#~ "to recover any data and partitions present on this hard drive, including\n"
+#~ "any Windows data.\n"
+#~ "\n"
+#~ "Click on \"Cancel\" to cancel this operation without losing any data and\n"
+#~ "partitions present on this hard drive."
+#~ msgstr ""
+#~ "Cliciwch \"Iawn\" os ydych am ddileu'r holl ddata a rhaniadau sy'n "
+#~ "bresennol ar y disg caled hwn. Byddwch ofalus, wedi i chi glicio \"Iawn\" "
+#~ "ni fydd modd i chi adfer unrhyw ddata na rhaniadau presennol ar y disg "
+#~ "caled, gan gynnwys data Windows.\n"
+#~ "\n"
+#~ "Cliciwch \" Diddymu\" i ddiddymu'r weithred hon heb golli unrhyw ddata a "
+#~ "rhaniadau sy'n bresennol ar y ddisg galed."
diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po
index 07503027d..cb13b2fc9 100644
--- a/perl-install/share/po/fr.po
+++ b/perl-install/share/po/fr.po
@@ -52,14 +52,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX for MDK 8.1\n"
-"POT-Creation-Date: 2002-09-12 13:54+0200\n"
-"PO-Revision-Date: 2002-09-12 17:03+0200\n"
+"POT-Creation-Date: 2002-09-13 22:00+0200\n"
+"PO-Revision-Date: 2002-09-14 11:19+0400\n"
 "Last-Translator: David Baudens <baudens@mandrakesoft.com>\n"
 "Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
 
 #: ../../Xconfig/card.pm_.c:16
 msgid "256 kB"
@@ -248,8 +247,8 @@ msgid "Ok"
 msgstr "Ok"
 
 #: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3184
-#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:224
+#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3203
+#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
 msgid "Quit"
 msgstr "Quitter"
 
@@ -358,7 +357,7 @@ msgstr "Carte graphique : %s"
 #: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195
 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
 #: ../../my_gtk.pm_.c:158 ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
-#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2150
+#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2169
 #: ../../security/main.pm_.c:295 ../../standalone/drakautoinst_.c:203
 #: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
 #: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
@@ -367,8 +366,8 @@ msgstr "Carte graphique : %s"
 #: ../../standalone/drakbackup_.c:4184 ../../standalone/drakconnect_.c:115
 #: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
 #: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:234 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:224
+#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
+#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:225
 #: ../../ugtk.pm_.c:296
 msgid "Cancel"
 msgstr "Annuler"
@@ -561,7 +560,7 @@ msgstr "Délai avant l'activation du choix par défaut"
 #: ../../any.pm_.c:170 ../../any.pm_.c:789
 #: ../../diskdrake/smbnfs_gtk.pm_.c:179
 #: ../../install_steps_interactive.pm_.c:1094 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:850 ../../printerdrake.pm_.c:965
+#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
 #: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
 #: ../../standalone/drakconnect_.c:649
 msgid "Password"
@@ -669,7 +668,7 @@ msgstr "Ajouter"
 #: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
 #: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
 #: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printerdrake.pm_.c:3184 ../../standalone/drakbackup_.c:2774
+#: ../../printerdrake.pm_.c:3203 ../../standalone/drakbackup_.c:2774
 msgid "Done"
 msgstr "Terminer"
 
@@ -939,8 +938,8 @@ msgstr "Accepter"
 msgid "Real name"
 msgstr "Nom et prénom"
 
-#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:849
-#: ../../printerdrake.pm_.c:964
+#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:979
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
@@ -998,7 +997,7 @@ msgstr "Autoriser tous les utilisateurs"
 msgid "No sharing"
 msgstr "Pas de partage"
 
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1198 ../../standalone.pm_.c:58
+#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:59
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Le paquetage %s doit être installé. Souhaitez-vous l'installer ?"
@@ -1009,7 +1008,7 @@ msgid ""
 msgstr ""
 "Souhaitez-vous exporter par NFS (protocole Unix) ou SMB (protocole Windows)?"
 
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1203 ../../standalone.pm_.c:63
+#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:64
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Le paquetage %s, requis, est manquant"
@@ -1247,18 +1246,18 @@ msgid "Boot Style Configuration"
 msgstr "Configuration du style de démarrage"
 
 #: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:81
-#: ../../standalone/logdrake_.c:101
+#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:82
+#: ../../standalone/logdrake_.c:102
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:82
-#: ../../standalone/logdrake_.c:107
+#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:83
+#: ../../standalone/logdrake_.c:108
 msgid "/File/_Quit"
 msgstr "/Fichier/_Quitter"
 
 #: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:63
-#: ../../standalone/drakfloppy_.c:82 ../../standalone/logdrake_.c:107
+#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:108
 msgid "<control>Q"
 msgstr "<control>Q"
 
@@ -2085,7 +2084,7 @@ msgstr "Options de montage"
 msgid "Various"
 msgstr "Divers"
 
-#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:103
+#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:104
 msgid "device"
 msgstr "périphérique"
 
@@ -2726,7 +2725,7 @@ msgstr "Classe de matériel"
 msgid "class of hardware device"
 msgstr "classe de matériel"
 
-#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1543
+#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1562
 msgid "Description"
 msgstr "Description"
 
@@ -2798,7 +2797,7 @@ msgstr "/_Quitter"
 
 #: ../../harddrake/ui.pm_.c:64 ../../harddrake/ui.pm_.c:65
 #: ../../harddrake/ui.pm_.c:71 ../../harddrake/ui.pm_.c:73
-#: ../../standalone/logdrake_.c:110
+#: ../../standalone/logdrake_.c:111
 msgid "/_Help"
 msgstr "/_Aide"
 
@@ -2951,30 +2950,37 @@ msgstr "activer le support de la radio"
 msgid ""
 "GNU/Linux is a multiuser system, and this means that each user can have his\n"
 "own preferences, his own files and so on. You can read the ``User Guide''\n"
-"to learn more. But unlike \"root\", which is the administrator, the users\n"
-"you add here will not be entitled to change anything except their own files\n"
-"and their own configuration. You will have to create at least one regular\n"
-"user for yourself. That account is where you should log in for routine use.\n"
-"Although it is very practical to log in as \"root\" everyday, it may also\n"
-"be very dangerous! The slightest mistake could mean that your system would\n"
-"not work any more. If you make a serious mistake as a regular user, you may\n"
-"only lose some information, but not the entire system.\n"
-"\n"
-"First, you have to enter your real name. This is not mandatory, of course -\n"
-"as you can actually enter whatever you want. DrakX will then take the first\n"
-"word you have entered in the box and will bring it over to the \"User\n"
+"to learn more this concept. But unlike \"root\", which is the\n"
+"administrator, the users you add here will not be entitled to change\n"
+"anything except their own files and their own configurations. You will have\n"
+"to create at least one regular user for yourself. That account is where you\n"
+"should log in for routine use. Although it is very practical to log in as\n"
+"\"root\" everyday, it may also be very dangerous! The slightest mistake\n"
+"could mean that your system would not work any more. If you make a serious\n"
+"mistake as a regular user, you may only lose some information, but not the\n"
+"entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course\n"
+"-- as you can actually enter whatever you want. DrakX will then take the\n"
+"first word you have entered in the box and will bring it over to the \"User\n"
 "name\". This is the name this particular user will use to log onto the\n"
 "system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as the \"root\"'\n"
+"non-privileged (regular) user's password is not as crucial as the \"root\"\n"
 "one from a security point of view, but that is no reason to neglect it:\n"
 "after all, your files are at risk.\n"
 "\n"
 "If you click on \"Accept user\", you can then add as many as you want. Add\n"
-"a user for each one of your friends: your father or your sister, for\n"
-"example. When you finish adding all the users you want, select \"Done\".\n"
+"a user for each one of the people meant to use that computer. When you are\n"
+"finish adding all the users you want, select \"Done\".\n"
 "\n"
 "Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default)."
+"for that user (bash by default).\n"
+"\n"
+"When you are finished adding all users, you will be proposed to choose a\n"
+"user which can automatically log into the system when the computer boots\n"
+"up. If you are interested in that feature (and do not care much about local\n"
+"security), choose the desired user and window manager, then click \"Yes\".\n"
+"If you are not interested in this feature, click \"No\"."
 msgstr ""
 "GNU/Linux est un système multi-utilisateurs, ce qui signifie généralement\n"
 "que chaque utilisateur peut avoir des préférences différences, ses propres\n"
@@ -3007,14 +3013,14 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:41
+#: ../../help.pm_.c:48
 msgid ""
 "Listed above are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, they are good for most common\n"
 "installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
 "able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a partition for \"/home\"\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
 "(only possible if you have more than one Linux partition available).\n"
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
@@ -3076,7 +3082,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:72
+#: ../../help.pm_.c:79
 msgid ""
 "The Mandrake Linux installation is spread out over several CD-ROMs. DrakX\n"
 "knows if a selected package is located on another CD-ROM and will eject the\n"
@@ -3089,7 +3095,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:77
+#: ../../help.pm_.c:84
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
 "system. There are thousands of packages available for Mandrake Linux, and\n"
@@ -3122,7 +3128,7 @@ msgid ""
 "installation (by opposition to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the fewer packages possible to have a working\n"
+" * \"With X\": install the fewest packages possible to have a working\n"
 "graphical desktop;\n"
 "\n"
 " * \"With basic documentation\": installs the base system plus basic\n"
@@ -3138,8 +3144,8 @@ msgid ""
 "total control over what will be installed.\n"
 "\n"
 "If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"groups to avoid installing any new package. This is useful to repair or\n"
+"update an existing system."
 msgstr ""
 "C'est maintenant le moment de choisir les paquetages qui seront installés\n"
 "sur votre système. Sachez que Mandrake Linux contient plusieurs milliers de\n"
@@ -3200,7 +3206,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:128
+#: ../../help.pm_.c:135
 msgid ""
 "Finally, depending on whether or not you chose to be able to select\n"
 "individual packages, you will be presented a tree containing all packages\n"
@@ -3211,9 +3217,9 @@ msgid ""
 "right. When your selection is finished, click the \"Install\" button which\n"
 "will then launch the installation process. Depending on the speed of your\n"
 "hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. An estimate of the time it will take to\n"
-"install everything is displayed on the screen, to help you gauge if there\n"
-"is sufficient time to enjoy a cup of coffee.\n"
+"a while to complete the process. An installation time estimate is displayed\n"
+"on the screen, to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
 "!! If a server package has been selected, either intentionally or because\n"
 "it was part of a whole group, you will be asked to confirm that you really\n"
@@ -3234,8 +3240,8 @@ msgid ""
 "The tiny floppy disk icon at the bottom of the list allows to load the\n"
 "package list chosen during a previous installation. Clicking on this icon\n"
 "will ask you to insert a floppy disk previously created at the end of\n"
-"another installation. See the second tip of last step on how to create such\n"
-"a floppy."
+"another installation. See the second tip of the previous step on how to\n"
+"create such a floppy disk."
 msgstr ""
 "Finalement, si vous avez choisi de sélectionner individuellement les\n"
 "paquetages à installer, DrakX vous présentera un arbre contenant tous les\n"
@@ -3275,12 +3281,12 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:164
+#: ../../help.pm_.c:171
 msgid ""
 "You are now able to set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"OK\".\n"
 "The autodetection of network devices and modem will be launched. If this\n"
-"detection fails, uncheck the \"Use auto detection\" box next time. You may\n"
+"detection fails, uncheck the \"Use auto-detection\" box next time. You may\n"
 "also choose not to configure the network, or do it later; in that case,\n"
 "simply click the \"Cancel\" button.\n"
 "\n"
@@ -3291,8 +3297,8 @@ msgid ""
 "all the parameters from your Internet Service Provider or system\n"
 "administrator.\n"
 "\n"
-"You can consult the ``User Guide'' chapter about Internet connections for\n"
-"details about the configuration, or simply wait until your system is\n"
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection.\n"
 "\n"
 "If you wish to configure the network later after installation, or if you\n"
@@ -3322,13 +3328,13 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:186
+#: ../../help.pm_.c:193
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
-"Here are presented all the services available with the current\n"
-"installation. Review them carefully and uncheck those which are not always\n"
-"needed at boot time.\n"
+"Here are listed all the services available with the current installation.\n"
+"Review them carefully and uncheck those which are not always needed at boot\n"
+"time.\n"
 "\n"
 "You can get a short explanatory text about a service by selecting a\n"
 "specific service. However, if you are not sure whether a service is useful\n"
@@ -3357,7 +3363,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:203
+#: ../../help.pm_.c:210
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
 "local time according to the time zone you selected. It is however possible\n"
@@ -3389,16 +3395,16 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:217
+#: ../../help.pm_.c:224
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX\n"
-"will try to configure X automatically.\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
 "\n"
-"It is extremely rare for it to fail, unless the hardware is very old (or\n"
-"very new). If it succeeds, it will start X automatically with the best\n"
-"resolution possible, depending on the size of the monitor. A window will\n"
+"You will be presented the list of available resolutions and color depth\n"
+"available for your hardware. Choose the one that best suit your needs (you\n"
+"will be able to change that after installation though). When you are\n"
+"satisfied with the sample shown in the monitor, click \"OK\". A window will\n"
 "then appear and ask you if you can see it.\n"
 "\n"
 "If you are doing an \"Expert\" installation, you will enter the X\n"
@@ -3408,7 +3414,7 @@ msgid ""
 "If you can see the message during the test, and answer \"Yes\", then DrakX\n"
 "will proceed to the next step. If you cannot see the message, it simply\n"
 "means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen. Refer then to the Video\n"
+"after 10 seconds, restoring the screen. Refer then to the video\n"
 "configuration section of the user guide for more information on how to\n"
 "configure your display."
 msgstr ""
@@ -3433,7 +3439,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:239
+#: ../../help.pm_.c:246
 msgid ""
 "Finally, you will be asked whether you want to see the graphical interface\n"
 "at boot. Note this question will be asked even if you chose not to test the\n"
@@ -3449,19 +3455,19 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:246
+#: ../../help.pm_.c:253
 msgid ""
 "The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
 "booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
 "at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
 "should come back to this step for help in at least two situations:\n"
 "\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows in\n"
-"your system). If you need to reinstall Windows, the Microsoft install\n"
-"process will rewrite the boot sector, and then you will not be able to\n"
-"start GNU/Linux!\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (\n"
+"MBR) of your main disk (unless you are using another boot manager), to\n"
+"allow you to start up with either Windows or GNU/Linux (assuming you have\n"
+"Windows in your system). If you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector, and then you will not be able\n"
+"to start GNU/Linux!\n"
 "\n"
 " * if a problem arises and you cannot start up GNU/Linux from the hard\n"
 "disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
@@ -3498,14 +3504,13 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:270
+#: ../../help.pm_.c:277
 msgid ""
-"At this point, you need to choose where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space, you will\n"
-"need to partition it. Basically, partitioning a hard drive consists of\n"
-"logically dividing it to create space to install your new Mandrake Linux\n"
-"system.\n"
+"You now need to choose where you want to install the Mandrake Linux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "Because the partitioning process' effects are usually irreversible,\n"
 "partitioning can be intimidating and stressful if you are an inexperienced\n"
@@ -3514,9 +3519,9 @@ msgid ""
 "\n"
 "If you are running the installation in Expert mode, you will enter\n"
 "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
-"fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
-"From the installation interface, you can use the wizards as described here\n"
-"by clicking the dialog's \"Wizard\" button.\n"
+"fine-tune your partitions. See the DiskDrake section in the ``Starter\n"
+"Guide''. From the installation interface, you can use the wizards as\n"
+"described here by clicking the dialog's \"Wizard\" button.\n"
 "\n"
 "If partitions have already been defined, either from a previous\n"
 "installation or from another partitioning tool, simply select those to\n"
@@ -3524,7 +3529,7 @@ msgid ""
 "\n"
 "If partitions are not defined, you will need to create them using the\n"
 "wizard. Depending on your hard drive configuration, several options are\n"
-"available:\n"
+"available.\n"
 "\n"
 " * \"Use free space\": this option will simply lead to an automatic\n"
 "partitioning of your blank drive(s). You will not be prompted further;\n"
@@ -3535,9 +3540,9 @@ msgid ""
 "each of the partitions. The legacy mount points are selected by default,\n"
 "and you should generally keep them.\n"
 "\n"
-" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
-"is installed on your hard drive and takes all the space available on it,\n"
-"you have to create free space for Linux data. To do so, you can delete your\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
 "Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
 "mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
 "be performed without the loss of any data, provided you previously\n"
@@ -3564,10 +3569,10 @@ msgid ""
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"your hard drive. Be careful -- it is a powerful but dangerous option. You\n"
 "can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing. To know how do use the DiskDrake utility used\n"
-"here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+"know what you are doing. To know how to use the DiskDrake utility used\n"
+"here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
 "Guide''''"
 msgstr ""
 "Cette étape vous permet de déterminer précisément l'emplacement de votre\n"
@@ -3646,9 +3651,9 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:341
+#: ../../help.pm_.c:347
 msgid ""
-"There you are. Installation is now complete and your GNU/Linux system is\n"
+"There you are. Installation is now completed and your GNU/Linux system is\n"
 "ready to use. Just click \"OK\" to reboot the system. You can start\n"
 "GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
 "soon as the computer has booted up again.\n"
@@ -3712,10 +3717,10 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:372
+#: ../../help.pm_.c:378
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a filesystem).\n"
+"(formatting means creating a filesystem on it).\n"
 "\n"
 "At this time, you may wish to reformat some already existing partitions to\n"
 "erase any data they contain. If you wish to do that, please select those\n"
@@ -3729,7 +3734,7 @@ msgid ""
 "\n"
 "Please be careful when selecting partitions. After formatting, all data on\n"
 "the selected partitions will be deleted and you will not be able to recover\n"
-"any of it.\n"
+"it.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
@@ -3762,7 +3767,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:398
+#: ../../help.pm_.c:404
 msgid ""
 "Your new Mandrake Linux operating system is currently being installed.\n"
 "Depending on the number of packages you will be installing and the speed of\n"
@@ -3781,7 +3786,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:406
+#: ../../help.pm_.c:412
 msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Some bugs may have\n"
@@ -3811,13 +3816,13 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:419
+#: ../../help.pm_.c:425
 msgid ""
 "Before continuing, you should read carefully the terms of the license. It\n"
 "covers the whole Mandrake Linux distribution, and if you do not agree with\n"
-"all the terms in it, click on the \"Refuse\" button which will immediately\n"
-"terminate the installation. To continue with the installation, click on the\n"
-"\"Accept\" button."
+"all the terms included in it, click on the \"Refuse\" button which will\n"
+"immediately terminate the installation. To continue with the installation,\n"
+"click on the \"Accept\" button."
 msgstr ""
 "Avant d'aller plus loin, il est fortement recommandé de lire attentivement\n"
 "les termes et conditions d'utilisations de la licence. Celle-ci régit\n"
@@ -3828,7 +3833,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:426
+#: ../../help.pm_.c:432
 msgid ""
 "At this point, it is time to choose the security level desired for the\n"
 "machine. As a rule of thumb, the more exposed the machine is, and the more\n"
@@ -3853,7 +3858,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:436
+#: ../../help.pm_.c:442
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
@@ -3871,16 +3876,16 @@ msgid ""
 "drive;\n"
 "\n"
 " * \"Auto allocate\": this option enables to automatically create ext3 and\n"
-"swap partitions in free space of your hard drive;\n"
+"swap partitions on your hard drive's free space;\n"
 "\n"
 "\"More\": gives access to additional features:\n"
 "\n"
 " * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery if necessary. It is strongly recommended\n"
-"to perform this step;\n"
+"for later partition-table recovery, if necessary. It is strongly\n"
+"recommended to perform this step;\n"
 "\n"
 " * \"Restore partition table\": allows to restore a previously saved\n"
-"partition table from floppy disk;\n"
+"partition table from a floppy disk;\n"
 "\n"
 " * \"Rescue partition table\": if your partition table is damaged, you can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
@@ -4002,7 +4007,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:507
+#: ../../help.pm_.c:513
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one you want to resize in order to install your new\n"
@@ -4069,49 +4074,47 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:538
+#: ../../help.pm_.c:544
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Veuillez patienter. Cette opération peut prendre plusieurs minutes."
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:541
+#: ../../help.pm_.c:547
 msgid ""
 "DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\"). You can\n"
-"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
-"system:\n"
+"installation or if you want to have greater control (\"Expert\") over your\n"
+"installation. You can also choose to do a new installation or upgrade your\n"
+"existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": completely wipes out the old system, however, depending on\n"
+" * \"Install\": completely wipes out the old system. However, depending on\n"
 "what is currently installed on your machine, you may be able to keep some\n"
 "old partitions (Linux or otherwise) unchanged;\n"
 "\n"
 " * \"Upgrade\": this installation class allows to simply update the\n"
-"packages currently installed on your Mandrake Linux system. It keeps the\n"
-"current partitions of your hard drives as well as user configurations. All\n"
-"other configuration steps remain available, similar to a normal\n"
-"installation;\n"
+"packages currently installed on your Mandrake Linux system. It keeps your\n"
+"hard drives' current partitions as well as user configurations. All other\n"
+"configuration steps remain available, similar to a normal installation;\n"
 "\n"
 " * \"Upgrade Packages Only\": this new installation class allows you to\n"
 "upgrade an existing Mandrake Linux system while keeping all system\n"
 "configurations unchanged. Adding new packages to the current installation\n"
 "is also possible.\n"
 "\n"
-"Upgrades should work fine on Mandrake Linux systems containing version\n"
-"\"8.1\" or later.\n"
+"Upgrades should work fine on Mandrake Linux systems using version \"8.1\"\n"
+"or later.\n"
 "\n"
-"Depending on your knowledge of GNU/Linux, select one of the following\n"
-"choices:\n"
+"Depending on your GNU/Linux knowledge, select one of the following choices:\n"
 "\n"
 " * Recommended: choose this if you have never installed a GNU/Linux\n"
 "operating system. The installation will be very easy and you will only be\n"
 "asked a few questions;\n"
 "\n"
-" * Expert: if you have a good understanding of GNU/Linux, you may wish to\n"
+" * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
 "perform a highly customized installation. Some of the decisions you will\n"
-"have to make may be difficult if you do not have good knowledge of\n"
-"GNU/Linux, so it is not recommended that those without a fair amount of\n"
-"experience select this installation class."
+"have to make may be difficult if you do not have good GNU/Linux knowledge,\n"
+"so it is not recommended that those without a fair amount of experience\n"
+"select this installation class."
 msgstr ""
 "DrakX doit maintenant savoir quel type d'installation vous désirez\n"
 "réaliser. Deux types d'installations sont proposés : Par défaut (« \n"
@@ -4159,7 +4162,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:578
+#: ../../help.pm_.c:582
 msgid ""
 "Normally, DrakX selects the right keyboard for you (depending on the\n"
 "language you have chosen). However, you might not have a keyboard that\n"
@@ -4173,8 +4176,8 @@ msgid ""
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
-"asked on next dialog to choose the key binding that will switch the\n"
-"keyboard layout between the latin and non latin layouts."
+"asked in the next dialog to choose the key binding that will switch the\n"
+"keyboard layout between the latin and non-latin layouts."
 msgstr ""
 "Normalement, DrakX sélectionne le clavier approprié en fonction de la\n"
 "langue choisie et vous ne devriez pas voir cette étape. Cela dit, il est\n"
@@ -4195,7 +4198,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:594
+#: ../../help.pm_.c:598
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -4204,12 +4207,16 @@ msgid ""
 "Clicking on the \"Advanced\" button will allow you to select other\n"
 "languages to be installed on your workstation. Selecting other languages\n"
 "will install the language-specific files for system documentation and\n"
-"applications. For example, if you will host users from Spain on your\n"
-"machine, select English as the main language in the tree view and in the\n"
-"Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
+"applications. For example, if you host users from Spain on your machine,\n"
+"select English as the main language in the tree view and in the Advanced\n"
+"section, click on the box corresponding to \"Spanish|Spain\".\n"
 "\n"
 "Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales, click the \"OK\" button to continue."
+"additional locales, click the \"OK\" button to continue.\n"
+"\n"
+"To switch from one language to the other, you can launch the\n"
+"\"/usr/sbin/localedrake\" command as \"root\" to change the whole system\n"
+"language, or as a simple user to only change that user's default language."
 msgstr ""
 "La première étape consiste à choisir votre langue.\n"
 "\n"
@@ -4231,14 +4238,14 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:617
 msgid ""
-"DrakX generally detects the number of buttons your mouse has. If not, it\n"
-"assumes you have a two-button mouse and will set it up for third-button\n"
+"DrakX generally detects the number of buttons your mouse possesses. If not,\n"
+"it assumes you have a two-button mouse and will set it up for third-button\n"
 "emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
 "USB mouse.\n"
 "\n"
-"If you wish to specify a different type of mouse select the appropriate\n"
+"If you wish to specify a different type of mouse, select the appropriate\n"
 "type from the provided list.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
@@ -4246,12 +4253,12 @@ msgid ""
 "correct. If the mouse is not working well, press the space bar or [Return]\n"
 "to \"Cancel\" and choose again.\n"
 "\n"
-"Wheel mouses are sometimes not automatically detected. You will need to\n"
+"Sometimes, wheel mouses are not automatically detected. You will need to\n"
 "manually select it in the list. Be sure to select the one corresponding to\n"
 "the correct port it is attached to. After you have pressed the \"OK\"\n"
-"button, a mouse image is displayed. You then need to move the wheel of your\n"
-"mouse to activate it correctly. Then test all buttons and movements are\n"
-"correct."
+"button, a mouse image will be displayed. You then need to move the wheel of\n"
+"your mouse to activate it correctly. Then test that all buttons and\n"
+"movements are correct."
 msgstr ""
 "DrakX détecte généralement le nombre de boutons de votre souris. Sinon, il\n"
 "prend pour acquis que vous avez une souris à deux boutons et configurera\n"
@@ -4269,7 +4276,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:630
+#: ../../help.pm_.c:638
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
@@ -4279,23 +4286,23 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:634
-msgid ""
-"This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
-"change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
-"choose not to enter a password, but we strongly advise you against this if\n"
-"only for one reason: do not think that because you booted GNU/Linux that\n"
-"your other operating systems are safe from mistakes. Since \"root\" can\n"
-"overcome all limitations and unintentionally erase all data on partitions\n"
-"by carelessly accessing the partitions themselves, it is important for it\n"
-"to be difficult to become \"root\".\n"
+#: ../../help.pm_.c:642
+msgid ""
+"This is the most crucial decision in regards with the security of your\n"
+"GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the\n"
+"system administrator and is the only one authorized to make updates, add\n"
+"users, change the overall system configuration, and so on. In short,\n"
+"\"root\" can do everything! That is why you must choose a password that is\n"
+"difficult to guess -- DrakX will tell you if it is too easy. As you can\n"
+"see, you can choose not to enter a password, but we strongly advise you\n"
+"against this if only for one reason: do not think that because you booted\n"
+"GNU/Linux that your other operating systems are safe from mistakes. Since\n"
+"\"root\" can overcome all limitations and unintentionally erase all data on\n"
+"partitions by carelessly accessing the partitions themselves, it is\n"
+"important for it to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password - it makes it too\n"
+"characters long. Never write down the \"root\" password -- it makes it too\n"
 "easy to compromise a system.\n"
 "\n"
 "However, please do not make the password too long or complicated because\n"
@@ -4309,9 +4316,9 @@ msgid ""
 "In Expert mode, you will be asked if you will be connecting to an\n"
 "authentication server, like NIS or LDAP.\n"
 "\n"
-"If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
-"authentication services, select the appropriate one as \"authentication\".\n"
-"If you do not know, ask your network administrator.\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one as \"authentication\". If you have no\n"
+"clue, ask your network administrator.\n"
 "\n"
 "If your computer is not connected to any administrated network, you will\n"
 "want to choose \"Local files\" for authentication."
@@ -4359,11 +4366,11 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:670
+#: ../../help.pm_.c:678
 msgid ""
-"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
+"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. In fact, DrakX analyzes the disk boot sector and acts\n"
-"accordingly, depending on what it finds here:\n"
+"accordingly, depending on what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
 "boot sector. Hence, you will be able to load either GNU/Linux or another\n"
@@ -4372,14 +4379,14 @@ msgid ""
 " * if a grub or LILO boot sector is found, it will replace it with a new\n"
 "one.\n"
 "\n"
-"If in doubt, DrakX will display a dialog with various options.\n"
+"if in doubt, DrakX will display a dialog with various options.\n"
 "\n"
 " * \"Bootloader to use\": you have three choices:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"GRUB\": if you prefer grub (text menu);\n"
 "\n"
 "    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"interface;\n"
 "\n"
 "    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
 "interface.\n"
@@ -4389,7 +4396,7 @@ msgid ""
 "second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
 " * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose - in the bootloader menu,\n"
+"this is the delay granted to the user to choose -- in the bootloader menu,\n"
 "another boot entry than the default one.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
@@ -4448,7 +4455,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:710
+#: ../../help.pm_.c:718
 msgid ""
 "After you have configured the general bootloader parameters, the list of\n"
 "boot options which will be available at boot time will be displayed.\n"
@@ -4456,7 +4463,7 @@ msgid ""
 "If there is another operating system installed on your machine, it will\n"
 "automatically be added to the boot menu. Here, you can choose to fine-tune\n"
 "the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"remove it. \"Add\" creates a new entry. and \"Done\" goes on to the next\n"
 "installation step.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
@@ -4476,10 +4483,10 @@ msgstr ""
 "d'exploitation. Il vous suffit de retirer l'entrée dans les options de\n"
 "démarrage et démarrer ce système avec une disquette."
 
-#: ../../help.pm_.c:724
+#: ../../help.pm_.c:732
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
-"to GNU/Linux.\n"
+"GNU/Linux.\n"
 "\n"
 "Unless you know exactly what you are doing, choose \"First sector of drive\n"
 "(MBR)\"."
@@ -4493,34 +4500,26 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:731
+#: ../../help.pm_.c:739
 msgid ""
-"Here, we select a printing system for your computer. Other OSs may offer\n"
-"you one, but Mandrake Linux offers three.\n"
+"Here, we select a printing system for your computer. Other OSes may offer\n"
+"you one, but Mandrake Linux offers two.\n"
 "\n"
-" * \"pdq\" - which means ``print, don't queue'', is the choice if you have\n"
+" * \"pdq\" -- which means ``print, don't queue'', is the choice if you have\n"
 "a direct connection to your printer and you want to be able to panic out of\n"
 "printer jams, and you do not have networked printers. It will handle only\n"
 "very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
-"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+"if this is your first voyage to GNU/Linux. You can change your choices\n"
 "after installation by running PrinterDrake from the Mandrake Control Center\n"
 "and clicking the expert button.\n"
 "\n"
-" * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing to\n"
+" * \"CUPS\" -- ``Common Unix Printing System'', is excellent at printing to\n"
 "your local printer and also halfway-around the planet. It is simple and can\n"
 "act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
 "it is compatible with the systems that went before. It can do many tricks,\n"
 "but the basic setup is almost as easy as \"pdq\". If you need this to\n"
 "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
-"graphical front-ends for printing or choosing printer options.\n"
-"\n"
-" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
-"approximately the same things the others can do, but it will print to\n"
-"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
-"and it can print directly to shell commands. If you have need of Novell or\n"
-"printing to commands without using a separate pipe construct, use lprNG.\n"
-"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
-"networks."
+"graphical front-ends for printing or choosing printer options."
 msgstr ""
 "Il faut choisir ici un système d'impression pour votre ordinateur. D'autre\n"
 "OSs offrent un, Mandrake Linux en propose trois.\n"
@@ -4555,7 +4554,7 @@ msgstr ""
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
 #: ../../help.pm_.c:759
 msgid ""
-"DrakX now detects any IDE devices present in your computer. It will also\n"
+"DrakX now detects any IDE device present in your computer. It will also\n"
 "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
@@ -4565,7 +4564,7 @@ msgid ""
 "be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
 "have no SCSI hardware. If you are unsure, you can check the list of\n"
 "hardware detected in your machine by selecting \"See hardware info\" and\n"
-"clicking \"OK\". Examine the list of hardware and then click on the \"OK\"\n"
+"clicking \"OK\". Examine the hardware list and then click on the \"OK\"\n"
 "button to return to the SCSI interface question.\n"
 "\n"
 "If you have to manually specify your adapter, DrakX will ask if you want to\n"
@@ -4574,12 +4573,7 @@ msgid ""
 "usually works well.\n"
 "\n"
 "If DrakX is not able to probe for the options which need to be passed, you\n"
-"will need to provide options to the driver manually. Please review the\n"
-"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
-"Hardware'' section) for hints on retrieving the parameters required from\n"
-"hardware documentation, from the manufacturer's web site (if you have\n"
-"Internet access) or from Microsoft Windows (if you used this hardware with\n"
-"Windows on your system)."
+"will need to manually provide options to the driver."
 msgstr ""
 "DrakX détecte maintenant tous les périphériques IDE présents sur votre\n"
 "système. Également, DrakX recherchera les périphériques SCSI. Finalement,\n"
@@ -4605,12 +4599,12 @@ msgstr ""
 "Il peut arriver que DrakX soit incapable de vérifier les options\n"
 "nécessaires. Dans ce cas, vous devrez les déterminer manuellement."
 
-#: ../../help.pm_.c:786
+#: ../../help.pm_.c:781
 msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
+"For other OSes, the entry consists only of a label and the \"root\"\n"
 "partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
@@ -4641,7 +4635,7 @@ msgid ""
 "need to allocate a large ramdisk, this option can be used;\n"
 "\n"
 " * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
+"read-only, to allow a filesystem check before the system becomes ``live''.\n"
 "Here, you can override this option;\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
@@ -4696,7 +4690,7 @@ msgstr ""
 "entrée qui sera alors précédée d'un « * », si vous pressez <Tab> pour voir\n"
 "la liste des possibilités."
 
-#: ../../help.pm_.c:833
+#: ../../help.pm_.c:828
 msgid ""
 "Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
 "either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
@@ -4764,10 +4758,10 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:865
+#: ../../help.pm_.c:860
 msgid ""
 "Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may - or not, see the following entries:\n"
+"your installed hardware, you may (or may not), see the following entries:\n"
 "\n"
 " * \"Mouse\": check the current mouse configuration and click on the button\n"
 "to change it if necessary;\n"
@@ -4782,19 +4776,19 @@ msgid ""
 "order to configure the clock according to the time zone you are in;\n"
 "\n"
 " * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``User\n"
+"configuration wizard. Consult the correpsonding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation;\n"
+"presented there is similar to the one used at installation time;\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
+" * \"Sound card\": if a sound card is detected on your system, it will be\n"
 "displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. No modification possible at installation time;\n"
+" * \"TV card\": if a TV card is detected on your system, it will be\n"
+"displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
 "displayed here. You can click on the button to change the parameters\n"
-"associated with it."
+"associated to it."
 msgstr ""
 "On vous présente ici les différents paramètres de votre système. Selon le\n"
 "matériel installé, certaines entrées seront présentes et d'autres pas.\n"
@@ -4825,7 +4819,7 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:896
+#: ../../help.pm_.c:891
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
 "Mandrake Linux partition. Be careful, all data present on it will be lost\n"
@@ -4836,14 +4830,14 @@ msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, SEE:
 # cvs.mandrakesoft.com:/cooker/doc/manualB/modules/fr/drakx-chapter.xml
-#: ../../help.pm_.c:901
+#: ../../help.pm_.c:896
 msgid ""
 "Click on \"OK\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
 "to recover any data and partitions present on this hard drive, including\n"
 "any Windows data.\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"Click on \"Cancel\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
 "Cliquez sur « OK » si vous voulez vraiment effacer toute l'information et\n"
@@ -4870,7 +4864,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Vous devez aussi formater %s"
 
-#: ../../install_any.pm_.c:424
+#: ../../install_any.pm_.c:423
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4895,7 +4889,7 @@ msgstr ""
 "\n"
 "Confirmez vous l'installation de ces serveurs ?\n"
 
-#: ../../install_any.pm_.c:442
+#: ../../install_any.pm_.c:441
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4909,20 +4903,20 @@ msgstr ""
 "\n"
 "Souhaitez-vous réellement les désinstaller ?\n"
 
-#: ../../install_any.pm_.c:472
+#: ../../install_any.pm_.c:471
 msgid "Can't use broadcast with no NIS domain"
 msgstr "On ne peut pas utiliser l'option broadcast sans domaine NIS"
 
-#: ../../install_any.pm_.c:869
+#: ../../install_any.pm_.c:870
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Insérez une disquette formatée en FAT (format DOS/Windows) %s"
 
-#: ../../install_any.pm_.c:873
+#: ../../install_any.pm_.c:874
 msgid "This floppy is not FAT formatted"
 msgstr "Cette disquette n'est pas au format DOS/Windows"
 
-#: ../../install_any.pm_.c:885
+#: ../../install_any.pm_.c:886
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -4930,12 +4924,12 @@ msgstr ""
 "Pour utiliser cette sauvegarde de sélection des paquetages, veuillez "
 "redémarrer l'installation avec la commande « linux defcfg=floppy »."
 
-#: ../../install_any.pm_.c:908 ../../partition_table.pm_.c:767
+#: ../../install_any.pm_.c:909 ../../partition_table.pm_.c:767
 #, c-format
 msgid "Error reading file %s"
 msgstr "Erreur lors de la lecture du fichier %s"
 
-#: ../../install_any.pm_.c:1030
+#: ../../install_any.pm_.c:1031
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -5191,7 +5185,7 @@ msgstr ""
 msgid "Welcome to %s"
 msgstr "Bienvenue sur %s"
 
-#: ../../install_steps.pm_.c:531 ../../install_steps.pm_.c:770
+#: ../../install_steps.pm_.c:542 ../../install_steps.pm_.c:781
 msgid "No floppy drive available"
 msgstr "Aucun lecteur de disquette disponible"
 
@@ -6145,8 +6139,8 @@ msgstr "Souris"
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2966
-#: ../../printerdrake.pm_.c:3055
+#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2985
+#: ../../printerdrake.pm_.c:3074
 msgid "Printer"
 msgstr "Imprimante"
 
@@ -6202,7 +6196,7 @@ msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Ce mot de passe est trop court (minimum %d caractères)"
 
 #: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:49
-#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:172
+#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
 msgid "Authentication"
 msgstr "Authentification"
 
@@ -6313,7 +6307,7 @@ msgstr "Premier lecteur de disquette"
 msgid "Second floppy drive"
 msgstr "Second lecteur de disquette"
 
-#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2496
+#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2515
 msgid "Skip"
 msgstr "Abandonner"
 
@@ -6561,7 +6555,7 @@ msgid "Basic"
 msgstr "Basique"
 
 #: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:158
-#: ../../printerdrake.pm_.c:2150
+#: ../../printerdrake.pm_.c:2169
 msgid "<- Previous"
 msgstr "<- Précédent"
 
@@ -7170,7 +7164,7 @@ msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
 msgid "Finish"
 msgstr "Terminer"
 
-#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2152
+#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2171
 msgid "Next ->"
 msgstr "Suivant ->"
 
@@ -7654,13 +7648,13 @@ msgstr "Choisissez le profil à configurer"
 msgid "Use auto detection"
 msgstr "Utiliser la détection automatique"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3180
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3199
 #: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
-#: ../../standalone/drakfloppy_.c:145
+#: ../../standalone/drakfloppy_.c:146
 msgid "Expert Mode"
 msgstr "Mode Expert"
 
-#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:386
+#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:399
 msgid "Detecting devices..."
 msgstr "Détection des périphériques..."
 
@@ -7833,7 +7827,7 @@ msgstr "Attribution automatique de l'adresse IP"
 msgid "Start at boot"
 msgstr "Exécuter au démarrage"
 
-#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:860
+#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:875
 msgid "IP address should be in format 1.2.3.4"
 msgstr "L'adresse IP doit ressembler à quelque chose comme « 192.168.1.20 »"
 
@@ -8094,7 +8088,7 @@ msgstr "LPD - Line Printer Daemon"
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue"
 
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1134
+#: ../../printer.pm_.c:34 ../../printer.pm_.c:1144
 msgid "CUPS"
 msgstr "CUPS"
 
@@ -8122,7 +8116,7 @@ msgstr "Imprimante distante"
 msgid "Printer on remote CUPS server"
 msgstr "Imprimante sur serveur CUPS distant"
 
-#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:883
+#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:898
 msgid "Printer on remote lpd server"
 msgstr "Imprimante sur serveur LPD distant"
 
@@ -8138,7 +8132,7 @@ msgstr "Imprimante sur serveur SMB (Windows 95/98/NT)"
 msgid "Printer on NetWare server"
 msgstr "Imprimante sur serveur NetWare"
 
-#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:887
+#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:902
 msgid "Enter a printer device URI"
 msgstr "Indiquer l'adresse du périphérique d'impression"
 
@@ -8146,102 +8140,102 @@ msgstr "Indiquer l'adresse du périphérique d'impression"
 msgid "Pipe job into a command"
 msgstr "Impression vers une commande shell"
 
-#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:542
+#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:552
 msgid "Unknown Model"
 msgstr "Modèle inconnu"
 
-#: ../../printer.pm_.c:744 ../../printer.pm_.c:935 ../../printer.pm_.c:1327
-#: ../../printerdrake.pm_.c:2286 ../../printerdrake.pm_.c:3443
+#: ../../printer.pm_.c:754 ../../printer.pm_.c:945 ../../printer.pm_.c:1337
+#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3462
 msgid "Unknown model"
 msgstr "Modèle inconnu"
 
-#: ../../printer.pm_.c:772
+#: ../../printer.pm_.c:782
 msgid "Local Printers"
 msgstr "Imprimantes locales"
 
-#: ../../printer.pm_.c:774 ../../printer.pm_.c:1135
+#: ../../printer.pm_.c:784 ../../printer.pm_.c:1145
 msgid "Remote Printers"
 msgstr "Imprimantes distantes"
 
-#: ../../printer.pm_.c:781 ../../printerdrake.pm_.c:404
+#: ../../printer.pm_.c:791 ../../printerdrake.pm_.c:417
 #, c-format
 msgid " on parallel port \\/*%s"
 msgstr " sur port parallèle \\/*%s"
 
-#: ../../printer.pm_.c:784 ../../printerdrake.pm_.c:406
+#: ../../printer.pm_.c:794 ../../printerdrake.pm_.c:419
 #, c-format
 msgid ", USB printer \\/*%s"
 msgstr ", imprimante USB \\/*%s"
 
-#: ../../printer.pm_.c:789
+#: ../../printer.pm_.c:799
 #, c-format
 msgid ", multi-function device on parallel port \\/*%s"
 msgstr ", périphérique multi-fonctions sur le port parallèle \\/*%s"
 
-#: ../../printer.pm_.c:792
+#: ../../printer.pm_.c:802
 msgid ", multi-function device on USB"
 msgstr ", périphérique  USB multi-fonctions"
 
-#: ../../printer.pm_.c:794
+#: ../../printer.pm_.c:804
 msgid ", multi-function device on HP JetDirect"
 msgstr ", périphérique HP JetDirect multi-fonctions"
 
-#: ../../printer.pm_.c:796
+#: ../../printer.pm_.c:806
 msgid ", multi-function device"
 msgstr ", périphérique multi-fonctions"
 
-#: ../../printer.pm_.c:799
+#: ../../printer.pm_.c:809
 #, c-format
 msgid ", printing to %s"
 msgstr ", impression sur %s"
 
-#: ../../printer.pm_.c:801
+#: ../../printer.pm_.c:811
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " sur serveur d'impression LPD « %s », imprimante « %s »"
 
-#: ../../printer.pm_.c:803
+#: ../../printer.pm_.c:813
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", hôte TCP/IP « %s », port « %s »"
 
-#: ../../printer.pm_.c:807
+#: ../../printer.pm_.c:817
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " sur serveur Windows « %s », partage « %s »"
 
-#: ../../printer.pm_.c:811
+#: ../../printer.pm_.c:821
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " sur serveur Novell « %s », imprimante « %s »"
 
-#: ../../printer.pm_.c:813
+#: ../../printer.pm_.c:823
 #, c-format
 msgid ", using command %s"
 msgstr ", en utilisant la commande %s"
 
-#: ../../printer.pm_.c:932 ../../printerdrake.pm_.c:1682
+#: ../../printer.pm_.c:942 ../../printerdrake.pm_.c:1701
 msgid "Raw printer (No driver)"
 msgstr "Imprimante à accès direct (pas de pilote)"
 
-#: ../../printer.pm_.c:1104
+#: ../../printer.pm_.c:1114
 #, c-format
 msgid "(on %s)"
 msgstr "(sur %s)"
 
-#: ../../printer.pm_.c:1106
+#: ../../printer.pm_.c:1116
 msgid "(on this machine)"
 msgstr "(sur cette machine)"
 
-#: ../../printer.pm_.c:1131
+#: ../../printer.pm_.c:1141
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "Sur serveur CUPS « %s »"
 
-#: ../../printer.pm_.c:1137 ../../printerdrake.pm_.c:3100
-#: ../../printerdrake.pm_.c:3111 ../../printerdrake.pm_.c:3332
-#: ../../printerdrake.pm_.c:3384 ../../printerdrake.pm_.c:3410
-#: ../../printerdrake.pm_.c:3585 ../../printerdrake.pm_.c:3587
+#: ../../printer.pm_.c:1147 ../../printerdrake.pm_.c:3119
+#: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3351
+#: ../../printerdrake.pm_.c:3403 ../../printerdrake.pm_.c:3429
+#: ../../printerdrake.pm_.c:3604 ../../printerdrake.pm_.c:3606
 msgid " (Default)"
 msgstr " (Défaut)"
 
@@ -8267,11 +8261,11 @@ msgstr ""
 msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
 msgstr "Autodétection d'imprimante (locale, réseau, et SMB)"
 
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3164
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3183
 msgid "CUPS configuration"
 msgstr "Configuration de CUPS"
 
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3165
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3184
 msgid "Specify CUPS server"
 msgstr "Specifiez le serveur CUPS"
 
@@ -8319,7 +8313,7 @@ msgstr ""
 msgid "The IP address should look like 192.168.1.20"
 msgstr "L'adresse IP doit ressembler à quelque chose comme « 192.168.1.20 »"
 
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1094
+#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1109
 msgid "The port number should be an integer!"
 msgstr "Le numéro de port doit être un nombre entier !"
 
@@ -8327,7 +8321,7 @@ msgstr "Le numéro de port doit être un nombre entier !"
 msgid "CUPS server IP"
 msgstr "Adresse IP du serveur CUPS"
 
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1114
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1129
 msgid "Port"
 msgstr "Port"
 
@@ -8336,19 +8330,19 @@ msgid "Automatic CUPS configuration"
 msgstr "Configuration automatique du serveur CUPS"
 
 #: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
-#: ../../printerdrake.pm_.c:1555 ../../printerdrake.pm_.c:1559
-#: ../../printerdrake.pm_.c:1677 ../../printerdrake.pm_.c:2229
-#: ../../printerdrake.pm_.c:2382 ../../printerdrake.pm_.c:2441
-#: ../../printerdrake.pm_.c:2514 ../../printerdrake.pm_.c:2535
-#: ../../printerdrake.pm_.c:2728 ../../printerdrake.pm_.c:2769
-#: ../../printerdrake.pm_.c:2774 ../../printerdrake.pm_.c:2808
-#: ../../printerdrake.pm_.c:2813 ../../printerdrake.pm_.c:2850
-#: ../../printerdrake.pm_.c:2903 ../../printerdrake.pm_.c:2923
-#: ../../printerdrake.pm_.c:2937 ../../printerdrake.pm_.c:2971
-#: ../../printerdrake.pm_.c:3017 ../../printerdrake.pm_.c:3035
-#: ../../printerdrake.pm_.c:3124 ../../printerdrake.pm_.c:3198
-#: ../../printerdrake.pm_.c:3500 ../../printerdrake.pm_.c:3555
-#: ../../printerdrake.pm_.c:3608 ../../standalone/printerdrake_.c:57
+#: ../../printerdrake.pm_.c:1574 ../../printerdrake.pm_.c:1578
+#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
+#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
+#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
+#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2788
+#: ../../printerdrake.pm_.c:2793 ../../printerdrake.pm_.c:2827
+#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2869
+#: ../../printerdrake.pm_.c:2922 ../../printerdrake.pm_.c:2942
+#: ../../printerdrake.pm_.c:2956 ../../printerdrake.pm_.c:2990
+#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3054
+#: ../../printerdrake.pm_.c:3143 ../../printerdrake.pm_.c:3217
+#: ../../printerdrake.pm_.c:3519 ../../printerdrake.pm_.c:3574
+#: ../../printerdrake.pm_.c:3627 ../../standalone/printerdrake_.c:57
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
@@ -8466,12 +8460,13 @@ msgstr ""
 "NOTE: En fonction du modèle et du système d'impression, jusqu'à %d Mo de "
 "logiciels additionnels seront installés."
 
-#: ../../printerdrake.pm_.c:269 ../../printerdrake.pm_.c:278
-#: ../../printerdrake.pm_.c:3146 ../../printerdrake.pm_.c:3271
+#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
+#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3165
+#: ../../printerdrake.pm_.c:3290
 msgid "Add a new printer"
 msgstr "Ajouter une nouvelle imprimante"
 
-#: ../../printerdrake.pm_.c:270
+#: ../../printerdrake.pm_.c:280
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8495,7 +8490,7 @@ msgstr ""
 "disponibles ainsi qu'à toutes leurs options et à tous les types de "
 "connection."
 
-#: ../../printerdrake.pm_.c:280
+#: ../../printerdrake.pm_.c:293
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8535,7 +8530,7 @@ msgstr ""
 "Cliquez sur « suivant » quand vous êtes prêt, et sur « annuler » si vous ne "
 "voulez pas configurer d'imprimante maintenant."
 
-#: ../../printerdrake.pm_.c:289 ../../printerdrake.pm_.c:306
+#: ../../printerdrake.pm_.c:302 ../../printerdrake.pm_.c:319
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8561,7 +8556,7 @@ msgstr ""
 "Cliquez sur « suivant » quand vous êtes prêt, et sur « annuler » si vous ne "
 "voulez pas configurer d'imprimante maintenant."
 
-#: ../../printerdrake.pm_.c:297
+#: ../../printerdrake.pm_.c:310
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8597,25 +8592,20 @@ msgstr ""
 "Cliquez sur « suivant » quand vous êtes prêt, et sur « annuler » si vous ne "
 "voulez pas configurer d'imprimante maintenant."
 
-#: ../../printerdrake.pm_.c:315
+#: ../../printerdrake.pm_.c:328
 msgid "Auto-detect printers connected to this machine"
 msgstr "Détecter automatiquement les imprimantes connectées sur cette machine"
 
-#: ../../printerdrake.pm_.c:318
+#: ../../printerdrake.pm_.c:331
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Détecter automatiquement les imprimantes reliées directement au réseau"
 
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:334
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Détecter automatiquement les imprimantes reliées à des machines sous windows"
 
-#: ../../printerdrake.pm_.c:348 ../../printerdrake.pm_.c:562
-#: ../../printerdrake.pm_.c:587
-msgid "Local Printer"
-msgstr "Imprimante locale"
-
-#: ../../printerdrake.pm_.c:349
+#: ../../printerdrake.pm_.c:362
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -8639,49 +8629,53 @@ msgstr ""
 "etc.), rendez-vous dans la partie « imprimante »de la section « matériel » "
 "du Centre de Contrôle Mandrake."
 
-#: ../../printerdrake.pm_.c:386 ../../printerdrake.pm_.c:577
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:590
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Printer auto-detection"
 msgstr "détection automatique d'imprimantes"
 
-#: ../../printerdrake.pm_.c:408
+#: ../../printerdrake.pm_.c:421
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", imprimante réseau « %s », port « %s »"
 
-#: ../../printerdrake.pm_.c:410
+#: ../../printerdrake.pm_.c:423
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", imprimante « %s » sur serveur SMB/Windows « %s »"
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:429
 #, c-format
 msgid "Detected %s"
 msgstr "Détecté %s"
 
-#: ../../printerdrake.pm_.c:420 ../../printerdrake.pm_.c:451
-#: ../../printerdrake.pm_.c:470
+#: ../../printerdrake.pm_.c:433 ../../printerdrake.pm_.c:464
+#: ../../printerdrake.pm_.c:483
 #, c-format
 msgid "Printer on parallel port \\/*%s"
 msgstr "Imprimante sur le port parallèle \\/*%s"
 
-#: ../../printerdrake.pm_.c:422 ../../printerdrake.pm_.c:453
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:435 ../../printerdrake.pm_.c:466
+#: ../../printerdrake.pm_.c:488
 #, c-format
 msgid "USB printer \\/*%s"
 msgstr "Imprimante USB \\/*%s"
 
-#: ../../printerdrake.pm_.c:424
+#: ../../printerdrake.pm_.c:437
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Imprimante réseau autonome « %s », port %s"
 
-#: ../../printerdrake.pm_.c:426
+#: ../../printerdrake.pm_.c:439
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Imprimante « %s » sur serveur SMB/Windows « %s »"
 
-#: ../../printerdrake.pm_.c:563
+#: ../../printerdrake.pm_.c:575 ../../printerdrake.pm_.c:600
+msgid "Local Printer"
+msgstr "Imprimante locale"
+
+#: ../../printerdrake.pm_.c:576
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
 "file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
@@ -8694,19 +8688,19 @@ msgstr ""
 "équivalents à LPT1:, LPT2:, ..., première imprimante USB : /dev/usb/lp0, "
 "deuxième imprimante USB : /dev/usb/lp1, ...) "
 
-#: ../../printerdrake.pm_.c:567
+#: ../../printerdrake.pm_.c:580
 msgid "You must enter a device or file name!"
 msgstr "Vous devez enter un nom de fichier ou de périphérique!"
 
-#: ../../printerdrake.pm_.c:578
+#: ../../printerdrake.pm_.c:591
 msgid "No printer found!"
 msgstr "Aucune imprimante trouvée !"
 
-#: ../../printerdrake.pm_.c:588
+#: ../../printerdrake.pm_.c:601
 msgid "Available printers"
 msgstr "Imprimantes disponibles"
 
-#: ../../printerdrake.pm_.c:592
+#: ../../printerdrake.pm_.c:605
 msgid ""
 "The following printer was auto-detected, if it is not the one you want to "
 "configure, enter a device name/file name in the input line"
@@ -8715,7 +8709,7 @@ msgstr ""
 "voulez configurer, tapez un nom de fichier ou de périphérique dans le champs "
 "d'entrée"
 
-#: ../../printerdrake.pm_.c:593
+#: ../../printerdrake.pm_.c:606
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up or enter a device name/file name in the input line"
@@ -8724,7 +8718,7 @@ msgstr ""
 "l'imprimante que vous voulez configurer ou tapez un nom de périphérique ou "
 "de fichier dans le champs d'entrée"
 
-#: ../../printerdrake.pm_.c:595
+#: ../../printerdrake.pm_.c:608
 msgid ""
 "The following printer was auto-detected. The configuration of the printer "
 "will work fully automatically. If your printer was not correctly detected or "
@@ -8736,7 +8730,7 @@ msgstr ""
 "correctement détectée ou si vous préférer effectuer une configuration "
 "personalisée, activez « Configuration Manuelle  » ."
 
-#: ../../printerdrake.pm_.c:596
+#: ../../printerdrake.pm_.c:609
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up. The configuration of the printer will work fully "
@@ -8749,7 +8743,7 @@ msgstr ""
 "correctement détectée ou si vous préférer effectuer une configuration "
 "personalisée, activez « Configuration Manuelle  » ."
 
-#: ../../printerdrake.pm_.c:598
+#: ../../printerdrake.pm_.c:611
 msgid ""
 "Please choose the port where your printer is connected to or enter a device "
 "name/file name in the input line"
@@ -8757,11 +8751,11 @@ msgstr ""
 "Veuillez choisir le port sur laquelle votre imprimante est connectée ou "
 "tapez le nom du périphérique ou de fichier dans le champs d'entrée"
 
-#: ../../printerdrake.pm_.c:599
+#: ../../printerdrake.pm_.c:612
 msgid "Please choose the port where your printer is connected to."
 msgstr "Veuillez choisir le port sur lequel votre imprimante est connectée."
 
-#: ../../printerdrake.pm_.c:601
+#: ../../printerdrake.pm_.c:614
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
@@ -8770,19 +8764,19 @@ msgstr ""
 "LPT2:, ..., première imprimante USB : /dev/usb/lp0, deuxième imprimante "
 "USB : /dev/usb/lp1, ...)."
 
-#: ../../printerdrake.pm_.c:606
+#: ../../printerdrake.pm_.c:619
 msgid "You must choose/enter a printer/device!"
 msgstr "Vous devez choisir ou entrer une imprimante ou un périphérique !"
 
-#: ../../printerdrake.pm_.c:626
+#: ../../printerdrake.pm_.c:639
 msgid "Manual configuration"
 msgstr "Configuration manuelle"
 
-#: ../../printerdrake.pm_.c:680
+#: ../../printerdrake.pm_.c:693
 msgid "Remote lpd Printer Options"
 msgstr "Configuration d'une imprimante Unix (lpd) distante"
 
-#: ../../printerdrake.pm_.c:681
+#: ../../printerdrake.pm_.c:694
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
@@ -8790,46 +8784,46 @@ msgstr ""
 "Pour utiliser une imprimante Unix distante, vous devez indiquer le nom "
 "d'hôte du serveur LPD et le nom attribué à l'imprimante par ce serveur."
 
-#: ../../printerdrake.pm_.c:682
+#: ../../printerdrake.pm_.c:695
 msgid "Remote host name"
 msgstr "Nom d'hôte du serveur"
 
-#: ../../printerdrake.pm_.c:683
+#: ../../printerdrake.pm_.c:696
 msgid "Remote printer name"
 msgstr "Nom de l'imprimante"
 
-#: ../../printerdrake.pm_.c:686
+#: ../../printerdrake.pm_.c:699
 msgid "Remote host name missing!"
 msgstr "Nom du serveur distant manquant !"
 
-#: ../../printerdrake.pm_.c:690
+#: ../../printerdrake.pm_.c:703
 msgid "Remote printer name missing!"
 msgstr "Le nom de l'imprimante est manquant !"
 
-#: ../../printerdrake.pm_.c:712 ../../printerdrake.pm_.c:1225
+#: ../../printerdrake.pm_.c:727 ../../printerdrake.pm_.c:1244
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Modèle détecté : %s %s"
 
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Scanning network..."
 msgstr "Parcours du réseau..."
 
-#: ../../printerdrake.pm_.c:799 ../../printerdrake.pm_.c:820
+#: ../../printerdrake.pm_.c:814 ../../printerdrake.pm_.c:835
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", imprimante « %s » sur serveur « %s »"
 
-#: ../../printerdrake.pm_.c:802 ../../printerdrake.pm_.c:823
+#: ../../printerdrake.pm_.c:817 ../../printerdrake.pm_.c:838
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Imprimante « %s » sur serveur « %s »"
 
-#: ../../printerdrake.pm_.c:843
+#: ../../printerdrake.pm_.c:858
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Configuration d'une imprimante SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:844
+#: ../../printerdrake.pm_.c:859
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
 "may be different from its TCP/IP hostname!) and possibly the IP address of "
@@ -8843,7 +8837,7 @@ msgstr ""
 "d'utilisateur, mot de passe et groupe de travail nécessaires pour accéder à "
 "l'imprimante."
 
-#: ../../printerdrake.pm_.c:845
+#: ../../printerdrake.pm_.c:860
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
@@ -8852,39 +8846,39 @@ msgstr ""
 "ajoutez un nom d'utilisateur, un mot de passe et un groupe de travail si "
 "nécessaire."
 
-#: ../../printerdrake.pm_.c:846
+#: ../../printerdrake.pm_.c:861
 msgid "SMB server host"
 msgstr "Nom du serveur"
 
-#: ../../printerdrake.pm_.c:847
+#: ../../printerdrake.pm_.c:862
 msgid "SMB server IP"
 msgstr "Adresse IP du serveur"
 
-#: ../../printerdrake.pm_.c:848
+#: ../../printerdrake.pm_.c:863
 msgid "Share name"
 msgstr "Nom de partage de l'imprimante"
 
-#: ../../printerdrake.pm_.c:851
+#: ../../printerdrake.pm_.c:866
 msgid "Workgroup"
 msgstr "Groupe de travail"
 
-#: ../../printerdrake.pm_.c:853
+#: ../../printerdrake.pm_.c:868
 msgid "Auto-detected"
 msgstr "Auto-détecté"
 
-#: ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:879
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Il faut au moins préciser le nom du serveur ou son adresse IP."
 
-#: ../../printerdrake.pm_.c:868
+#: ../../printerdrake.pm_.c:883
 msgid "Samba share name missing!"
 msgstr "Il faut préciser le nom de partage de l'imprimante."
 
-#: ../../printerdrake.pm_.c:874
+#: ../../printerdrake.pm_.c:889
 msgid "SECURITY WARNING!"
 msgstr "ALERTE DE SÉCURITÉ !"
 
-#: ../../printerdrake.pm_.c:875
+#: ../../printerdrake.pm_.c:890
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -8929,7 +8923,7 @@ msgstr ""
 "le type de connexion « %s » dans Printerdrake.\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:885
+#: ../../printerdrake.pm_.c:900
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -8942,7 +8936,7 @@ msgstr ""
 "type de connexion « %s » dans Printerdrake.\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:888
+#: ../../printerdrake.pm_.c:903
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
 "connect to it as a client.\n"
@@ -8955,11 +8949,11 @@ msgstr ""
 "Souhaitez-vous vraiment poursuivre le parmétrage de cette imprimante de "
 "cette façon?"
 
-#: ../../printerdrake.pm_.c:960
+#: ../../printerdrake.pm_.c:975
 msgid "NetWare Printer Options"
 msgstr "Options de l'imprimante NetWare"
 
-#: ../../printerdrake.pm_.c:961
+#: ../../printerdrake.pm_.c:976
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
 "name (Note! it may be different from its TCP/IP hostname!) as well as the "
@@ -8971,37 +8965,37 @@ msgstr ""
 "du nom d'hôte TCP/IP) et le nom de la file d'impression à laquelle vous "
 "voulez accéder ainsi qu'un nom de login et un mot de passe si nécessaire."
 
-#: ../../printerdrake.pm_.c:962
+#: ../../printerdrake.pm_.c:977
 msgid "Printer Server"
 msgstr "Nom du serveur d'impression"
 
-#: ../../printerdrake.pm_.c:963
+#: ../../printerdrake.pm_.c:978
 msgid "Print Queue Name"
 msgstr "Nom de la file d'impression"
 
-#: ../../printerdrake.pm_.c:968
+#: ../../printerdrake.pm_.c:983
 msgid "NCP server name missing!"
 msgstr "Nom du serveur NCP manquant!"
 
-#: ../../printerdrake.pm_.c:972
+#: ../../printerdrake.pm_.c:987
 msgid "NCP queue name missing!"
 msgstr "Nom de la file d'attente NCP manquant!"
 
-#: ../../printerdrake.pm_.c:1039 ../../printerdrake.pm_.c:1059
+#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1074
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", hôte « %s », port « %s »"
 
-#: ../../printerdrake.pm_.c:1042 ../../printerdrake.pm_.c:1062
+#: ../../printerdrake.pm_.c:1057 ../../printerdrake.pm_.c:1077
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Hôte « %s », port « %s »"
 
-#: ../../printerdrake.pm_.c:1082
+#: ../../printerdrake.pm_.c:1097
 msgid "TCP/Socket Printer Options"
 msgstr "Options de l'imprimante réseau (TCP/socket)"
 
-#: ../../printerdrake.pm_.c:1084
+#: ../../printerdrake.pm_.c:1099
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) into the input fields."
@@ -9010,7 +9004,7 @@ msgstr ""
 "nom de machine ou une adresse IP et le numéro port optionnel (9100 par "
 "défaut)."
 
-#: ../../printerdrake.pm_.c:1085
+#: ../../printerdrake.pm_.c:1100
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
 "of the printer and optionally the port number (default is 9100). On HP "
@@ -9023,19 +9017,19 @@ msgstr ""
 "9100, mais cela peut être différent pour d'autres serveurs. Veuillez "
 "consulter le manuel de votre imprimante."
 
-#: ../../printerdrake.pm_.c:1090
+#: ../../printerdrake.pm_.c:1105
 msgid "Printer host name or IP missing!"
 msgstr "Nom d'hôte de l'imprimante ou adresse IP manquant(e) !"
 
-#: ../../printerdrake.pm_.c:1112
+#: ../../printerdrake.pm_.c:1127
 msgid "Printer host name or IP"
 msgstr "Nom d'hôte ou adresse IP de l'imprimante "
 
-#: ../../printerdrake.pm_.c:1160 ../../printerdrake.pm_.c:1162
+#: ../../printerdrake.pm_.c:1177 ../../printerdrake.pm_.c:1179
 msgid "Printer Device URI"
 msgstr "Adresse réseau du périphérique d'impression"
 
-#: ../../printerdrake.pm_.c:1161
+#: ../../printerdrake.pm_.c:1178
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
@@ -9047,11 +9041,11 @@ msgstr ""
 "que tous les types d'URL ne sont pas supportés par tous les gestionnaires "
 "d'impression."
 
-#: ../../printerdrake.pm_.c:1176
+#: ../../printerdrake.pm_.c:1193
 msgid "A valid URI must be entered!"
 msgstr "Une adresse valide doit être entrée !"
 
-#: ../../printerdrake.pm_.c:1541
+#: ../../printerdrake.pm_.c:1560
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
@@ -9061,27 +9055,27 @@ msgstr ""
 "Les champs « Description » et « Emplacement » n'ont pas besoin d'être "
 "remplis. Ce sont de simples commentaires pour les utilisateurs."
 
-#: ../../printerdrake.pm_.c:1542
+#: ../../printerdrake.pm_.c:1561
 msgid "Name of printer"
 msgstr "Nom de l'imprimante"
 
-#: ../../printerdrake.pm_.c:1544
+#: ../../printerdrake.pm_.c:1563
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../../printerdrake.pm_.c:1556 ../../printerdrake.pm_.c:1678
+#: ../../printerdrake.pm_.c:1575 ../../printerdrake.pm_.c:1697
 msgid "Reading printer database..."
 msgstr "Lecture de la base de données des imprimantes..."
 
-#: ../../printerdrake.pm_.c:1560
+#: ../../printerdrake.pm_.c:1579
 msgid "Preparing printer database..."
 msgstr "Préparation de la base de données des imprimantes..."
 
-#: ../../printerdrake.pm_.c:1657
+#: ../../printerdrake.pm_.c:1676
 msgid "Your printer model"
 msgstr "Le modèle de votre imprimante"
 
-#: ../../printerdrake.pm_.c:1658
+#: ../../printerdrake.pm_.c:1677
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -9105,24 +9099,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../printerdrake.pm_.c:1663 ../../printerdrake.pm_.c:1666
+#: ../../printerdrake.pm_.c:1682 ../../printerdrake.pm_.c:1685
 msgid "The model is correct"
 msgstr "Le modèle est correct"
 
-#: ../../printerdrake.pm_.c:1664 ../../printerdrake.pm_.c:1665
-#: ../../printerdrake.pm_.c:1668
+#: ../../printerdrake.pm_.c:1683 ../../printerdrake.pm_.c:1684
+#: ../../printerdrake.pm_.c:1687
 msgid "Select model manually"
 msgstr "Sélectionner manuellement le modèle"
 
-#: ../../printerdrake.pm_.c:1685
+#: ../../printerdrake.pm_.c:1704
 msgid "Printer model selection"
 msgstr "Sélection du modèle de l'imprimante"
 
-#: ../../printerdrake.pm_.c:1686
+#: ../../printerdrake.pm_.c:1705
 msgid "Which printer model do you have?"
 msgstr "Quel modèle d'imprimante possédez-vous ?"
 
-#: ../../printerdrake.pm_.c:1687
+#: ../../printerdrake.pm_.c:1706
 msgid ""
 "\n"
 "\n"
@@ -9136,7 +9130,7 @@ msgstr ""
 "modèle correct dans la liste si le curseur se situe sur un modèle erroné ou "
 "sur « Imprimante à accès direct »."
 
-#: ../../printerdrake.pm_.c:1690
+#: ../../printerdrake.pm_.c:1709
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
@@ -9144,11 +9138,11 @@ msgstr ""
 "Si votre imprimante n'est pas listée, choisissez-en une compatible (voir le "
 "manuel de l'imprimante) ou similaire."
 
-#: ../../printerdrake.pm_.c:1767
+#: ../../printerdrake.pm_.c:1786
 msgid "OKI winprinter configuration"
 msgstr "Configuration de l'imprimante OKI winprinter"
 
-#: ../../printerdrake.pm_.c:1768
+#: ../../printerdrake.pm_.c:1787
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
 "use a very special communication protocol and therefore they work only when "
@@ -9165,11 +9159,11 @@ msgstr ""
 "l'impression de la page de test. Sans cela, l'imprimante ne fonctionnera pas "
 "Vos paramètres de type de connexion seront ignorés par le pilote."
 
-#: ../../printerdrake.pm_.c:1811 ../../printerdrake.pm_.c:1838
+#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1857
 msgid "Lexmark inkjet configuration"
 msgstr "Configuration de l'imprimante Lexmark inkjet"
 
-#: ../../printerdrake.pm_.c:1812
+#: ../../printerdrake.pm_.c:1831
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
 "no printers on remote machines or print server boxes. Please connect your "
@@ -9181,7 +9175,7 @@ msgstr ""
 "des serveurs d'impression. Veuillez connecter votre imprimante sur un port "
 "local ou configurez-la sur la machine à laquelle elle est connectée."
 
-#: ../../printerdrake.pm_.c:1839
+#: ../../printerdrake.pm_.c:1858
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
 "need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
@@ -9204,11 +9198,11 @@ msgstr ""
 "d'impression avec « lexmarkmaintain » et ajustez les paramètres de ces têtes "
 "avec ce programme."
 
-#: ../../printerdrake.pm_.c:1842
+#: ../../printerdrake.pm_.c:1861
 msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
 msgstr "Imprimante Laser GDI avec le format Zenographics ZJ-Stream"
 
-#: ../../printerdrake.pm_.c:1843
+#: ../../printerdrake.pm_.c:1862
 msgid ""
 "Your printer belongs to the group of GDI laser printers (winprinters) sold "
 "by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -9251,7 +9245,7 @@ msgstr ""
 "ne peut être lancée que par root.Aprés cela vous pourrez imprimer "
 "normalement.\n"
 
-#: ../../printerdrake.pm_.c:2066
+#: ../../printerdrake.pm_.c:2085
 msgid ""
 "Printer default settings\n"
 "\n"
@@ -9266,22 +9260,22 @@ msgstr ""
 "sont correctement indiqués. Notez que la vitesse d'impression peut diminuer "
 "si vous augmentez la qualité d'impression."
 
-#: ../../printerdrake.pm_.c:2075
+#: ../../printerdrake.pm_.c:2094
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "L'option %s doit être un nombre entier !"
 
-#: ../../printerdrake.pm_.c:2079
+#: ../../printerdrake.pm_.c:2098
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "L'option %s être un nombre !"
 
-#: ../../printerdrake.pm_.c:2084
+#: ../../printerdrake.pm_.c:2103
 #, c-format
 msgid "Option %s out of range!"
 msgstr "L'option %s est en dehors des limites !"
 
-#: ../../printerdrake.pm_.c:2123
+#: ../../printerdrake.pm_.c:2142
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -9290,11 +9284,11 @@ msgstr ""
 "Désirez-vous que l'imprimante « %s » soit l'imprimante\n"
 "par défaut ?"
 
-#: ../../printerdrake.pm_.c:2146
+#: ../../printerdrake.pm_.c:2165
 msgid "Test pages"
 msgstr "Pages de test"
 
-#: ../../printerdrake.pm_.c:2147
+#: ../../printerdrake.pm_.c:2166
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed and on "
@@ -9307,39 +9301,39 @@ msgstr ""
 "même ne pas sortir.\n"
 "Dans la plupart des cas, l'impression de la page de test standard suffit."
 
-#: ../../printerdrake.pm_.c:2151
+#: ../../printerdrake.pm_.c:2170
 msgid "No test pages"
 msgstr "Pas de page de test"
 
-#: ../../printerdrake.pm_.c:2152
+#: ../../printerdrake.pm_.c:2171
 msgid "Print"
 msgstr "Imprimer"
 
-#: ../../printerdrake.pm_.c:2209
+#: ../../printerdrake.pm_.c:2228
 msgid "Standard test page"
 msgstr "Page de test standard"
 
-#: ../../printerdrake.pm_.c:2212
+#: ../../printerdrake.pm_.c:2231
 msgid "Alternative test page (Letter)"
 msgstr "Page de test alternative (Letter)"
 
-#: ../../printerdrake.pm_.c:2215
+#: ../../printerdrake.pm_.c:2234
 msgid "Alternative test page (A4)"
 msgstr "Page de test alternative (A4)"
 
-#: ../../printerdrake.pm_.c:2217
+#: ../../printerdrake.pm_.c:2236
 msgid "Photo test page"
 msgstr "Page de test photo"
 
-#: ../../printerdrake.pm_.c:2221
+#: ../../printerdrake.pm_.c:2240
 msgid "Do not print any test page"
 msgstr "Ne pas imprimer de page de test"
 
-#: ../../printerdrake.pm_.c:2230 ../../printerdrake.pm_.c:2383
+#: ../../printerdrake.pm_.c:2249 ../../printerdrake.pm_.c:2402
 msgid "Printing test page(s)..."
 msgstr "Impression des pages de test..."
 
-#: ../../printerdrake.pm_.c:2255
+#: ../../printerdrake.pm_.c:2274
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -9354,7 +9348,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2259
+#: ../../printerdrake.pm_.c:2278
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
@@ -9362,15 +9356,15 @@ msgstr ""
 "Les pages de test ont été envoyées à l'imprimante.\n"
 "Il peut se passer un certain temps avant le début effectif de l'impression.\n"
 
-#: ../../printerdrake.pm_.c:2266
+#: ../../printerdrake.pm_.c:2285
 msgid "Did it work properly?"
 msgstr "Êtes-vous satisfait du résultat ?"
 
-#: ../../printerdrake.pm_.c:2288 ../../printerdrake.pm_.c:3445
+#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3464
 msgid "Raw printer"
 msgstr "Imprimante à accès direct"
 
-#: ../../printerdrake.pm_.c:2314
+#: ../../printerdrake.pm_.c:2333
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -9384,7 +9378,7 @@ msgstr ""
 "<fichier> ». Les utilitaires graphiques vous permettent de choisir "
 "l'imprimante et de modifier les paramètres d'impression facilement.\n"
 
-#: ../../printerdrake.pm_.c:2316
+#: ../../printerdrake.pm_.c:2335
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications, but here do not supply the file name "
@@ -9395,8 +9389,8 @@ msgstr ""
 "applications. Dans ce cas n'indiquez pas le nom du fichier puisqu'il sera "
 "fourni par l'application elle-même.\n"
 
-#: ../../printerdrake.pm_.c:2319 ../../printerdrake.pm_.c:2336
-#: ../../printerdrake.pm_.c:2346
+#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:2365
 #, c-format
 msgid ""
 "\n"
@@ -9409,7 +9403,7 @@ msgstr ""
 "pour une impression particulière. Il suffit pour cela d'ajouter les "
 "paramètres voulus sur la ligne de commande. Par exemple, « %s <fichier> ». "
 
-#: ../../printerdrake.pm_.c:2322 ../../printerdrake.pm_.c:2362
+#: ../../printerdrake.pm_.c:2341 ../../printerdrake.pm_.c:2381
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -9420,7 +9414,7 @@ msgstr ""
 "lisez la liste ci-dessous ou cliquez sur le bouton « imprimer la liste des "
 "options ».%s%s\n"
 
-#: ../../printerdrake.pm_.c:2326
+#: ../../printerdrake.pm_.c:2345
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
@@ -9429,7 +9423,7 @@ msgstr ""
 "courante:\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2331 ../../printerdrake.pm_.c:2341
+#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2360
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -9438,8 +9432,8 @@ msgstr ""
 "Pour imprimer un fichier depuis la ligne de commande (une fenêtre de "
 "terminal), utilisez la commande « %s <fichier>».\n"
 
-#: ../../printerdrake.pm_.c:2333 ../../printerdrake.pm_.c:2343
-#: ../../printerdrake.pm_.c:2353
+#: ../../printerdrake.pm_.c:2352 ../../printerdrake.pm_.c:2362
+#: ../../printerdrake.pm_.c:2372
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications. But here do not supply the file name "
@@ -9450,7 +9444,7 @@ msgstr ""
 "applications. Dans ce cas, n'indiquez pas le nom du fichier à imprimer "
 "puisque celui-ci sera fourni par l'application elle-même.\n"
 
-#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2348
+#: ../../printerdrake.pm_.c:2357 ../../printerdrake.pm_.c:2367
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
@@ -9458,7 +9452,7 @@ msgstr ""
 "Pour obtenir la liste des paramètres disponibles pour l'imprimante courante, "
 "cliquez sur le bouton « liste des options d'impression »."
 
-#: ../../printerdrake.pm_.c:2351
+#: ../../printerdrake.pm_.c:2370
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -9467,7 +9461,7 @@ msgstr ""
 "Pour imprimer un fichier depuis la ligne de commande (une fenêtre de "
 "terminal), utilisez la commande « %s <fichier> » ou « %s <fichier> ».\n"
 
-#: ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:2374
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
 "handling printing jobs.\n"
@@ -9484,7 +9478,7 @@ msgstr ""
 "les travaux d'impression. Ceci peut être utile en cas de bourrage papier, "
 "par exemple.\n"
 
-#: ../../printerdrake.pm_.c:2359
+#: ../../printerdrake.pm_.c:2378
 #, c-format
 msgid ""
 "\n"
@@ -9498,40 +9492,40 @@ msgstr ""
 "cela d'ajouter les paramètres voulus sur la ligne de commande, par exemple "
 "« %s <fichier> ».\n"
 
-#: ../../printerdrake.pm_.c:2369
+#: ../../printerdrake.pm_.c:2388
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Impression/Acquisition/Cartes photo sur « %s »"
 
-#: ../../printerdrake.pm_.c:2370
+#: ../../printerdrake.pm_.c:2389
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Impression/Acquisition sur l'imprimante « %s »"
 
-#: ../../printerdrake.pm_.c:2372
+#: ../../printerdrake.pm_.c:2391
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Impression/Accès aux cartes photos sur « %s »"
 
-#: ../../printerdrake.pm_.c:2373
+#: ../../printerdrake.pm_.c:2392
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Impression sur l'imprimante « %s »"
 
-#: ../../printerdrake.pm_.c:2376 ../../printerdrake.pm_.c:2379
-#: ../../printerdrake.pm_.c:2380 ../../printerdrake.pm_.c:2381
-#: ../../printerdrake.pm_.c:3429 ../../standalone/drakTermServ_.c:248
+#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
+#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
+#: ../../printerdrake.pm_.c:3448 ../../standalone/drakTermServ_.c:248
 #: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
 #: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
 #: ../../standalone/drakfont_.c:1014
 msgid "Close"
 msgstr "Fermer"
 
-#: ../../printerdrake.pm_.c:2379
+#: ../../printerdrake.pm_.c:2398
 msgid "Print option list"
 msgstr "Liste des options d'impression"
 
-#: ../../printerdrake.pm_.c:2399
+#: ../../printerdrake.pm_.c:2418
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -9555,7 +9549,7 @@ msgstr ""
 "\n"
 "N'utilisez pas « scannerdrake » pour cet appareil ! "
 
-#: ../../printerdrake.pm_.c:2420
+#: ../../printerdrake.pm_.c:2439
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
 "card drives from your PC. Now you can access your photo cards using the "
@@ -9578,17 +9572,17 @@ msgstr ""
 "plusieurs lecteurs grâce au champ situé dans le coin supérieur droit de la "
 "liste de fichiers."
 
-#: ../../printerdrake.pm_.c:2442 ../../printerdrake.pm_.c:2904
-#: ../../printerdrake.pm_.c:3199
+#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2923
+#: ../../printerdrake.pm_.c:3218
 msgid "Reading printer data..."
 msgstr "Lecture des données de l'imprimante..."
 
-#: ../../printerdrake.pm_.c:2462 ../../printerdrake.pm_.c:2490
-#: ../../printerdrake.pm_.c:2525
+#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2509
+#: ../../printerdrake.pm_.c:2544
 msgid "Transfer printer configuration"
 msgstr "Transfert de la configuration de l'imprimante"
 
-#: ../../printerdrake.pm_.c:2463
+#: ../../printerdrake.pm_.c:2482
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -9605,7 +9599,7 @@ msgstr ""
 "Toutes les files d'attente n'ont pas pu être transférées à cause des raisons "
 "suivantes :\n"
 
-#: ../../printerdrake.pm_.c:2466
+#: ../../printerdrake.pm_.c:2485
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
@@ -9613,7 +9607,7 @@ msgstr ""
 "CUPS ne supporte pas les imprimantes sur les serveurs Novell ni les "
 "impressions vers des commandes shell.\n"
 
-#: ../../printerdrake.pm_.c:2468
+#: ../../printerdrake.pm_.c:2487
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
@@ -9621,11 +9615,11 @@ msgstr ""
 "PDQ ne supporte que les imprimantes locales, les imprimantes LPD distantes, "
 "et les imprimantes réseau autonomes.\n"
 
-#: ../../printerdrake.pm_.c:2470
+#: ../../printerdrake.pm_.c:2489
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD et LPRng ne supportent pas les imprimantes IPP.\n"
 
-#: ../../printerdrake.pm_.c:2472
+#: ../../printerdrake.pm_.c:2491
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
@@ -9633,7 +9627,7 @@ msgstr ""
 "De plus, les files d'attente qui n'ont pas été créées avec ce programme ou "
 "avec «foomatic-configure» ne peuvent pas être transférées."
 
-#: ../../printerdrake.pm_.c:2473
+#: ../../printerdrake.pm_.c:2492
 msgid ""
 "\n"
 "Also printers configured with the PPD files provided by their manufacturers "
@@ -9643,7 +9637,7 @@ msgstr ""
 "Aussi, les imprimantes configurées avec les fichiers PPD fournis par leur "
 "fabriquant ou avec des pilotes CUPS natifs ne peuvent pas être transférées."
 
-#: ../../printerdrake.pm_.c:2474
+#: ../../printerdrake.pm_.c:2493
 msgid ""
 "\n"
 "Mark the printers which you want to transfer and click \n"
@@ -9653,15 +9647,15 @@ msgstr ""
 "Cochez les imprimantes que vous voulez transférer, et\n"
 "cliquez sur « Transfert »."
 
-#: ../../printerdrake.pm_.c:2477
+#: ../../printerdrake.pm_.c:2496
 msgid "Do not transfer printers"
 msgstr "Ne pas transférer les imprimantes"
 
-#: ../../printerdrake.pm_.c:2478 ../../printerdrake.pm_.c:2495
+#: ../../printerdrake.pm_.c:2497 ../../printerdrake.pm_.c:2514
 msgid "Transfer"
 msgstr "Transfert"
 
-#: ../../printerdrake.pm_.c:2491
+#: ../../printerdrake.pm_.c:2510
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -9673,13 +9667,13 @@ msgstr ""
 "Vous pouvez également taper un nouveau nom ou\n"
 "simplement ignorer cette imprimante."
 
-#: ../../printerdrake.pm_.c:2499
+#: ../../printerdrake.pm_.c:2518
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 "Le nom de l'imprimante ne devrait contenir que des lettres, des nombres et "
 "des tirets bas (_)"
 
-#: ../../printerdrake.pm_.c:2504
+#: ../../printerdrake.pm_.c:2523
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -9688,16 +9682,16 @@ msgstr ""
 "L'imprimante « %s » existe déjà,\n"
 "souhaitez-vous vraiment écraser sa configuration ?"
 
-#: ../../printerdrake.pm_.c:2512
+#: ../../printerdrake.pm_.c:2531
 msgid "New printer name"
 msgstr "Nouveau nom de l'imprimante"
 
-#: ../../printerdrake.pm_.c:2515
+#: ../../printerdrake.pm_.c:2534
 #, c-format
 msgid "Transferring %s..."
 msgstr "Transfert de %s..."
 
-#: ../../printerdrake.pm_.c:2526
+#: ../../printerdrake.pm_.c:2545
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -9707,29 +9701,29 @@ msgstr ""
 "elle être également l'imprimante par défaut de votre nouveau système "
 "d'impression %s ?"
 
-#: ../../printerdrake.pm_.c:2536
+#: ../../printerdrake.pm_.c:2555
 msgid "Refreshing printer data..."
 msgstr "Mise à jour des données de l'imprimante..."
 
-#: ../../printerdrake.pm_.c:2544 ../../printerdrake.pm_.c:2619
-#: ../../printerdrake.pm_.c:2631
+#: ../../printerdrake.pm_.c:2563 ../../printerdrake.pm_.c:2638
+#: ../../printerdrake.pm_.c:2650
 msgid "Configuration of a remote printer"
 msgstr "Configuration d'une imprimante distante"
 
-#: ../../printerdrake.pm_.c:2545
+#: ../../printerdrake.pm_.c:2564
 msgid "Starting network..."
 msgstr "Démarrage du réseau..."
 
-#: ../../printerdrake.pm_.c:2580 ../../printerdrake.pm_.c:2584
-#: ../../printerdrake.pm_.c:2586
+#: ../../printerdrake.pm_.c:2599 ../../printerdrake.pm_.c:2603
+#: ../../printerdrake.pm_.c:2605
 msgid "Configure the network now"
 msgstr "Configurez le réseau maintenant"
 
-#: ../../printerdrake.pm_.c:2581
+#: ../../printerdrake.pm_.c:2600
 msgid "Network functionality not configured"
 msgstr "Les fonctionnalités du réseau ne sont pas configurées"
 
-#: ../../printerdrake.pm_.c:2582
+#: ../../printerdrake.pm_.c:2601
 msgid ""
 "You are going to configure a remote printer. This needs working network "
 "access, but your network is not configured yet. If you go on without network "
@@ -9741,11 +9735,11 @@ msgstr ""
 "voulez continuer sans configurer le réseau, vous ne pourez pas utiliser "
 "l'imprimante que vous êtes en train de configurer. Que souhaitez-vous faire ?"
 
-#: ../../printerdrake.pm_.c:2585
+#: ../../printerdrake.pm_.c:2604
 msgid "Go on without configuring the network"
 msgstr "Continuer sans configurer le réseau"
 
-#: ../../printerdrake.pm_.c:2621
+#: ../../printerdrake.pm_.c:2640
 msgid ""
 "The network configuration done during the installation cannot be started "
 "now. Please check whether the network gets accessable after booting your "
@@ -9761,7 +9755,7 @@ msgstr ""
 "essayez à nouveau de configurer l'imprimante dans la section « Matériel / "
 "Imprimante »."
 
-#: ../../printerdrake.pm_.c:2622
+#: ../../printerdrake.pm_.c:2641
 msgid ""
 "The network access was not running and could not be started. Please check "
 "your configuration and your hardware. Then try to configure your remote "
@@ -9771,24 +9765,24 @@ msgstr ""
 "de votre matériel et de votre accès réseau grâce au « Centre de Contrôle "
 "Mandrake » puis essayez à nouveau de configurer l'imprimante distante."
 
-#: ../../printerdrake.pm_.c:2632
+#: ../../printerdrake.pm_.c:2651
 msgid "Restarting printing system..."
 msgstr "Redémarrage du système d'impression..."
 
-#: ../../printerdrake.pm_.c:2670
+#: ../../printerdrake.pm_.c:2689
 msgid "high"
 msgstr "élevé"
 
-#: ../../printerdrake.pm_.c:2670
+#: ../../printerdrake.pm_.c:2689
 msgid "paranoid"
 msgstr "paranoïaque"
 
-#: ../../printerdrake.pm_.c:2671
+#: ../../printerdrake.pm_.c:2690
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Installation du système d'impression sous le niveau de sécurité « %s »"
 
-#: ../../printerdrake.pm_.c:2672
+#: ../../printerdrake.pm_.c:2691
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -9814,11 +9808,11 @@ msgstr ""
 "\n"
 "Souhaitez-vous réellement installer un système d'impression ?"
 
-#: ../../printerdrake.pm_.c:2704
+#: ../../printerdrake.pm_.c:2723
 msgid "Starting the printing system at boot time"
 msgstr "Activation du système d'impression au démarrage"
 
-#: ../../printerdrake.pm_.c:2705
+#: ../../printerdrake.pm_.c:2724
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -9840,59 +9834,59 @@ msgstr ""
 "\n"
 "Souhaitez-vous rétablir l'activation automatique du système d'impression ?"
 
-#: ../../printerdrake.pm_.c:2729 ../../printerdrake.pm_.c:2770
-#: ../../printerdrake.pm_.c:2809 ../../printerdrake.pm_.c:2851
-#: ../../printerdrake.pm_.c:2972
+#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2789
+#: ../../printerdrake.pm_.c:2828 ../../printerdrake.pm_.c:2870
+#: ../../printerdrake.pm_.c:2991
 msgid "Checking installed software..."
 msgstr "Vérification du logiciel installé..."
 
-#: ../../printerdrake.pm_.c:2775
+#: ../../printerdrake.pm_.c:2794
 msgid "Removing LPRng..."
 msgstr "Suppression de LPRng..."
 
-#: ../../printerdrake.pm_.c:2814
+#: ../../printerdrake.pm_.c:2833
 msgid "Removing LPD..."
 msgstr "Suppression de LPD..."
 
-#: ../../printerdrake.pm_.c:2887
+#: ../../printerdrake.pm_.c:2906
 msgid "Select Printer Spooler"
 msgstr "Choisissez le gestionnaire d'impression"
 
-#: ../../printerdrake.pm_.c:2888
+#: ../../printerdrake.pm_.c:2907
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Quel système d'impression désirez-vous utiliser ?"
 
-#: ../../printerdrake.pm_.c:2924
+#: ../../printerdrake.pm_.c:2943
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Configuration en cours de l'imprimante « %s »..."
 
-#: ../../printerdrake.pm_.c:2938
+#: ../../printerdrake.pm_.c:2957
 msgid "Installing Foomatic..."
 msgstr "Installation de Foomatic ..."
 
-#: ../../printerdrake.pm_.c:3008 ../../printerdrake.pm_.c:3049
-#: ../../printerdrake.pm_.c:3446 ../../printerdrake.pm_.c:3519
+#: ../../printerdrake.pm_.c:3027 ../../printerdrake.pm_.c:3068
+#: ../../printerdrake.pm_.c:3465 ../../printerdrake.pm_.c:3538
 msgid "Printer options"
 msgstr "Options de l'imprimante"
 
-#: ../../printerdrake.pm_.c:3018
+#: ../../printerdrake.pm_.c:3037
 msgid "Preparing Printerdrake..."
 msgstr "Préparation de PrinterDrake..."
 
-#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3609
+#: ../../printerdrake.pm_.c:3055 ../../printerdrake.pm_.c:3628
 msgid "Configuring applications..."
 msgstr "Configuration des applications...."
 
-#: ../../printerdrake.pm_.c:3056
+#: ../../printerdrake.pm_.c:3075
 msgid "Would you like to configure printing?"
 msgstr "Désirez-vous configurer l'impression ?"
 
-#: ../../printerdrake.pm_.c:3068
+#: ../../printerdrake.pm_.c:3087
 msgid "Printing system: "
 msgstr "Système d'impression : "
 
-#: ../../printerdrake.pm_.c:3128
+#: ../../printerdrake.pm_.c:3147
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; to view information about it; "
@@ -9904,7 +9898,7 @@ msgstr ""
 "consulter les informations à son propos ou pour rendre une imprimante d'un "
 "serveur CUPS distant utilisable par Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3129
+#: ../../printerdrake.pm_.c:3148
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
@@ -9914,30 +9908,30 @@ msgstr ""
 "pour modifier ses paramètres, en faire l'imprimante par défaut ou consulter "
 "les informations à son propos."
 
-#: ../../printerdrake.pm_.c:3156
+#: ../../printerdrake.pm_.c:3175
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Rafraîchir la liste des imprimantes (pour afficher toutes les imprimantes "
 "CUPS distantes)"
 
-#: ../../printerdrake.pm_.c:3174
+#: ../../printerdrake.pm_.c:3193
 msgid "Change the printing system"
 msgstr "Changer le système d'impression"
 
-#: ../../printerdrake.pm_.c:3179 ../../standalone/drakconnect_.c:277
+#: ../../printerdrake.pm_.c:3198 ../../standalone/drakconnect_.c:277
 msgid "Normal Mode"
 msgstr "Mode normal"
 
-#: ../../printerdrake.pm_.c:3339 ../../printerdrake.pm_.c:3389
-#: ../../printerdrake.pm_.c:3602
+#: ../../printerdrake.pm_.c:3358 ../../printerdrake.pm_.c:3408
+#: ../../printerdrake.pm_.c:3621
 msgid "Do you want to configure another printer?"
 msgstr "Désirez-vous configurer une autre imprimante ?"
 
-#: ../../printerdrake.pm_.c:3424
+#: ../../printerdrake.pm_.c:3443
 msgid "Modify printer configuration"
 msgstr "Modifier la configuration de l'imprimante"
 
-#: ../../printerdrake.pm_.c:3426
+#: ../../printerdrake.pm_.c:3445
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -9946,102 +9940,102 @@ msgstr ""
 "Imprimante %s\n"
 "Que souhaitez-vous modifier sur cette imprimante ?"
 
-#: ../../printerdrake.pm_.c:3430
+#: ../../printerdrake.pm_.c:3449
 msgid "Do it!"
 msgstr "Faire"
 
-#: ../../printerdrake.pm_.c:3435 ../../printerdrake.pm_.c:3490
+#: ../../printerdrake.pm_.c:3454 ../../printerdrake.pm_.c:3509
 msgid "Printer connection type"
 msgstr "Type de connexion"
 
-#: ../../printerdrake.pm_.c:3436 ../../printerdrake.pm_.c:3494
+#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3513
 msgid "Printer name, description, location"
 msgstr "Nom, description, emplacement"
 
-#: ../../printerdrake.pm_.c:3438 ../../printerdrake.pm_.c:3512
+#: ../../printerdrake.pm_.c:3457 ../../printerdrake.pm_.c:3531
 msgid "Printer manufacturer, model, driver"
 msgstr "Marque, modèle, pilote"
 
-#: ../../printerdrake.pm_.c:3439 ../../printerdrake.pm_.c:3513
+#: ../../printerdrake.pm_.c:3458 ../../printerdrake.pm_.c:3532
 msgid "Printer manufacturer, model"
 msgstr "Marque, modèle"
 
-#: ../../printerdrake.pm_.c:3448 ../../printerdrake.pm_.c:3523
+#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3542
 msgid "Set this printer as the default"
 msgstr "Choisir comme imprimante par défaut"
 
-#: ../../printerdrake.pm_.c:3450 ../../printerdrake.pm_.c:3528
+#: ../../printerdrake.pm_.c:3469 ../../printerdrake.pm_.c:3547
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Ajouter cette imprimante à StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3451 ../../printerdrake.pm_.c:3537
+#: ../../printerdrake.pm_.c:3470 ../../printerdrake.pm_.c:3556
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Retirer cette imprimante de StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3452 ../../printerdrake.pm_.c:3546
+#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3565
 msgid "Print test pages"
 msgstr "Imprimer des pages de test"
 
-#: ../../printerdrake.pm_.c:3453 ../../printerdrake.pm_.c:3548
+#: ../../printerdrake.pm_.c:3472 ../../printerdrake.pm_.c:3567
 msgid "Know how to use this printer"
 msgstr "Savoir comment utiliser cette imprimante"
 
-#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3550
+#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3569
 msgid "Remove printer"
 msgstr "Désinstaller l'imprimante"
 
-#: ../../printerdrake.pm_.c:3501
+#: ../../printerdrake.pm_.c:3520
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Désinstallation de l'ancienne imprimante « %s »..."
 
-#: ../../printerdrake.pm_.c:3526
+#: ../../printerdrake.pm_.c:3545
 msgid "Default printer"
 msgstr "Imprimante par défaut"
 
-#: ../../printerdrake.pm_.c:3527
+#: ../../printerdrake.pm_.c:3546
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "L'imprimante « %s » est maintenant celle par défaut."
 
-#: ../../printerdrake.pm_.c:3531 ../../printerdrake.pm_.c:3534
+#: ../../printerdrake.pm_.c:3550 ../../printerdrake.pm_.c:3553
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Ajout de l'imprimante à StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3532
+#: ../../printerdrake.pm_.c:3551
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr "L'imprimante « %s » a été ajoutée avec succès à StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3535
+#: ../../printerdrake.pm_.c:3554
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr "Impossible d'ajouter l'imprimante « %s » à StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3540 ../../printerdrake.pm_.c:3543
+#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Retrait de l'imprimante de StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3541
+#: ../../printerdrake.pm_.c:3560
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
 msgstr "L'imprimante « %s » a été retirée avec succès de StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3544
+#: ../../printerdrake.pm_.c:3563
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr "Impossible de retirer l'imprimante « %s » de StarOffice/OpenOffice"
 
-#: ../../printerdrake.pm_.c:3552
+#: ../../printerdrake.pm_.c:3571
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Désirez-vous vraiment désinstaller l'imprimante « %s »?"
 
-#: ../../printerdrake.pm_.c:3556
+#: ../../printerdrake.pm_.c:3575
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Suppression de l'imprimante « %s »..."
@@ -10169,6 +10163,22 @@ msgid ""
 "be sent to this user (username or\n"
 "\t       email)"
 msgstr ""
+"Standard : Ceci est le niveau standard de sécurité recommandé pour un "
+"ordinateur devant se connecter à Internet en tant que client.\n"
+"\n"
+"Elevée : Quelques restrictions en plus, et chaque nuit divers contrôles sont "
+"exécutés.\n"
+"\n"
+"Plus élevée : La sécurité est ici suffisante pour utiliser la machine comme "
+"serveur acceptant de multiples connexions. Si votre machine n'est pas "
+"destinée à être serveur sur Internet, un niveau plus bas est approprié.\n"
+"\n"
+"Panaoïaque : Idem que le précédent, mais le système sera totalement clos et "
+"la sécurité au maximum.\n"
+"\n"
+"Administreur de Sécurité : Si l'option « Alertes de sécurité » est choisie, "
+"celles-ci seont envoyées à l'utilisateur indiqué (nom ou\n"
+"courriel).\t"
 
 #: ../../security/main.pm_.c:66
 msgid "Security Level:"
@@ -10886,7 +10896,7 @@ msgstr ""
 "gagner en compétitivité, si vous voulez soutenir le développement de "
 "Mandrake Linux, rejoingnez MandrakeClub !"
 
-#: ../../standalone.pm_.c:41
+#: ../../standalone.pm_.c:42
 msgid "Installing packages..."
 msgstr "Installation des paquetages..."
 
@@ -12140,7 +12150,7 @@ msgid "Previous"
 msgstr "<- Précédent"
 
 #: ../../standalone/drakbackup_.c:3941 ../../standalone/drakbackup_.c:4027
-#: ../../standalone/logdrake_.c:223
+#: ../../standalone/logdrake_.c:224
 msgid "Save"
 msgstr "Valider"
 
@@ -13035,93 +13045,93 @@ msgstr "Carte ethernet"
 msgid "DHCP Client"
 msgstr "Client DHCP"
 
-#: ../../standalone/drakfloppy_.c:63
+#: ../../standalone/drakfloppy_.c:64
 msgid "usage: drakfloppy\n"
 msgstr "mode d'emploi : drakfloppy\n"
 
-#: ../../standalone/drakfloppy_.c:67
+#: ../../standalone/drakfloppy_.c:68
 msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Module name"
 msgstr "Nom du module"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Size"
 msgstr "Taille"
 
-#: ../../standalone/drakfloppy_.c:73
+#: ../../standalone/drakfloppy_.c:74
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: ../../standalone/drakfloppy_.c:90
+#: ../../standalone/drakfloppy_.c:91
 msgid "boot disk creation"
 msgstr "création d'une disquette d'amorçage"
 
-#: ../../standalone/drakfloppy_.c:98 ../../standalone/drakfloppy_.c:111
+#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
 msgid "default"
 msgstr "par défaut"
 
-#: ../../standalone/drakfloppy_.c:114
+#: ../../standalone/drakfloppy_.c:115
 #, c-format
 msgid "DrakFloppy Error: %s"
 msgstr "Erreur DrakFloppy : %s"
 
-#: ../../standalone/drakfloppy_.c:125
+#: ../../standalone/drakfloppy_.c:126
 msgid "kernel version"
 msgstr "version du noyau"
 
-#: ../../standalone/drakfloppy_.c:131
+#: ../../standalone/drakfloppy_.c:132
 msgid "General"
 msgstr "Général"
 
-#: ../../standalone/drakfloppy_.c:136
+#: ../../standalone/drakfloppy_.c:137
 msgid "Expert Area"
 msgstr "Mode Expert"
 
-#: ../../standalone/drakfloppy_.c:139
+#: ../../standalone/drakfloppy_.c:140
 msgid "mkinitrd optional arguments"
 msgstr "arguments optionnels pour mkinitrd"
 
-#: ../../standalone/drakfloppy_.c:140
+#: ../../standalone/drakfloppy_.c:141
 msgid "Add a module"
 msgstr "Ajouter un module"
 
-#: ../../standalone/drakfloppy_.c:160
+#: ../../standalone/drakfloppy_.c:161
 msgid "force"
 msgstr "forcer"
 
-#: ../../standalone/drakfloppy_.c:161
+#: ../../standalone/drakfloppy_.c:162
 msgid "if needed"
 msgstr "si besoin est"
 
-#: ../../standalone/drakfloppy_.c:162
+#: ../../standalone/drakfloppy_.c:163
 msgid "omit scsi modules"
 msgstr "ne pas tenir compte des modules SCSI"
 
-#: ../../standalone/drakfloppy_.c:163
+#: ../../standalone/drakfloppy_.c:164
 msgid "omit raid modules"
 msgstr "ne pas tenir compte des modules RAID"
 
-#: ../../standalone/drakfloppy_.c:199
+#: ../../standalone/drakfloppy_.c:200
 msgid "Remove a module"
 msgstr "Retirer un module"
 
-#: ../../standalone/drakfloppy_.c:221
+#: ../../standalone/drakfloppy_.c:222
 msgid "Output"
 msgstr "Sortie"
 
-#: ../../standalone/drakfloppy_.c:233
+#: ../../standalone/drakfloppy_.c:234
 msgid "Build the disk"
 msgstr "Créer la disquette"
 
-#: ../../standalone/drakfloppy_.c:376
+#: ../../standalone/drakfloppy_.c:377
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Assurez-vous qu'un médium est présent dans le périphérique %s"
 
-#: ../../standalone/drakfloppy_.c:381
+#: ../../standalone/drakfloppy_.c:382
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -13130,12 +13140,12 @@ msgstr ""
 "Il n'y a aucune disquette dans le lecteur %s ou alors elle est \n"
 "protégée contre l'écriture. Veuillez vérifier ou en insérer une."
 
-#: ../../standalone/drakfloppy_.c:383
+#: ../../standalone/drakfloppy_.c:384
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Ne peut dédoubler (fork) : %s"
 
-#: ../../standalone/drakfloppy_.c:387
+#: ../../standalone/drakfloppy_.c:388
 #, c-format
 msgid ""
 "Unable to close properly mkbootdisk: \n"
@@ -13938,7 +13948,7 @@ msgstr "Création de l'aperçu ..."
 #: ../../standalone/draksplash_.c:511
 #, c-format
 msgid "%s BootSplash (%s) preview"
-msgstr ""
+msgstr "Aperçu de lécran de démarrage %s (%s)"
 
 #: ../../standalone/drakxtv_.c:49
 msgid ""
@@ -14142,128 +14152,128 @@ msgstr ""
 "Les changements ont été effectués mais ne seront effectifs qu'après votre "
 "déconnection"
 
-#: ../../standalone/logdrake_.c:85 ../../ugtk.pm_.c:285
+#: ../../standalone/logdrake_.c:86 ../../ugtk.pm_.c:285
 msgid "logdrake"
 msgstr "logdrake"
 
-#: ../../standalone/logdrake_.c:95
+#: ../../standalone/logdrake_.c:96
 msgid "Show only for the selected day"
 msgstr "N'afficher que les pour les jours sélectionnés"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "/File/_New"
 msgstr "/Fichier/_Nouveau"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "/File/_Open"
 msgstr "/Fichier/_Ouvrir"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "/File/_Save"
 msgstr "/Fichier/Enregi_strer"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:106
 msgid "/File/Save _As"
 msgstr "/Fichier/_Enregistrer sous"
 
-#: ../../standalone/logdrake_.c:106
+#: ../../standalone/logdrake_.c:107
 msgid "/File/-"
 msgstr "/Fichier/-"
 
-#: ../../standalone/logdrake_.c:108
+#: ../../standalone/logdrake_.c:109
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../../standalone/logdrake_.c:109
+#: ../../standalone/logdrake_.c:110
 msgid "/Options/Test"
 msgstr "/Options/Test"
 
-#: ../../standalone/logdrake_.c:111
+#: ../../standalone/logdrake_.c:112
 msgid "/Help/_About..."
 msgstr "/Aide/_A propos..."
 
-#: ../../standalone/logdrake_.c:118
+#: ../../standalone/logdrake_.c:119
 msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:119
+#: ../../standalone/logdrake_.c:120
 msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:173
+#: ../../standalone/logdrake_.c:174
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../../standalone/logdrake_.c:174
+#: ../../standalone/logdrake_.c:175
 msgid "Messages"
 msgstr "Messages"
 
-#: ../../standalone/logdrake_.c:175
+#: ../../standalone/logdrake_.c:176
 msgid "Syslog"
 msgstr "Syslog"
 
-#: ../../standalone/logdrake_.c:176
+#: ../../standalone/logdrake_.c:177
 msgid "Mandrake Tools Explanations"
 msgstr "Explications sur les Outils Mandrake"
 
-#: ../../standalone/logdrake_.c:179
+#: ../../standalone/logdrake_.c:180
 msgid "search"
 msgstr "chercher"
 
-#: ../../standalone/logdrake_.c:185
+#: ../../standalone/logdrake_.c:186
 msgid "A tool to monitor your logs"
 msgstr "Un outil pour voir vos fichiers journaux"
 
-#: ../../standalone/logdrake_.c:186
+#: ../../standalone/logdrake_.c:187
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../../standalone/logdrake_.c:191
+#: ../../standalone/logdrake_.c:192
 msgid "matching"
 msgstr "contenant"
 
-#: ../../standalone/logdrake_.c:192
+#: ../../standalone/logdrake_.c:193
 msgid "but not matching"
 msgstr "mais ne contenant pas"
 
-#: ../../standalone/logdrake_.c:196
+#: ../../standalone/logdrake_.c:197
 msgid "Choose file"
 msgstr "Choisir le fichier"
 
-#: ../../standalone/logdrake_.c:201
+#: ../../standalone/logdrake_.c:202
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: ../../standalone/logdrake_.c:211
+#: ../../standalone/logdrake_.c:212
 msgid "Content of the file"
 msgstr "Contenu du fichier"
 
-#: ../../standalone/logdrake_.c:215 ../../standalone/logdrake_.c:391
+#: ../../standalone/logdrake_.c:216 ../../standalone/logdrake_.c:392
 msgid "Mail alert"
 msgstr "Alerte par courrier"
 
-#: ../../standalone/logdrake_.c:267
+#: ../../standalone/logdrake_.c:268
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "s'il vous plaît attendez, examen du fichier : %s"
 
-#: ../../standalone/logdrake_.c:408
+#: ../../standalone/logdrake_.c:409
 msgid "Mail alert configuration"
 msgstr "Configuration des alertes par courrier"
 
-#: ../../standalone/logdrake_.c:409
+#: ../../standalone/logdrake_.c:410
 msgid ""
 "Welcome to the mail configuration utility.\n"
 "\n"
@@ -14273,65 +14283,65 @@ msgstr ""
 "\n"
 "Vous allez pouvoir configurer ici vos les alertes systèmes.\n"
 
-#: ../../standalone/logdrake_.c:416
+#: ../../standalone/logdrake_.c:417
 msgid "Apache World Wide Web Server"
 msgstr "Apache (serveur www)"
 
-#: ../../standalone/logdrake_.c:417
+#: ../../standalone/logdrake_.c:418
 msgid "Domain Name Resolver"
 msgstr "Solveur de Nom de domaine"
 
-#: ../../standalone/logdrake_.c:418
+#: ../../standalone/logdrake_.c:419
 msgid "Ftp Server"
 msgstr "Serveur Ftp"
 
-#: ../../standalone/logdrake_.c:419
+#: ../../standalone/logdrake_.c:420
 msgid "Postfix Mail Server"
 msgstr "Serveur de courrier Postfix"
 
-#: ../../standalone/logdrake_.c:420
+#: ../../standalone/logdrake_.c:421
 msgid "Samba Server"
 msgstr "Serveur Sambe"
 
-#: ../../standalone/logdrake_.c:421
+#: ../../standalone/logdrake_.c:422
 msgid "SSH Server"
 msgstr "Serveur SSH"
 
-#: ../../standalone/logdrake_.c:422
+#: ../../standalone/logdrake_.c:423
 msgid "Webmin Service"
 msgstr "Service Webmin"
 
-#: ../../standalone/logdrake_.c:423
+#: ../../standalone/logdrake_.c:424
 msgid "Xinetd Service"
 msgstr "Service Xinetd"
 
-#: ../../standalone/logdrake_.c:430
+#: ../../standalone/logdrake_.c:431
 msgid "service setting"
 msgstr "configuration des services"
 
-#: ../../standalone/logdrake_.c:431
+#: ../../standalone/logdrake_.c:432
 msgid ""
 "You will receive an alert if one of the selected services is no more running"
 msgstr ""
 "Vous recevrez une alerte si l'un des services sélectionnés ne tourne plus"
 
-#: ../../standalone/logdrake_.c:443
+#: ../../standalone/logdrake_.c:444
 msgid "load setting"
 msgstr "chargement des paramètres"
 
-#: ../../standalone/logdrake_.c:444
+#: ../../standalone/logdrake_.c:445
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Vous recevrez une alerte si la charge machine dépasse cette valeur"
 
-#: ../../standalone/logdrake_.c:457
+#: ../../standalone/logdrake_.c:458
 msgid "alert configuration"
 msgstr "configuration des alertes"
 
-#: ../../standalone/logdrake_.c:458
+#: ../../standalone/logdrake_.c:459
 msgid "Please enter your email address below "
 msgstr "Veuillez entrer votre adresse e-mail ci -dessous"
 
-#: ../../standalone/logdrake_.c:497
+#: ../../standalone/logdrake_.c:498
 msgid "Save as.."
 msgstr "Enregistrer sous..."
 
@@ -14747,71 +14757,3 @@ msgstr "Multimédia - Gravure de CD"
 #: ../../share/compssUsers:999
 msgid "Scientific Workstation"
 msgstr "Applications scientifiques"
-
-#~ msgid "Make bootsplash step 2"
-#~ msgstr "créer l'image de démarrage, 2° étape"
-
-#~ msgid "Go to lilosplash configuration"
-#~ msgstr "Configuration de l'image de lilo"
-
-#~ msgid "Go back"
-#~ msgstr "Retour"
-
-#~ msgid ""
-#~ "There's no known OSS/ALSA alternative driver for your sound card (%s)"
-#~ msgstr "Il n'y a aucun pilote OSS ou ALSA connu pour votre carte son(%s)"
-
-#~ msgid ""
-#~ "Here you can select an alternative driver (either OSS or ALSA) for your "
-#~ "sound card (%s)"
-#~ msgstr ""
-#~ "Vous pouvez sélectionner ici un pilote alternatif (OSS ou ALSA) pour "
-#~ "votre carte son (%s)"
-
-#~ msgid "ECI Hi-Focus"
-#~ msgstr "ECI Hi-Focus"
-
-#~ msgid "Proxy should be ftp://..."
-#~ msgstr "La syntaxe doit être ftp://..."
-
-#~ msgid ""
-#~ "Mandrake Linux 9.0 has selected the best softwares for you. Surf the Web "
-#~ "and view animations with Mozilla and Konqueror, or read your mail and "
-#~ "handle your personal information with Evolution and Kmail"
-#~ msgstr ""
-#~ "Mandrake Linux 9.0 vous fournit les meilleures applications du moment. "
-#~ "Vous pourrez parcourir le Web et visualiser des animations via Mozilla ou "
-#~ "Konqueror, lire vos e-mails et gérer vos informations personnelles avec "
-#~ "Evolution ou Kmail"
-
-#~ msgid ""
-#~ "Join the MandrakeSoft support teams and the Linux Community online to "
-#~ "share your knowledge and help your others by becoming a recognized Expert "
-#~ "on the online technical support website:"
-#~ msgstr ""
-#~ "En tant qu'expert, vous pourrez partager vos connaissances et proposer du "
-#~ "support à d'autres utilisateurs sur :"
-
-#~ msgid "Please choose your CD/DVD media size"
-#~ msgstr "Veuillez choisir la taille de votre CD/DVD"
-
-#~ msgid "make bootsplash step 2"
-#~ msgstr "créer l'image de démarrage, 2° étape"
-
-#~ msgid "go to lilosplash configuration"
-#~ msgstr "Configuration de l'image de lilo"
-
-#~ msgid "quit"
-#~ msgstr "quitter"
-
-#~ msgid "save theme"
-#~ msgstr "sauvegarder le thème"
-
-#~ msgid "go back"
-#~ msgstr "Retour"
-
-#~ msgid "preview"
-#~ msgstr "aperçu"
-
-#~ msgid "choose color"
-#~ msgstr "Choisissez une couleur"
diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po
index 93f921892..afa1978ff 100644
--- a/perl-install/share/po/lv.po
+++ b/perl-install/share/po/lv.po
@@ -1,16 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Copyright (c) 2000 MandrakeSoft.
-# Vitauts Stochka <vit@dpu.lv>, 2000.
-# Juris Kudiòð <cooker@inbox.lv>, 2001.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2002-09-11 13:59+0200\n"
-"PO-Revision-Date: 2001-08-21 09:34+0200\n"
-"Last-Translator: Juris Kudiòð <cooker@inbox.lv>\n"
-"Language-Team: Latvian\n"
+"POT-Creation-Date: 2002-09-13 22:00+0200\n"
+"PO-Revision-Date: 2002-09-14 10:27+0200\n"
+"Last-Translator: Vitauts Stochka <vit@dau.lv>\n"
+"Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,16 +83,16 @@ msgstr "Kuru XFree konfigurâciju izvçlaties?"
 
 #: ../../Xconfig/card.pm_.c:381
 msgid "Configure all heads independently"
-msgstr "Konfigurât visus ekrânus neatkarîgi"
+msgstr "Konfigurçt visus ekrânus neatkarîgi"
 
 #: ../../Xconfig/card.pm_.c:382
 msgid "Use Xinerama extension"
 msgstr "Lietot Xinerama piebûvi"
 
 #: ../../Xconfig/card.pm_.c:387
-#, fuzzy, c-format
+#, c-format
 msgid "Configure only card \"%s\"%s"
-msgstr "Konfigurât tikai karti \"%s\" (%s)"
+msgstr "Konfigurât tikai karti \"%s\"%s"
 
 #: ../../Xconfig/card.pm_.c:399 ../../Xconfig/card.pm_.c:400
 #: ../../Xconfig/various.pm_.c:23
@@ -157,7 +155,6 @@ msgid "Custom"
 msgstr "Pielâgota"
 
 #: ../../Xconfig/main.pm_.c:102
-#, fuzzy
 msgid "Graphic Card"
 msgstr "Grafiskâ karte"
 
@@ -193,8 +190,8 @@ msgid "Ok"
 msgstr "Labi"
 
 #: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3155
-#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:224
+#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3203
+#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
 msgid "Quit"
 msgstr "Beigt"
 
@@ -217,20 +214,19 @@ msgstr "Norâdiet monitoru"
 
 #: ../../Xconfig/monitor.pm_.c:97
 msgid "Plug'n Play"
-msgstr ""
+msgstr "Plug'n Play"
 
 #: ../../Xconfig/monitor.pm_.c:98 ../../mouse.pm_.c:46
 msgid "Generic"
 msgstr "Vispârçja"
 
 #: ../../Xconfig/monitor.pm_.c:99 ../../harddrake/ui.pm_.c:37
-#, fuzzy
 msgid "Vendor"
-msgstr "Atsaukt"
+msgstr "Pârdevçjs"
 
 #: ../../Xconfig/monitor.pm_.c:109
 msgid "Plug'n Play probing failed. Please choose a precise monitor"
-msgstr ""
+msgstr "Plug'n Play pârbaude neizdevâs. Lûdzu, izvçlieties precîzu monitoru"
 
 #: ../../Xconfig/monitor.pm_.c:114
 msgid ""
@@ -296,13 +292,13 @@ msgid "Graphics card: %s"
 msgstr "Grafiskâ karte: %s"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:268 ../../any.pm_.c:1019
-#: ../../bootlook.pm_.c:343 ../../diskdrake/smbnfs_gtk.pm_.c:87
+#: ../../bootlook.pm_.c:344 ../../diskdrake/smbnfs_gtk.pm_.c:87
 #: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464
 #: ../../interactive.pm_.c:142 ../../interactive.pm_.c:354
 #: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195
 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
 #: ../../my_gtk.pm_.c:158 ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
-#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2124
+#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2169
 #: ../../security/main.pm_.c:295 ../../standalone/drakautoinst_.c:203
 #: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
 #: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
@@ -311,8 +307,8 @@ msgstr "Grafiskâ karte: %s"
 #: ../../standalone/drakbackup_.c:4184 ../../standalone/drakconnect_.c:115
 #: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
 #: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:234 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:536 ../../standalone/logdrake_.c:224
+#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
+#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:225
 #: ../../ugtk.pm_.c:296
 msgid "Cancel"
 msgstr "Atcelt"
@@ -326,7 +322,6 @@ msgid "Do you want to test the configuration?"
 msgstr "Vai vçlaties izmçìinât ðo konfigurâciju?"
 
 #: ../../Xconfig/test.pm_.c:31
-#, fuzzy
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Brîdinâjums: ðîs grafiskâs kartes izmçìinâðana var uzkârt datoru"
 
@@ -416,13 +411,12 @@ msgid ""
 msgstr ""
 
 #: ../../Xconfig/various.pm_.c:85
-#, fuzzy
 msgid "What norm is your TV using?"
-msgstr "Kâds ir jûsu ISDN pieslçguma veids?"
+msgstr "Kâdu TV standartu jûs izmantojat?"
 
 #: ../../any.pm_.c:108 ../../any.pm_.c:133
 msgid "First sector of boot partition"
-msgstr "Sâknçjamâs partîcijas pirmais sektors"
+msgstr "Sâknçjamâs sadaïas pirmais sektors"
 
 #: ../../any.pm_.c:108 ../../any.pm_.c:133 ../../any.pm_.c:210
 msgid "First sector of drive (MBR)"
@@ -446,11 +440,11 @@ msgstr "SILO"
 
 #: ../../any.pm_.c:139
 msgid "LILO with text menu"
-msgstr ""
+msgstr "LILO ar teksta izvçlni"
 
 #: ../../any.pm_.c:140 ../../any.pm_.c:151
 msgid "LILO with graphical menu"
-msgstr ""
+msgstr "LILO ar grafisko izvçlni"
 
 #: ../../any.pm_.c:143
 msgid "Grub"
@@ -458,7 +452,7 @@ msgstr "Grub"
 
 #: ../../any.pm_.c:147
 msgid "Boot from DOS/Windows (loadlin)"
-msgstr ""
+msgstr "Ielâdçt sistçmu no DOS/Windows (loadlin)"
 
 #: ../../any.pm_.c:149 ../../any.pm_.c:151
 msgid "Yaboot"
@@ -499,7 +493,7 @@ msgstr "Pauze pirms noklusçtâs sistçmas ielâdes"
 #: ../../any.pm_.c:170 ../../any.pm_.c:789
 #: ../../diskdrake/smbnfs_gtk.pm_.c:179
 #: ../../install_steps_interactive.pm_.c:1094 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:850 ../../printerdrake.pm_.c:965
+#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
 #: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
 #: ../../standalone/drakconnect_.c:649
 msgid "Password"
@@ -601,7 +595,7 @@ msgstr "Pievienot"
 #: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
 #: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
 #: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printerdrake.pm_.c:3155 ../../standalone/drakbackup_.c:2774
+#: ../../printerdrake.pm_.c:3203 ../../standalone/drakbackup_.c:2774
 msgid "Done"
 msgstr "Izdarîts"
 
@@ -686,9 +680,8 @@ msgid "You must specify a kernel image"
 msgstr ""
 
 #: ../../any.pm_.c:332
-#, fuzzy
 msgid "You must specify a root partition"
-msgstr "Jums ir nepiecieðama swap partîcija"
+msgstr "Jums ir nepiecieðama root sadaïa"
 
 #: ../../any.pm_.c:333
 msgid "This label is already used"
@@ -798,27 +791,27 @@ msgstr ""
 
 #: ../../any.pm_.c:751
 msgid "access to X programs"
-msgstr ""
+msgstr "piekïuve X programmâm"
 
 #: ../../any.pm_.c:752
 msgid "access to rpm tools"
-msgstr ""
+msgstr "piekïuve rpm rîkiem"
 
 #: ../../any.pm_.c:753
 msgid "allow \"su\""
-msgstr ""
+msgstr "atïaut \"su\""
 
 #: ../../any.pm_.c:754
 msgid "access to administrative files"
-msgstr ""
+msgstr "piekïuve administrçðanas failiem"
 
 #: ../../any.pm_.c:755
 msgid "access to network tools"
-msgstr ""
+msgstr "piekïuve tîkla rîkiem"
 
 #: ../../any.pm_.c:756
 msgid "access to compilation tools"
-msgstr ""
+msgstr "piekïuve kompilçðanas rîkiem"
 
 #: ../../any.pm_.c:761
 #, c-format
@@ -839,9 +832,8 @@ msgid ""
 msgstr "Lietotâja vârdâ var bût tikai mazie angïu burti, cipari, `-' un `_'"
 
 #: ../../any.pm_.c:769
-#, fuzzy
 msgid "The user name is too long"
-msgstr "Ðâds lietotâja vârds jau ir pievienots"
+msgstr "Lietotâja vârds ir pârâk garð"
 
 #: ../../any.pm_.c:770
 msgid "This user name is already added"
@@ -868,8 +860,8 @@ msgstr "Apstiprinât lietotâju"
 msgid "Real name"
 msgstr "Vârds un uzvârds"
 
-#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:849
-#: ../../printerdrake.pm_.c:964
+#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:979
 msgid "User name"
 msgstr "Lietotâja vârds"
 
@@ -886,14 +878,13 @@ msgid "Autologin"
 msgstr "Autoreìistrçðanâs"
 
 #: ../../any.pm_.c:821
-#, fuzzy
 msgid ""
 "I can set up your computer to automatically log on one user.\n"
 "Do you want to use this feature?"
 msgstr ""
 "Sistçmu var konfigurçt tâ, lai pçc startçðanas automâtiski tiktu\n"
 "atvçrta viena noteikta lietotâja sesija. \n"
-"Ja nevçlaties izmantot ðo iespçju, nospiediet atcelðanas pogu."
+"Vai vçlaties lietot ðo iespçju?"
 
 #: ../../any.pm_.c:825
 msgid "Choose the default user:"
@@ -904,7 +895,6 @@ msgid "Choose the window manager to run:"
 msgstr "Norâdiet izmantojamo logu menedþeri:"
 
 #: ../../any.pm_.c:841
-#, fuzzy
 msgid "Please choose a language to use."
 msgstr "Lûdzu izvçlieties izmantojamo valodu."
 
@@ -921,31 +911,27 @@ msgid "All"
 msgstr "Viss"
 
 #: ../../any.pm_.c:978
-#, fuzzy
 msgid "Allow all users"
-msgstr "Lietotâju pievienoðana"
+msgstr "Atïaut visus lietotâjus"
 
 #: ../../any.pm_.c:978
-#, fuzzy
 msgid "No sharing"
-msgstr "CUPS startçðana"
+msgstr "Bez koplietoðanas"
 
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1198 ../../standalone.pm_.c:58
-#, fuzzy, c-format
+#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:59
+#, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
-msgstr ""
-"Ðo pakotni ir nepiecieðams uzlabot\n"
-"Vai tieðâm vçlaties atteikties no tâs?"
+msgstr "Nepiecieðams instalçt pakotni %s. Vai vçlaties to instalçt?"
 
 #: ../../any.pm_.c:991
 msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
 msgstr ""
 
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1203 ../../standalone.pm_.c:63
+#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:64
 #, c-format
 msgid "Mandatory package %s is missing"
-msgstr ""
+msgstr "Iztrûkst obligâtâ pakotne %s."
 
 #: ../../any.pm_.c:1005
 msgid ""
@@ -958,7 +944,7 @@ msgstr ""
 
 #: ../../any.pm_.c:1019
 msgid "Launch userdrake"
-msgstr ""
+msgstr "Izpildît userdrake"
 
 #: ../../any.pm_.c:1021
 msgid ""
@@ -983,9 +969,8 @@ msgid "High"
 msgstr "Augsts"
 
 #: ../../any.pm_.c:1076
-#, fuzzy
 msgid "Higher"
-msgstr "Augsts"
+msgstr "Augstâk"
 
 #: ../../any.pm_.c:1077
 msgid "Paranoid"
@@ -1010,13 +995,12 @@ msgstr ""
 "nav ieteicams."
 
 #: ../../any.pm_.c:1084
-#, fuzzy
 msgid ""
 "This is the standard security recommended for a computer that will be used "
 "to connect to the Internet as a client."
 msgstr ""
 "Ðis ir parasts droðîbas lîmenis, kas ir ieteicams datoram, kas tiks\n"
-"izmantots kâ klients Interneta pieslçgumam. Tagad tiek pârbaudîta droðîba. "
+"izmantots, lai pieslçgtos Internetam kâ klients."
 
 #: ../../any.pm_.c:1085
 msgid ""
@@ -1025,7 +1009,6 @@ msgid ""
 msgstr ""
 
 #: ../../any.pm_.c:1086
-#, fuzzy
 msgid ""
 "With this security level, the use of this system as a server becomes "
 "possible.\n"
@@ -1035,37 +1018,34 @@ msgid ""
 "Internet, you should choose a lower level."
 msgstr ""
 "Ar ðo droðîbas lîmeni sistçmu var sâkt izmantot kâ serveri.\n"
-"Droðîba tagad ir pietiekoði augsta, lai izmantotu sistçmu kâ serveri, kas\n"
-"apkalpo pieslçgumus no daudziem klientiem. "
+"Droðîba tagad ir pietiekoði stipra, lai izmantotu sistçmu kâ serveri, kas\n"
+"apkalpo pieslçgumus no daudziem klientiem. Piezîme: ja jûsu dators darbojas\n"
+"tikai kâ klients Internetâ, Jums vajadzçtu izvçlçties zemâku mazâku droðîbas "
+"lîmeni."
 
 #: ../../any.pm_.c:1089
-#, fuzzy
 msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"Mçs izmantojam 4. lîmeòa iespçjas, taèu tagad sistçma ir pilnîbâ\n"
-"aizslçgta. Droðîba tagad ir maksimâlajâ lîmenî."
+"Ðis ir lîdzîgs iepriekðçjam lîmenim, bet sistçma ir pilnîbâ slçgta un "
+"droðîbas iespçjas ir paðas maksimâlâkâs."
 
 #: ../../any.pm_.c:1095
-#, fuzzy
 msgid "DrakSec Basic Options"
-msgstr "Opcijas"
+msgstr "DrakSec pamata opcijas"
 
 #: ../../any.pm_.c:1096
-#, fuzzy
 msgid "Please choose the desired security level"
-msgstr "Izvçlieties droðîbas lîmeni?"
+msgstr "Izvçlieties vçlamo droðîbas lîmeni?"
 
 #: ../../any.pm_.c:1099
-#, fuzzy
 msgid "Security level"
-msgstr "Uzstâdu droðîbas lîmeni"
+msgstr "Droðîbas lîmenis"
 
 #: ../../any.pm_.c:1101
-#, fuzzy
 msgid "Use libsafe for servers"
-msgstr "Norâdiet servera opcijas"
+msgstr "Lietot libsafe priekð serveriem"
 
 #: ../../any.pm_.c:1102
 msgid ""
@@ -1082,6 +1062,9 @@ msgid ""
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
 msgstr ""
+"Ðeit Jûs varat izvçlçties taustiòu vai taustiòu kombinâciju,\n"
+"kas Jums ïaus pârslçgties starp daþâdiem tastatûras\n"
+"izkârtojumiem (piemçram, latîòu un ne-latîòu)"
 
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
@@ -1178,7 +1161,7 @@ msgstr "Izdaliitais ieraksts tiks saakneets peec %d sekundeem."
 
 #: ../../bootloader.pm_.c:1005
 msgid "not enough room in /boot"
-msgstr "nepietiek vietas partîcijâ /boot"
+msgstr "nepietiek vietas /boot sadaïâ"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
 #. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
@@ -1192,9 +1175,9 @@ msgid "Start Menu"
 msgstr "Starta izvçlne"
 
 #: ../../bootloader.pm_.c:1126
-#, fuzzy, c-format
+#, c-format
 msgid "You can't install the bootloader on a %s partition\n"
-msgstr "Kur jûs vçlaties instalçt sâknçtâju?"
+msgstr "Jûs nevarat instalçt sâknçtâju %s sadaïâ\n"
 
 #: ../../bootlook.pm_.c:46 ../../standalone/drakperm_.c:15
 #: ../../standalone/draksplash_.c:26
@@ -1206,18 +1189,18 @@ msgid "Boot Style Configuration"
 msgstr "Sâknçðanas stila konfigurçðana"
 
 #: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:81
-#: ../../standalone/logdrake_.c:101
+#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:82
+#: ../../standalone/logdrake_.c:102
 msgid "/_File"
 msgstr "/_Fails"
 
-#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:82
-#: ../../standalone/logdrake_.c:107
+#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:83
+#: ../../standalone/logdrake_.c:108
 msgid "/File/_Quit"
 msgstr "/Fails/_Iziet"
 
 #: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:63
-#: ../../standalone/drakfloppy_.c:82 ../../standalone/logdrake_.c:107
+#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:108
 msgid "<control>Q"
 msgstr "<control>Q"
 
@@ -1250,27 +1233,27 @@ msgid "Yaboot mode"
 msgstr "Yaboot reþîms"
 
 #: ../../bootlook.pm_.c:146
-#, fuzzy
 msgid "Install themes"
-msgstr "Sistçmas instalçðana"
+msgstr "Instalçt tçmas"
 
 #: ../../bootlook.pm_.c:147
-msgid "Display theme under console"
+msgid ""
+"Display theme\n"
+"under console"
 msgstr ""
 
 #: ../../bootlook.pm_.c:148
-#, fuzzy
 msgid "Create new theme"
-msgstr "Izveidot jaunu partîciju"
+msgstr "Izveidot jaunu tçmu"
 
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:193
 #, c-format
 msgid "Backup %s to %s.old"
 msgstr ""
 
-#: ../../bootlook.pm_.c:193 ../../bootlook.pm_.c:196 ../../bootlook.pm_.c:199
-#: ../../bootlook.pm_.c:229 ../../bootlook.pm_.c:231 ../../bootlook.pm_.c:241
-#: ../../bootlook.pm_.c:250 ../../bootlook.pm_.c:257
+#: ../../bootlook.pm_.c:194 ../../bootlook.pm_.c:197 ../../bootlook.pm_.c:200
+#: ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232 ../../bootlook.pm_.c:242
+#: ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
 #: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
 #: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:355
 #: ../../diskdrake/interactive.pm_.c:469 ../../diskdrake/interactive.pm_.c:474
@@ -1281,74 +1264,74 @@ msgstr ""
 msgid "Error"
 msgstr "Kïûda"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:194
 msgid "unable to backup lilo message"
 msgstr ""
 
-#: ../../bootlook.pm_.c:195
+#: ../../bootlook.pm_.c:196
 #, c-format
 msgid "Copy %s to %s"
-msgstr ""
+msgstr "Kopçt no %s uz %s"
 
-#: ../../bootlook.pm_.c:196
+#: ../../bootlook.pm_.c:197
 msgid "can't change lilo message"
-msgstr ""
+msgstr "nav iespçjams izmainît lilo paziòojumu"
 
-#: ../../bootlook.pm_.c:199
+#: ../../bootlook.pm_.c:200
 msgid "Lilo message not found"
-msgstr ""
+msgstr "Lilo paziòojums nav atrasts"
 
-#: ../../bootlook.pm_.c:229
+#: ../../bootlook.pm_.c:230
 msgid "Can't write /etc/sysconfig/bootsplash."
-msgstr ""
+msgstr "Nav iespçjams rakstît /etc/sysconfig/bootsplash."
 
-#: ../../bootlook.pm_.c:229
+#: ../../bootlook.pm_.c:230
 #, fuzzy, c-format
 msgid "Write %s"
 msgstr "XFree %s"
 
-#: ../../bootlook.pm_.c:231
+#: ../../bootlook.pm_.c:232
 msgid ""
 "Can't write /etc/sysconfig/bootsplash\n"
 "File not found."
 msgstr ""
+"Nav iespçjams rakstît /etc/sysconfig/bootsplash\n"
+"Fails nav atrasts."
 
-#: ../../bootlook.pm_.c:242
+#: ../../bootlook.pm_.c:243
 #, c-format
 msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
 msgstr ""
 
-#: ../../bootlook.pm_.c:245
+#: ../../bootlook.pm_.c:246
 #, c-format
 msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
 msgstr ""
 
-#: ../../bootlook.pm_.c:251
+#: ../../bootlook.pm_.c:252
 msgid ""
 "Can't relaunch LiLo!\n"
 "Launch \"lilo\" as root in command line to complete LiLo theme installation."
 msgstr ""
 
-#: ../../bootlook.pm_.c:255
+#: ../../bootlook.pm_.c:256
 msgid "Relaunch 'lilo'"
 msgstr ""
 
-#: ../../bootlook.pm_.c:257 ../../standalone/draksplash_.c:165
+#: ../../bootlook.pm_.c:258 ../../standalone/draksplash_.c:165
 #: ../../standalone/draksplash_.c:329 ../../standalone/draksplash_.c:456
-#, fuzzy
 msgid "Notice"
-msgstr "BezVideo"
+msgstr "Brîdinâjums"
 
-#: ../../bootlook.pm_.c:258
+#: ../../bootlook.pm_.c:259
 msgid "LiLo and Bootsplash themes installation successfull"
 msgstr ""
 
-#: ../../bootlook.pm_.c:258
-#, fuzzy
+#: ../../bootlook.pm_.c:259
 msgid "Theme installation failed!"
-msgstr "Instalçðanas klases izvçle"
+msgstr "Tçmas instalçðana neizdevâs!"
 
-#: ../../bootlook.pm_.c:266
+#: ../../bootlook.pm_.c:267
 #, c-format
 msgid ""
 "You are currently using %s as your boot manager.\n"
@@ -1357,55 +1340,55 @@ msgstr ""
 "Jûs paðlaik lietojat OS ielâdçtâju %s.\n"
 "Spiediet Konfigurçt, lai palaistu uzstâdîðanas meistaru."
 
-#: ../../bootlook.pm_.c:268 ../../standalone/drakbackup_.c:2429
+#: ../../bootlook.pm_.c:269 ../../standalone/drakbackup_.c:2429
 #: ../../standalone/drakbackup_.c:2439 ../../standalone/drakbackup_.c:2449
-#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:530
+#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:526
 msgid "Configure"
 msgstr "Konfigurçt"
 
-#: ../../bootlook.pm_.c:275
+#: ../../bootlook.pm_.c:276
 #, fuzzy
 msgid "Splash selection"
 msgstr "Saglabât pakotòu izvçli"
 
-#: ../../bootlook.pm_.c:278
+#: ../../bootlook.pm_.c:279
 msgid "Themes"
-msgstr ""
+msgstr "Tçmas"
 
-#: ../../bootlook.pm_.c:280
+#: ../../bootlook.pm_.c:281
 msgid ""
 "\n"
-"Select a theme for\n"
+"Select theme for\n"
 "lilo and bootsplash,\n"
 "you can choose\n"
 "them separatly"
 msgstr ""
 
-#: ../../bootlook.pm_.c:283
+#: ../../bootlook.pm_.c:284
 msgid "Lilo screen"
-msgstr ""
+msgstr "Lilo ekrâns"
 
-#: ../../bootlook.pm_.c:288
+#: ../../bootlook.pm_.c:289
 msgid "Bootsplash"
 msgstr ""
 
-#: ../../bootlook.pm_.c:323
+#: ../../bootlook.pm_.c:324
 msgid "System mode"
 msgstr "Sistçmas reþîms"
 
-#: ../../bootlook.pm_.c:325
+#: ../../bootlook.pm_.c:326
 msgid "Launch the graphical environment when your system starts"
 msgstr "Palaist X-Window sistçmu sâknçðanas laikâ"
 
-#: ../../bootlook.pm_.c:330
+#: ../../bootlook.pm_.c:331
 msgid "No, I don't want autologin"
 msgstr "Nç, negribu lietot autologin"
 
-#: ../../bootlook.pm_.c:332
+#: ../../bootlook.pm_.c:333
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Jâ, gribu lietot autologin ðim lietotâjam un darba virsmai"
 
-#: ../../bootlook.pm_.c:342 ../../network/netconnect.pm_.c:97
+#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:97
 #: ../../standalone/drakTermServ_.c:173 ../../standalone/drakTermServ_.c:300
 #: ../../standalone/drakTermServ_.c:405 ../../standalone/drakbackup_.c:4193
 #: ../../standalone/drakbackup_.c:4956 ../../standalone/drakconnect_.c:108
@@ -1416,58 +1399,56 @@ msgstr "Jâ, gribu lietot autologin ðim lietotâjam un darba virsmai"
 #: ../../standalone/drakfont_.c:876 ../../standalone/drakfont_.c:963
 #: ../../ugtk.pm_.c:289
 msgid "OK"
-msgstr "Ok"
+msgstr "Labi"
 
-#: ../../bootlook.pm_.c:402
+#: ../../bootlook.pm_.c:403
 #, c-format
 msgid "can not open /etc/inittab for reading: %s"
 msgstr "lasîðanai nevar atvçrt /etc/inittab: %s"
 
-#: ../../common.pm_.c:94
+#: ../../common.pm_.c:99
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:94
+#: ../../common.pm_.c:99
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:94
+#: ../../common.pm_.c:99
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:102
+#: ../../common.pm_.c:107
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:110
+#: ../../common.pm_.c:115
 #, c-format
 msgid "%d minutes"
 msgstr "%d minûtes"
 
-#: ../../common.pm_.c:112
+#: ../../common.pm_.c:117
 msgid "1 minute"
 msgstr "1 minûte"
 
-#: ../../common.pm_.c:114
+#: ../../common.pm_.c:119
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundes"
 
-#: ../../common.pm_.c:159
-#, fuzzy
+#: ../../common.pm_.c:164
 msgid "Can't make screenshots before partitioning"
-msgstr "Vairâk partîciju nevar pievienot"
+msgstr "Nevar izveidot ekrâna attçlus pirms sadaïu izveides"
 
-#: ../../common.pm_.c:166
-#, fuzzy, c-format
+#: ../../common.pm_.c:171
+#, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Jûs varat izvçlçties citas valodas, kas bûs pieejamas pçc instalçðanas"
+msgstr "Ekrâna attçli bûs pieejami pçc instalçðanas %s."
 
 #: ../../crypto.pm_.c:14 ../../crypto.pm_.c:28 ../../network/tools.pm_.c:104
 #: ../../network/tools.pm_.c:113
-#, fuzzy
 msgid "France"
-msgstr "Francijas"
+msgstr "Francija"
 
 #: ../../crypto.pm_.c:15
 msgid "Costa Rica"
@@ -1475,54 +1456,47 @@ msgstr ""
 
 #: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29 ../../network/tools.pm_.c:104
 #: ../../network/tools.pm_.c:116
-#, fuzzy
 msgid "Belgium"
-msgstr "Beïìijas"
+msgstr "Beïìija"
 
 #: ../../crypto.pm_.c:17 ../../crypto.pm_.c:30
 msgid "Czech Republic"
-msgstr ""
+msgstr "Èehijas Republika"
 
 #: ../../crypto.pm_.c:18 ../../crypto.pm_.c:31
-#, fuzzy
 msgid "Germany"
-msgstr "Vâcijas"
+msgstr "Vâcija"
 
 #: ../../crypto.pm_.c:19 ../../crypto.pm_.c:32
-#, fuzzy
 msgid "Greece"
-msgstr "Grieíijas"
+msgstr "Grieíija"
 
 #: ../../crypto.pm_.c:20 ../../crypto.pm_.c:33
-#, fuzzy
 msgid "Norway"
-msgstr "Norvçìijas"
+msgstr "Norvçìija"
 
 #: ../../crypto.pm_.c:21 ../../crypto.pm_.c:34
-#, fuzzy
 msgid "Sweden"
-msgstr "Zviedrijas"
+msgstr "Zviedrija"
 
 #: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:104
 #: ../../network/tools.pm_.c:114
 msgid "Netherlands"
-msgstr ""
+msgstr "Holande"
 
 #: ../../crypto.pm_.c:23 ../../crypto.pm_.c:37 ../../network/tools.pm_.c:104
 #: ../../network/tools.pm_.c:115 ../../standalone/drakxtv_.c:68
-#, fuzzy
 msgid "Italy"
-msgstr "Itâlijas"
+msgstr "Itâlija"
 
 #: ../../crypto.pm_.c:24 ../../crypto.pm_.c:38
-#, fuzzy
 msgid "Austria"
-msgstr "seriâla"
+msgstr "Austrija"
 
 #: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:104
 #: ../../network/tools.pm_.c:117
 msgid "United States"
-msgstr ""
+msgstr "A.S.V."
 
 #: ../../diskdrake/dav.pm_.c:19
 msgid ""
@@ -1531,11 +1505,15 @@ msgid ""
 "configured as a WebDAV server). If you would like to add WebDAV mount\n"
 "points, select \"New\"."
 msgstr ""
+"WebDAV ir protokols, ka ïauj jums lokâli montçt web servera direktoriju\n"
+"un rîkoties ar to kâ ar lokâlu failsistçmu (ja vien web serveris ir "
+"konfigurçts\n"
+"kâ WebDAV serveris). Ja jûs vçlaties pievienot WebDAV montçðanas\n"
+"punktus, izvçlieties \"Jauns\"."
 
 #: ../../diskdrake/dav.pm_.c:27
-#, fuzzy
 msgid "New"
-msgstr "jauns"
+msgstr "Jauns"
 
 #: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:388
 #: ../../diskdrake/smbnfs_gtk.pm_.c:81
@@ -1548,9 +1526,8 @@ msgid "Mount"
 msgstr "Montçta"
 
 #: ../../diskdrake/dav.pm_.c:65
-#, fuzzy
 msgid "Server"
-msgstr "serveris"
+msgstr "Serveris"
 
 #: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:379
 #: ../../diskdrake/interactive.pm_.c:568 ../../diskdrake/interactive.pm_.c:595
@@ -1560,18 +1537,16 @@ msgid "Mount point"
 msgstr "Montçðanas punkts"
 
 #: ../../diskdrake/dav.pm_.c:85
-#, fuzzy
 msgid "Please enter the WebDAV server URL"
-msgstr "Lûdzu notestçjiet peli"
+msgstr "Lûdzu ievadiet WebDAV servera URL"
 
 #: ../../diskdrake/dav.pm_.c:88
 msgid "The URL must begin with http:// or https://"
-msgstr ""
+msgstr "URL ir jâsâkas ar http:// vai https://"
 
 #: ../../diskdrake/dav.pm_.c:109
-#, fuzzy
 msgid "Server: "
-msgstr "serveris"
+msgstr "Serveris:"
 
 #: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:440
 #: ../../diskdrake/interactive.pm_.c:1089
@@ -1618,14 +1593,14 @@ msgid ""
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
 msgstr ""
-"Jums ir viena liela FAT partîcija\n"
+"Jums ir viena liela FAT sadaïa\n"
 "(parasti to izmanto MicroSoft Dos/Windows).\n"
-"Iesaku vispirms izmainît ðîs partîcijas izmçru\n"
+"Iesaku vispirms izmainît ðîs sadaïas izmçru\n"
 "(uzklikðíiniet uz tâs, tad uz \"Mainît izmçru\")"
 
 #: ../../diskdrake/hd_gtk.pm_.c:191
 msgid "Please click on a partition"
-msgstr "Lûdzu uzklikðíiniet uz partîcijas"
+msgstr "Lûdzu uzklikðíiniet uz sadaïas"
 
 #: ../../diskdrake/hd_gtk.pm_.c:205 ../../diskdrake/smbnfs_gtk.pm_.c:69
 #: ../../install_steps_gtk.pm_.c:465
@@ -1633,9 +1608,8 @@ msgid "Details"
 msgstr "Detaïas"
 
 #: ../../diskdrake/hd_gtk.pm_.c:252
-#, fuzzy
 msgid "No hard drives found"
-msgstr "Lokâls printeris"
+msgstr "Cietòi netika atrasti"
 
 #: ../../diskdrake/hd_gtk.pm_.c:323
 msgid "Ext2"
@@ -1674,7 +1648,7 @@ msgstr "Cits"
 
 #: ../../diskdrake/hd_gtk.pm_.c:328
 msgid "Filesystem types:"
-msgstr "Failu sistçmu tipi:"
+msgstr "Failsistçmu tipi:"
 
 #: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:402
 msgid "Create"
@@ -1704,16 +1678,15 @@ msgstr "Vispirms izmantojiet ``Nomontçt''"
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Pçc partîcijas %s tipa nomaiòas visi ðajâ partîcijâ esoðie dati tiks "
-"pazaudçti"
+"Pçc sadaïas %s tipa nomaiòas visi ðajâ sadaïâ esoðie dati tiks pazaudçti"
 
 #: ../../diskdrake/interactive.pm_.c:174
 msgid "Choose a partition"
-msgstr "Izvçlieties partîciju"
+msgstr "Izvçlieties sadaïu"
 
 #: ../../diskdrake/interactive.pm_.c:174
 msgid "Choose another partition"
-msgstr "Izvçlieties citu partîciju"
+msgstr "Izvçlieties citu sadaïu"
 
 #: ../../diskdrake/interactive.pm_.c:199
 msgid "Exit"
@@ -1741,12 +1714,11 @@ msgstr "Iziet nesaglabâjot"
 
 #: ../../diskdrake/interactive.pm_.c:245
 msgid "Quit without writing the partition table?"
-msgstr "Iziet neierakstot partîciju tabulau?"
+msgstr "Iziet neierakstot sadaïu tabulu?"
 
 #: ../../diskdrake/interactive.pm_.c:250
-#, fuzzy
 msgid "Do you want to save /etc/fstab modifications"
-msgstr "Vai vçlaties izmçìinât ðo konfigurâciju?"
+msgstr "Vai vçlaties saglabât /etc/fstab izmaiòas"
 
 #: ../../diskdrake/interactive.pm_.c:263
 msgid "Auto allocate"
@@ -1767,43 +1739,39 @@ msgstr "Cietâ diska informâcija"
 
 #: ../../diskdrake/interactive.pm_.c:298
 msgid "All primary partitions are used"
-msgstr "Visas primârâs partîcijas izmantotas"
+msgstr "Visas primârâs sadaïas izmantotas"
 
 #: ../../diskdrake/interactive.pm_.c:299
 msgid "I can't add any more partition"
-msgstr "Vairâk partîciju nevar pievienot"
+msgstr "Vairâk sadaïas nevar pievienot"
 
 #: ../../diskdrake/interactive.pm_.c:300
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr ""
-"Ja gribat vairâk partîcijas, izdzçsiet kâdu partîciju, lai varçtu izveidot "
-"paplaðinâto partîciju"
+"Ja gribat vairâk sadaïas, izdzçsiet kâdu sadaïu, lai varçtu izveidot "
+"paplaðinâto sadaïu"
 
 #: ../../diskdrake/interactive.pm_.c:310
-#, fuzzy
 msgid "Save partition table"
-msgstr "Ierakstît partîciju tabulu"
+msgstr "Ierakstît sadaïu tabulu"
 
 #: ../../diskdrake/interactive.pm_.c:311
-#, fuzzy
 msgid "Restore partition table"
-msgstr "Salabot partîciju tabulu"
+msgstr "Atjaunot sadaïu tabulu"
 
 #: ../../diskdrake/interactive.pm_.c:312
 msgid "Rescue partition table"
-msgstr "Salabot partîciju tabulu"
+msgstr "Salabot sadaïu tabulu"
 
 #: ../../diskdrake/interactive.pm_.c:314
-#, fuzzy
 msgid "Reload partition table"
-msgstr "Salabot partîciju tabulu"
+msgstr "Pârlâdçt sadaïu tabulu"
 
 #: ../../diskdrake/interactive.pm_.c:319
-#, fuzzy
 msgid "Removable media automounting"
-msgstr "Izòemams datu nesçjs"
+msgstr "Izòemama datu nesçja automontçðana"
 
 #: ../../diskdrake/interactive.pm_.c:328 ../../diskdrake/interactive.pm_.c:348
 msgid "Select file"
@@ -1814,8 +1782,8 @@ msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
-"Partîciju tabulas rezerves kopijai ir atðíirîgs izmçrs\n"
-"Tomçr turpinât, ja?"
+"Sadaïu tabulas rezerves kopijai ir atðíirîgs izmçrs\n"
+"Tomçr turpinât?"
 
 #: ../../diskdrake/interactive.pm_.c:349 ../../harddrake/sound.pm_.c:200
 msgid "Warning"
@@ -1831,7 +1799,7 @@ msgstr ""
 
 #: ../../diskdrake/interactive.pm_.c:361
 msgid "Trying to rescue partition table"
-msgstr "Mçìinu saglâbt partîciju tabulu"
+msgstr "Mçìinu saglâbt sadaïu tabulu"
 
 #: ../../diskdrake/interactive.pm_.c:367
 msgid "Detailed information"
@@ -1875,7 +1843,7 @@ msgstr "Izmantot priekð loopback"
 
 #: ../../diskdrake/interactive.pm_.c:433
 msgid "Create a new partition"
-msgstr "Izveidot jaunu partîciju"
+msgstr "Izveidot jaunu sadaïu"
 
 #: ../../diskdrake/interactive.pm_.c:436
 msgid "Start sector: "
@@ -1887,7 +1855,7 @@ msgstr "Izmçrs MB: "
 
 #: ../../diskdrake/interactive.pm_.c:439 ../../diskdrake/interactive.pm_.c:816
 msgid "Filesystem type: "
-msgstr "Failu sistçmas tips: "
+msgstr "Failsistçmas tips: "
 
 #: ../../diskdrake/interactive.pm_.c:444
 msgid "Preference: "
@@ -1899,15 +1867,17 @@ msgid ""
 "(since you reached the maximal number of primary partitions).\n"
 "First remove a primary partition and create an extended partition."
 msgstr ""
+"Jûs nevarat izveidot jaunu diska sadaïu\n"
+"(jo ir sasniegts maksimâlais primâro sadaïu skaits).\n"
+"Vispims noòemiet kâdu primâro sadaïu un izveidojiet paplaðinâto sadaïu."
 
 #: ../../diskdrake/interactive.pm_.c:499
-#, fuzzy
 msgid "Remove the loopback file?"
-msgstr "Formatçju loopback failu %s"
+msgstr "Atvienot loopback failu?"
 
 #: ../../diskdrake/interactive.pm_.c:529
 msgid "Change partition type"
-msgstr "Nomainît partîcijas tipu"
+msgstr "Nomainît sadaïas tipu"
 
 #: ../../diskdrake/interactive.pm_.c:530 ../../diskdrake/removable.pm_.c:48
 msgid "Which filesystem do you want?"
@@ -1915,7 +1885,7 @@ msgstr "Kuru failu sistçmu vçlaties?"
 
 #: ../../diskdrake/interactive.pm_.c:536
 msgid "Switching from ext2 to ext3"
-msgstr ""
+msgstr "Pârslçgðanâs no ext2 uz ext3"
 
 #: ../../diskdrake/interactive.pm_.c:566
 #, c-format
@@ -1932,14 +1902,14 @@ msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"Nevaru noòemt montçðanas punktu, jo ðî partîcija tiek izmantota priekð "
+"Nevaru noòemt montçðanas punktu, jo ðî sadaïa tiek izmantota priekð "
 "loopback.\n"
 "Vispirms noòemiet loopback"
 
 #: ../../diskdrake/interactive.pm_.c:594
-#, fuzzy, c-format
+#, c-format
 msgid "Where do you want to mount %s?"
-msgstr "Kur jûs vçlaties montçt %s ierîci?"
+msgstr "Kur jûs vçlaties montçt %s?"
 
 #: ../../diskdrake/interactive.pm_.c:618
 msgid "Computing FAT filesystem bounds"
@@ -1952,18 +1922,17 @@ msgstr "Mainu izmçru"
 
 #: ../../diskdrake/interactive.pm_.c:650
 msgid "This partition is not resizeable"
-msgstr "Ðîs partîcijas izmçru nevar izmainît"
+msgstr "Ðîs sadaïas izmçru nevar izmainît"
 
 #: ../../diskdrake/interactive.pm_.c:655
 msgid "All data on this partition should be backed-up"
-msgstr "Visiem ðîs partîcijas datiem jâizveido rezerves kopijas"
+msgstr "Visiem ðîs sadaïas datiem jâizveido rezerves kopijas"
 
 #: ../../diskdrake/interactive.pm_.c:657
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
-"Pçc partîcijas %s izmçra maiòas visi ðajâ partîcijâ esoðie dati tiks "
-"pazaudçti"
+"Pçc sadaïas %s izmçra maiòas visi ðajâ sadaïâ esoðie dati tiks pazaudçti"
 
 #: ../../diskdrake/interactive.pm_.c:662
 msgid "Choose the new size"
@@ -1991,7 +1960,7 @@ msgstr "Pârvietoju"
 
 #: ../../diskdrake/interactive.pm_.c:721
 msgid "Moving partition..."
-msgstr "Pârvietoju partîciju..."
+msgstr "Pârvietoju sadaïu..."
 
 #: ../../diskdrake/interactive.pm_.c:738
 msgid "Choose an existing RAID to add to"
@@ -2011,7 +1980,7 @@ msgstr "LVM vârds?"
 
 #: ../../diskdrake/interactive.pm_.c:800
 msgid "This partition can't be used for loopback"
-msgstr "Ðo Partîciju nevar izmantot priekð loopback"
+msgstr "Ðo sadaïu nevar izmantot priekð loopback"
 
 #: ../../diskdrake/interactive.pm_.c:813
 msgid "Loopback"
@@ -2022,9 +1991,8 @@ msgid "Loopback file name: "
 msgstr "Loopback faila vârds: "
 
 #: ../../diskdrake/interactive.pm_.c:819
-#, fuzzy
 msgid "Give a file name"
-msgstr "Vârds un uzvârds"
+msgstr "Faila nosaukums"
 
 #: ../../diskdrake/interactive.pm_.c:822
 msgid "File already used by another loopback, choose another one"
@@ -2040,9 +2008,9 @@ msgstr "Montçðanas iespçjas:"
 
 #: ../../diskdrake/interactive.pm_.c:853
 msgid "Various"
-msgstr "Viss kas"
+msgstr "Daþâdi"
 
-#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:103
+#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:104
 msgid "device"
 msgstr "ierîce"
 
@@ -2063,11 +2031,9 @@ msgid "What type of partitioning?"
 msgstr "Kâds ir sadalîjuma tips?"
 
 #: ../../diskdrake/interactive.pm_.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "The package %s is needed. Install it?"
-msgstr ""
-"Ðo pakotni ir nepiecieðams uzlabot\n"
-"Vai tieðâm vçlaties atteikties no tâs?"
+msgstr "Ir nepiecieðama pakotne %s. Instalçt to?"
 
 #: ../../diskdrake/interactive.pm_.c:979
 msgid ""
@@ -2087,9 +2053,9 @@ msgid ""
 "the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
-"partîcija, ko jûs izvçlçjâties pievienot kâ sakni (/), fiziski atrodas aiz\n"
-"ðî cietâ diska 1024. cilindra, un jums nav /boot partîcijas.\n"
-"Ja jûs plânojat izmantot LILO, neaizmirstiet pievienot /boot partîciju"
+"Sadaïa, ko jûs izvçlçjâties pievienot kâ sakni (/), fiziski atrodas aiz\n"
+"ðî cietâ diska 1024. cilindra, un jums nav /boot sadaïas.\n"
+"Ja jûs plânojat izmantot LILO, neaizmirstiet pievienot /boot sadaïu"
 
 #: ../../diskdrake/interactive.pm_.c:989
 msgid ""
@@ -2097,15 +2063,14 @@ msgid ""
 "No bootloader is able to handle this without a /boot partition.\n"
 "So be careful to add a /boot partition"
 msgstr ""
-"Jûs izvçlçjies programmatûras uzturçtu RAID partîciju kâ saknes partîciju "
-"(/).\n"
-"Neviens sâknçtâjs nespçj to izmantot bez /boot partîcijas.\n"
-"Tâpçc neaizmirstiet izveidot /boot partîciju."
+"Jûs izvçlçjies programmatûras uzturçtu RAID sadaïu kâ saknes sadaïu (/).\n"
+"Neviens sâknçtâjs nespçj to izmantot bez /boot sadaïas.\n"
+"Tâpçc neaizmirstiet izveidot /boot sadaïu."
 
 #: ../../diskdrake/interactive.pm_.c:1009
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Iekârtas %s partîciju tabula tiks ierakstîta uz diska!"
+msgstr "Iekârtas %s sadaïu tabula tiks ierakstîta uz diska!"
 
 #: ../../diskdrake/interactive.pm_.c:1013
 msgid "You'll need to reboot before the modification can take place"
@@ -2115,7 +2080,7 @@ msgstr "Lai izmaiòas stâtos spçkâ, jums ir jâpârstartç dators"
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
-"Pçc partîcijas %s formatçðanas visi ðajâ partîcijâ esoðie dati tiks pazaudçti"
+"Pçc sadaïas %s formatçðanas visi ðajâ sadaïâ esoðie dati tiks pazaudçti"
 
 #: ../../diskdrake/interactive.pm_.c:1026
 msgid "Formatting"
@@ -2130,17 +2095,15 @@ msgstr "Formatçju loopback failu %s"
 #: ../../install_steps_interactive.pm_.c:459
 #, c-format
 msgid "Formatting partition %s"
-msgstr "Formatçju partîciju %s"
+msgstr "Formatçju sadaïu %s"
 
 #: ../../diskdrake/interactive.pm_.c:1039
-#, fuzzy
 msgid "Hide files"
-msgstr "mkraid neizdevâs"
+msgstr "Slçpt failus"
 
 #: ../../diskdrake/interactive.pm_.c:1039
-#, fuzzy
 msgid "Move files to the new partition"
-msgstr "Nepietiek brîvas vietas, lai izvietotu jaunas partîcijas"
+msgstr "Pârvietot failus uz jauno sadaïu"
 
 #: ../../diskdrake/interactive.pm_.c:1040
 #, c-format
@@ -2148,26 +2111,27 @@ msgid ""
 "Directory %s already contains data\n"
 "(%s)"
 msgstr ""
+"Direktorijâ %s jau ir dati\n"
+"(%s)"
 
 #: ../../diskdrake/interactive.pm_.c:1051
-#, fuzzy
 msgid "Moving files to the new partition"
-msgstr "Nepietiek brîvas vietas, lai izvietotu jaunas partîcijas"
+msgstr "Pârvietoju failus uz jauno sadaïu"
 
 #: ../../diskdrake/interactive.pm_.c:1055
 #, c-format
 msgid "Copying %s"
-msgstr ""
+msgstr "Kopçju %s"
 
 #: ../../diskdrake/interactive.pm_.c:1059
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Izðíirtspçja: %s\n"
+msgstr "Atvienoju %s"
 
 #: ../../diskdrake/interactive.pm_.c:1069
 #, c-format
 msgid "partition %s is now known as %s"
-msgstr ""
+msgstr "sadaïa %s tagad ir zinâma kâ %s"
 
 #: ../../diskdrake/interactive.pm_.c:1090
 #: ../../diskdrake/interactive.pm_.c:1149
@@ -2205,7 +2169,7 @@ msgid ", %s sectors"
 msgstr ", %s sektori"
 
 #: ../../diskdrake/interactive.pm_.c:1112
-#, fuzzy, c-format
+#, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "No cilindra %d lîdz cilindram %d\n"
 
@@ -2227,18 +2191,20 @@ msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
 #: ../../diskdrake/interactive.pm_.c:1118
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Loopback file(s):\n"
 "   %s\n"
-msgstr "Loopback fails(i): %s\n"
+msgstr ""
+"Loopback fails(i):\n"
+"   %s\n"
 
 #: ../../diskdrake/interactive.pm_.c:1119
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"Noklusçti sâknçjamâ partîcija\n"
+"Noklusçti sâknçjamâ sadaïa\n"
 "    (lai sâknçtu MS-DOS, nevis lilo)\n"
 
 #: ../../diskdrake/interactive.pm_.c:1121
@@ -2268,6 +2234,10 @@ msgid ""
 "a Driver partition, you should\n"
 "probably leave it alone.\n"
 msgstr ""
+"\n"
+"Pastâv iespçja, ka ðî sadaïa\n"
+"ir Draivera sadaïa, ko jums\n"
+"varbût nevajadzçtu aiztikt.\n"
 
 #: ../../diskdrake/interactive.pm_.c:1131
 msgid ""
@@ -2276,10 +2246,14 @@ msgid ""
 "partition is for\n"
 "dual-booting your system.\n"
 msgstr ""
+"\n"
+"Ðî speciâlâ Bootstrap\n"
+"sadaïa ir paredzçta jûsu\n"
+"sistçmas duâlai sâknçðanai.\n"
 
 #: ../../diskdrake/interactive.pm_.c:1150
 msgid "Read-only"
-msgstr ""
+msgstr "Tikai-lasît"
 
 #: ../../diskdrake/interactive.pm_.c:1151
 #, c-format
@@ -2303,7 +2277,7 @@ msgstr "LVM-diski %s\n"
 #: ../../diskdrake/interactive.pm_.c:1155
 #, c-format
 msgid "Partition table type: %s\n"
-msgstr "partîciju tabulas tips: %s\n"
+msgstr "sadaïu tabulas tips: %s\n"
 
 #: ../../diskdrake/interactive.pm_.c:1156
 #, fuzzy, c-format
@@ -2311,40 +2285,37 @@ msgid "on channel %d id %d\n"
 msgstr "uz ðinas %d id %d\n"
 
 #: ../../diskdrake/interactive.pm_.c:1186
-#, fuzzy
 msgid "Filesystem encryption key"
-msgstr "Failu sistçmas tips: "
+msgstr "Failsistçmas ðifrçðanas atslçga"
 
 #: ../../diskdrake/interactive.pm_.c:1187
 msgid "Choose your filesystem encryption key"
-msgstr ""
+msgstr "Izvçlieties jûsu failsistçmas ðifrçðanas atslçgu"
 
 #: ../../diskdrake/interactive.pm_.c:1190
-#, fuzzy, c-format
+#, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
-msgstr "Ðî parole ir pârâk vienkârða (jâbût vismaz %d simbolus garai)"
+msgstr "Ðifrçðanas atslçga ir pârâk vienkârða (jâbût vismaz %d simbolus garai)"
 
 #: ../../diskdrake/interactive.pm_.c:1191
-#, fuzzy
 msgid "The encryption keys do not match"
-msgstr "Paroles nesakrît"
+msgstr "Ðifrçðanas atslçgas nesakrît"
 
 #: ../../diskdrake/interactive.pm_.c:1194
 msgid "Encryption key"
-msgstr ""
+msgstr "Ðifrçðanas atslçga"
 
 #: ../../diskdrake/interactive.pm_.c:1195
 msgid "Encryption key (again)"
-msgstr ""
+msgstr "Ðifrçðanas atslçga (vçlreiz)"
 
 #: ../../diskdrake/removable.pm_.c:47
 msgid "Change type"
 msgstr "Mainît tipu"
 
 #: ../../diskdrake/removable_gtk.pm_.c:28
-#, fuzzy
 msgid "Please click on a medium"
-msgstr "Lûdzu uzklikðíiniet uz partîcijas"
+msgstr "Lûdzu uzklikðíiniet uz datu nesçja"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:162
 #, c-format
@@ -2352,20 +2323,17 @@ msgid "Can't login using username %s (bad password?)"
 msgstr ""
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:166 ../../diskdrake/smbnfs_gtk.pm_.c:175
-#, fuzzy
 msgid "Domain Authentication Required"
-msgstr "Autentifikâcija"
+msgstr "Nepiecieðama Domain autentikâcija"
 
 #
 #: ../../diskdrake/smbnfs_gtk.pm_.c:167
-#, fuzzy
 msgid "Another one"
-msgstr "Internets"
+msgstr "Cits"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:167
-#, fuzzy
 msgid "Which username"
-msgstr "Lietotâja vârds"
+msgstr "Kurð lietotâja vârds"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:176
 msgid ""
@@ -2373,19 +2341,16 @@ msgid ""
 msgstr ""
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3529
-#, fuzzy
 msgid "Username"
 msgstr "Lietotâja vârds"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:180
-#, fuzzy
 msgid "Domain"
-msgstr "NIS domçns"
+msgstr "Domçns"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:200
-#, fuzzy
 msgid "Search servers"
-msgstr "DNS serveris"
+msgstr "Meklçðanas serveri"
 
 #: ../../fs.pm_.c:545 ../../fs.pm_.c:555 ../../fs.pm_.c:559 ../../fs.pm_.c:563
 #: ../../fs.pm_.c:567 ../../fs.pm_.c:571
@@ -2401,7 +2366,7 @@ msgstr "Nezinu, kâ formatçt %s, izmantojot tipu %s"
 #: ../../fs.pm_.c:682 ../../fs.pm_.c:725
 #, c-format
 msgid "mounting partition %s in directory %s failed"
-msgstr ""
+msgstr "sadaïas %s montçðana direktorijâ %s neizdevâs"
 
 #: ../../fs.pm_.c:740 ../../partition_table.pm_.c:598
 #, c-format
@@ -2414,14 +2379,14 @@ msgstr "vienkârðs"
 
 #: ../../fsedit.pm_.c:25
 msgid "with /usr"
-msgstr ""
+msgstr "ar /usr"
 
 #: ../../fsedit.pm_.c:30
 msgid "server"
 msgstr "serveris"
 
 #: ../../fsedit.pm_.c:240
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
@@ -2430,18 +2395,21 @@ msgid ""
 "\n"
 "Do you agree to loose all the partitions?\n"
 msgstr ""
-"Neizdevâs nolasît diska partîciju tabulu, jo tâ bija pârâk stipri bojâta :(\n"
-"Sistçma var mçìinât atslçgts sliktâs partîcijas (VISI DATI pazudîs!).\n"
-"Otrs risinâjums ir aizliegt DrakX izmainît partîciju tabulu.\n"
+"Neizdevâs nolasît iekârtas %s sadaïu tabulu, jo tâ bija pârâk stipri bojâta :"
+"(\n"
+"Sistçma var mçìinât atslçgt sliktâs sadaïas (VISI DATI pazudîs!).\n"
+"Otrs risinâjums ir aizliegt DrakX izmainît sadaïu tabulu.\n"
 "(kïûda ir %s)\n"
+"\n"
+"Vai Jûs piekrîtat zaudçt visas sadaïas?\n"
 
 #: ../../fsedit.pm_.c:501
 msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Nevarat izmantot JFS partîcijâm, kas mazâkas par 16MB"
+msgstr "JFS nevar izmantot sadaïâm, kas mazâkas par 16MB"
 
 #: ../../fsedit.pm_.c:502
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Nevarat izmantot ReiserFS pârtîcijâm, kas mazâkas par 32MB"
+msgstr "ReiserFS nevar izmantot sadaïâm, kas mazâkas par 32MB"
 
 #: ../../fsedit.pm_.c:521
 msgid "Mount points must begin with a leading /"
@@ -2450,7 +2418,7 @@ msgstr "Montçðanas punktiem jâsâkas ar /"
 #: ../../fsedit.pm_.c:522
 #, c-format
 msgid "There is already a partition with mount point %s\n"
-msgstr "Jau eksistç partîcija ar montçðanas punktu %s\n"
+msgstr "Jau eksistç sadaïa ar montçðanas punktu %s\n"
 
 #: ../../fsedit.pm_.c:526
 #, c-format
@@ -2462,27 +2430,25 @@ msgid "This directory should remain within the root filesystem"
 msgstr "Ðim katalogam ir jâpaliek saknes failsistçmâ"
 
 #: ../../fsedit.pm_.c:530
-#, fuzzy
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
 "point\n"
 msgstr ""
-"Ðim montçðanas punktam ir nepiecieðama reâla failu sistçma (ext2, reiserfs)\n"
+"Ðim montçðanas punktam ir nepiecieðama reâla failsistçma (ext2/ext3, "
+"reiserfs, xfs vai jfs)\n"
 
 #: ../../fsedit.pm_.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "You can't use an encrypted file system for mount point %s"
-msgstr ""
-"Ðim montçðanas punktam ir nepiecieðama reâla failu sistçma (ext2, reiserfs)\n"
+msgstr "Jûs nevarat lietot ðifrçto failsistçmu montçðanas punktâ %s"
 
 #: ../../fsedit.pm_.c:599
-#, fuzzy
 msgid "Not enough free space for auto-allocating"
 msgstr "Nepietiek brîvas vietas, lai izvietotu automâtiski"
 
 #: ../../fsedit.pm_.c:601
 msgid "Nothing to do"
-msgstr ""
+msgstr "Nav ko darît"
 
 #: ../../fsedit.pm_.c:694
 #, c-format
@@ -2491,7 +2457,7 @@ msgstr "Kïûda, atverot %s ierakstîðanai: %s"
 
 #: ../../harddrake/sound.pm_.c:168
 msgid "No alternative driver"
-msgstr ""
+msgstr "Nav alternatîva draivera"
 
 #: ../../harddrake/sound.pm_.c:169
 #, c-format
@@ -2501,9 +2467,8 @@ msgid ""
 msgstr ""
 
 #: ../../harddrake/sound.pm_.c:171
-#, fuzzy
 msgid "Sound configuration"
-msgstr "LAN konfigurâcija"
+msgstr "Skaòas konfigurâcija"
 
 #: ../../harddrake/sound.pm_.c:172
 #, c-format
@@ -2522,9 +2487,8 @@ msgid ""
 msgstr ""
 
 #: ../../harddrake/sound.pm_.c:176
-#, fuzzy
 msgid "Driver:"
-msgstr "Draiveris"
+msgstr "Draiveris:"
 
 #: ../../harddrake/sound.pm_.c:181 ../../standalone/drakTermServ_.c:246
 #: ../../standalone/drakbackup_.c:3932 ../../standalone/drakbackup_.c:3965
@@ -2533,9 +2497,8 @@ msgstr "Draiveris"
 #: ../../standalone/drakbackup_.c:4105 ../../standalone/drakbackup_.c:4132
 #: ../../standalone/drakbackup_.c:4162 ../../standalone/drakbackup_.c:4188
 #: ../../standalone/drakbackup_.c:4213 ../../standalone/drakfont_.c:700
-#, fuzzy
 msgid "Help"
-msgstr "/_Palîdzîba"
+msgstr "Palîdzîba"
 
 #: ../../harddrake/sound.pm_.c:183
 msgid "Switching between ALSA and OSS help"
@@ -2571,9 +2534,8 @@ msgid ""
 msgstr ""
 
 #: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301
-#, fuzzy
 msgid "Please Wait... Applying the configuration"
-msgstr "Konfigurâcijas izmçìinâðana"
+msgstr "Lûdzu uzgaidiet ... konfigurâcijas piemçroðana"
 
 #: ../../harddrake/sound.pm_.c:203 ../../harddrake/ui.pm_.c:111
 #: ../../interactive.pm_.c:391
@@ -2582,17 +2544,16 @@ msgstr "Lûdzu uzgaidiet"
 
 #: ../../harddrake/sound.pm_.c:208
 msgid "No known driver"
-msgstr ""
+msgstr "Nav zinâmu draiveru"
 
 #: ../../harddrake/sound.pm_.c:209
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
-msgstr ""
+msgstr "Nav zinâmu draiveru jûsu skaòu kartei (%s)"
 
 #: ../../harddrake/sound.pm_.c:212
-#, fuzzy
 msgid "Unkown driver"
-msgstr "nezinâms"
+msgstr "Nezinâms draiveris"
 
 #: ../../harddrake/sound.pm_.c:213
 #, c-format
@@ -2605,27 +2566,24 @@ msgid ""
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:16
-#, fuzzy
 msgid "Model"
-msgstr "Modulis"
+msgstr "Modelis"
 
 #: ../../harddrake/ui.pm_.c:16
-#, fuzzy
 msgid "hard disk model"
-msgstr "Kartes mem (DMA)"
+msgstr "cietòa modelis"
 
 #: ../../harddrake/ui.pm_.c:17
-#, fuzzy
 msgid "Channel"
-msgstr "Atcelt"
+msgstr "Kanâls"
 
 #: ../../harddrake/ui.pm_.c:17
 msgid "EIDE/SCSI channel"
-msgstr ""
+msgstr "EIDE/SCSI kanâls"
 
 #: ../../harddrake/ui.pm_.c:19
 msgid "Bus"
-msgstr ""
+msgstr "Kopne"
 
 #: ../../harddrake/ui.pm_.c:20
 msgid ""
@@ -2648,7 +2606,7 @@ msgstr ""
 msgid "class of hardware device"
 msgstr ""
 
-#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1517
+#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1562
 msgid "Description"
 msgstr "Apraksts"
 
@@ -2657,9 +2615,8 @@ msgid "this field describe the device"
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:25
-#, fuzzy
 msgid "Bus identification"
-msgstr "Autentifikâcija"
+msgstr "Kopnes identifikâcija"
 
 #: ../../harddrake/ui.pm_.c:26
 msgid ""
@@ -2679,128 +2636,119 @@ msgid ""
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:32
-#, fuzzy
 msgid "Old device file"
-msgstr "Izvçlieties failu"
+msgstr "Vecais iekârtas fails"
 
 #: ../../harddrake/ui.pm_.c:33
 msgid "old static device name used in dev package"
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:34
-#, fuzzy
 msgid "New devfs device"
-msgstr "Vârtejas ierîce"
+msgstr "Jaunâ devfs iekârta"
 
 #: ../../harddrake/ui.pm_.c:35
 msgid "new dinamic device name generated by incore kernel devfs"
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:36
-#, fuzzy
 msgid "Number of buttons"
-msgstr "2 pogas"
+msgstr "Pogu skaits"
 
 #: ../../harddrake/ui.pm_.c:37
 msgid "the vendor name of the device"
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:38
-#, fuzzy
 msgid "Alternative drivers"
-msgstr "Tiek drukâta(s) izmçìinâjuma lapa(s)..."
+msgstr "alternatîvi draiveri"
 
 #: ../../harddrake/ui.pm_.c:39
 msgid "the list of alternative drivers for this sound card"
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:63
-#, fuzzy
 msgid "/_Quit"
-msgstr "Beigt"
+msgstr "/_Iziet"
 
 #: ../../harddrake/ui.pm_.c:64 ../../harddrake/ui.pm_.c:65
 #: ../../harddrake/ui.pm_.c:71 ../../harddrake/ui.pm_.c:73
-#: ../../standalone/logdrake_.c:110
+#: ../../standalone/logdrake_.c:111
 msgid "/_Help"
 msgstr "_Palîdzîba"
 
 #: ../../harddrake/ui.pm_.c:65
-#, fuzzy
 msgid "/_Help..."
-msgstr "_Palîdzîba"
+msgstr "/_Palîdzîba..."
 
 #: ../../harddrake/ui.pm_.c:66
 msgid "Harddrake help"
-msgstr ""
+msgstr "HardDrake palîdzîba"
 
 #: ../../harddrake/ui.pm_.c:67
 msgid ""
 "Description of the fields:\n"
 "\n"
 msgstr ""
+"Lauku apraksts:\n"
+"\n"
 
 #: ../../harddrake/ui.pm_.c:71
 msgid "/_Report Bug"
 msgstr "/_Ziòot kïûdu"
 
 #: ../../harddrake/ui.pm_.c:73
-#, fuzzy
 msgid "/_About..."
-msgstr "/Palîdzîba/_Par..."
+msgstr "/P_ar..."
 
 #: ../../harddrake/ui.pm_.c:74
 msgid "About Harddrake"
-msgstr ""
+msgstr "Par HardDrake"
 
 #: ../../harddrake/ui.pm_.c:75
 msgid ""
 "This is HardDrake, a Mandrake hardware configuration tool.\n"
 "Version:"
 msgstr ""
+"Ðis ir HardDrake, Mandrake aparatûras konfigurçðanas rîks.\n"
+"Versija:"
 
 #: ../../harddrake/ui.pm_.c:76
-#, fuzzy
 msgid "Author:"
-msgstr "Aptaujât"
+msgstr "Autors:"
 
 #: ../../harddrake/ui.pm_.c:86
-#, fuzzy
 msgid "Harddrake2 version "
-msgstr "Cietâ diska noteikðana"
+msgstr "HardDrake2 versija"
 
 #: ../../harddrake/ui.pm_.c:101
-#, fuzzy
 msgid "Detected hardware"
-msgstr "Apskatît dzelþu informâciju"
+msgstr "Noteiktâ aparatûras"
 
 #: ../../harddrake/ui.pm_.c:103
-#, fuzzy
 msgid "Information"
-msgstr "Parâdît informâciju"
+msgstr "Informâcija"
 
 #: ../../harddrake/ui.pm_.c:106
-#, fuzzy
 msgid "Configure module"
-msgstr "Peles konfigurçðana"
+msgstr "Moduïa konfigurçðana"
 
 #: ../../harddrake/ui.pm_.c:107
 msgid "Run config tool"
-msgstr ""
+msgstr "Izpildît config rîku"
 
 #: ../../harddrake/ui.pm_.c:111
-#, fuzzy
 msgid "Detection in progress"
-msgstr "atklâts uz porta %s"
+msgstr "Notiek noteikðana"
 
 #: ../../harddrake/ui.pm_.c:148
 msgid "You can configure each parameter of the module here."
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "Running \"%s\" ..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Izpildu \"%s\" ..."
 
 #: ../../harddrake/ui.pm_.c:180
 #, c-format
@@ -2812,19 +2760,16 @@ msgid "primary"
 msgstr ""
 
 #: ../../harddrake/ui.pm_.c:201
-#, fuzzy
 msgid "secondary"
-msgstr "%d sekundes"
+msgstr "sekundârs"
 
 #: ../../harddrake/v4l.pm_.c:15 ../../harddrake/v4l.pm_.c:65
-#, fuzzy
 msgid "Auto-detect"
-msgstr "Attâls printeris"
+msgstr "Automâtiska noteikðana"
 
 #: ../../harddrake/v4l.pm_.c:66 ../../harddrake/v4l.pm_.c:186
-#, fuzzy
 msgid "Unknown|Generic"
-msgstr "Vispârçja"
+msgstr "Nezinâma|vispârçja"
 
 #: ../../harddrake/v4l.pm_.c:98
 msgid "Unknown|CPH05X (bt878) [many vendors]"
@@ -2843,14 +2788,12 @@ msgid ""
 msgstr ""
 
 #: ../../harddrake/v4l.pm_.c:213
-#, fuzzy
 msgid "Card model:"
-msgstr "Kartes mem (DMA)"
+msgstr "Kartes modelis:"
 
 #: ../../harddrake/v4l.pm_.c:214
-#, fuzzy
 msgid "Tuner type:"
-msgstr "Mainît tipu"
+msgstr "Uztvçrçja tips:"
 
 #: ../../harddrake/v4l.pm_.c:215
 msgid "Number of capture buffers:"
@@ -2867,51 +2810,57 @@ msgstr "Formatçju"
 
 #: ../../harddrake/v4l.pm_.c:218
 msgid "Radio support:"
-msgstr ""
+msgstr "Radio atbalsts:"
 
 #: ../../harddrake/v4l.pm_.c:218
 msgid "enable radio support"
-msgstr ""
+msgstr "ieslçgt radio atbalstu"
 
 #: ../../help.pm_.c:13
 msgid ""
 "GNU/Linux is a multiuser system, and this means that each user can have his\n"
 "own preferences, his own files and so on. You can read the ``User Guide''\n"
-"to learn more. But unlike \"root\", which is the administrator, the users\n"
-"you add here will not be entitled to change anything except their own files\n"
-"and their own configuration. You will have to create at least one regular\n"
-"user for yourself. That account is where you should log in for routine use.\n"
-"Although it is very practical to log in as \"root\" everyday, it may also\n"
-"be very dangerous! The slightest mistake could mean that your system would\n"
-"not work any more. If you make a serious mistake as a regular user, you may\n"
-"only lose some information, but not the entire system.\n"
-"\n"
-"First, you have to enter your real name. This is not mandatory, of course -\n"
-"as you can actually enter whatever you want. DrakX will then take the first\n"
-"word you have entered in the box and will bring it over to the \"User\n"
+"to learn more this concept. But unlike \"root\", which is the\n"
+"administrator, the users you add here will not be entitled to change\n"
+"anything except their own files and their own configurations. You will have\n"
+"to create at least one regular user for yourself. That account is where you\n"
+"should log in for routine use. Although it is very practical to log in as\n"
+"\"root\" everyday, it may also be very dangerous! The slightest mistake\n"
+"could mean that your system would not work any more. If you make a serious\n"
+"mistake as a regular user, you may only lose some information, but not the\n"
+"entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course\n"
+"-- as you can actually enter whatever you want. DrakX will then take the\n"
+"first word you have entered in the box and will bring it over to the \"User\n"
 "name\". This is the name this particular user will use to log onto the\n"
 "system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as the \"root\"'\n"
+"non-privileged (regular) user's password is not as crucial as the \"root\"\n"
 "one from a security point of view, but that is no reason to neglect it:\n"
 "after all, your files are at risk.\n"
 "\n"
 "If you click on \"Accept user\", you can then add as many as you want. Add\n"
-"a user for each one of your friends: your father or your sister, for\n"
-"example. When you finish adding all the users you want, select \"Done\".\n"
+"a user for each one of the people meant to use that computer. When you are\n"
+"finish adding all the users you want, select \"Done\".\n"
 "\n"
 "Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default)."
+"for that user (bash by default).\n"
+"\n"
+"When you are finished adding all users, you will be proposed to choose a\n"
+"user which can automatically log into the system when the computer boots\n"
+"up. If you are interested in that feature (and do not care much about local\n"
+"security), choose the desired user and window manager, then click \"Yes\".\n"
+"If you are not interested in this feature, click \"No\"."
 msgstr ""
 
-#: ../../help.pm_.c:41
-#, fuzzy
+#: ../../help.pm_.c:48
 msgid ""
 "Listed above are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, they are good for most common\n"
 "installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
 "able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a partition for \"/home\"\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
 "(only possible if you have more than one Linux partition available).\n"
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
@@ -2936,30 +2885,24 @@ msgid ""
 "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
-"Augstâk ir uzskaitîtas eksistçjoðâs Linux partîcijas, kas ir atrastas uz "
-"jûsu\n"
+"Augstâk ir uzskaitîtas eksistçjoðâs Linux sadaïas, kas ir atrastas uz jûsu\n"
 "cietâ diska. Jûs varat atstât meistara izdarîto izvçli, jo tâ ir laba\n"
 "parastâm vajadzîbâm. Ja jûs izmainât ðo izvçli, jums ir jâdefinç vismaz\n"
-"saknes partîcijâ(\"/\"). Neizvçlieties pârâk mazu partîciju, citâdi jûs "
-"nevarçsit\n"
+"saknes sadaïâ(\"/\"). Neizvçlieties pârâk mazu sadaïu, citâdi jûs nevarçsit\n"
 "instalçt visas vajadzîgâs programmas. Ja vçlaties datus glabât atseviðíâ\n"
-"partîcijâ, jums ir jânorâda arî \"/home\" (to var izdarît tikai tad, ja jums "
+"sadaïâ, jums ir jânorâda arî \"/home\" (to var izdarît tikai tad, ja jums "
 "ir\n"
-"vairâkas Linux partîcijas).\n"
+"vairâkas Linux sadaïas).\n"
 "\n"
-"\n"
-"Jûsu zinâðanai, katra partîcija ir uzskaitîta ðâdâ veidâ: \"Nosaukums\", "
+"Jûsu zinâðanai, katra sadaïa ir uzskaitîta ðâdâ veidâ: \"Nosaukums\", "
 "\"Izmçrs\".\n"
 "\n"
-"\n"
 "\"Nosaukums\" ir kodçts ðâdi: \"cietâ diska tips\", \"cietâ diska numurs\",\n"
-"\"partîcijas numurs\" (piemçram, \"hda1\").\n"
-"\n"
+"\"sadaïas numurs\" (piemçram, \"hda1\").\n"
 "\n"
 "\"Cietâ diska tips\" ir \"hd\", ja jûsu cietais disks ir IDE disks, \"sd\",\n"
 "ja tas ir SCSI cietais disks.\n"
 "\n"
-"\n"
 "\"Cietâ diska numurs\" vienmçr ir burts pçc \"hd\" vai \"sd\". IDE diskiem:\n"
 "\n"
 "   * \"a\" nozîmç \"primârâ IDE kontroliera galvenais disks\",\n"
@@ -2970,18 +2913,20 @@ msgstr ""
 "\n"
 "   * \"d\" nozîmç \"sekundârâ IDE kontroliera pakârtotais disks\".\n"
 "\n"
-"\n"
 "SCSI diskiem \"a\" nozîmç \"primârais cietais disks\", \"b\" nozîmç\n"
 " \"sekundârais cietais disks\", utt..."
 
-#: ../../help.pm_.c:72
+#: ../../help.pm_.c:79
 msgid ""
 "The Mandrake Linux installation is spread out over several CD-ROMs. DrakX\n"
 "knows if a selected package is located on another CD-ROM and will eject the\n"
 "current CD and ask you to insert a different one as required."
 msgstr ""
+"Mandrake Linux instalâcija ir sadalîta pa daþiem CD-ROM diskiem. DrakX\n"
+"zin, vai izvçlçtâ pakotne atrodas uz cita CD-ROM diska, izvirzîs paðreizçjo\n"
+"kompaktdisku un palûgs ievietot citu pçc nepiecieðamîbas."
 
-#: ../../help.pm_.c:77
+#: ../../help.pm_.c:84
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
 "system. There are thousands of packages available for Mandrake Linux, and\n"
@@ -3014,7 +2959,7 @@ msgid ""
 "installation (by opposition to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the fewer packages possible to have a working\n"
+" * \"With X\": install the fewest packages possible to have a working\n"
 "graphical desktop;\n"
 "\n"
 " * \"With basic documentation\": installs the base system plus basic\n"
@@ -3030,11 +2975,11 @@ msgid ""
 "total control over what will be installed.\n"
 "\n"
 "If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"groups to avoid installing any new package. This is useful to repair or\n"
+"update an existing system."
 msgstr ""
 
-#: ../../help.pm_.c:128
+#: ../../help.pm_.c:135
 msgid ""
 "Finally, depending on whether or not you chose to be able to select\n"
 "individual packages, you will be presented a tree containing all packages\n"
@@ -3045,9 +2990,9 @@ msgid ""
 "right. When your selection is finished, click the \"Install\" button which\n"
 "will then launch the installation process. Depending on the speed of your\n"
 "hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. An estimate of the time it will take to\n"
-"install everything is displayed on the screen, to help you gauge if there\n"
-"is sufficient time to enjoy a cup of coffee.\n"
+"a while to complete the process. An installation time estimate is displayed\n"
+"on the screen, to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
 "!! If a server package has been selected, either intentionally or because\n"
 "it was part of a whole group, you will be asked to confirm that you really\n"
@@ -3068,16 +3013,16 @@ msgid ""
 "The tiny floppy disk icon at the bottom of the list allows to load the\n"
 "package list chosen during a previous installation. Clicking on this icon\n"
 "will ask you to insert a floppy disk previously created at the end of\n"
-"another installation. See the second tip of last step on how to create such\n"
-"a floppy."
+"another installation. See the second tip of the previous step on how to\n"
+"create such a floppy disk."
 msgstr ""
 
-#: ../../help.pm_.c:164
+#: ../../help.pm_.c:171
 msgid ""
 "You are now able to set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"OK\".\n"
 "The autodetection of network devices and modem will be launched. If this\n"
-"detection fails, uncheck the \"Use auto detection\" box next time. You may\n"
+"detection fails, uncheck the \"Use auto-detection\" box next time. You may\n"
 "also choose not to configure the network, or do it later; in that case,\n"
 "simply click the \"Cancel\" button.\n"
 "\n"
@@ -3088,22 +3033,22 @@ msgid ""
 "all the parameters from your Internet Service Provider or system\n"
 "administrator.\n"
 "\n"
-"You can consult the ``User Guide'' chapter about Internet connections for\n"
-"details about the configuration, or simply wait until your system is\n"
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection.\n"
 "\n"
 "If you wish to configure the network later after installation, or if you\n"
 "are finished configuring your network connection, click \"Cancel\"."
 msgstr ""
 
-#: ../../help.pm_.c:186
+#: ../../help.pm_.c:193
 #, fuzzy
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
-"Here are presented all the services available with the current\n"
-"installation. Review them carefully and uncheck those which are not always\n"
-"needed at boot time.\n"
+"Here are listed all the services available with the current installation.\n"
+"Review them carefully and uncheck those which are not always needed at boot\n"
+"time.\n"
 "\n"
 "You can get a short explanatory text about a service by selecting a\n"
 "specific service. However, if you are not sure whether a service is useful\n"
@@ -3128,7 +3073,7 @@ msgstr ""
 "ka daþi servisi var bût bîstami, ja darbojas serverî.\n"
 "Parasti izvçlieties tikai tos servisus, kas jums tieðâm nepiecieðami."
 
-#: ../../help.pm_.c:203
+#: ../../help.pm_.c:210
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
 "local time according to the time zone you selected. It is however possible\n"
@@ -3144,16 +3089,16 @@ msgid ""
 "by other machines on your local network."
 msgstr ""
 
-#: ../../help.pm_.c:217
+#: ../../help.pm_.c:224
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX\n"
-"will try to configure X automatically.\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
 "\n"
-"It is extremely rare for it to fail, unless the hardware is very old (or\n"
-"very new). If it succeeds, it will start X automatically with the best\n"
-"resolution possible, depending on the size of the monitor. A window will\n"
+"You will be presented the list of available resolutions and color depth\n"
+"available for your hardware. Choose the one that best suit your needs (you\n"
+"will be able to change that after installation though). When you are\n"
+"satisfied with the sample shown in the monitor, click \"OK\". A window will\n"
 "then appear and ask you if you can see it.\n"
 "\n"
 "If you are doing an \"Expert\" installation, you will enter the X\n"
@@ -3163,12 +3108,12 @@ msgid ""
 "If you can see the message during the test, and answer \"Yes\", then DrakX\n"
 "will proceed to the next step. If you cannot see the message, it simply\n"
 "means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen. Refer then to the Video\n"
+"after 10 seconds, restoring the screen. Refer then to the video\n"
 "configuration section of the user guide for more information on how to\n"
 "configure your display."
 msgstr ""
 
-#: ../../help.pm_.c:239
+#: ../../help.pm_.c:246
 msgid ""
 "Finally, you will be asked whether you want to see the graphical interface\n"
 "at boot. Note this question will be asked even if you chose not to test the\n"
@@ -3177,19 +3122,19 @@ msgid ""
 "configured."
 msgstr ""
 
-#: ../../help.pm_.c:246
+#: ../../help.pm_.c:253
 msgid ""
 "The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
 "booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
 "at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
 "should come back to this step for help in at least two situations:\n"
 "\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows in\n"
-"your system). If you need to reinstall Windows, the Microsoft install\n"
-"process will rewrite the boot sector, and then you will not be able to\n"
-"start GNU/Linux!\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (\n"
+"MBR) of your main disk (unless you are using another boot manager), to\n"
+"allow you to start up with either Windows or GNU/Linux (assuming you have\n"
+"Windows in your system). If you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector, and then you will not be able\n"
+"to start GNU/Linux!\n"
 "\n"
 " * if a problem arises and you cannot start up GNU/Linux from the hard\n"
 "disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
@@ -3203,15 +3148,14 @@ msgid ""
 "disk."
 msgstr ""
 
-#: ../../help.pm_.c:270
+#: ../../help.pm_.c:277
 #, fuzzy
 msgid ""
-"At this point, you need to choose where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space, you will\n"
-"need to partition it. Basically, partitioning a hard drive consists of\n"
-"logically dividing it to create space to install your new Mandrake Linux\n"
-"system.\n"
+"You now need to choose where you want to install the Mandrake Linux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "Because the partitioning process' effects are usually irreversible,\n"
 "partitioning can be intimidating and stressful if you are an inexperienced\n"
@@ -3220,9 +3164,9 @@ msgid ""
 "\n"
 "If you are running the installation in Expert mode, you will enter\n"
 "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
-"fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
-"From the installation interface, you can use the wizards as described here\n"
-"by clicking the dialog's \"Wizard\" button.\n"
+"fine-tune your partitions. See the DiskDrake section in the ``Starter\n"
+"Guide''. From the installation interface, you can use the wizards as\n"
+"described here by clicking the dialog's \"Wizard\" button.\n"
 "\n"
 "If partitions have already been defined, either from a previous\n"
 "installation or from another partitioning tool, simply select those to\n"
@@ -3230,7 +3174,7 @@ msgid ""
 "\n"
 "If partitions are not defined, you will need to create them using the\n"
 "wizard. Depending on your hard drive configuration, several options are\n"
-"available:\n"
+"available.\n"
 "\n"
 " * \"Use free space\": this option will simply lead to an automatic\n"
 "partitioning of your blank drive(s). You will not be prompted further;\n"
@@ -3241,9 +3185,9 @@ msgid ""
 "each of the partitions. The legacy mount points are selected by default,\n"
 "and you should generally keep them.\n"
 "\n"
-" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
-"is installed on your hard drive and takes all the space available on it,\n"
-"you have to create free space for Linux data. To do so, you can delete your\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
 "Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
 "mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
 "be performed without the loss of any data, provided you previously\n"
@@ -3270,10 +3214,10 @@ msgid ""
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"your hard drive. Be careful -- it is a powerful but dangerous option. You\n"
 "can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing. To know how do use the DiskDrake utility used\n"
-"here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+"know what you are doing. To know how to use the DiskDrake utility used\n"
+"here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
 "Guide''''"
 msgstr ""
 "Paðlaik jums ir jâizvçlas, kur uz cietâ diska instalçt Mandrake Linux\n"
@@ -3289,59 +3233,58 @@ msgstr ""
 "rokasgrâmatu un visu labi pârdomâjiet.\n"
 "\n"
 "\n"
-"Jums ir nepiecieðamas vismaz divas partîcijas. Viena vajadzîga paðai "
-"sistçmai,\n"
+"Jums ir nepiecieðamas vismaz divas sadaïas. Viena vajadzîga paðai sistçmai,\n"
 "otra - virtuâlajai atmiòai (Swap).\n"
 "\n"
 "\n"
-"Ja partîcijas jau izveidotas (agrâkas instalçðanas laikâ vai ar citu diska\n"
-"sadalîðanas rîku), jums tikai jânorâda tâs partîcijas, kurâs vçlaties\n"
+"Ja sadaïas jau izveidotas (agrâkas instalçðanas laikâ vai ar citu diska\n"
+"sadalîðanas rîku), jums tikai jânorâda tâs sadaïas, kurâs vçlaties\n"
 "instalçt Linux sistçmu.\n"
 "\n"
 "\n"
-"Ja partîcijas vçl nav izveidotas, jums tâs ir jâizveido. Lai to izdarîtu,\n"
+"Ja sadaïas vçl nav izveidotas, jums tâs ir jâizveido. Lai to izdarîtu,\n"
 "izmantojiet augstâk pieejamo meistaru. Atkarîbâ no jûsu cietâ diska \n"
 "konfigurâcijas ir iespçjami vairâki risinâjumi:\n"
 "\n"
-"* Izmantot esoðu partîciju: meistars uz cietâ diska ir atklâjis vienu vai "
-"vairâkas Linux partîcijas. Ja vçlaties\n"
+"* Izmantot esoðu sadaïu: meistars uz cietâ diska ir atklâjis vienu vai "
+"vairâkas Linux sadaïas. Ja vçlaties\n"
 " tâs saglabât, izvçlieties ðo opciju. \n"
 "\n"
 "\n"
 "* Izdzçst visu disku: ja vçlaties izdzçst visus uz diska esoðos datus un "
-"partîcijas un aizstât tâs ar jaunu\n"
+"sadaïas un aizstât tâs ar jaunu\n"
 "  Mandrake Linux sistçmu, varat izvçlçties ðo opciju. Esiet uzmanîgi, "
 "izvçloties ðo risinâjumu, jo pçc\n"
 "  apstiprinâðanas jûs vairs nevarçsit atteikties no ðîs izvçles.\n"
 "\n"
 "\n"
-"* Izmanto brîvo vietu Windows partîcijâ: ja uz cietâ diska ir instalçts "
+"* Izmanto brîvo vietu Windows sadaïâ: ja uz cietâ diska ir instalçts "
 "Microsoft Windows, kas aizòem visu\n"
 "  vietu, jums ir jâatbrîvo vieta Linux datiem. Lai to izdarîtu, jûs varat "
-"nodzçst Microsoft Windows partîciju un\n"
+"nodzçst Microsoft Windows sadaïu un\n"
 "  datus (skatît risinâjumus \"Izdzçst visu disku\" vai \"Eksperta reþîms\") "
 "vai izmainît Microsoft\n"
-"  Windows partîcijas izmçru. partîcijas izmçru var izmainît bez datu "
-"zaudçðanas. Ðis risinâjums ir ieteicams, ja\n"
+"  Windows sadaïas izmçru. Sadaïas izmçru var izmainît bez datu zaudçðanas. "
+"Ðis risinâjums ir ieteicams, ja\n"
 "  jûs savâ datorâ vçlaties izmantot gan Mandrake Linux, gan Microsoft "
 "Windows.\n"
 "\n"
 "\n"
-"  Pirms izvçlaties ðo risinâjumu, òemiet vçrâ, ka Microsoft Windows "
-"partîcijas izmçrs bûs mazâks, nekâ tas ir\n"
+"  Pirms izvçlaties ðo risinâjumu, òemiet vçrâ, ka Microsoft Windows sadaïas "
+"izmçrs bûs mazâks, nekâ tas ir\n"
 "  paðlaik. Tas nozîmç, ka jums Microsoft Windows sistçmâ bûs mazâk vietas "
 "datiem vai programmu instalçðanai.\n"
 "\n"
 "\n"
-"* Eksperta reþîms: ja jûs vçlaties patstâvîgi veidot diska partîcijas, varat "
+"* Eksperta reþîms: ja jûs vçlaties patstâvîgi veidot diska sadaïas, varat "
 "izvçlçties ðo variantu. Esiet\n"
 "  uzmanîgi, izveloties ðo risinâjumu. Tas ir ar plaðâm iespçjâm, bet ïoti "
 "bîstams. Jûs varat pazaudçt\n"
 "  visus datus, tâpçc izvçlieties tikai tad, ja zinat, ko darât."
 
-#: ../../help.pm_.c:341
+#: ../../help.pm_.c:347
 msgid ""
-"There you are. Installation is now complete and your GNU/Linux system is\n"
+"There you are. Installation is now completed and your GNU/Linux system is\n"
 "ready to use. Just click \"OK\" to reboot the system. You can start\n"
 "GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
 "soon as the computer has booted up again.\n"
@@ -3372,11 +3315,10 @@ msgid ""
 "\"mformat a:\")"
 msgstr ""
 
-#: ../../help.pm_.c:372
-#, fuzzy
+#: ../../help.pm_.c:378
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a filesystem).\n"
+"(formatting means creating a filesystem on it).\n"
 "\n"
 "At this time, you may wish to reformat some already existing partitions to\n"
 "erase any data they contain. If you wish to do that, please select those\n"
@@ -3390,7 +3332,7 @@ msgid ""
 "\n"
 "Please be careful when selecting partitions. After formatting, all data on\n"
 "the selected partitions will be deleted and you will not be able to recover\n"
-"any of it.\n"
+"it.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
@@ -3400,36 +3342,28 @@ msgid ""
 "Click on \"Advanced\" if you wish to select partitions that will be checked\n"
 "for bad blocks on the disk."
 msgstr ""
-"Visas jaunizveidotâs partîcijas ir jâformatç, pirms tâs var izmantot\n"
+"Visas jaunizveidotâs sadaïas ir jâformatç, pirms tâs var izmantot\n"
 "(formatçðana nozîmç failsistçmas izveidoðanu).\n"
 "\n"
-"\n"
-"Tagad jûs arî varat izvçlçties pârformatçt daþas jau esoðas partîcijas, lai\n"
+"Tagad jûs arî varat izvçlçties pârformatçt daþas jau esoðas sadaïas, lai\n"
 "izdzçstu tajâs esoðo informâciju. Ja jûs vçlaties to darît, norâdiet\n"
-"partîcijas, kuras vçlaties formatçt.\n"
-"\n"
+"sadaïas, kuras vçlaties formatçt.\n"
 "\n"
 "Òemiet vçrâ, ka nav nepiecieðams pârformatçt visas jau eksistçjoðas "
-"partîcijas.\n"
-"Jums ir jâformatç partîcijas, kurâs atrodas operçtâjsistçma (piemçram, \"/"
-"\",\n"
-"\"/usr\" vai \"/var\"), bet nav jâformatç partîcijas, kurâs atrodas dati, "
-"ko\n"
+"sadaïas.\n"
+"Jums ir jâformatç sadaïas, kurâs atrodas operçtâjsistçma (piemçram, \"/\",\n"
+"\"/usr\" vai \"/var\"), bet nav jâformatç sadaïas, kurâs atrodas dati, ko\n"
 "jûs vçlaties saglabât (parasti /home).\n"
 "\n"
-"\n"
-"Esiet uzmanîgi, izvçloties partîcijas, jo pçc formatçðanas visi dati bûs\n"
+"Esiet uzmanîgi, izvçloties sadaïas, jo pçc formatçðanas visi dati bûs\n"
 "iznîcinâti un jûs vairs nevarçsit tos atjaunot.\n"
 "\n"
+"Noklikðíiniet \"Labi\", kad esat gatavi formatçt sadaïas.\n"
 "\n"
-"Noklikðíiniet \"Labi\", kad esat gatavi formatçt partîcijas.\n"
-"\n"
-"\n"
-"Noklikðíiniet \"Atcelt\", ja jûs gribat izvçlçties citas partîcijas, kur\n"
+"Noklikðíiniet \"Atcelt\", ja jûs gribat izvçlçties citas sadaïas, kur\n"
 "instalçt jauno Mandrake Linux operçtâjsistçmu."
 
-#: ../../help.pm_.c:398
-#, fuzzy
+#: ../../help.pm_.c:404
 msgid ""
 "Your new Mandrake Linux operating system is currently being installed.\n"
 "Depending on the number of packages you will be installing and the speed of\n"
@@ -3442,10 +3376,9 @@ msgstr ""
 "instalçta. Ðî darbîba aizòems daþas minûtes (tas ir atkarîgs no apjoma,\n"
 "ko jûs izvçlçjâties instalçt, un no jûsu datota âtruma.)\n"
 "\n"
-"\n"
 "Lûdzu esiet pacietîgs."
 
-#: ../../help.pm_.c:406
+#: ../../help.pm_.c:412
 msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Some bugs may have\n"
@@ -3460,16 +3393,22 @@ msgid ""
 "install the selected package(s), or \"Cancel\" to abort."
 msgstr ""
 
-#: ../../help.pm_.c:419
+#: ../../help.pm_.c:425
 msgid ""
 "Before continuing, you should read carefully the terms of the license. It\n"
 "covers the whole Mandrake Linux distribution, and if you do not agree with\n"
-"all the terms in it, click on the \"Refuse\" button which will immediately\n"
-"terminate the installation. To continue with the installation, click on the\n"
-"\"Accept\" button."
+"all the terms included in it, click on the \"Refuse\" button which will\n"
+"immediately terminate the installation. To continue with the installation,\n"
+"click on the \"Accept\" button."
 msgstr ""
+"Pirms turpinât, Jums vajadzçtu uzmanîgi izlasît licences vienoðanos. Tâ "
+"nosedz\n"
+"visu Mandrake Linux distribûciju, un ja Jûs nepiekrîtat visiem noteikumiem,\n"
+"nospiediet uz pogas \"Noraidît\", kas nekavçjoties pârtrauks instalâciju. "
+"Lai turpinâtu\n"
+"instalâcijas procesu, nospiediet pogu \"Pieòemt\"."
 
-#: ../../help.pm_.c:426
+#: ../../help.pm_.c:432
 msgid ""
 "At this point, it is time to choose the security level desired for the\n"
 "machine. As a rule of thumb, the more exposed the machine is, and the more\n"
@@ -3481,7 +3420,7 @@ msgid ""
 "If you do not know what to choose, keep the default option."
 msgstr ""
 
-#: ../../help.pm_.c:436
+#: ../../help.pm_.c:442
 #, fuzzy
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
@@ -3500,16 +3439,16 @@ msgid ""
 "drive;\n"
 "\n"
 " * \"Auto allocate\": this option enables to automatically create ext3 and\n"
-"swap partitions in free space of your hard drive;\n"
+"swap partitions on your hard drive's free space;\n"
 "\n"
 "\"More\": gives access to additional features:\n"
 "\n"
 " * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery if necessary. It is strongly recommended\n"
-"to perform this step;\n"
+"for later partition-table recovery, if necessary. It is strongly\n"
+"recommended to perform this step;\n"
 "\n"
 " * \"Restore partition table\": allows to restore a previously saved\n"
-"partition table from floppy disk;\n"
+"partition table from a floppy disk;\n"
 "\n"
 " * \"Rescue partition table\": if your partition table is damaged, you can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
@@ -3554,33 +3493,32 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Paðlaik jums ir jâizvçlas, kurâ(s) diska partîcijâ(s) instalçt Mandrake "
-"Linux\n"
-"operçtâjsistçmu. Ja partîcijas jau ir izveidotas (agrâkas GNU/Linux "
+"Paðlaik jums ir jâizvçlas, kurâ(s) diska sadaïâ(s) instalçt Mandrake Linux\n"
+"operçtâjsistçmu. Ja sadaïas jau ir izveidotas (agrâkas GNU/Linux "
 "instalçðanas\n"
 "laikâ vai ar citu diska sadalîðanas rîku), jûs varat izmantot esoðâs "
-"dadaïas.\n"
-"Citos gadîjumos ir jâveido jaunas diska partîcijas.\n"
+"sadaïas.\n"
+"Citos gadîjumos ir jâveido jaunas diska sadaïas.\n"
 "\n"
 "\n"
-"Lai veidotu partîcijas, jums vispirms ir jâizvçlas cietais disks. Jûs varat\n"
+"Lai veidotu sadaïas, jums vispirms ir jâizvçlas cietais disks. Jûs varat\n"
 "norâdît sadalâmo disku, noklikðíinot uz \"hda\" pirmajam IDE diskam,\n"
 "\"hdb\" - otrajam diskam, \"sda\" - pirmajam SCSI diskam, utt.\n"
 "\n"
 "\n"
 "Lai sadalîtu izvçlçto cieto disku, varat izmantot sekojoðas opcijas:\n"
 "\n"
-"   * Izdzçst visu: ðî opcija izdzçð visas partîcijas, kas atrodas uz "
-"izvçlçtâ cietâ diska.\n"
+"   * Izdzçst visu: ðî opcija izdzçð visas sadaïas, kas atrodas uz izvçlçtâ "
+"cietâ diska.\n"
 "\n"
 "\n"
 "   * Izvietot automâtiski: ðî opcija ïauj jums automâtiski izveidot Ext2 un "
-"swap partîcijas jûsu cietâ diska\n"
+"swap sadaïas jûsu cietâ diska\n"
 "     brîvajâ vietâ.\n"
 "\n"
 "\n"
-"   * Salabot partîciju tabulu: ja partîciju tabula ir bojâta, jûs varat "
-"mçìinât to autjaunot, izmantojot ðo opciju.\n"
+"   * Salabot sadaïu tabulu: ja sadaïu tabula ir bojâta, jûs varat mçìinât to "
+"autjaunot, izmantojot ðo opciju.\n"
 "     Esiet uzmanîgi un atcerieties, ka tas var neizdoties.\n"
 "\n"
 "\n"
@@ -3588,20 +3526,20 @@ msgstr ""
 "\n"
 "\n"
 "   * Pârlâdçt: jûs varat izmantot ðo opciju, ja vçlaties atsaukt visas "
-"izmaiòas un ielâdçt sâkotnçjot partîciju tabulu.\n"
+"izmaiòas un ielâdçt sâkotnçjo sadaïu tabulu.\n"
 "\n"
 "\n"
-"   * Meistart: Ja cietâ diska sadalîðanai vçlaties izmantot meistaru, varat "
+"   * Meistars: Ja cietâ diska sadalîðanai vçlaties izmantot meistaru, varat "
 "lietot ðo opciju. Tâ ir ieteicama,\n"
 "     ja jums nav labu zinâðanu par diska sadalîðanu.\n"
 "\n"
 "\n"
 "   * Atjaunot no disketes: ja iepriekðçjâs instalçðanas laikâ saglabâjât "
-"partîciju tabulu disketç, jûs varat\n"
+"sadaïu tabulu disketç, jûs varat\n"
 "     to atjaunot, izmantojot ðo opciju.\n"
 "\n"
 "\n"
-"   * Saglabât disketç: ja vçlaties partîciju tabulu saglabât disketç, lai "
+"   * Saglabât disketç: ja vçlaties sadaïu tabulu saglabât disketç, lai "
 "varçtu to atjaunot, izmantojiet ðo\n"
 "     opciju. Ir ïoti ieteicams izmantot ðo opciju.\n"
 "\n"
@@ -3611,19 +3549,19 @@ msgstr ""
 "\n"
 "\n"
 "Jûsu zinâðanai, jebkuru opciju var izsaukt ar tastatûru: pârvietojieties "
-"starp partîcijâm, izmantojot Tab un Auðup/Lejup bultiòas.\n"
+"starp sadaïâm, izmantojot Tab un Auðup/Lejup bultiòas.\n"
 "\n"
 "\n"
-"Kad ir izvçlçta partîcija, jûs varat izmantot:\n"
+"Kad ir izvçlçta sadaïa, jûs varat izmantot:\n"
 "\n"
-"           * Ctrl-c, lai izveidotu jaunu partîciju (kad ir izvçlçta tukða "
-"partîcija)\n"
+"           * Ctrl-c, lai izveidotu jaunu sadaïu (kad ir izvçlçta tukða "
+"sadaïa)\n"
 "\n"
-"           * Ctrl-d, lai izdzçstu partîciju\n"
+"           * Ctrl-d, lai izdzçstu sadaïu\n"
 "\n"
 "           * Ctrl-m, lai uzstâdîtu montçðanas punktu"
 
-#: ../../help.pm_.c:507
+#: ../../help.pm_.c:513
 #, fuzzy
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -3656,18 +3594,16 @@ msgid ""
 "\"Windows name\" is the letter of your hard drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
-"Uz jûsu cietâ diska ir atrasta vairâk nekâ viena Microsoft Windows "
-"partîcija.\n"
-"Lûdzu izvçlieties to partîciju, kuras izmçru jûs vçlaties izmainît, lai\n"
+"Uz jûsu cietâ diska ir atrasta vairâk nekâ viena Microsoft Windows sadaïa.\n"
+"Lûdzu izvçlieties to sadaïu, kuras izmçru jûs vçlaties izmainît, lai\n"
 "instalçtu jauno Mandrake Linux operçtâjsistçmu.\n"
 "\n"
 "\n"
-"Jûsu zinâðanai, katra partîcija ir uzskaitîta ðâdâ veidâ: \"Linux nosaukums"
-"\",\n"
+"Jûsu zinâðanai, katra sadaïa ir uzskaitîta ðâdâ veidâ: \"Linux nosaukums\",\n"
 "\"Windows nosaukums\" \"Izmçrs\".\n"
 "\n"
 "\"Linux nosaukums\" ir kodçts ðâdi: \"cietâ diska tips\", \"cietâ diska\n"
-"numurs\", \"partîcijas numurs\" (piemçram, \"hda1\").\n"
+"numurs\", \"sadaïas numurs\" (piemçram, \"hda1\").\n"
 "\n"
 "\n"
 "\"Cietâ diska tips\" ir \"hd\", ja jûsu cietais disks ir IDE disks, \"sd\",\n"
@@ -3689,53 +3625,92 @@ msgstr ""
 " \"sekundârais cietais disks\", utt...\n"
 "\n"
 "\"Windows nosaukums\" ir jûsu cietâ diska burts Windows vidç (pirmais disks\n"
-"vai partîcija saucas \"C:\")."
+"vai sadaïa saucas \"C:\")."
 
-#: ../../help.pm_.c:538
+#: ../../help.pm_.c:544
 msgid "Please be patient. This operation can take several minutes."
 msgstr "Lûdzu esat pacietîgs. Ðî darbîba var ilgt vairâkas minûtes."
 
-#: ../../help.pm_.c:541
-#, fuzzy
+#: ../../help.pm_.c:547
 msgid ""
 "DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\"). You can\n"
-"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
-"system:\n"
+"installation or if you want to have greater control (\"Expert\") over your\n"
+"installation. You can also choose to do a new installation or upgrade your\n"
+"existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": completely wipes out the old system, however, depending on\n"
+" * \"Install\": completely wipes out the old system. However, depending on\n"
 "what is currently installed on your machine, you may be able to keep some\n"
 "old partitions (Linux or otherwise) unchanged;\n"
 "\n"
 " * \"Upgrade\": this installation class allows to simply update the\n"
-"packages currently installed on your Mandrake Linux system. It keeps the\n"
-"current partitions of your hard drives as well as user configurations. All\n"
-"other configuration steps remain available, similar to a normal\n"
-"installation;\n"
+"packages currently installed on your Mandrake Linux system. It keeps your\n"
+"hard drives' current partitions as well as user configurations. All other\n"
+"configuration steps remain available, similar to a normal installation;\n"
 "\n"
 " * \"Upgrade Packages Only\": this new installation class allows you to\n"
 "upgrade an existing Mandrake Linux system while keeping all system\n"
 "configurations unchanged. Adding new packages to the current installation\n"
 "is also possible.\n"
 "\n"
-"Upgrades should work fine on Mandrake Linux systems containing version\n"
-"\"8.1\" or later.\n"
+"Upgrades should work fine on Mandrake Linux systems using version \"8.1\"\n"
+"or later.\n"
 "\n"
-"Depending on your knowledge of GNU/Linux, select one of the following\n"
-"choices:\n"
+"Depending on your GNU/Linux knowledge, select one of the following choices:\n"
 "\n"
 " * Recommended: choose this if you have never installed a GNU/Linux\n"
 "operating system. The installation will be very easy and you will only be\n"
 "asked a few questions;\n"
 "\n"
-" * Expert: if you have a good understanding of GNU/Linux, you may wish to\n"
+" * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
 "perform a highly customized installation. Some of the decisions you will\n"
-"have to make may be difficult if you do not have good knowledge of\n"
-"GNU/Linux, so it is not recommended that those without a fair amount of\n"
-"experience select this installation class."
-msgstr ""
-"Lûdzu izvçlieties \"Instalçt\", ja nav instalçta vecâka Linux-Mandrak "
-"versija\n"
+"have to make may be difficult if you do not have good GNU/Linux knowledge,\n"
+"so it is not recommended that those without a fair amount of experience\n"
+"select this installation class."
+msgstr ""
+"DrakX nepiecieðams zinât, vai Jûs vçlaties veikt noklusçto (\"Rekomendçto"
+"\")\n"
+"instalâciju, vai arî Jûs vçlaties lielâku kontroli pâr instalâcijas procesu "
+"(\"Expert\").\n"
+"Jûs varat arî izvçlçties vai veikt jaunu instalâciju, vai atjauninât "
+"eksistçjoðu\n"
+"Mandrake Linux sistçmu:\n"
+"\n"
+" * \"Instalçt\": pilnîbâ izdzçð veco sistçmu, tomçr atkarîbâ no tâ, kas ir "
+"patreiz\n"
+"instalçts uz Jûsu maðînas, Jums var bût iespçja saglabât daþas iepriekðçjâs\n"
+"sadaïas (Linux vai citâdas) bez izmaiòâm;\n"
+"\n"
+" * \"Atjauninât\": ðî instalâcijas klase atïauj vienkârði atjauninât "
+"pakotnes, kuras\n"
+"patreiz ir uzinstalçtas uz Jûsu Mandrake Linux sistçmas. Tâ patur esoðâs "
+"sadaïas\n"
+"uz cietòiem, kâ arî lietotâju uzstâdîjumus. Visi citi konfigurçðanas soïi "
+"paliek iespçjami,\n"
+"lîdzîgi kâ pie jaunas instalâcijas;\n"
+"\n"
+" * \"Atjauninât tikai pakotnes\": ðî jaunâ instalâcijas klase atïauj Jums "
+"atjauninât\n"
+"eksistçjoðu Mandrake Linux sistçmu, saglabâjot visu sistçmas konfigurâciju "
+"bez\n"
+"izmaiòâm. Jaunu pakotòu pievienoðana esoðajai sistçmai arî ir iespçjama.\n"
+"\n"
+"Atjauninâðanai bûtu jânotiek vienkârði uz Mandrake Linux sistçmâm ar "
+"versiju\n"
+"\"8.1\" un jaunâkâm.\n"
+"\n"
+"Atkarîbâ no Jûsu zinâðanâm par GNU/Linux, izvçlieties vienu no sekojoðâm\n"
+"iespçjâm:\n"
+"\n"
+" * Ieteicamâ: izvçlieties ðo, ja Jûs nekad neesat instalçjis GNU/Linux\n"
+"operçtâjsistçmu. Instalâcija bûs ïoti vienkârða un Jums tiks uzdoti tikai "
+"daþi jautâjumi;\n"
+"\n"
+" * Eksperta: ja Jûs labi saprotat GNU/Linux, Jûs varbût vçlaties veikti\n"
+"stingri piemçrotu instalâciju. Daþi no lçmumiem, kas Jums bûs jâpieòem, var\n"
+"izrâdîties grûti, ja Jums nav labas zinâðanas par GNU/Linux, tâpçc nav "
+"ieteicams\n"
+"izvçlçties ðo instalâcijas klasi tiem, kam nav krietna pieredze.Lûdzu "
+"izvçlieties \"Instalçt\", ja nav instalçta vecâka Linux-Mandrak versija\n"
 "vai jûs vçlaties izmantot vairâkas operçtâjsistçmas.\n"
 "\n"
 "\n"
@@ -3769,7 +3744,8 @@ msgstr ""
 "pietiekoði labas. Tâpçc neizvçlieties\n"
 "  ðo instalçðanas klasi, ja neesat pârliecinâts."
 
-#: ../../help.pm_.c:578
+#: ../../help.pm_.c:582
+#, fuzzy
 msgid ""
 "Normally, DrakX selects the right keyboard for you (depending on the\n"
 "language you have chosen). However, you might not have a keyboard that\n"
@@ -3783,11 +3759,24 @@ msgid ""
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
-"asked on next dialog to choose the key binding that will switch the\n"
-"keyboard layout between the latin and non latin layouts."
+"asked in the next dialog to choose the key binding that will switch the\n"
+"keyboard layout between the latin and non-latin layouts."
 msgstr ""
+"Parasti DrakX izvçlas tastatûras izkârtojumu priekð Jums (atkarîbâ no\n"
+"valodas, kuru Jûs izvçlçjâties), tomçr Jums var nebût tastatûra, kas "
+"atbilst\n"
+"tieði Jûsu valodai.\n"
+"ÐEIT DERÇTU KÂDS PIEMÇRS SAISTÎBÂ \n"
+"AR LATVIEÐIEM :)\n"
+"Klikðíiniet uz pogas \"Vairâk\" lai saòemtu pilnu sarakstu ar atbalstîtiem\n"
+"tastatûras izkârtojumiem.\n"
+"\n"
+"Ja Jûs izvçlçsieties tastatûras izkârtojumu, kas balstâs uz savâdâku, kâ\n"
+"latîòu alfabçtu, nâkamajâ dialogâ jums tiks pieprasîts izvçlçties taustiòa\n"
+"piesaisti, kas pârslçgs tastatûras izkârtojumu starp latîòu un ne-latîòu\n"
+"izkârtojumiem."
 
-#: ../../help.pm_.c:594
+#: ../../help.pm_.c:598
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -3796,22 +3785,26 @@ msgid ""
 "Clicking on the \"Advanced\" button will allow you to select other\n"
 "languages to be installed on your workstation. Selecting other languages\n"
 "will install the language-specific files for system documentation and\n"
-"applications. For example, if you will host users from Spain on your\n"
-"machine, select English as the main language in the tree view and in the\n"
-"Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
+"applications. For example, if you host users from Spain on your machine,\n"
+"select English as the main language in the tree view and in the Advanced\n"
+"section, click on the box corresponding to \"Spanish|Spain\".\n"
 "\n"
 "Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales, click the \"OK\" button to continue."
+"additional locales, click the \"OK\" button to continue.\n"
+"\n"
+"To switch from one language to the other, you can launch the\n"
+"\"/usr/sbin/localedrake\" command as \"root\" to change the whole system\n"
+"language, or as a simple user to only change that user's default language."
 msgstr ""
 
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:617
 msgid ""
-"DrakX generally detects the number of buttons your mouse has. If not, it\n"
-"assumes you have a two-button mouse and will set it up for third-button\n"
+"DrakX generally detects the number of buttons your mouse possesses. If not,\n"
+"it assumes you have a two-button mouse and will set it up for third-button\n"
 "emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
 "USB mouse.\n"
 "\n"
-"If you wish to specify a different type of mouse select the appropriate\n"
+"If you wish to specify a different type of mouse, select the appropriate\n"
 "type from the provided list.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
@@ -3819,16 +3812,15 @@ msgid ""
 "correct. If the mouse is not working well, press the space bar or [Return]\n"
 "to \"Cancel\" and choose again.\n"
 "\n"
-"Wheel mouses are sometimes not automatically detected. You will need to\n"
+"Sometimes, wheel mouses are not automatically detected. You will need to\n"
 "manually select it in the list. Be sure to select the one corresponding to\n"
 "the correct port it is attached to. After you have pressed the \"OK\"\n"
-"button, a mouse image is displayed. You then need to move the wheel of your\n"
-"mouse to activate it correctly. Then test all buttons and movements are\n"
-"correct."
+"button, a mouse image will be displayed. You then need to move the wheel of\n"
+"your mouse to activate it correctly. Then test that all buttons and\n"
+"movements are correct."
 msgstr ""
 
-#: ../../help.pm_.c:630
-#, fuzzy
+#: ../../help.pm_.c:638
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
@@ -3836,23 +3828,23 @@ msgstr ""
 "Lûdzu izvçlieties pareizu portu. Piemçram, MS Windows\n"
 "ports COM1 GNU/Linux vidç saucas ttyS0."
 
-#: ../../help.pm_.c:634
-msgid ""
-"This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
-"change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
-"choose not to enter a password, but we strongly advise you against this if\n"
-"only for one reason: do not think that because you booted GNU/Linux that\n"
-"your other operating systems are safe from mistakes. Since \"root\" can\n"
-"overcome all limitations and unintentionally erase all data on partitions\n"
-"by carelessly accessing the partitions themselves, it is important for it\n"
-"to be difficult to become \"root\".\n"
+#: ../../help.pm_.c:642
+msgid ""
+"This is the most crucial decision in regards with the security of your\n"
+"GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the\n"
+"system administrator and is the only one authorized to make updates, add\n"
+"users, change the overall system configuration, and so on. In short,\n"
+"\"root\" can do everything! That is why you must choose a password that is\n"
+"difficult to guess -- DrakX will tell you if it is too easy. As you can\n"
+"see, you can choose not to enter a password, but we strongly advise you\n"
+"against this if only for one reason: do not think that because you booted\n"
+"GNU/Linux that your other operating systems are safe from mistakes. Since\n"
+"\"root\" can overcome all limitations and unintentionally erase all data on\n"
+"partitions by carelessly accessing the partitions themselves, it is\n"
+"important for it to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password - it makes it too\n"
+"characters long. Never write down the \"root\" password -- it makes it too\n"
 "easy to compromise a system.\n"
 "\n"
 "However, please do not make the password too long or complicated because\n"
@@ -3866,19 +3858,19 @@ msgid ""
 "In Expert mode, you will be asked if you will be connecting to an\n"
 "authentication server, like NIS or LDAP.\n"
 "\n"
-"If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
-"authentication services, select the appropriate one as \"authentication\".\n"
-"If you do not know, ask your network administrator.\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one as \"authentication\". If you have no\n"
+"clue, ask your network administrator.\n"
 "\n"
 "If your computer is not connected to any administrated network, you will\n"
 "want to choose \"Local files\" for authentication."
 msgstr ""
 
-#: ../../help.pm_.c:670
+#: ../../help.pm_.c:678
 msgid ""
-"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
+"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. In fact, DrakX analyzes the disk boot sector and acts\n"
-"accordingly, depending on what it finds here:\n"
+"accordingly, depending on what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
 "boot sector. Hence, you will be able to load either GNU/Linux or another\n"
@@ -3887,14 +3879,14 @@ msgid ""
 " * if a grub or LILO boot sector is found, it will replace it with a new\n"
 "one.\n"
 "\n"
-"If in doubt, DrakX will display a dialog with various options.\n"
+"if in doubt, DrakX will display a dialog with various options.\n"
 "\n"
 " * \"Bootloader to use\": you have three choices:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"GRUB\": if you prefer grub (text menu);\n"
 "\n"
 "    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"interface;\n"
 "\n"
 "    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
 "interface.\n"
@@ -3904,7 +3896,7 @@ msgid ""
 "second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
 " * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose - in the bootloader menu,\n"
+"this is the delay granted to the user to choose -- in the bootloader menu,\n"
 "another boot entry than the default one.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
@@ -3916,7 +3908,7 @@ msgid ""
 "options, which are reserved for the expert user."
 msgstr ""
 
-#: ../../help.pm_.c:710
+#: ../../help.pm_.c:718
 #, fuzzy
 msgid ""
 "After you have configured the general bootloader parameters, the list of\n"
@@ -3925,7 +3917,7 @@ msgid ""
 "If there is another operating system installed on your machine, it will\n"
 "automatically be added to the boot menu. Here, you can choose to fine-tune\n"
 "the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"remove it. \"Add\" creates a new entry. and \"Done\" goes on to the next\n"
 "installation step.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
@@ -3943,11 +3935,10 @@ msgstr ""
 "un ðajâ gadîjumâ jûs varat izdzçst attiecîgos ierakstus. Bet ðajâ\n"
 "gadîjumâ jums bûs nepiecieðama sâknçðanas diskete, lai tâs sâknçtu!"
 
-#: ../../help.pm_.c:724
-#, fuzzy
+#: ../../help.pm_.c:732
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
-"to GNU/Linux.\n"
+"GNU/Linux.\n"
 "\n"
 "Unless you know exactly what you are doing, choose \"First sector of drive\n"
 "(MBR)\"."
@@ -3955,44 +3946,35 @@ msgstr ""
 "Jums ir jânorâda, kur jûs vçlaties novietot\n"
 "GNU/Linux sâknçðanai nepiecieðamo informâciju.\n"
 "\n"
-"\n"
 "Ja vien jûs neesat absolûti pârliecinâts par savu rîcîbu,\n"
 "izvçlieties \"Diska pirmais sektors (MBR)\"."
 
-#: ../../help.pm_.c:731
+#: ../../help.pm_.c:739
 msgid ""
-"Here, we select a printing system for your computer. Other OSs may offer\n"
-"you one, but Mandrake Linux offers three.\n"
+"Here, we select a printing system for your computer. Other OSes may offer\n"
+"you one, but Mandrake Linux offers two.\n"
 "\n"
-" * \"pdq\" - which means ``print, don't queue'', is the choice if you have\n"
+" * \"pdq\" -- which means ``print, don't queue'', is the choice if you have\n"
 "a direct connection to your printer and you want to be able to panic out of\n"
 "printer jams, and you do not have networked printers. It will handle only\n"
 "very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
-"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+"if this is your first voyage to GNU/Linux. You can change your choices\n"
 "after installation by running PrinterDrake from the Mandrake Control Center\n"
 "and clicking the expert button.\n"
 "\n"
-" * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing to\n"
+" * \"CUPS\" -- ``Common Unix Printing System'', is excellent at printing to\n"
 "your local printer and also halfway-around the planet. It is simple and can\n"
 "act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
 "it is compatible with the systems that went before. It can do many tricks,\n"
 "but the basic setup is almost as easy as \"pdq\". If you need this to\n"
 "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
-"graphical front-ends for printing or choosing printer options.\n"
-"\n"
-" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
-"approximately the same things the others can do, but it will print to\n"
-"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
-"and it can print directly to shell commands. If you have need of Novell or\n"
-"printing to commands without using a separate pipe construct, use lprNG.\n"
-"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
-"networks."
+"graphical front-ends for printing or choosing printer options."
 msgstr ""
 
 #: ../../help.pm_.c:759
 #, fuzzy
 msgid ""
-"DrakX now detects any IDE devices present in your computer. It will also\n"
+"DrakX now detects any IDE device present in your computer. It will also\n"
 "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
@@ -4002,7 +3984,7 @@ msgid ""
 "be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
 "have no SCSI hardware. If you are unsure, you can check the list of\n"
 "hardware detected in your machine by selecting \"See hardware info\" and\n"
-"clicking \"OK\". Examine the list of hardware and then click on the \"OK\"\n"
+"clicking \"OK\". Examine the hardware list and then click on the \"OK\"\n"
 "button to return to the SCSI interface question.\n"
 "\n"
 "If you have to manually specify your adapter, DrakX will ask if you want to\n"
@@ -4011,12 +3993,7 @@ msgid ""
 "usually works well.\n"
 "\n"
 "If DrakX is not able to probe for the options which need to be passed, you\n"
-"will need to provide options to the driver manually. Please review the\n"
-"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
-"Hardware'' section) for hints on retrieving the parameters required from\n"
-"hardware documentation, from the manufacturer's web site (if you have\n"
-"Internet access) or from Microsoft Windows (if you used this hardware with\n"
-"Windows on your system)."
+"will need to manually provide options to the driver."
 msgstr ""
 "DrakX mçìinâs sameklçt PCI SCSI adapteri(us).\n"
 "Ja DrakX atradîs kâdu SCSI adapteri un zinâs, kuru draiveri izmantot,\n"
@@ -4040,12 +4017,12 @@ msgstr ""
 "(ja jums ir pieejams Internets) vai Windows (ja tas ir uzstâdîts jûsu "
 "datorâ)."
 
-#: ../../help.pm_.c:786
+#: ../../help.pm_.c:781
 msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
+"For other OSes, the entry consists only of a label and the \"root\"\n"
 "partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
@@ -4076,7 +4053,7 @@ msgid ""
 "need to allocate a large ramdisk, this option can be used;\n"
 "\n"
 " * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
+"read-only, to allow a filesystem check before the system becomes ``live''.\n"
 "Here, you can override this option;\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
@@ -4089,7 +4066,7 @@ msgid ""
 "selections."
 msgstr ""
 
-#: ../../help.pm_.c:833
+#: ../../help.pm_.c:828
 msgid ""
 "Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
 "either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
@@ -4123,10 +4100,10 @@ msgid ""
 "Firmware Delay expires."
 msgstr ""
 
-#: ../../help.pm_.c:865
+#: ../../help.pm_.c:860
 msgid ""
 "Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may - or not, see the following entries:\n"
+"your installed hardware, you may (or may not), see the following entries:\n"
 "\n"
 " * \"Mouse\": check the current mouse configuration and click on the button\n"
 "to change it if necessary;\n"
@@ -4141,22 +4118,22 @@ msgid ""
 "order to configure the clock according to the time zone you are in;\n"
 "\n"
 " * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``User\n"
+"configuration wizard. Consult the correpsonding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation;\n"
+"presented there is similar to the one used at installation time;\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
+" * \"Sound card\": if a sound card is detected on your system, it will be\n"
 "displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. No modification possible at installation time;\n"
+" * \"TV card\": if a TV card is detected on your system, it will be\n"
+"displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
 "displayed here. You can click on the button to change the parameters\n"
-"associated with it."
+"associated to it."
 msgstr ""
 
-#: ../../help.pm_.c:896
+#: ../../help.pm_.c:891
 #, fuzzy
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -4164,29 +4141,26 @@ msgid ""
 "and will not be recoverable!"
 msgstr ""
 "Norâdiet cieto disku, ko vçlaties izdzçst, lai izveidotu jaunu\n"
-"Mandrake Linux partîciju. Esiet uzmanîgi, jo visi diskâ esoðie dati\n"
+"Mandrake Linux sadaïu. Esiet uzmanîgi, jo visi diskâ esoðie dati\n"
 "pazudîs un nebûs atjaunojami."
 
-#: ../../help.pm_.c:901
-#, fuzzy
+#: ../../help.pm_.c:896
 msgid ""
 "Click on \"OK\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
 "to recover any data and partitions present on this hard drive, including\n"
 "any Windows data.\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"Click on \"Cancel\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
 "Nospiediet \"Labi\", ja vçlaties izdzçst visus datus un\n"
-"partîcijas, kas atrodas uz ðî cietâ diska. Esiet uzmanîgi, pçc \"Labi\" "
-"nospieðanas jûs nevarçsit atjaunot nekâdus datus vai partîcijas, kas "
-"atradâs\n"
+"sadaïas, kas atrodas uz ðî cietâ diska. Esiet uzmanîgi, pçc \"Labi\" "
+"nospieðanas jûs nevarçsit atjaunot nekâdus datus vai sadaïas, kas atradâs\n"
 "uz diska, tajâ skaitâ arî Windows datus.\n"
 "\n"
-"\n"
 "Nospiediet \"Atcelt\", lai atceltu ðo operâciju bez jebkâdu uz ðî diska "
-"esoðu datu vai partîciju pazaudçðanas."
+"esoðu datu vai sadaïu pazaudçðanas."
 
 #: ../../install2.pm_.c:111
 #, c-format
@@ -4199,9 +4173,9 @@ msgstr ""
 #: ../../install2.pm_.c:167
 #, c-format
 msgid "You must also format %s"
-msgstr ""
+msgstr "Jums ir jâformatç arî %s"
 
-#: ../../install_any.pm_.c:424
+#: ../../install_any.pm_.c:423
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4216,7 +4190,7 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:442
+#: ../../install_any.pm_.c:441
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4225,20 +4199,20 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:472
+#: ../../install_any.pm_.c:471
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:869
+#: ../../install_any.pm_.c:870
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Ielieciet FAT formatçtu disketi iekârtâ %s"
 
-#: ../../install_any.pm_.c:873
+#: ../../install_any.pm_.c:874
 msgid "This floppy is not FAT formatted"
-msgstr ""
+msgstr "Ðî diskete nav FAT formatçta"
 
-#: ../../install_any.pm_.c:885
+#: ../../install_any.pm_.c:886
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -4246,12 +4220,12 @@ msgstr ""
 "Lai izmantotu ðo saglabâto pakotòu izvçli, palaidiet instalâciju ar ``linux "
 "defcfg=floppy''"
 
-#: ../../install_any.pm_.c:908 ../../partition_table.pm_.c:767
+#: ../../install_any.pm_.c:909 ../../partition_table.pm_.c:767
 #, c-format
 msgid "Error reading file %s"
 msgstr "Kïûda, nolasot failu %s"
 
-#: ../../install_any.pm_.c:1030
+#: ../../install_any.pm_.c:1031
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -4274,13 +4248,13 @@ msgid ""
 "For this, create a partition (or click on an existing one).\n"
 "Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
-"Jums ir nepiecieðama saknes partîcija.\n"
-"Ðim nolûkam izveidojiet partîciju (vai uzklikðíiniet uz jau esoðas).\n"
+"Jums ir nepiecieðama saknes sadaïa.\n"
+"Ðim nolûkam izveidojiet sadaïu (vai uzklikðíiniet uz jau esoðas).\n"
 "Tad izvçlieties darbîbu ``Montçðanas punkts'' un norâdiet, ka tas ir `/'"
 
 #: ../../install_interactive.pm_.c:63
 msgid "You must have a swap partition"
-msgstr "Jums ir nepiecieðama swap partîcija"
+msgstr "Jums ir nepiecieðama swap sadaïa"
 
 #: ../../install_interactive.pm_.c:64
 msgid ""
@@ -4288,14 +4262,13 @@ msgid ""
 "\n"
 "Continue anyway?"
 msgstr ""
-"Jums nav swap partîcijas\n"
+"Jums nav swap sadaïas\n"
 "\n"
 "Vai tomçr turpinât?"
 
 #: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:169
-#, fuzzy
 msgid "You must have a FAT partition mounted in /boot/efi"
-msgstr "Jums ir nepiecieðama swap partîcija"
+msgstr "Jums ir nepiecieðama /boot/efi montçta FAT sadaïa"
 
 #: ../../install_interactive.pm_.c:92
 msgid "Use free space"
@@ -4303,23 +4276,23 @@ msgstr "Izmantot brîvo vietu"
 
 #: ../../install_interactive.pm_.c:94
 msgid "Not enough free space to allocate new partitions"
-msgstr "Nepietiek brîvas vietas, lai izvietotu jaunas partîcijas"
+msgstr "Nepietiek brîvas vietas, lai izvietotu jaunas sadaïas"
 
 #: ../../install_interactive.pm_.c:102
 msgid "Use existing partitions"
-msgstr "Izmantot jau esoðu partîciju"
+msgstr "Izmantot jau esoðu sadaïu"
 
 #: ../../install_interactive.pm_.c:104
 msgid "There is no existing partition to use"
-msgstr "Nav nevienas partîcijas, ko varçtu izmantot"
+msgstr "Nav nevienas sadaïas, ko varçtu izmantot"
 
 #: ../../install_interactive.pm_.c:111
 msgid "Use the Windows partition for loopback"
-msgstr "Izmantot Windows partîciju priekð loopback"
+msgstr "Izmantot Windows sadaïu priekð loopback"
 
 #: ../../install_interactive.pm_.c:114
 msgid "Which partition do you want to use for Linux4Win?"
-msgstr "Kuru partîciju vçlaties izmantot priekð Linux4Win?"
+msgstr "Kuru sadaïu vçlaties izmantot priekð Linux4Win?"
 
 #: ../../install_interactive.pm_.c:116
 msgid "Choose the sizes"
@@ -4327,23 +4300,23 @@ msgstr "Izvçlieties izmçrus"
 
 #: ../../install_interactive.pm_.c:117
 msgid "Root partition size in MB: "
-msgstr "Saknes partîcijas izmçrs (MB): "
+msgstr "Saknes sadaïas izmçrs (MB): "
 
 #: ../../install_interactive.pm_.c:118
 msgid "Swap partition size in MB: "
-msgstr "Swap partîcijas izmçrs (MB): "
+msgstr "Swap sadaïas izmçrs (MB): "
 
 #: ../../install_interactive.pm_.c:128
 msgid "Use the free space on the Windows partition"
-msgstr "Izmantot Windows partîcijas brîvo vietu"
+msgstr "Izmantot Windows sadaïas brîvo vietu"
 
 #: ../../install_interactive.pm_.c:131
 msgid "Which partition do you want to resize?"
-msgstr "Kuras partîcijas izmçru vçlaties izmainît?"
+msgstr "Kuras sadaïas izmçru vçlaties izmainît?"
 
 #: ../../install_interactive.pm_.c:133
 msgid "Resizing Windows partition"
-msgstr "Izskaitïoju Windows failu sistçmas robeþas"
+msgstr "Mainu Windows sadaïas izmçru"
 
 #: ../../install_interactive.pm_.c:136
 #, c-format
@@ -4351,7 +4324,7 @@ msgid ""
 "The FAT resizer is unable to handle your partition, \n"
 "the following error occured: %s"
 msgstr ""
-"FAT izmçra mainîtâjs nespçj izmainît jûsu partîciju,\n"
+"FAT izmçra mainîtâjs nespçj izmainît jûsu sadaïu,\n"
 "atklâta sekojoða kïûda: %s"
 
 #: ../../install_interactive.pm_.c:139
@@ -4359,7 +4332,9 @@ msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
 "Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
 "installation."
-msgstr "Windows partîcija ir pârâk fragmentçta, vispirms palaidiet ``defrag''"
+msgstr ""
+"Windows sadaïa ir pârâk fragmentçta. Vispirms no Windows vides palaidiet "
+"``defrag'' un tad atsâciet Mandrake Linux instalçðanu."
 
 #: ../../install_interactive.pm_.c:140
 #, fuzzy
@@ -4375,7 +4350,7 @@ msgid ""
 msgstr ""
 "BRÎDINÂJUMS!\n"
 "\n"
-"Tagad DrakX izmainîs Windows partîcijas izmçru. Esiet uzmanîgs: ðî darbîba\n"
+"Tagad DrakX izmainîs Windows sadaïas izmçru. Esiet uzmanîgs: ðî darbîba\n"
 "ir bîstama. Ja jûs to vçl neesat izdarîjis, jums vispirms ir jâpârtrauc\n"
 "instalçðana, no Windows jâpalaiþ scandisk (ieteicams palaist arî defrag),\n"
 "tad atkârtoti jâsâk instalçðana. Vajadzçtu izveidot arî datu rezerves\n"
@@ -4388,7 +4363,7 @@ msgstr "Kâdu apjomu vçlaties atstât priekð windows uz"
 #: ../../install_interactive.pm_.c:151
 #, c-format
 msgid "partition %s"
-msgstr "partîcija %s"
+msgstr "sadaïa %s"
 
 #: ../../install_interactive.pm_.c:158
 #, c-format
@@ -4400,7 +4375,7 @@ msgid ""
 "There is no FAT partition to resize or to use as loopback (or not enough "
 "space left)"
 msgstr ""
-"Nav FAT partîciju, lai izmainîto to izmçru vai izmantotu kâ loopback (vai "
+"Nav FAT sadaïu, lai izmainîto to izmçru vai izmantotu kâ loopback (vai "
 "nepietiek brîvas vietas)"
 
 #: ../../install_interactive.pm_.c:179
@@ -4418,7 +4393,7 @@ msgstr "Jums ir vairâk nekâ viens cietais disks, uz kura jûs instalçjat linux?"
 #: ../../install_interactive.pm_.c:185
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
-msgstr "VISAS diska %s partîcijas un tajâs esoðie dati tiks pazaudçti"
+msgstr "VISAS diska %s sadaïas un tajâs esoðie dati tiks pazaudçti"
 
 #: ../../install_interactive.pm_.c:193
 msgid "Custom disk partitioning"
@@ -4439,7 +4414,7 @@ msgstr ""
 
 #: ../../install_interactive.pm_.c:229
 msgid "You don't have enough free space on your Windows partition"
-msgstr "Jûsu Windows partîcijâ nav pietiekoði daudz brîvas vietas"
+msgstr "Jûsu Windows sadaïâ nav pietiekoði daudz brîvas vietas"
 
 #: ../../install_interactive.pm_.c:245
 msgid "I can't find any room for installing"
@@ -4447,7 +4422,7 @@ msgstr "Nevaru atrast vietu instalçðanai"
 
 #: ../../install_interactive.pm_.c:248
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX partîciju veidoðanas meistars atrada sekojoðus risinâjumus:"
+msgstr "DrakX sadaïu veidoðanas meistars atrada sekojoðus risinâjumus:"
 
 #: ../../install_interactive.pm_.c:252
 #, c-format
@@ -4492,7 +4467,7 @@ msgstr ""
 msgid "Welcome to %s"
 msgstr "Jûs sveic %s"
 
-#: ../../install_steps.pm_.c:531 ../../install_steps.pm_.c:770
+#: ../../install_steps.pm_.c:542 ../../install_steps.pm_.c:781
 msgid "No floppy drive available"
 msgstr "Nav nevienas diskeðu iekârtas"
 
@@ -4519,7 +4494,6 @@ msgid "Install Class"
 msgstr "Instalçðanas klase"
 
 #: ../../install_steps_gtk.pm_.c:164
-#, fuzzy
 msgid "Please choose one of the following classes of installation:"
 msgstr "Lûdzu izvçlieties vienu no sekojoðâm instalçðanas klasçm:"
 
@@ -4600,7 +4574,7 @@ msgstr "Jûs nevarat atteikties no ðîs pakotnes. To ir nepiecieðams uzlabot"
 
 #: ../../install_steps_gtk.pm_.c:404
 msgid "Show automatically selected packages"
-msgstr ""
+msgstr "Parâdît automâtiski izvçlçtâs pakotnes"
 
 #: ../../install_steps_gtk.pm_.c:405 ../../install_steps_interactive.pm_.c:255
 #: ../../install_steps_interactive.pm_.c:259
@@ -4609,19 +4583,16 @@ msgid "Install"
 msgstr "Instalçt"
 
 #: ../../install_steps_gtk.pm_.c:408
-#, fuzzy
 msgid "Load/Save on floppy"
-msgstr "Saglabât disketç"
+msgstr "Ielâdçt/saglabât disketç"
 
 #: ../../install_steps_gtk.pm_.c:409
-#, fuzzy
 msgid "Updating package selection"
-msgstr "Saglabât pakotòu izvçli"
+msgstr "Atjaunoju pakotòu izvçli"
 
 #: ../../install_steps_gtk.pm_.c:414
-#, fuzzy
 msgid "Minimal install"
-msgstr "Instalçðanas beigas"
+msgstr "Minimâla instalçðana"
 
 #: ../../install_steps_gtk.pm_.c:429 ../../install_steps_interactive.pm_.c:522
 msgid "Choose the packages you want to install"
@@ -4739,9 +4710,9 @@ msgstr ""
 "kopçðanas nolûkus), izplatît tâlâk, reversi uzbûvçt, de-asamblçt,\n"
 "de-kompilçt vai modificçt ðo kompomentu. Jebkurð ðîs vienoðanâs pârkâpums\n"
 "jums automâtiski atòems tiesîbas, ko pieðíîrusi attiecîgâ licence. Izòemot\n"
-"gadîjumus, kad konkrçtas lcences nosacîjumi jums dod ðâdas tiesîbas, jûs\n"
-"parasti nedrîkstat instalçt ðâdu programmu uz vairâk nekâ vienas sistçmas\n"
-"vai pielâgot to izmantoðanai tîklâ. Ja ðaubâties, lûdzu sazinieties ar\n"
+"gadîjumus, kad konkrçtas licences nosacîjumi jums dod ðâdas tiesîbas, jûs\n"
+"parasti nedrîkstat instalçt ðâdu programmu uz vairâk, kâ vienas sistçmas\n"
+"vai pielâgot to izmantoðanai tîklâ. Ja ðaubaties, lûdzu sazinieties ar\n"
 "komponenta izplatîtâju vai redaktoru.\n"
 "Ðâdu komponentu, tajâ skaitâ arî iekïautâs dokumentâcijas, nodoðana\n"
 "treðajâm personâm vai kopçðana parasti ir aizliegta.\n"
@@ -4756,9 +4727,8 @@ msgid "An error occurred"
 msgstr "Atklâta kïûda"
 
 #: ../../install_steps_interactive.pm_.c:85
-#, fuzzy
 msgid "Do you really want to leave the installation?"
-msgstr "Vai vçlaties pârstartçt tîklu"
+msgstr "Vai tieðâm vçlaties pârtraukt instalçðanu?"
 
 #: ../../install_steps_interactive.pm_.c:112
 msgid "License agreement"
@@ -4887,7 +4857,7 @@ msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:191
 msgid "Are you sure you refuse the licence?"
-msgstr ""
+msgstr "Vai tieðâm vçlaties noraidît licenci?"
 
 #: ../../install_steps_interactive.pm_.c:211
 #: ../../install_steps_interactive.pm_.c:1021
@@ -4896,7 +4866,6 @@ msgid "Keyboard"
 msgstr "Tastatûra"
 
 #: ../../install_steps_interactive.pm_.c:212
-#, fuzzy
 msgid "Please choose your keyboard layout."
 msgstr "Lûdzu izvçlieties jûsu tastatûras izkârtojumu."
 
@@ -4927,18 +4896,15 @@ msgstr "Eksperta"
 
 #: ../../install_steps_interactive.pm_.c:255
 #: ../../install_steps_interactive.pm_.c:259
-#, fuzzy
 msgid "Upgrade"
 msgstr "Atjauninât"
 
 #: ../../install_steps_interactive.pm_.c:255
 #: ../../install_steps_interactive.pm_.c:259
-#, fuzzy
 msgid "Upgrade packages only"
-msgstr "Saglabât pakotòu izvçli"
+msgstr "Atjauninâk tikai pakotnes"
 
 #: ../../install_steps_interactive.pm_.c:275
-#, fuzzy
 msgid "Please choose the type of your mouse."
 msgstr "Lûdzu izvçlieties jûsu peles tipu."
 
@@ -4952,15 +4918,15 @@ msgstr "Lûdzu izvçlieties, kuram seriâlajam portam ir pieslçgta pele."
 
 #: ../../install_steps_interactive.pm_.c:290
 msgid "Buttons emulation"
-msgstr ""
+msgstr "Pogu emulâcija"
 
 #: ../../install_steps_interactive.pm_.c:292
 msgid "Button 2 Emulation"
-msgstr ""
+msgstr "2. pogas emulâcija"
 
 #: ../../install_steps_interactive.pm_.c:293
 msgid "Button 3 Emulation"
-msgstr ""
+msgstr "3. pogas emulâcija"
 
 #: ../../install_steps_interactive.pm_.c:314
 msgid "Configuring PCMCIA cards..."
@@ -4980,11 +4946,11 @@ msgstr "IDE"
 
 #: ../../install_steps_interactive.pm_.c:338
 msgid "No partition available"
-msgstr "nav pieejamu partîciju"
+msgstr "Nav pieejamu sadaïu"
 
 #: ../../install_steps_interactive.pm_.c:341
 msgid "Scanning partitions to find mount points"
-msgstr "Pârmeklçju partîcijas, lai atrastu montçðanas punktus"
+msgstr "Pârmeklçju sadaïas, lai atrastu montçðanas punktus"
 
 #: ../../install_steps_interactive.pm_.c:349
 msgid "Choose the mount points"
@@ -4999,23 +4965,23 @@ msgstr ""
 #: ../../install_steps_interactive.pm_.c:388
 #, fuzzy
 msgid "No root partition found to perform an upgrade"
-msgstr "Izvçlieties partîcijas, ko vçlaties formatçt"
+msgstr "Izvçlieties sadaïas, ko vçlaties formatçt"
 
 #: ../../install_steps_interactive.pm_.c:389
 msgid "Root Partition"
-msgstr "Saknes partîcija"
+msgstr "Saknes sadaïa"
 
 #: ../../install_steps_interactive.pm_.c:390
 msgid "What is the root partition (/) of your system?"
-msgstr "Kura ir jûsu sistçmas saknes partîcija (/)?"
+msgstr "Kura ir jûsu sistçmas saknes sadaïa (/)?"
 
 #: ../../install_steps_interactive.pm_.c:404
 msgid "You need to reboot for the partition table modifications to take place"
-msgstr "Lai partîciju tabulas izmaiòas stâtos spçkâ, jums jâpârstartç dators"
+msgstr "Lai sadaïu tabulas izmaiòas stâtos spçkâ, jums jâpârstartç dators"
 
 #: ../../install_steps_interactive.pm_.c:428
 msgid "Choose the partitions you want to format"
-msgstr "Izvçlieties partîcijas, ko vçlaties formatçt"
+msgstr "Izvçlieties sadaïas, ko vçlaties formatçt"
 
 #: ../../install_steps_interactive.pm_.c:429
 msgid "Check bad blocks?"
@@ -5023,7 +4989,7 @@ msgstr "Pârbaudît sliktos blokus?"
 
 #: ../../install_steps_interactive.pm_.c:456
 msgid "Formatting partitions"
-msgstr "Formatçju partîcijas"
+msgstr "Formatçju sadaïas"
 
 #: ../../install_steps_interactive.pm_.c:458
 #, c-format
@@ -5051,9 +5017,8 @@ msgid "Looking for available packages..."
 msgstr "Meklçju pieejamâs pakotnes"
 
 #: ../../install_steps_interactive.pm_.c:476
-#, fuzzy
 msgid "Looking at packages already installed..."
-msgstr "Jûs nevarat atteikties no ðîs pakotnes. Tâ jau ir instalçta"
+msgstr "Meklçju jau iepriekð uzinstalçtâs pakotnes..."
 
 #: ../../install_steps_interactive.pm_.c:480
 msgid "Finding packages to upgrade..."
@@ -5074,36 +5039,32 @@ msgid ""
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:536
-#, fuzzy
 msgid "Load from floppy"
-msgstr "Atjanot no disketes"
+msgstr "Ielâdçt no disketes"
 
 #: ../../install_steps_interactive.pm_.c:536
 msgid "Save on floppy"
 msgstr "Saglabât disketç"
 
 #: ../../install_steps_interactive.pm_.c:540
-#, fuzzy
 msgid "Loading from floppy"
-msgstr "Atjanot no disketes"
+msgstr "Ielâdçju no disketes"
 
 #: ../../install_steps_interactive.pm_.c:540
-#, fuzzy
 msgid "Package selection"
-msgstr "Pakotòu grupu izvçle"
+msgstr "Pakotòu izvçle"
 
 #: ../../install_steps_interactive.pm_.c:545
-#, fuzzy
 msgid "Insert a floppy containing package selection"
-msgstr "Ielieciet disketi iekârtâ %s"
+msgstr "Ielieciet disketi, kas satur pakotòu izvçli"
 
 #: ../../install_steps_interactive.pm_.c:627
 msgid "Selected size is larger than available space"
-msgstr ""
+msgstr "Izvçlçtais apjoms ir lielâks nekâ pieejamâ vieta"
 
 #: ../../install_steps_interactive.pm_.c:642
 msgid "Type of install"
-msgstr ""
+msgstr "Instalâcijas tips"
 
 #: ../../install_steps_interactive.pm_.c:643
 msgid ""
@@ -5113,15 +5074,15 @@ msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:646
 msgid "With X"
-msgstr ""
+msgstr "Ar X"
 
 #: ../../install_steps_interactive.pm_.c:648
 msgid "With basic documentation (recommended!)"
-msgstr ""
+msgstr "Ar pamatdokumentâciju (ieteicams!)"
 
 #: ../../install_steps_interactive.pm_.c:649
 msgid "Truly minimal install (especially no urpmi)"
-msgstr ""
+msgstr "Patiesi minimâla instalâcija (îpaði bez urpmi)"
 
 #: ../../install_steps_interactive.pm_.c:734
 msgid ""
@@ -5245,10 +5206,11 @@ msgid ""
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:901
-#, fuzzy
 msgid ""
 "Contacting Mandrake Linux web site to get the list of available mirrors..."
-msgstr "Pieslçdzos spoguïserverim, lai saòemtu pieejamo pakotòu sarakstu"
+msgstr ""
+"Pieslçdzos Mandrake Linux tîmeklim, lai saòemtu pieejamo spoguïserveru "
+"sarakstu sarakstu..."
 
 #: ../../install_steps_interactive.pm_.c:906
 msgid "Choose a mirror from which to get the packages"
@@ -5263,18 +5225,16 @@ msgid "Which is your timezone?"
 msgstr "Kâda ir jûsu laika josla?"
 
 #: ../../install_steps_interactive.pm_.c:948
-#, fuzzy
 msgid "Hardware clock set to GMT"
-msgstr "Vai datora pulkstenis râda GMT laiku?"
+msgstr "Datora pulkstenis iestatîts râdît GMT laiku"
 
 #: ../../install_steps_interactive.pm_.c:949
 msgid "Automatic time synchronization (using NTP)"
-msgstr ""
+msgstr "Automâtiska laika sinhronizâcija (izmantojot NTP)"
 
 #: ../../install_steps_interactive.pm_.c:956
-#, fuzzy
 msgid "NTP Server"
-msgstr "NIS serveris"
+msgstr "NTP serveris"
 
 #: ../../install_steps_interactive.pm_.c:990
 #: ../../install_steps_interactive.pm_.c:998
@@ -5286,9 +5246,8 @@ msgid "No printer"
 msgstr "Nav printera"
 
 #: ../../install_steps_interactive.pm_.c:1008
-#, fuzzy
 msgid "Do you have an ISA sound card?"
-msgstr "Vai ir vçl kâds?"
+msgstr "Vai Jums ir ISA skaòas karte?"
 
 #: ../../install_steps_interactive.pm_.c:1010
 msgid "Run \"sndconfig\" after installation to configure your sound card"
@@ -5296,7 +5255,7 @@ msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:1012
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr ""
+msgstr "Nav atrasta skaòu karte. Pçc instalçðanas izmçìiniet \"harddrake\""
 
 #: ../../install_steps_interactive.pm_.c:1017 ../../steps.pm_.c:27
 msgid "Summary"
@@ -5310,52 +5269,47 @@ msgstr "Pele"
 msgid "Timezone"
 msgstr "Laika josla"
 
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2937
-#: ../../printerdrake.pm_.c:3026
+#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2985
+#: ../../printerdrake.pm_.c:3074
 msgid "Printer"
 msgstr "Printeris"
 
 #: ../../install_steps_interactive.pm_.c:1025
-#, fuzzy
 msgid "ISDN card"
-msgstr "Iekðçja ISDN karte"
+msgstr "ISDN karte"
 
 #: ../../install_steps_interactive.pm_.c:1028
 #: ../../install_steps_interactive.pm_.c:1030
-#, fuzzy
 msgid "Sound card"
-msgstr "Standarta"
+msgstr "Skaòas karte"
 
 #: ../../install_steps_interactive.pm_.c:1032
 msgid "TV card"
-msgstr ""
+msgstr "TV karte"
 
 #: ../../install_steps_interactive.pm_.c:1072
 #: ../../install_steps_interactive.pm_.c:1097
 #: ../../install_steps_interactive.pm_.c:1101
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #: ../../install_steps_interactive.pm_.c:1073
 #: ../../install_steps_interactive.pm_.c:1097
 #: ../../install_steps_interactive.pm_.c:1110
-#, fuzzy
 msgid "NIS"
-msgstr "Izmantot NIS"
+msgstr "NIS"
 
 #: ../../install_steps_interactive.pm_.c:1074
 #: ../../install_steps_interactive.pm_.c:1097
 #: ../../install_steps_interactive.pm_.c:1118
 #: ../../install_steps_interactive.pm_.c:1124
-#, fuzzy
 msgid "Windows Domain"
-msgstr "NIS domçns"
+msgstr "Windows domçns"
 
 #: ../../install_steps_interactive.pm_.c:1075
 #: ../../install_steps_interactive.pm_.c:1097
-#, fuzzy
 msgid "Local files"
-msgstr "Lokâls printeris"
+msgstr "Lokâlie faili"
 
 #: ../../install_steps_interactive.pm_.c:1084
 #: ../../install_steps_interactive.pm_.c:1085 ../../steps.pm_.c:24
@@ -5372,28 +5326,25 @@ msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Ðî parole ir pârâk vienkârða (jâbût vismaz %d simbolus garai)"
 
 #: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:49
-#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:172
+#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
 msgid "Authentication"
 msgstr "Autentifikâcija"
 
 #: ../../install_steps_interactive.pm_.c:1105
-#, fuzzy
 msgid "Authentication LDAP"
-msgstr "Autentifikâcija"
+msgstr "LDAP autentikâcija"
 
 #: ../../install_steps_interactive.pm_.c:1106
 msgid "LDAP Base dn"
-msgstr ""
+msgstr "LDAP Base dn"
 
 #: ../../install_steps_interactive.pm_.c:1107
-#, fuzzy
 msgid "LDAP Server"
-msgstr "serveris"
+msgstr "LDAP serveris"
 
 #: ../../install_steps_interactive.pm_.c:1113
-#, fuzzy
 msgid "Authentication NIS"
-msgstr "Autentifikâcijas NIS"
+msgstr "NIS autentikâcija"
 
 #: ../../install_steps_interactive.pm_.c:1114
 msgid "NIS Domain"
@@ -5420,14 +5371,12 @@ msgid ""
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:1123
-#, fuzzy
 msgid "Authentication Windows Domain"
-msgstr "Autentifikâcija"
+msgstr "Windows Domain autentikâcija"
 
 #: ../../install_steps_interactive.pm_.c:1125
-#, fuzzy
 msgid "Domain Admin User Name"
-msgstr "Domçna nosaukums"
+msgstr "Domçna administratora lietotâja vârds"
 
 #: ../../install_steps_interactive.pm_.c:1126
 msgid "Domain Admin Password"
@@ -5468,7 +5417,7 @@ msgstr "Pirmâ diskeðu iekârta"
 msgid "Second floppy drive"
 msgstr "Otrâ diskeðu iekârta"
 
-#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2470
+#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2515
 msgid "Skip"
 msgstr "Izlaist"
 
@@ -5514,7 +5463,7 @@ msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Norâdiet diskeðu iekârtu, ko izmanto distetes veidoðanai"
 
 #: ../../install_steps_interactive.pm_.c:1206
-#, fuzzy, c-format
+#, c-format
 msgid "Insert a floppy in %s"
 msgstr "Ielieciet disketi iekârtâ %s"
 
@@ -5544,10 +5493,9 @@ msgid ""
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 "Kïûda, instalçjot aboot, \n"
-"vai instalçt piespiedu kârtâ pat tad, ja tiks iznîcinâta pirmâ partîcija?"
+"vai instalçt piespiedu kârtâ pat tad, ja tiks iznîcinâta pirmâ sadaïa?"
 
 #: ../../install_steps_interactive.pm_.c:1243
-#, fuzzy
 msgid "Installing bootloader"
 msgstr "Sâknçtâja instalçðana"
 
@@ -5661,38 +5609,35 @@ msgstr ""
 "   <Tab>/<Alt-Tab> pâriet | <Space> izvçlçties | <F12> uz nâkamo ekrânu"
 
 #: ../../interactive.pm_.c:87
-#, fuzzy
 msgid "kdesu missing"
-msgstr "atmest"
+msgstr "trûkstoðs kdesu"
 
 #: ../../interactive.pm_.c:89 ../../interactive.pm_.c:100
 msgid "consolehelper missing"
 msgstr ""
 
 #: ../../interactive.pm_.c:152
-#, fuzzy
 msgid "Choose a file"
-msgstr "Izvçlieties darbîbu"
+msgstr "Izvçlieties failu"
 
 #: ../../interactive.pm_.c:320
 msgid "Advanced"
 msgstr "Izvçrsta"
 
-#: ../../interactive.pm_.c:321
+#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:220
 msgid "Basic"
 msgstr ""
 
 #: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:158
-#: ../../printerdrake.pm_.c:2124
+#: ../../printerdrake.pm_.c:2169
 msgid "<- Previous"
 msgstr "<- Atpakaï"
 
 #: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
 #: ../../standalone/drakbackup_.c:4114 ../../standalone/drakbackup_.c:4141
 #: ../../standalone/drakbackup_.c:4171 ../../standalone/drakbackup_.c:4197
-#, fuzzy
 msgid "Next"
-msgstr "Tâlâk ->"
+msgstr "Tâlâk"
 
 #: ../../interactive/stdio.pm_.c:29 ../../interactive/stdio.pm_.c:149
 msgid "Bad choice, try again\n"
@@ -5711,28 +5656,27 @@ msgid ""
 msgstr ""
 
 #: ../../interactive/stdio.pm_.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "Your choice? (0/1, default `%s') "
-msgstr "Jûsu izvçle? (noklusçti %s) "
+msgstr "Jûsu izvçle? (0/1, noklusçti %s) "
 
 #: ../../interactive/stdio.pm_.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "Button `%s': %s"
-msgstr "Opcijas: %s"
+msgstr "Poga `%s': %s"
 
 #: ../../interactive/stdio.pm_.c:96
-#, fuzzy
 msgid "Do you want to click on this button?"
-msgstr "Vai vçlaties izmantot aboot?"
+msgstr "Vai vçlaties uzklikðíinât uz ðîs pogas?"
 
 #: ../../interactive/stdio.pm_.c:105
 msgid " enter `void' for void entry"
 msgstr ""
 
 #: ../../interactive/stdio.pm_.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Your choice? (default `%s'%s) "
-msgstr "Jûsu izvçle? (noklusçti %s) "
+msgstr "Jûsu izvçle? (noklusçti `%s'%s) "
 
 #: ../../interactive/stdio.pm_.c:123
 #, c-format
@@ -5806,9 +5750,8 @@ msgid "US keyboard"
 msgstr "ASV tastatûra"
 
 #: ../../keyboard.pm_.c:166
-#, fuzzy
 msgid "Albanian"
-msgstr "Irânas"
+msgstr "Albâòu"
 
 #: ../../keyboard.pm_.c:167
 msgid "Armenian (old)"
@@ -5831,28 +5774,24 @@ msgid "Belgian"
 msgstr "Beïìijas"
 
 #: ../../keyboard.pm_.c:177
-#, fuzzy
 msgid "Bengali"
-msgstr "ieslçgt"
+msgstr "Bengâïu"
 
 #: ../../keyboard.pm_.c:178
-#, fuzzy
 msgid "Bulgarian (phonetic)"
-msgstr "Armçnijas (fonçtiskâ)"
+msgstr "Bulgâru (fonçtiskâ)"
 
 #: ../../keyboard.pm_.c:179
-#, fuzzy
 msgid "Bulgarian (BDS)"
-msgstr "Bulgârijas"
+msgstr "Bulgâru (BDS)"
 
 #: ../../keyboard.pm_.c:180
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazîlijas (ABNT-2)"
 
 #: ../../keyboard.pm_.c:183
-#, fuzzy
 msgid "Bosnian"
-msgstr "Igaunijas"
+msgstr "Bosnieðu"
 
 #: ../../keyboard.pm_.c:184
 msgid "Belarusian"
@@ -5891,9 +5830,8 @@ msgid "Dvorak (Norwegian)"
 msgstr "Dvoraka (Norvçìijas)"
 
 #: ../../keyboard.pm_.c:195
-#, fuzzy
 msgid "Dvorak (Swedish)"
-msgstr "Dvoraka (US)"
+msgstr "Dvoraka (Zviedru)"
 
 #: ../../keyboard.pm_.c:196
 msgid "Estonian"
@@ -5956,9 +5894,8 @@ msgid "Japanese 106 keys"
 msgstr "Japânas 106 taistiòi"
 
 #: ../../keyboard.pm_.c:216
-#, fuzzy
 msgid "Korean keyboard"
-msgstr "Apvienotâs Karalistes"
+msgstr "Korejieðu tastatûra"
 
 #: ../../keyboard.pm_.c:217
 msgid "Latin American"
@@ -5986,9 +5923,8 @@ msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lietuvas \"fonçtiskâ\" QWERTY"
 
 #: ../../keyboard.pm_.c:224
-#, fuzzy
 msgid "Latvian"
-msgstr "Atraðanâs vieta"
+msgstr "Latvieðu"
 
 #: ../../keyboard.pm_.c:225
 msgid "Macedonian"
@@ -5999,9 +5935,8 @@ msgid "Myanmar (Burmese)"
 msgstr ""
 
 #: ../../keyboard.pm_.c:227
-#, fuzzy
 msgid "Mongolian (cyrillic)"
-msgstr "Azerbaidþânas (kirilica)"
+msgstr "Mongoïu (kirilica)"
 
 #: ../../keyboard.pm_.c:228
 msgid "Maltese (UK)"
@@ -6032,14 +5967,12 @@ msgid "Canadian (Quebec)"
 msgstr "Kanâdas (Kvebeka)"
 
 #: ../../keyboard.pm_.c:237
-#, fuzzy
 msgid "Romanian (qwertz)"
-msgstr "Krievijas (Yawerty)"
+msgstr "Rumâòu (qwertz)"
 
 #: ../../keyboard.pm_.c:238
-#, fuzzy
 msgid "Romanian (qwerty)"
-msgstr "Krievijas (Yawerty)"
+msgstr "Rumâòu (qwertz)"
 
 #: ../../keyboard.pm_.c:240
 msgid "Russian (Yawerty)"
@@ -6058,9 +5991,8 @@ msgid "Slovakian (QWERTY)"
 msgstr "Slovâkijas (QWERTY)"
 
 #: ../../keyboard.pm_.c:246
-#, fuzzy
 msgid "Serbian (cyrillic)"
-msgstr "Azerbaidþânas (kirilica)"
+msgstr "Serbu (kirilica)"
 
 #: ../../keyboard.pm_.c:248
 msgid "Tamil (Unicode)"
@@ -6075,9 +6007,8 @@ msgid "Thai keyboard"
 msgstr "Tai tastatûra"
 
 #: ../../keyboard.pm_.c:252
-#, fuzzy
 msgid "Tajik keyboard"
-msgstr "Tai tastatûra"
+msgstr "Tadþiku tastatûra"
 
 #: ../../keyboard.pm_.c:253
 msgid "Turkish (traditional \"F\" model)"
@@ -6100,45 +6031,44 @@ msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vjetnamas \"numuru rinda\" QWERTY"
 
 #: ../../keyboard.pm_.c:261
-#, fuzzy
 msgid "Yugoslavian (latin)"
-msgstr "Dienvidslâvijas (latîòu/kirilicas)"
+msgstr "Dienvidslâvu (latîòu)"
 
 #: ../../keyboard.pm_.c:268
 msgid "Right Alt key"
-msgstr ""
+msgstr "Labais Alt taustiòs"
 
 #: ../../keyboard.pm_.c:269
 msgid "Both Shift keys simultaneously"
-msgstr ""
+msgstr "Abi Shift taustiòi vienlaicîgi"
 
 #: ../../keyboard.pm_.c:270
 msgid "Control and Shift keys simultaneously"
-msgstr ""
+msgstr "Ctrll un Shift taustiòi vienlaicîgi"
 
 #: ../../keyboard.pm_.c:271
 msgid "CapsLock key"
-msgstr ""
+msgstr "CapsLock taustiòð"
 
 #: ../../keyboard.pm_.c:272
 msgid "Ctrl and Alt keys simultaneously"
-msgstr ""
+msgstr "Ctrl un Alt taustiòi vienlaicîgi"
 
 #: ../../keyboard.pm_.c:273
 msgid "Alt and Shift keys simultaneously"
-msgstr ""
+msgstr "Alt un Shift taustiòi vienlaicîgi"
 
 #: ../../keyboard.pm_.c:274
 msgid "\"Menu\" key"
-msgstr ""
+msgstr "\"Menu\" taustiòð"
 
 #: ../../keyboard.pm_.c:275
 msgid "Left \"Windows\" key"
-msgstr ""
+msgstr "Kreisais \"Windows\" taustiòð"
 
 #: ../../keyboard.pm_.c:276
 msgid "Right \"Windows\" key"
-msgstr ""
+msgstr "Labais \"Windows\" taustiòð"
 
 #: ../../loopback.pm_.c:32
 #, c-format
@@ -6150,33 +6080,32 @@ msgid "Remove the logical volumes first\n"
 msgstr ""
 
 #: ../../modparm.pm_.c:50
-#, fuzzy
 msgid "a number"
-msgstr "Telefona numurs"
+msgstr "numurs"
 
 #: ../../modparm.pm_.c:52
 #, c-format
 msgid "%d comma separated numbers"
-msgstr ""
+msgstr "%d ar komatu atdalîti skaitïi"
 
 #: ../../modparm.pm_.c:52
 #, c-format
 msgid "%d comma separated strings"
-msgstr ""
+msgstr "%d ar komatu atdalîtas rindas"
 
 #: ../../modparm.pm_.c:54
 msgid "comma separated numbers"
-msgstr ""
+msgstr "ar komatu atdalîti skaitïi"
 
 #: ../../modparm.pm_.c:54
-#, fuzzy
 msgid "comma separated strings"
-msgstr "Diska formatçðana"
+msgstr "ar komatu atdalîta virkne"
 
 #: ../../modules.pm_.c:293
 msgid ""
 "PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
 msgstr ""
+"PCMCIA atbalsts 2.2 kodoliem vairs nepastâv. Lûdzu izmantojiet 2.4 kodolu."
 
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
@@ -6207,14 +6136,12 @@ msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
 #: ../../mouse.pm_.c:39 ../../mouse.pm_.c:48
-#, fuzzy
 msgid "Microsoft Explorer"
 msgstr "Microsoft IntelliMouse"
 
 #: ../../mouse.pm_.c:44 ../../mouse.pm_.c:70
-#, fuzzy
 msgid "1 button"
-msgstr "2 pogas"
+msgstr "1 poga"
 
 #: ../../mouse.pm_.c:45 ../../mouse.pm_.c:53
 msgid "Generic 2 Button Mouse"
@@ -6298,14 +6225,13 @@ msgstr "PAKUSTINIET RITENI!"
 
 #: ../../my_gtk.pm_.c:64
 msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
-msgstr ""
+msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
 
 #: ../../my_gtk.pm_.c:159
-#, fuzzy
 msgid "Finish"
-msgstr "Somijas"
+msgstr "Somu"
 
-#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2126
+#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2171
 msgid "Next ->"
 msgstr "Tâlâk ->"
 
@@ -6345,7 +6271,7 @@ msgstr ""
 
 #: ../../network/adsl.pm_.c:26
 msgid "Alcatel speedtouch usb"
-msgstr ""
+msgstr "Alcatel speedtouch usb"
 
 #: ../../network/adsl.pm_.c:26
 msgid "use dhcp"
@@ -6360,29 +6286,24 @@ msgid "use pptp"
 msgstr "izmantot pptp"
 
 #: ../../network/drakfirewall.pm_.c:12
-#, fuzzy
 msgid "Web Server"
-msgstr "serveris"
+msgstr "Web serveris"
 
 #: ../../network/drakfirewall.pm_.c:17
-#, fuzzy
 msgid "Domain Name Server"
-msgstr "Domçna nosaukums"
+msgstr "Domçna nosaukumu serveris"
 
 #: ../../network/drakfirewall.pm_.c:32
-#, fuzzy
 msgid "Mail Server"
-msgstr "Serveris, Datubâzes"
+msgstr "Pasta serveris"
 
 #: ../../network/drakfirewall.pm_.c:37
-#, fuzzy
 msgid "POP and IMAP Server"
-msgstr "serveris"
+msgstr "POP un IMAP serveris"
 
 #: ../../network/drakfirewall.pm_.c:111
-#, fuzzy
 msgid "No network card"
-msgstr "tîkla karte nav atrasta"
+msgstr "Nav tîkla kartes"
 
 #: ../../network/drakfirewall.pm_.c:129
 msgid ""
@@ -6411,15 +6332,17 @@ msgid ""
 "The proper format is \"port/tcp\" or \"port/udp\", \n"
 "where port is between 1 and 65535."
 msgstr ""
+"Norâdîts nepareizs ports: %s.\n"
+"Pareizs formâts ir \"ports/tcp\" vai \"ports/udp\", \n"
+"kur ports ir no 1 lîdz 65535."
 
 #: ../../network/drakfirewall.pm_.c:162
 msgid "Everything (no firewall)"
-msgstr ""
+msgstr "Viss (bez ugunsmûra)"
 
 #: ../../network/drakfirewall.pm_.c:164
-#, fuzzy
 msgid "Other ports"
-msgstr "Pârbaudît portus"
+msgstr "Citi porti"
 
 #: ../../network/ethernet.pm_.c:37
 msgid ""
@@ -6437,7 +6360,7 @@ msgstr ""
 "Jûsu sistçmâ nav atrasts neviens ethernet tîkla adapteris.\n"
 "Nevaru uzstâdît ðo pieslçguma veidu."
 
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:240
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:236
 msgid "Choose the network interface"
 msgstr "Izvçlieties tîkla interfeisu"
 
@@ -6469,7 +6392,7 @@ msgstr ""
 
 #: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:367
 msgid "Host name"
-msgstr "Resursa vârds:"
+msgstr "Resursa vârds"
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
 #: ../../network/netconnect.pm_.c:90 ../../network/netconnect.pm_.c:104
@@ -6505,14 +6428,12 @@ msgid ""
 msgstr ""
 
 #: ../../network/isdn.pm_.c:54
-#, fuzzy
 msgid "New configuration (isdn-light)"
-msgstr "Tika atklâta ugunsmûra konfigurâcija!"
+msgstr "Jauna konfigurâcija (isdn-light)"
 
 #: ../../network/isdn.pm_.c:54
-#, fuzzy
 msgid "Old configuration (isdn4net)"
-msgstr "Tika atklâta ugunsmûra konfigurâcija!"
+msgstr "Veca konfigurâcija (isdn4net)"
 
 #: ../../network/isdn.pm_.c:170 ../../network/isdn.pm_.c:188
 #: ../../network/isdn.pm_.c:200 ../../network/isdn.pm_.c:206
@@ -6529,22 +6450,18 @@ msgstr ""
 " Ja tas nav ðajâ sarakstâ, izvçlietis Nav sarakstâ"
 
 #: ../../network/isdn.pm_.c:183
-#, fuzzy
 msgid "Europe protocol"
-msgstr "Protokols"
+msgstr "Eiropas protokols"
 
 #: ../../network/isdn.pm_.c:183
-#, fuzzy
 msgid "Europe protocol (EDSS1)"
-msgstr "Eiropa (EDSS1)"
+msgstr "Eiropas protokols (EDSS1)"
 
 #: ../../network/isdn.pm_.c:185
-#, fuzzy
 msgid "Protocol for the rest of the world"
 msgstr "Citur pasaulç"
 
 #: ../../network/isdn.pm_.c:185
-#, fuzzy
 msgid ""
 "Protocol for the rest of the world\n"
 "No D-Channel (leased lines)"
@@ -6637,7 +6554,7 @@ msgstr "Lietotâja ID"
 
 #: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
 msgid "CHAP"
-msgstr ""
+msgstr "CHAP"
 
 #: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
 msgid "PAP"
@@ -6656,14 +6573,12 @@ msgid "Domain name"
 msgstr "Domçna nosaukums"
 
 #: ../../network/modem.pm_.c:51 ../../standalone/drakconnect_.c:627
-#, fuzzy
 msgid "First DNS Server (optional)"
-msgstr "Pirmais DNS serveris"
+msgstr "Pirmais DNS serveris (neobligâts)"
 
 #: ../../network/modem.pm_.c:52 ../../standalone/drakconnect_.c:628
-#, fuzzy
 msgid "Second DNS Server (optional)"
-msgstr "Otrais DNS serveris"
+msgstr "Otrais DNS serveris (neobligâts)"
 
 #: ../../network/netconnect.pm_.c:29
 msgid ""
@@ -6698,33 +6613,28 @@ msgid "You are not currently connected to Internet."
 msgstr "Paðlaik jûs neesat pieslçdzies Internetam."
 
 #: ../../network/netconnect.pm_.c:36
-#, fuzzy
 msgid "Connect"
-msgstr "Nav pieslçgts"
+msgstr "Pieslçgties"
 
 #: ../../network/netconnect.pm_.c:38
-#, fuzzy
 msgid "Disconnect"
-msgstr "ISDN pieslçgums"
+msgstr "Atslçgties"
 
 #: ../../network/netconnect.pm_.c:40
-#, fuzzy
 msgid "Configure the connection"
-msgstr "Tîkla konfigurçðana"
+msgstr "Konfigurçt pieslçgumu"
 
 #: ../../network/netconnect.pm_.c:45
 msgid "Internet connection & configuration"
 msgstr "Interneta pieslçgums un konfigurâcija"
 
 #: ../../network/netconnect.pm_.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "We are now going to configure the %s connection."
-msgstr ""
-"\n"
-"Varat atslçgties vai pârkonfigurçt pieslçgumu."
+msgstr "Tagad mçs konfigurçsim %s pieslçgumu."
 
 #: ../../network/netconnect.pm_.c:104
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -6735,7 +6645,12 @@ msgid ""
 "Press OK to continue."
 msgstr ""
 "\n"
-"Varat atslçgties vai pârkonfigurçt pieslçgumu."
+"\n"
+"\n"
+"Tagad mçs konfigurçsim %s pieslçgumu.\n"
+"\n"
+"\n"
+"Nospiediet OK lai turpinâtu."
 
 #: ../../network/netconnect.pm_.c:133 ../../network/netconnect.pm_.c:251
 #: ../../network/netconnect.pm_.c:271 ../../network/tools.pm_.c:63
@@ -6764,15 +6679,15 @@ msgstr "Izvçlieties konfigurçjamo profilu"
 
 #: ../../network/netconnect.pm_.c:167
 msgid "Use auto detection"
-msgstr ""
+msgstr "Izmantot autonoteikðanu"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3151
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3199
 #: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
-#: ../../standalone/drakfloppy_.c:145
+#: ../../standalone/drakfloppy_.c:146
 msgid "Expert Mode"
 msgstr "Eksperta reþîms"
 
-#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:386
+#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:399
 msgid "Detecting devices..."
 msgstr "Noskaidroju ierîces..."
 
@@ -6795,9 +6710,8 @@ msgid "detected %s"
 msgstr "atklâts %s"
 
 #: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
-#, fuzzy
 msgid "ADSL connection"
-msgstr "LAN pieslçgums"
+msgstr "ADSL pieslçgums"
 
 #: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
 #, c-format
@@ -6809,9 +6723,8 @@ msgid "Cable connection"
 msgstr "Kabeïa pieslçgums"
 
 #: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
-#, fuzzy
 msgid "cable connection detected"
-msgstr "Kabeïa pieslçgums"
+msgstr "Noteikts kabeïa pieslçgums"
 
 #: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
 msgid "LAN connection"
@@ -6822,9 +6735,8 @@ msgid "ethernet card(s) detected"
 msgstr "ethernet karte(s) atrasta"
 
 #: ../../network/netconnect.pm_.c:201
-#, fuzzy
 msgid "Choose the connection you want to configure"
-msgstr "Izvçlieties izmantojamo rîku"
+msgstr "Izvçlieties pieslçgumu, kuru vçlaties konfigurçt"
 
 #: ../../network/netconnect.pm_.c:225
 msgid ""
@@ -6834,9 +6746,8 @@ msgid ""
 msgstr ""
 
 #: ../../network/netconnect.pm_.c:226
-#, fuzzy
 msgid "Internet connection"
-msgstr "Interneta pieslçguma koplietoðana"
+msgstr "Interneta pieslçgums"
 
 #: ../../network/netconnect.pm_.c:232
 msgid "Do you want to start the connection at boot?"
@@ -6848,7 +6759,7 @@ msgstr "Tîkla konfigurâcija"
 
 #: ../../network/netconnect.pm_.c:247
 msgid "The network needs to be restarted"
-msgstr ""
+msgstr "Tîkls ir jâpârstartç"
 
 #: ../../network/netconnect.pm_.c:251
 #, fuzzy, c-format
@@ -6931,7 +6842,7 @@ msgstr "Automâtisks IP"
 msgid "Start at boot"
 msgstr "Sistçmdisketes radîðana"
 
-#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:860
+#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:875
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adreses formâtam jâbût 1.2.3.4"
 
@@ -6954,21 +6865,19 @@ msgstr "DNS serveris"
 #: ../../network/network.pm_.c:369
 #, c-format
 msgid "Gateway (e.g. %s)"
-msgstr ""
+msgstr "Vârteja (piem. %s)"
 
 #: ../../network/network.pm_.c:371
 msgid "Gateway device"
 msgstr "Vârtejas ierîce"
 
 #: ../../network/network.pm_.c:376
-#, fuzzy
 msgid "DNS server address should be in format 1.2.3.4"
-msgstr "IP adreses formâtam jâbût 1.2.3.4"
+msgstr "DNS servera adreses formâtam jâbût 1.2.3.4"
 
 #: ../../network/network.pm_.c:380
-#, fuzzy
 msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP adreses formâtam jâbût 1.2.3.4"
+msgstr "Vârtejas adreses formâtam ir jâbût 1.2.3.4"
 
 #: ../../network/network.pm_.c:394
 msgid "Proxies configuration"
@@ -6991,9 +6900,8 @@ msgid "Proxy should be http://..."
 msgstr "Proxy bûtu jâbût http://..."
 
 #: ../../network/network.pm_.c:401 ../../proxy.pm_.c:65
-#, fuzzy
 msgid "Url should begin with 'ftp:' or 'http:'"
-msgstr "Proxy bûtu jâbût http://..."
+msgstr "URL bûtu jâsâkas ar 'ftp:' vai 'http:'"
 
 #: ../../network/shorewall.pm_.c:24
 msgid "Firewalling configuration detected!"
@@ -7041,7 +6949,7 @@ msgstr "Savienojuma konfigurçðana"
 
 #: ../../network/tools.pm_.c:83
 msgid "Please fill or check the field below"
-msgstr "Lûdzu aizpieldiet vai izvçlietis lauku"
+msgstr "Lûdzu aizpildiet vai izvçlietis lauku"
 
 #: ../../network/tools.pm_.c:85 ../../standalone/drakconnect_.c:607
 msgid "Card IRQ"
@@ -7084,18 +6992,16 @@ msgid "Provider dns 2 (optional)"
 msgstr "Provaidera dns 2 (nav obligâti)"
 
 #: ../../network/tools.pm_.c:95
-#, fuzzy
 msgid "Choose your country"
-msgstr "Tastatûras izvçle"
+msgstr "Izvçlieties valsti"
 
 #: ../../network/tools.pm_.c:96 ../../standalone/drakconnect_.c:619
 msgid "Dialing mode"
 msgstr "Zvanîðanas reþîms"
 
 #: ../../network/tools.pm_.c:97 ../../standalone/drakconnect_.c:631
-#, fuzzy
 msgid "Connection speed"
-msgstr "Savienojuma tips: "
+msgstr "Savienojuma âtrums"
 
 #: ../../network/tools.pm_.c:98 ../../standalone/drakconnect_.c:632
 #, fuzzy
@@ -7113,7 +7019,7 @@ msgstr "Konta parole"
 
 #: ../../network/tools.pm_.c:104 ../../network/tools.pm_.c:118
 msgid "United Kingdom"
-msgstr ""
+msgstr "Apvienotâ Karaliste"
 
 #: ../../partition_table.pm_.c:602
 msgid "mount failed: "
@@ -7121,7 +7027,7 @@ msgstr "montçðana neizdevâs: "
 
 #: ../../partition_table.pm_.c:666
 msgid "Extended partition not supported on this platform"
-msgstr "Ðai platformai paplaðinâtâ partîcija nav pieejama"
+msgstr "Ðai platformai paplaðinâtâ sadaïa nav pieejama"
 
 #: ../../partition_table.pm_.c:684
 msgid ""
@@ -7129,9 +7035,9 @@ msgid ""
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 msgstr ""
-"Jûsu diska partîciju tabulâ ir caurums, bet es to nevaru izmantot.\n"
-"Vienîgais risinâjums ir pârvietot primâras partîcijas tâ, lai caurums "
-"atrastos blakus paplaðinâtajâm partîcijâm"
+"Jûsu diska sadaïu tabulâ ir caurums, bet es to nevaru izmantot.\n"
+"Vienîgais risinâjums ir pârvietot primâras sadaïas tâ, lai caurums atrastos "
+"blakus paplaðinâtajâm sadaïâm."
 
 #: ../../partition_table.pm_.c:774
 #, c-format
@@ -7176,35 +7082,35 @@ msgstr "varbût"
 
 #: ../../printer.pm_.c:26
 msgid "CUPS - Common Unix Printing System"
-msgstr ""
+msgstr "CUPS - Common Unix Printing System"
 
 #: ../../printer.pm_.c:27
 msgid "LPRng - LPR New Generation"
-msgstr ""
+msgstr "LPRng - LPR New Generation"
 
 #: ../../printer.pm_.c:28
 msgid "LPD - Line Printer Daemon"
-msgstr ""
+msgstr "LPD - Line Printer Daemon"
 
 #: ../../printer.pm_.c:29
 msgid "PDQ - Print, Don't Queue"
-msgstr ""
+msgstr "PDQ - Print, Don't Queue"
 
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1125
+#: ../../printer.pm_.c:34 ../../printer.pm_.c:1144
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: ../../printer.pm_.c:35
 msgid "LPRng"
-msgstr ""
+msgstr "LPRng"
 
 #: ../../printer.pm_.c:36
 msgid "LPD"
-msgstr ""
+msgstr "LPD"
 
 #: ../../printer.pm_.c:37
 msgid "PDQ"
-msgstr ""
+msgstr "PDQ"
 
 #: ../../printer.pm_.c:49
 msgid "Local printer"
@@ -7215,137 +7121,129 @@ msgid "Remote printer"
 msgstr "Attâls printeris"
 
 #: ../../printer.pm_.c:51
-#, fuzzy
 msgid "Printer on remote CUPS server"
-msgstr "Attâls CUPS serveris"
+msgstr "Printeris uz attâla CUPS servera"
 
-#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:883
-#, fuzzy
+#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:898
 msgid "Printer on remote lpd server"
-msgstr "Attâls lpd serveris"
+msgstr "Printeris uz attâla lpd servera"
 
 #: ../../printer.pm_.c:53
 msgid "Network printer (TCP/Socket)"
 msgstr "Tîkla printeris (TCP/Socket)"
 
 #: ../../printer.pm_.c:54
-#, fuzzy
 msgid "Printer on SMB/Windows 95/98/NT server"
-msgstr "SMB/Windows 95/98/NT"
+msgstr "Printeris uz SMB/Windows 95/98/NT servera"
 
 #: ../../printer.pm_.c:55
-#, fuzzy
 msgid "Printer on NetWare server"
-msgstr "Printera serveris"
+msgstr "Printeris uz NetWare servera"
 
-#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:887
-#, fuzzy
+#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:902
 msgid "Enter a printer device URI"
-msgstr "Printera ierîces URI"
+msgstr "Ievadiet printera ierîces URI"
 
 #: ../../printer.pm_.c:57
 msgid "Pipe job into a command"
 msgstr ""
 
-#: ../../printer.pm_.c:324 ../../printer.pm_.c:366 ../../printer.pm_.c:533
-#, fuzzy
+#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:552
 msgid "Unknown Model"
-msgstr "nezinâms"
+msgstr "Nezinâms modelis"
 
-#: ../../printer.pm_.c:735 ../../printer.pm_.c:926 ../../printer.pm_.c:1318
-#: ../../printerdrake.pm_.c:2260 ../../printerdrake.pm_.c:3414
+#: ../../printer.pm_.c:754 ../../printer.pm_.c:945 ../../printer.pm_.c:1337
+#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3462
 msgid "Unknown model"
-msgstr ""
+msgstr "Nezinâms modelis"
 
-#: ../../printer.pm_.c:763
-#, fuzzy
+#: ../../printer.pm_.c:782
 msgid "Local Printers"
 msgstr "Lokâls printeris"
 
-#: ../../printer.pm_.c:765 ../../printer.pm_.c:1126
-#, fuzzy
+#: ../../printer.pm_.c:784 ../../printer.pm_.c:1145
 msgid "Remote Printers"
 msgstr "Attâls printeris"
 
-#: ../../printer.pm_.c:772 ../../printerdrake.pm_.c:404
+#: ../../printer.pm_.c:791 ../../printerdrake.pm_.c:417
 #, c-format
 msgid " on parallel port \\/*%s"
-msgstr ""
+msgstr " uz paralelâ porta \\/*%s"
 
-#: ../../printer.pm_.c:775 ../../printerdrake.pm_.c:406
+#: ../../printer.pm_.c:794 ../../printerdrake.pm_.c:419
 #, c-format
 msgid ", USB printer \\/*%s"
-msgstr ""
+msgstr ", USB printeris \\/*%s"
 
-#: ../../printer.pm_.c:780
+#: ../../printer.pm_.c:799
 #, c-format
 msgid ", multi-function device on parallel port \\/*%s"
 msgstr ""
 
-#: ../../printer.pm_.c:783
+#: ../../printer.pm_.c:802
 msgid ", multi-function device on USB"
 msgstr ""
 
-#: ../../printer.pm_.c:785
+#: ../../printer.pm_.c:804
 msgid ", multi-function device on HP JetDirect"
 msgstr ""
 
-#: ../../printer.pm_.c:787
+#: ../../printer.pm_.c:806
 msgid ", multi-function device"
 msgstr ""
 
-#: ../../printer.pm_.c:790
-#, fuzzy, c-format
+#: ../../printer.pm_.c:809
+#, c-format
 msgid ", printing to %s"
-msgstr "Kïûda, ierakstot failâ %s"
+msgstr ", drukâju uz %s"
 
-#: ../../printer.pm_.c:792
+#: ../../printer.pm_.c:811
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
-msgstr ""
+msgstr " uz LPD servers \"%s\", printeris \"%s\""
 
-#: ../../printer.pm_.c:794
+#: ../../printer.pm_.c:813
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
-msgstr ""
+msgstr ", TCP/IP resurss \"%s\", ports %s"
 
-#: ../../printer.pm_.c:798
+#: ../../printer.pm_.c:817
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
-msgstr ""
+msgstr " uz SMB/Windows servera \"%s\", koplietojums \"%s\""
 
-#: ../../printer.pm_.c:802
+#: ../../printer.pm_.c:821
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
-msgstr ""
+msgstr " uz Novell servers \"%s\", printeris \"%s\""
 
-#: ../../printer.pm_.c:804
+#: ../../printer.pm_.c:823
 #, c-format
 msgid ", using command %s"
 msgstr ""
 
-#: ../../printer.pm_.c:923 ../../printerdrake.pm_.c:1656
+#: ../../printer.pm_.c:942 ../../printerdrake.pm_.c:1701
 msgid "Raw printer (No driver)"
 msgstr ""
 
-#: ../../printer.pm_.c:1095
-#, fuzzy, c-format
+#: ../../printer.pm_.c:1114
+#, c-format
 msgid "(on %s)"
-msgstr "(modulis %s)"
+msgstr "uz %s)"
 
-#: ../../printer.pm_.c:1097
+#: ../../printer.pm_.c:1116
 msgid "(on this machine)"
 msgstr ""
 
-#: ../../printer.pm_.c:1122
-#, fuzzy, c-format
+#: ../../printer.pm_.c:1141
+#, c-format
 msgid "On CUPS server \"%s\""
-msgstr "CUPS servera IP"
+msgstr "Uz CUPS servera \"%s\""
 
-#: ../../printer.pm_.c:1128 ../../printerdrake.pm_.c:3071
-#: ../../printerdrake.pm_.c:3082 ../../printerdrake.pm_.c:3303
-#: ../../printerdrake.pm_.c:3355 ../../printerdrake.pm_.c:3381
-#: ../../printerdrake.pm_.c:3556 ../../printerdrake.pm_.c:3558
+#: ../../printer.pm_.c:1147 ../../printerdrake.pm_.c:3119
+#: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3351
+#: ../../printerdrake.pm_.c:3403 ../../printerdrake.pm_.c:3429
+#: ../../printerdrake.pm_.c:3604 ../../printerdrake.pm_.c:3606
 msgid " (Default)"
 msgstr " (Noklusçts)"
 
@@ -7370,17 +7268,15 @@ msgstr ""
 
 #: ../../printerdrake.pm_.c:36
 msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
-msgstr ""
+msgstr "Printeru automâtiska noteikðana (lokâli, TCP/Socket un SMB printeri)"
 
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3135
-#, fuzzy
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3183
 msgid "CUPS configuration"
-msgstr "LAN konfigurâcija"
+msgstr "CUPS konfigurâcija"
 
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3136
-#, fuzzy
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3184
 msgid "Specify CUPS server"
-msgstr "Attâls CUPS serveris"
+msgstr "Norâdiet CUPS serveri"
 
 #: ../../printerdrake.pm_.c:86
 msgid ""
@@ -7404,50 +7300,45 @@ msgid ""
 msgstr ""
 
 #: ../../printerdrake.pm_.c:91
-#, fuzzy
 msgid "The IP address should look like 192.168.1.20"
-msgstr "IP adreses formâtam jâbût 1.2.3.4"
+msgstr "IP adresei ir jaizskatâs ðâdi: 192.168.1.20"
 
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1094
-#, fuzzy
+#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1109
 msgid "The port number should be an integer!"
-msgstr "Porta numuram ir jâbût skaitlim"
+msgstr "Porta numuram ir jâbût skaitlim!"
 
 #: ../../printerdrake.pm_.c:102
 msgid "CUPS server IP"
 msgstr "CUPS servera IP"
 
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1114
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1129
 msgid "Port"
 msgstr "Ports"
 
 #: ../../printerdrake.pm_.c:105
-#, fuzzy
 msgid "Automatic CUPS configuration"
-msgstr "Sâknçðanas stila konfigurçðana"
+msgstr "Automâtiska CUPS konfigurçðana"
 
 #: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
-#: ../../printerdrake.pm_.c:1529 ../../printerdrake.pm_.c:1533
-#: ../../printerdrake.pm_.c:1651 ../../printerdrake.pm_.c:2203
-#: ../../printerdrake.pm_.c:2356 ../../printerdrake.pm_.c:2415
-#: ../../printerdrake.pm_.c:2488 ../../printerdrake.pm_.c:2509
-#: ../../printerdrake.pm_.c:2699 ../../printerdrake.pm_.c:2740
-#: ../../printerdrake.pm_.c:2745 ../../printerdrake.pm_.c:2779
-#: ../../printerdrake.pm_.c:2784 ../../printerdrake.pm_.c:2821
-#: ../../printerdrake.pm_.c:2874 ../../printerdrake.pm_.c:2894
-#: ../../printerdrake.pm_.c:2908 ../../printerdrake.pm_.c:2942
-#: ../../printerdrake.pm_.c:2988 ../../printerdrake.pm_.c:3006
-#: ../../printerdrake.pm_.c:3095 ../../printerdrake.pm_.c:3169
-#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3526
-#: ../../printerdrake.pm_.c:3579 ../../standalone/printerdrake_.c:57
-#, fuzzy
+#: ../../printerdrake.pm_.c:1574 ../../printerdrake.pm_.c:1578
+#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
+#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
+#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
+#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2788
+#: ../../printerdrake.pm_.c:2793 ../../printerdrake.pm_.c:2827
+#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2869
+#: ../../printerdrake.pm_.c:2922 ../../printerdrake.pm_.c:2942
+#: ../../printerdrake.pm_.c:2956 ../../printerdrake.pm_.c:2990
+#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3054
+#: ../../printerdrake.pm_.c:3143 ../../printerdrake.pm_.c:3217
+#: ../../printerdrake.pm_.c:3519 ../../printerdrake.pm_.c:3574
+#: ../../printerdrake.pm_.c:3627 ../../standalone/printerdrake_.c:57
 msgid "Printerdrake"
-msgstr "Printeris"
+msgstr "Printerdrake"
 
 #: ../../printerdrake.pm_.c:178
-#, fuzzy
 msgid "Checking your system..."
-msgstr "Kuru drukâðanas sistçmu vçlaties izmantot?"
+msgstr "Pârbaudu jûsu sistçmu..."
 
 #: ../../printerdrake.pm_.c:186
 msgid ""
@@ -7455,18 +7346,20 @@ msgid ""
 msgstr ""
 
 #: ../../printerdrake.pm_.c:198
-#, fuzzy
 msgid ""
 "The following printers\n"
 "\n"
-msgstr "Tiks noòemtas sekojoðas pakotnes"
+msgstr ""
+"Sekojoði printeri\n"
+"\n"
 
 #: ../../printerdrake.pm_.c:199
-#, fuzzy
 msgid ""
 "The following printer\n"
 "\n"
-msgstr "Tiks noòemtas sekojoðas pakotnes"
+msgstr ""
+"Sekojoðs printeris\n"
+"\n"
 
 #: ../../printerdrake.pm_.c:201
 msgid ""
@@ -7494,15 +7387,16 @@ msgid ""
 msgstr ""
 
 #: ../../printerdrake.pm_.c:210
-#, fuzzy
 msgid "directly connected to your system"
-msgstr "Jûsu sistçmâ nav tîkla adaptera!"
+msgstr "tieði pieslçgts jûsu sistçmai"
 
 #: ../../printerdrake.pm_.c:213
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
+"\n"
+"Jûsu sistçmai ir tieði pieslçgts viens nezinâms printeris"
 
 #: ../../printerdrake.pm_.c:215
 #, c-format
@@ -7510,11 +7404,12 @@ msgid ""
 "\n"
 "There are %d unknown printers directly connected to your system"
 msgstr ""
+"\n"
+"Jûsu sistçmai ir tieði pieslçgti %d nezinâmi printeri"
 
 #: ../../printerdrake.pm_.c:221
-#, fuzzy
 msgid " (Make sure that all your printers are connected and turned on).\n"
-msgstr "Lûdzu norâdiet, kuram seriâlajam portam ir pieslçgts modçms."
+msgstr "(Pârliecinieties, ka visi jûsu printeri ir pieslçgti un ieslçgti).\n"
 
 #: ../../printerdrake.pm_.c:235
 msgid ""
@@ -7523,14 +7418,12 @@ msgid ""
 msgstr ""
 
 #: ../../printerdrake.pm_.c:236
-#, fuzzy
 msgid "Do you want to enable printing on printers in the local network?\n"
-msgstr "Vai vçlaties izmçìinât printeri?"
+msgstr "Vai vçlaties ieslçgt drukâðanu uz lokâlâ tîkla printeriem?\n"
 
 #: ../../printerdrake.pm_.c:238
-#, fuzzy
 msgid "Do you want to enable printing on the printers mentioned above?\n"
-msgstr "Vai vçlaties startçt pieslçgumu palaiðanas laikâ?"
+msgstr "Vai vçlaties ieslçgt drukâðanu uz augstâk norâdîtajiem printeriem?\n"
 
 #: ../../printerdrake.pm_.c:239
 msgid "Are you sure that you want to set up printing on this machine?\n"
@@ -7543,13 +7436,13 @@ msgid ""
 "additional software will be installed."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:269 ../../printerdrake.pm_.c:278
-#: ../../printerdrake.pm_.c:3117 ../../printerdrake.pm_.c:3242
-#, fuzzy
+#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
+#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3165
+#: ../../printerdrake.pm_.c:3290
 msgid "Add a new printer"
-msgstr "Nav printera"
+msgstr "Pievienot jaunu printeri"
 
-#: ../../printerdrake.pm_.c:270
+#: ../../printerdrake.pm_.c:280
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7562,7 +7455,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:280
+#: ../../printerdrake.pm_.c:293
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7584,7 +7477,7 @@ msgid ""
 "want to set up your printer(s) now."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:289 ../../printerdrake.pm_.c:306
+#: ../../printerdrake.pm_.c:302 ../../printerdrake.pm_.c:319
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7599,7 +7492,7 @@ msgid ""
 "want to set up your printer(s) now."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:297
+#: ../../printerdrake.pm_.c:310
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7619,26 +7512,19 @@ msgid ""
 "want to set up your printer(s) now."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:315
-#, fuzzy
+#: ../../printerdrake.pm_.c:328
 msgid "Auto-detect printers connected to this machine"
-msgstr "Attâls printeris"
+msgstr "Automâtiski noteikt ðim datoram pieslçgtos printerus"
 
-#: ../../printerdrake.pm_.c:318
+#: ../../printerdrake.pm_.c:331
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:334
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:348 ../../printerdrake.pm_.c:562
-#: ../../printerdrake.pm_.c:587
-#, fuzzy
-msgid "Local Printer"
-msgstr "Lokâls printeris"
-
-#: ../../printerdrake.pm_.c:349
+#: ../../printerdrake.pm_.c:362
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -7652,50 +7538,53 @@ msgid ""
 "Center."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:386 ../../printerdrake.pm_.c:577
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
-#, fuzzy
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:590
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Printer auto-detection"
-msgstr "Attâls printeris"
+msgstr "Printeru automâtiska noteikðana"
 
-#: ../../printerdrake.pm_.c:408
+#: ../../printerdrake.pm_.c:421
 #, c-format
 msgid ", network printer \"%s\", port %s"
-msgstr ""
+msgstr ", tîkla printeris \"%s\", ports %s"
 
-#: ../../printerdrake.pm_.c:410
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:423
+#, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "SMB/Windows 95/98/NT"
+msgstr ". printeris \"%s\" uz SMB/Windows servera \"%s\""
 
-#: ../../printerdrake.pm_.c:416
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:429
+#, c-format
 msgid "Detected %s"
-msgstr "atklâts %s"
+msgstr "Atklâts %s"
 
-#: ../../printerdrake.pm_.c:420 ../../printerdrake.pm_.c:451
-#: ../../printerdrake.pm_.c:470
+#: ../../printerdrake.pm_.c:433 ../../printerdrake.pm_.c:464
+#: ../../printerdrake.pm_.c:483
 #, c-format
 msgid "Printer on parallel port \\/*%s"
-msgstr ""
+msgstr "Printeris uz paralçlâ porta \\/*%s"
 
-#: ../../printerdrake.pm_.c:422 ../../printerdrake.pm_.c:453
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:435 ../../printerdrake.pm_.c:466
+#: ../../printerdrake.pm_.c:488
 #, c-format
 msgid "USB printer \\/*%s"
-msgstr ""
+msgstr "USB printeris \\/*%s"
 
-#: ../../printerdrake.pm_.c:424
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:437
+#, c-format
 msgid "Network printer \"%s\", port %s"
-msgstr "Tîkla printeris (TCP/Socket)"
+msgstr "Tîkla printeris \"%s\", ports %s"
 
-#: ../../printerdrake.pm_.c:426
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:439
+#, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "SMB/Windows 95/98/NT"
+msgstr "Printeris \"%s\" uz SMB/Windows servera \"%s\""
 
-#: ../../printerdrake.pm_.c:563
+#: ../../printerdrake.pm_.c:575 ../../printerdrake.pm_.c:600
+msgid "Local Printer"
+msgstr "Lokâls printeris"
+
+#: ../../printerdrake.pm_.c:576
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
 "file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
@@ -7703,34 +7592,31 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:567
-#, fuzzy
+#: ../../printerdrake.pm_.c:580
 msgid "You must enter a device or file name!"
-msgstr "Printera ierîces URI"
+msgstr "Jums ir jâievada ierîces vai faila nosaukums!"
 
-#: ../../printerdrake.pm_.c:578
-#, fuzzy
+#: ../../printerdrake.pm_.c:591
 msgid "No printer found!"
-msgstr "Lokâls printeris"
+msgstr "Printeris nav atrasts!"
 
-#: ../../printerdrake.pm_.c:588
-#, fuzzy
+#: ../../printerdrake.pm_.c:601
 msgid "Available printers"
-msgstr "Lokâls printeris"
+msgstr "Pieejamie printeri"
 
-#: ../../printerdrake.pm_.c:592
+#: ../../printerdrake.pm_.c:605
 msgid ""
 "The following printer was auto-detected, if it is not the one you want to "
 "configure, enter a device name/file name in the input line"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:593
+#: ../../printerdrake.pm_.c:606
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up or enter a device name/file name in the input line"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:595
+#: ../../printerdrake.pm_.c:608
 msgid ""
 "The following printer was auto-detected. The configuration of the printer "
 "will work fully automatically. If your printer was not correctly detected or "
@@ -7738,7 +7624,7 @@ msgid ""
 "configuration\"."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:596
+#: ../../printerdrake.pm_.c:609
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up. The configuration of the printer will work fully "
@@ -7746,92 +7632,82 @@ msgid ""
 "customized printer configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:598
+#: ../../printerdrake.pm_.c:611
 msgid ""
 "Please choose the port where your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:599
-#, fuzzy
+#: ../../printerdrake.pm_.c:612
 msgid "Please choose the port where your printer is connected to."
-msgstr "Lûdzu norâdiet, kuram seriâlajam portam ir pieslçgts modçms."
+msgstr "Lûdzu norâdiet portu, kuram ir pieslçgts printeris."
 
-#: ../../printerdrake.pm_.c:601
+#: ../../printerdrake.pm_.c:614
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:606
-#, fuzzy
+#: ../../printerdrake.pm_.c:619
 msgid "You must choose/enter a printer/device!"
-msgstr "Printera ierîces URI"
+msgstr "Jums ir jânorâda/jâievada printeris/ierîce!"
 
-#: ../../printerdrake.pm_.c:626
-#, fuzzy
+#: ../../printerdrake.pm_.c:639
 msgid "Manual configuration"
-msgstr "Konfigurâcija"
+msgstr "Manuâla konfigurçðana"
 
-#: ../../printerdrake.pm_.c:680
+#: ../../printerdrake.pm_.c:693
 msgid "Remote lpd Printer Options"
 msgstr "Attâla lpd printera opcijas"
 
-#: ../../printerdrake.pm_.c:681
-#, fuzzy
+#: ../../printerdrake.pm_.c:694
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
 msgstr ""
-"Lai izmantotu attâlu lpd drukas rindu, jums jânorâda\n"
-"printera servera resursa vârds un tâs servera rindas\n"
-"nosaukums, kurai jâadresç drukas uzdevumi."
+"Lai izmantotu attâlu lpd printeri, jums ir jânorâda printera servera "
+"nosaukums un printera nosaukums uz ðî servera."
 
-#: ../../printerdrake.pm_.c:682
-#, fuzzy
+#: ../../printerdrake.pm_.c:695
 msgid "Remote host name"
-msgstr "Attâlâ resursa vârds"
+msgstr "Attâlâ resursa nosaukums"
 
-#: ../../printerdrake.pm_.c:683
-#, fuzzy
+#: ../../printerdrake.pm_.c:696
 msgid "Remote printer name"
-msgstr "Attâls printeris"
+msgstr "Attâlâ printera nosaukums"
 
-#: ../../printerdrake.pm_.c:686
-#, fuzzy
+#: ../../printerdrake.pm_.c:699
 msgid "Remote host name missing!"
-msgstr "Attâlâ resursa vârds"
+msgstr "Nav attâlâ resursa nosaukuma!"
 
-#: ../../printerdrake.pm_.c:690
-#, fuzzy
+#: ../../printerdrake.pm_.c:703
 msgid "Remote printer name missing!"
-msgstr "Attâlâ resursa vârds"
+msgstr "Nav attâlâ printera nosaukuma!"
 
-#: ../../printerdrake.pm_.c:712 ../../printerdrake.pm_.c:1225
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:727 ../../printerdrake.pm_.c:1244
+#, c-format
 msgid "Detected model: %s %s"
-msgstr "atklâts %s"
+msgstr "Atklâtais modelis: %s %s"
 
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
-#, fuzzy
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Scanning network..."
-msgstr "Izmçìinu pieslçgumu..."
+msgstr "Meklçju tîklâ..."
 
-#: ../../printerdrake.pm_.c:799 ../../printerdrake.pm_.c:820
+#: ../../printerdrake.pm_.c:814 ../../printerdrake.pm_.c:835
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ""
 
-#: ../../printerdrake.pm_.c:802 ../../printerdrake.pm_.c:823
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:817 ../../printerdrake.pm_.c:838
+#, c-format
 msgid "Printer \"%s\" on server \"%s\""
-msgstr "Atslçdzu tîklu"
+msgstr "Printeris \"%s\" uz servera \"%s\""
 
-#: ../../printerdrake.pm_.c:843
+#: ../../printerdrake.pm_.c:858
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) printera opcijas"
 
-#: ../../printerdrake.pm_.c:844
+#: ../../printerdrake.pm_.c:859
 #, fuzzy
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -7845,46 +7721,45 @@ msgstr ""
 "koplietojuma vârds un atbilstoðs lietotâja vârds, parole un\n"
 "darba grupas informâcija."
 
-#: ../../printerdrake.pm_.c:845
+#: ../../printerdrake.pm_.c:860
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:846
+#: ../../printerdrake.pm_.c:861
 msgid "SMB server host"
 msgstr "SMB servera resurss"
 
-#: ../../printerdrake.pm_.c:847
+#: ../../printerdrake.pm_.c:862
 msgid "SMB server IP"
 msgstr "SMB servera IP"
 
-#: ../../printerdrake.pm_.c:848
+#: ../../printerdrake.pm_.c:863
 msgid "Share name"
 msgstr "Koplietojuma vârds"
 
-#: ../../printerdrake.pm_.c:851
+#: ../../printerdrake.pm_.c:866
 msgid "Workgroup"
 msgstr "Darba grupa"
 
-#: ../../printerdrake.pm_.c:853
-#, fuzzy
+#: ../../printerdrake.pm_.c:868
 msgid "Auto-detected"
-msgstr "Attâls printeris"
+msgstr "Automâtiska noteikðana"
 
-#: ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:879
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:868
+#: ../../printerdrake.pm_.c:883
 msgid "Samba share name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:874
+#: ../../printerdrake.pm_.c:889
 msgid "SECURITY WARNING!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:875
+#: ../../printerdrake.pm_.c:890
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -7908,7 +7783,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:885
+#: ../../printerdrake.pm_.c:900
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -7917,7 +7792,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:888
+#: ../../printerdrake.pm_.c:903
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
 "connect to it as a client.\n"
@@ -7925,11 +7800,11 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:960
+#: ../../printerdrake.pm_.c:975
 msgid "NetWare Printer Options"
 msgstr "NetWare printera opcijas"
 
-#: ../../printerdrake.pm_.c:961
+#: ../../printerdrake.pm_.c:976
 #, fuzzy
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -7942,44 +7817,43 @@ msgstr ""
 "TCP/IP resursa vârda!), kâ arî jûsu izvçlçtâ printera rindas\n"
 "nosaukums un jebkurð atbilstoðs lietotâja vârds un parole."
 
-#: ../../printerdrake.pm_.c:962
+#: ../../printerdrake.pm_.c:977
 msgid "Printer Server"
 msgstr "Printera serveris"
 
-#: ../../printerdrake.pm_.c:963
+#: ../../printerdrake.pm_.c:978
 msgid "Print Queue Name"
 msgstr "Printera rindas nosaukums"
 
-#: ../../printerdrake.pm_.c:968
+#: ../../printerdrake.pm_.c:983
 msgid "NCP server name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:972
+#: ../../printerdrake.pm_.c:987
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1039 ../../printerdrake.pm_.c:1059
+#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1074
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1042 ../../printerdrake.pm_.c:1062
+#: ../../printerdrake.pm_.c:1057 ../../printerdrake.pm_.c:1077
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1082
-#, fuzzy
+#: ../../printerdrake.pm_.c:1097
 msgid "TCP/Socket Printer Options"
-msgstr "Socket printera opcijas"
+msgstr "TCP/Socket printera opcijas"
 
-#: ../../printerdrake.pm_.c:1084
+#: ../../printerdrake.pm_.c:1099
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) into the input fields."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1085
+#: ../../printerdrake.pm_.c:1100
 #, fuzzy
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -7990,61 +7864,56 @@ msgstr ""
 "Lai drukâtu ar socket printeri, jums ir jânorâda printera\n"
 "resursa vârds tîklâ un papildus arî porta numurs."
 
-#: ../../printerdrake.pm_.c:1090
-#, fuzzy
+#: ../../printerdrake.pm_.c:1105
 msgid "Printer host name or IP missing!"
-msgstr "Printera resursa vârds"
+msgstr "Nav printera resursa vârda vai IP!"
 
-#: ../../printerdrake.pm_.c:1112
-#, fuzzy
+#: ../../printerdrake.pm_.c:1127
 msgid "Printer host name or IP"
-msgstr "Printera resursa vârds"
+msgstr "Printera resursa vârds vai IP"
 
-#: ../../printerdrake.pm_.c:1160 ../../printerdrake.pm_.c:1162
+#: ../../printerdrake.pm_.c:1177 ../../printerdrake.pm_.c:1179
 msgid "Printer Device URI"
 msgstr "Printera ierîces URI"
 
-#: ../../printerdrake.pm_.c:1161
+#: ../../printerdrake.pm_.c:1178
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1176
+#: ../../printerdrake.pm_.c:1193
 msgid "A valid URI must be entered!"
-msgstr ""
+msgstr "Jâievada pareizs URI!"
 
-#: ../../printerdrake.pm_.c:1515
+#: ../../printerdrake.pm_.c:1560
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1516
+#: ../../printerdrake.pm_.c:1561
 msgid "Name of printer"
 msgstr "Printera nosaukums"
 
-#: ../../printerdrake.pm_.c:1518
+#: ../../printerdrake.pm_.c:1563
 msgid "Location"
 msgstr "Atraðanâs vieta"
 
-#: ../../printerdrake.pm_.c:1530 ../../printerdrake.pm_.c:1652
-#, fuzzy
+#: ../../printerdrake.pm_.c:1575 ../../printerdrake.pm_.c:1697
 msgid "Reading printer database..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Nolasu printeru datubâzi..."
 
-#: ../../printerdrake.pm_.c:1534
-#, fuzzy
+#: ../../printerdrake.pm_.c:1579
 msgid "Preparing printer database..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Sagatavoju printeru datubâzi..."
 
-#: ../../printerdrake.pm_.c:1631
-#, fuzzy
+#: ../../printerdrake.pm_.c:1676
 msgid "Your printer model"
-msgstr "Attâls printeris"
+msgstr "Jûsu printera modelis"
 
-#: ../../printerdrake.pm_.c:1632
+#: ../../printerdrake.pm_.c:1677
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -8059,28 +7928,24 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1637 ../../printerdrake.pm_.c:1640
-#, fuzzy
+#: ../../printerdrake.pm_.c:1682 ../../printerdrake.pm_.c:1685
 msgid "The model is correct"
-msgstr "Vai tas ir pareizi?"
+msgstr "Modelis ir pareizs"
 
-#: ../../printerdrake.pm_.c:1638 ../../printerdrake.pm_.c:1639
-#: ../../printerdrake.pm_.c:1642
-#, fuzzy
+#: ../../printerdrake.pm_.c:1683 ../../printerdrake.pm_.c:1684
+#: ../../printerdrake.pm_.c:1687
 msgid "Select model manually"
-msgstr "Attâls printeris"
+msgstr "Manuâli izvçlieties modeli"
 
-#: ../../printerdrake.pm_.c:1659
-#, fuzzy
+#: ../../printerdrake.pm_.c:1704
 msgid "Printer model selection"
-msgstr "Printera pieslçgums"
+msgstr "Printera modeïa izvçle"
 
-#: ../../printerdrake.pm_.c:1660
-#, fuzzy
+#: ../../printerdrake.pm_.c:1705
 msgid "Which printer model do you have?"
-msgstr "Kâds ir jûsu printera tips?"
+msgstr "Kâds ir jûsu printera modelis?"
 
-#: ../../printerdrake.pm_.c:1661
+#: ../../printerdrake.pm_.c:1706
 msgid ""
 "\n"
 "\n"
@@ -8089,18 +7954,17 @@ msgid ""
 "standing on a wrong model or on \"Raw printer\"."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1664
+#: ../../printerdrake.pm_.c:1709
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1741
-#, fuzzy
+#: ../../printerdrake.pm_.c:1786
 msgid "OKI winprinter configuration"
-msgstr "Interneta konfigurâcija"
+msgstr "OKI winprinter konfigurâcija"
 
-#: ../../printerdrake.pm_.c:1742
+#: ../../printerdrake.pm_.c:1787
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
 "use a very special communication protocol and therefore they work only when "
@@ -8110,12 +7974,11 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1785 ../../printerdrake.pm_.c:1812
-#, fuzzy
+#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1857
 msgid "Lexmark inkjet configuration"
-msgstr "Interneta konfigurâcija"
+msgstr "Lexmark inkjet konfigurâcija"
 
-#: ../../printerdrake.pm_.c:1786
+#: ../../printerdrake.pm_.c:1831
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
 "no printers on remote machines or print server boxes. Please connect your "
@@ -8123,7 +7986,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1813
+#: ../../printerdrake.pm_.c:1858
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
 "need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
@@ -8135,11 +7998,11 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1816
+#: ../../printerdrake.pm_.c:1861
 msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1817
+#: ../../printerdrake.pm_.c:1862
 msgid ""
 "Your printer belongs to the group of GDI laser printers (winprinters) sold "
 "by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -8162,7 +8025,7 @@ msgid ""
 "as root. After having done so you can print normally.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2040
+#: ../../printerdrake.pm_.c:2085
 msgid ""
 "Printer default settings\n"
 "\n"
@@ -8172,34 +8035,35 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2049
+#: ../../printerdrake.pm_.c:2094
 #, c-format
 msgid "Option %s must be an integer number!"
-msgstr ""
+msgstr "Opcijai %s ir jâbût veselam skaitlim!"
 
-#: ../../printerdrake.pm_.c:2053
+#: ../../printerdrake.pm_.c:2098
 #, c-format
 msgid "Option %s must be a number!"
-msgstr ""
+msgstr "Opcijai %s ir jâbût skaitlim!"
 
-#: ../../printerdrake.pm_.c:2058
+#: ../../printerdrake.pm_.c:2103
 #, c-format
 msgid "Option %s out of range!"
-msgstr ""
+msgstr "Opcija %s ir ârpus diapazona!"
 
-#: ../../printerdrake.pm_.c:2097
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:2142
+#, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
-msgstr "Vai vçlaties izmçìinât printeri?"
+msgstr ""
+"Vai vçlaties norâdît printeri (\"%s\")\n"
+"kâ noklusçto printeri?"
 
-#: ../../printerdrake.pm_.c:2120
-#, fuzzy
+#: ../../printerdrake.pm_.c:2165
 msgid "Test pages"
-msgstr "Pârbaudît portus"
+msgstr "Izmçìinâjuma lapas"
 
-#: ../../printerdrake.pm_.c:2121
+#: ../../printerdrake.pm_.c:2166
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed and on "
@@ -8207,45 +8071,39 @@ msgid ""
 "it is enough to print the standard test page."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2125
-#, fuzzy
+#: ../../printerdrake.pm_.c:2170
 msgid "No test pages"
-msgstr "Jâ, izdrukât abas izmçìinâjuma lapas"
+msgstr "Bez izmçìinâjuma lapâm"
 
-#: ../../printerdrake.pm_.c:2126
-#, fuzzy
+#: ../../printerdrake.pm_.c:2171
 msgid "Print"
-msgstr "Printeris"
+msgstr "Drukât"
 
-#: ../../printerdrake.pm_.c:2183
-#, fuzzy
+#: ../../printerdrake.pm_.c:2228
 msgid "Standard test page"
-msgstr "Standarta"
+msgstr "Standarta izmçìinâjuma lapa"
 
-#: ../../printerdrake.pm_.c:2186
+#: ../../printerdrake.pm_.c:2231
 msgid "Alternative test page (Letter)"
-msgstr ""
+msgstr "Alternatîva izmçìinâjuma lapa (Letter)"
 
-#: ../../printerdrake.pm_.c:2189
-#, fuzzy
+#: ../../printerdrake.pm_.c:2234
 msgid "Alternative test page (A4)"
-msgstr "Tiek drukâta(s) izmçìinâjuma lapa(s)..."
+msgstr "Alternatîva izmçìinâjuma lapa (A4)"
 
-#: ../../printerdrake.pm_.c:2191
-#, fuzzy
+#: ../../printerdrake.pm_.c:2236
 msgid "Photo test page"
-msgstr "Tiek drukâta(s) izmçìinâjuma lapa(s)..."
+msgstr "Foto izmçìinâjuma lapa"
 
-#: ../../printerdrake.pm_.c:2195
-#, fuzzy
+#: ../../printerdrake.pm_.c:2240
 msgid "Do not print any test page"
-msgstr "Tiek drukâta(s) izmçìinâjuma lapa(s)..."
+msgstr "Nedrukât nevienu izmçìinâjuma lapu"
 
-#: ../../printerdrake.pm_.c:2204 ../../printerdrake.pm_.c:2357
+#: ../../printerdrake.pm_.c:2249 ../../printerdrake.pm_.c:2402
 msgid "Printing test page(s)..."
 msgstr "Tiek drukâta(s) izmçìinâjuma lapa(s)..."
 
-#: ../../printerdrake.pm_.c:2229
+#: ../../printerdrake.pm_.c:2274
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -8262,7 +8120,7 @@ msgstr ""
 "\n"
 "Vai tas darbojas pareizi?"
 
-#: ../../printerdrake.pm_.c:2233
+#: ../../printerdrake.pm_.c:2278
 #, fuzzy
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -8272,16 +8130,16 @@ msgstr ""
 "Var paiet zinâms laiks, pirms printeris sâk drukât.\n"
 "Vai tas darbojas pareizi?"
 
-#: ../../printerdrake.pm_.c:2240
+#: ../../printerdrake.pm_.c:2285
 msgid "Did it work properly?"
-msgstr ""
+msgstr "Vai izdrukâja pareizi?"
 
-#: ../../printerdrake.pm_.c:2262 ../../printerdrake.pm_.c:3416
+#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3464
 #, fuzzy
 msgid "Raw printer"
 msgstr "Nav printera"
 
-#: ../../printerdrake.pm_.c:2288
+#: ../../printerdrake.pm_.c:2333
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -8290,15 +8148,15 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2290
+#: ../../printerdrake.pm_.c:2335
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications, but here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2293 ../../printerdrake.pm_.c:2310
-#: ../../printerdrake.pm_.c:2320
+#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:2365
 #, c-format
 msgid ""
 "\n"
@@ -8307,7 +8165,7 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2296 ../../printerdrake.pm_.c:2336
+#: ../../printerdrake.pm_.c:2341 ../../printerdrake.pm_.c:2381
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -8315,41 +8173,43 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2300
+#: ../../printerdrake.pm_.c:2345
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:2315
+#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2360
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\".\n"
 msgstr ""
+"Lai izdrukâtu failu no komandrindas (terminâïa loga), izmantojiet komandu \"%"
+"s <fails>\".\n"
 
-#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:2317
-#: ../../printerdrake.pm_.c:2327
+#: ../../printerdrake.pm_.c:2352 ../../printerdrake.pm_.c:2362
+#: ../../printerdrake.pm_.c:2372
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications. But here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2312 ../../printerdrake.pm_.c:2322
+#: ../../printerdrake.pm_.c:2357 ../../printerdrake.pm_.c:2367
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2325
+#: ../../printerdrake.pm_.c:2370
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2329
+#: ../../printerdrake.pm_.c:2374
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
 "handling printing jobs.\n"
@@ -8359,7 +8219,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2333
+#: ../../printerdrake.pm_.c:2378
 #, c-format
 msgid ""
 "\n"
@@ -8368,42 +8228,40 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2343
+#: ../../printerdrake.pm_.c:2388
 #, fuzzy, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Atslçdzu tîklu"
 
-#: ../../printerdrake.pm_.c:2344
+#: ../../printerdrake.pm_.c:2389
 #, fuzzy, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Atslçdzu tîklu"
 
-#: ../../printerdrake.pm_.c:2346
+#: ../../printerdrake.pm_.c:2391
 #, fuzzy, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Atslçdzu tîklu"
 
-#: ../../printerdrake.pm_.c:2347
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:2392
+#, c-format
 msgid "Printing on the printer \"%s\""
-msgstr "Atslçdzu tîklu"
+msgstr "Drukâju uz printeri \"%s\""
 
-#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2353
-#: ../../printerdrake.pm_.c:2354 ../../printerdrake.pm_.c:2355
-#: ../../printerdrake.pm_.c:3400 ../../standalone/drakTermServ_.c:248
+#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
+#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
+#: ../../printerdrake.pm_.c:3448 ../../standalone/drakTermServ_.c:248
 #: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
 #: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
 #: ../../standalone/drakfont_.c:1014
-#, fuzzy
 msgid "Close"
-msgstr "Pele"
+msgstr "Aizvçrt"
 
-#: ../../printerdrake.pm_.c:2353
-#, fuzzy
+#: ../../printerdrake.pm_.c:2398
 msgid "Print option list"
-msgstr "Printera opcijas"
+msgstr "Printera opciju saraksts"
 
-#: ../../printerdrake.pm_.c:2373
+#: ../../printerdrake.pm_.c:2418
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -8417,7 +8275,7 @@ msgid ""
 "Do not use \"scannerdrake\" for this device!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2394
+#: ../../printerdrake.pm_.c:2439
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
 "card drives from your PC. Now you can access your photo cards using the "
@@ -8430,19 +8288,17 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2416 ../../printerdrake.pm_.c:2875
-#: ../../printerdrake.pm_.c:3170
-#, fuzzy
+#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2923
+#: ../../printerdrake.pm_.c:3218
 msgid "Reading printer data..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Nolasu printera datus..."
 
-#: ../../printerdrake.pm_.c:2436 ../../printerdrake.pm_.c:2464
-#: ../../printerdrake.pm_.c:2499
-#, fuzzy
+#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2509
+#: ../../printerdrake.pm_.c:2544
 msgid "Transfer printer configuration"
-msgstr "Interneta konfigurâcija"
+msgstr "Pârsûtu printera konfigurâciju"
 
-#: ../../printerdrake.pm_.c:2437
+#: ../../printerdrake.pm_.c:2482
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -8452,51 +8308,51 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2440
+#: ../../printerdrake.pm_.c:2485
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2442
+#: ../../printerdrake.pm_.c:2487
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2444
+#: ../../printerdrake.pm_.c:2489
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2446
+#: ../../printerdrake.pm_.c:2491
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2447
+#: ../../printerdrake.pm_.c:2492
 msgid ""
 "\n"
 "Also printers configured with the PPD files provided by their manufacturers "
 "or with native CUPS drivers cannot be transferred."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2448
+#: ../../printerdrake.pm_.c:2493
 msgid ""
 "\n"
 "Mark the printers which you want to transfer and click \n"
 "\"Transfer\"."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2451
+#: ../../printerdrake.pm_.c:2496
 msgid "Do not transfer printers"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2452 ../../printerdrake.pm_.c:2469
+#: ../../printerdrake.pm_.c:2497 ../../printerdrake.pm_.c:2514
 msgid "Transfer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2465
+#: ../../printerdrake.pm_.c:2510
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -8504,62 +8360,58 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2473
+#: ../../printerdrake.pm_.c:2518
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2478
+#: ../../printerdrake.pm_.c:2523
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2486
-#, fuzzy
+#: ../../printerdrake.pm_.c:2531
 msgid "New printer name"
-msgstr "Nav printera"
+msgstr "Jauns printera nosaukums"
 
-#: ../../printerdrake.pm_.c:2489
+#: ../../printerdrake.pm_.c:2534
 #, c-format
 msgid "Transferring %s..."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2500
+#: ../../printerdrake.pm_.c:2545
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2510
-#, fuzzy
+#: ../../printerdrake.pm_.c:2555
 msgid "Refreshing printer data..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Atsvaidzinu printera datus..."
 
-#: ../../printerdrake.pm_.c:2518 ../../printerdrake.pm_.c:2590
-#: ../../printerdrake.pm_.c:2602
+#: ../../printerdrake.pm_.c:2563 ../../printerdrake.pm_.c:2638
+#: ../../printerdrake.pm_.c:2650
 #, fuzzy
 msgid "Configuration of a remote printer"
 msgstr "Konfigurâcija"
 
-#: ../../printerdrake.pm_.c:2519
+#: ../../printerdrake.pm_.c:2564
 #, fuzzy
 msgid "Starting network..."
 msgstr "Izmçìinu pieslçgumu..."
 
-#: ../../printerdrake.pm_.c:2554 ../../printerdrake.pm_.c:2558
-#: ../../printerdrake.pm_.c:2560
-#, fuzzy
+#: ../../printerdrake.pm_.c:2599 ../../printerdrake.pm_.c:2603
+#: ../../printerdrake.pm_.c:2605
 msgid "Configure the network now"
-msgstr "Tîkla konfigurçðana"
+msgstr "Tûlît konfigurçt tîklu"
 
-#: ../../printerdrake.pm_.c:2555
-#, fuzzy
+#: ../../printerdrake.pm_.c:2600
 msgid "Network functionality not configured"
-msgstr "Monitors nav konfigurçts"
+msgstr "Tîkla funkcionalitâte nav konfigurçta"
 
-#: ../../printerdrake.pm_.c:2556
+#: ../../printerdrake.pm_.c:2601
 msgid ""
 "You are going to configure a remote printer. This needs working network "
 "access, but your network is not configured yet. If you go on without network "
@@ -8567,12 +8419,11 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2559
-#, fuzzy
+#: ../../printerdrake.pm_.c:2604
 msgid "Go on without configuring the network"
-msgstr "Konfigurçju tîklu"
+msgstr "Turpinât bez tîkla konfigurçðanas"
 
-#: ../../printerdrake.pm_.c:2592
+#: ../../printerdrake.pm_.c:2640
 msgid ""
 "The network configuration done during the installation cannot be started "
 "now. Please check whether the network gets accessable after booting your "
@@ -8582,34 +8433,32 @@ msgid ""
 "\"Printer\""
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2593
+#: ../../printerdrake.pm_.c:2641
 msgid ""
 "The network access was not running and could not be started. Please check "
 "your configuration and your hardware. Then try to configure your remote "
 "printer again."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2603
+#: ../../printerdrake.pm_.c:2651
 #, fuzzy
 msgid "Restarting printing system..."
 msgstr "Kuru drukâðanas sistçmu vçlaties izmantot?"
 
-#: ../../printerdrake.pm_.c:2641
-#, fuzzy
+#: ../../printerdrake.pm_.c:2689
 msgid "high"
-msgstr "Augsts"
+msgstr "augsts"
 
-#: ../../printerdrake.pm_.c:2641
-#, fuzzy
+#: ../../printerdrake.pm_.c:2689
 msgid "paranoid"
-msgstr "Paranoisks"
+msgstr "paranoisks"
 
-#: ../../printerdrake.pm_.c:2642
+#: ../../printerdrake.pm_.c:2690
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2643
+#: ../../printerdrake.pm_.c:2691
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -8624,12 +8473,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2675
+#: ../../printerdrake.pm_.c:2723
 #, fuzzy
 msgid "Starting the printing system at boot time"
 msgstr "Kuru drukâðanas sistçmu vçlaties izmantot?"
 
-#: ../../printerdrake.pm_.c:2676
+#: ../../printerdrake.pm_.c:2724
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -8643,227 +8492,218 @@ msgid ""
 "again?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:2700 ../../printerdrake.pm_.c:2741
-#: ../../printerdrake.pm_.c:2780 ../../printerdrake.pm_.c:2822
-#: ../../printerdrake.pm_.c:2943
+#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2789
+#: ../../printerdrake.pm_.c:2828 ../../printerdrake.pm_.c:2870
+#: ../../printerdrake.pm_.c:2991
 msgid "Checking installed software..."
-msgstr ""
+msgstr "Pârbaudu instalçtâs programmas..."
 
-#: ../../printerdrake.pm_.c:2746
+#: ../../printerdrake.pm_.c:2794
 msgid "Removing LPRng..."
-msgstr ""
+msgstr "Noòemu LRPng..."
 
-#: ../../printerdrake.pm_.c:2785
+#: ../../printerdrake.pm_.c:2833
 msgid "Removing LPD..."
-msgstr ""
+msgstr "Noòemu LPD..."
 
-#: ../../printerdrake.pm_.c:2858
-#, fuzzy
+#: ../../printerdrake.pm_.c:2906
 msgid "Select Printer Spooler"
-msgstr "Izvçlieties printera pieslçgumu"
+msgstr "Izvçlieties printera spolçtâju"
 
-#: ../../printerdrake.pm_.c:2859
-#, fuzzy
+#: ../../printerdrake.pm_.c:2907
 msgid "Which printing system (spooler) do you want to use?"
-msgstr "Kuru drukâðanas sistçmu vçlaties izmantot?"
+msgstr "Kuru drukâðanas sistçmu (spolçtâju) vçlaties izmantot?"
 
-#: ../../printerdrake.pm_.c:2895
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:2943
+#, c-format
 msgid "Configuring printer \"%s\"..."
-msgstr "Konfigurçt printeri"
+msgstr "Konfigurçju printeri \"%s\"..."
 
-#: ../../printerdrake.pm_.c:2909
-#, fuzzy
+#: ../../printerdrake.pm_.c:2957
 msgid "Installing Foomatic..."
-msgstr "Instalçju pakotni %s"
+msgstr "Instalçju Foomatic..."
 
-#: ../../printerdrake.pm_.c:2979 ../../printerdrake.pm_.c:3020
-#: ../../printerdrake.pm_.c:3417 ../../printerdrake.pm_.c:3490
+#: ../../printerdrake.pm_.c:3027 ../../printerdrake.pm_.c:3068
+#: ../../printerdrake.pm_.c:3465 ../../printerdrake.pm_.c:3538
 msgid "Printer options"
 msgstr "Printera opcijas"
 
-#: ../../printerdrake.pm_.c:2989
-#, fuzzy
+#: ../../printerdrake.pm_.c:3037
 msgid "Preparing Printerdrake..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Sagatavoju Printerdrake..."
 
-#: ../../printerdrake.pm_.c:3007 ../../printerdrake.pm_.c:3580
-#, fuzzy
+#: ../../printerdrake.pm_.c:3055 ../../printerdrake.pm_.c:3628
 msgid "Configuring applications..."
-msgstr "Konfigurçt printeri"
+msgstr "Konfigurçju aplikâcijas..."
 
-#: ../../printerdrake.pm_.c:3027
-#, fuzzy
+#: ../../printerdrake.pm_.c:3075
 msgid "Would you like to configure printing?"
 msgstr "Vai vçlaties konfigurçt printeri?"
 
-#: ../../printerdrake.pm_.c:3039
+#: ../../printerdrake.pm_.c:3087
 msgid "Printing system: "
-msgstr ""
+msgstr "Drukas sistçma:"
 
-#: ../../printerdrake.pm_.c:3099
-#, fuzzy
+#: ../../printerdrake.pm_.c:3147
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; to view information about it; "
 "or to make a printer on a remote CUPS server available for Star Office/"
 "OpenOffice.org/GIMP."
 msgstr ""
-"Eksistç sekojoðas drukas rindas.\n"
-"Jûs varat pievienot jaunass vai izmainît esoðâs."
+"Ir konfigurçti sekojoði printeri. Ar dubultklikðíi izvçlieties printeri, lai "
+"nomainîtu tâ uzstâdîjumus, padarîtu to par noklusçto printeri, apskatîtos "
+"informâciju par to vai printeri uz attâla CUPS servera padarîtu pieejamu "
+"Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3100
-#, fuzzy
+#: ../../printerdrake.pm_.c:3148
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
 "it."
 msgstr ""
-"Eksistç sekojoðas drukas rindas.\n"
-"Jûs varat pievienot jaunass vai izmainît esoðâs."
+"Ir konfigurçti sekojoði printeri. Ar dubultklikðíi izvçlieties printeri, lai "
+"nomainîtu tâ uzstâdîjumus, padarîtu to par noklusçto printeri vai apskatîtos "
+"informâciju par to."
 
-#: ../../printerdrake.pm_.c:3127
+#: ../../printerdrake.pm_.c:3175
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
+"Atsvaidzinât printeru sarakstu (lai parâdîtu visus attâli pieejamos CUPS "
+"printerus)"
 
-#: ../../printerdrake.pm_.c:3145
-#, fuzzy
+#: ../../printerdrake.pm_.c:3193
 msgid "Change the printing system"
-msgstr "Tîkla konfigurçðana"
+msgstr "Drukas sistçmas nomaiòa"
 
-#: ../../printerdrake.pm_.c:3150 ../../standalone/drakconnect_.c:277
+#: ../../printerdrake.pm_.c:3198 ../../standalone/drakconnect_.c:277
 msgid "Normal Mode"
-msgstr ""
+msgstr "Normâls reþîms"
 
-#: ../../printerdrake.pm_.c:3310 ../../printerdrake.pm_.c:3360
-#: ../../printerdrake.pm_.c:3573
-#, fuzzy
+#: ../../printerdrake.pm_.c:3358 ../../printerdrake.pm_.c:3408
+#: ../../printerdrake.pm_.c:3621
 msgid "Do you want to configure another printer?"
-msgstr "Vai vçlaties izmçìinât ðo konfigurâciju?"
+msgstr "Vai vçlaties konfigurçt vçl kâdu printeri?"
 
-#: ../../printerdrake.pm_.c:3395
-#, fuzzy
+#: ../../printerdrake.pm_.c:3443
 msgid "Modify printer configuration"
-msgstr "Interneta konfigurâcija"
+msgstr "Izmainît printera konfigurâciju"
 
-#: ../../printerdrake.pm_.c:3397
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:3445
+#, c-format
 msgid ""
 "Printer %s\n"
 "What do you want to modify on this printer?"
-msgstr "Vai vçlaties izmçìinât ðo konfigurâciju?"
+msgstr ""
+"Printeris %s\n"
+"Ko jûs vçlaties mainît ðim printerim?"
 
-#: ../../printerdrake.pm_.c:3401
+#: ../../printerdrake.pm_.c:3449
 msgid "Do it!"
-msgstr ""
+msgstr "Aiziet!"
 
-#: ../../printerdrake.pm_.c:3406 ../../printerdrake.pm_.c:3461
-#, fuzzy
+#: ../../printerdrake.pm_.c:3454 ../../printerdrake.pm_.c:3509
 msgid "Printer connection type"
-msgstr "Interneta pieslçguma koplietoðana"
+msgstr "Printera pieslçguma tips"
 
-#: ../../printerdrake.pm_.c:3407 ../../printerdrake.pm_.c:3465
-#, fuzzy
+#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3513
 msgid "Printer name, description, location"
-msgstr "Printera pieslçgums"
+msgstr "Printera nosaukums, apraksts, atraðanâs vieta"
 
-#: ../../printerdrake.pm_.c:3409 ../../printerdrake.pm_.c:3483
+#: ../../printerdrake.pm_.c:3457 ../../printerdrake.pm_.c:3531
 msgid "Printer manufacturer, model, driver"
-msgstr ""
+msgstr "Printera izgatavotâjs, modelis, draiveris"
 
-#: ../../printerdrake.pm_.c:3410 ../../printerdrake.pm_.c:3484
+#: ../../printerdrake.pm_.c:3458 ../../printerdrake.pm_.c:3532
 msgid "Printer manufacturer, model"
-msgstr ""
+msgstr "Printera izgatavotâjs, modelis"
 
-#: ../../printerdrake.pm_.c:3419 ../../printerdrake.pm_.c:3494
+#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3542
 msgid "Set this printer as the default"
-msgstr ""
+msgstr "Uzstâdît ðo printeri ka noklusçto"
 
-#: ../../printerdrake.pm_.c:3421 ../../printerdrake.pm_.c:3499
+#: ../../printerdrake.pm_.c:3469 ../../printerdrake.pm_.c:3547
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Pievienot ðo printeri Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3422 ../../printerdrake.pm_.c:3508
+#: ../../printerdrake.pm_.c:3470 ../../printerdrake.pm_.c:3556
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Noòemt ðo printeri no Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3423 ../../printerdrake.pm_.c:3517
-#, fuzzy
+#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3565
 msgid "Print test pages"
-msgstr "Tiek drukâta(s) izmçìinâjuma lapa(s)..."
+msgstr "Drukât izmçìinâjuma lapas"
 
-#: ../../printerdrake.pm_.c:3424 ../../printerdrake.pm_.c:3519
-#, fuzzy
+#: ../../printerdrake.pm_.c:3472 ../../printerdrake.pm_.c:3567
 msgid "Know how to use this printer"
-msgstr "Vai vçlaties izmçìinât ðo konfigurâciju?"
+msgstr "Uzziniet, kâ izmantot ðo printeri"
 
-#: ../../printerdrake.pm_.c:3426 ../../printerdrake.pm_.c:3521
-#, fuzzy
+#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3569
 msgid "Remove printer"
-msgstr "Attâls printeris"
+msgstr "Noòemt printeri"
 
-#: ../../printerdrake.pm_.c:3472
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:3520
+#, c-format
 msgid "Removing old printer \"%s\"..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Noòemu veco printeri \"%s\"..."
 
-#: ../../printerdrake.pm_.c:3497
-#, fuzzy
+#: ../../printerdrake.pm_.c:3545
 msgid "Default printer"
-msgstr "Lokâls printeris"
+msgstr "Noklusçtais printeris"
 
-#: ../../printerdrake.pm_.c:3498
+#: ../../printerdrake.pm_.c:3546
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
-msgstr ""
+msgstr "Printeris \"%s\" tagad ir uzstâdîts kâ noklusçtais printeris."
 
-#: ../../printerdrake.pm_.c:3502 ../../printerdrake.pm_.c:3505
+#: ../../printerdrake.pm_.c:3550 ../../printerdrake.pm_.c:3553
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Pievienoju printeri Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3503
+#: ../../printerdrake.pm_.c:3551
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr ""
+"Printeris \"%s\" tika veiksmîgi pievienots Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3506
+#: ../../printerdrake.pm_.c:3554
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
+msgstr "Neizdevâs printeri \"%s\" pievienot Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3511 ../../printerdrake.pm_.c:3514
+#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Noòemu printeri no Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3512
+#: ../../printerdrake.pm_.c:3560
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
 msgstr ""
+"Printeris \"%s\" tika veiksmîgi noòemts no Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3515
+#: ../../printerdrake.pm_.c:3563
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
+msgstr "Neizdevâs printeri \"%s\" noòemt no Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3523
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:3571
+#, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
-msgstr "Vai vçlaties pârstartçt tîklu"
+msgstr "Vai tieðâm vçlaties noòemt printeri \"%s\"?"
 
-#: ../../printerdrake.pm_.c:3527
-#, fuzzy, c-format
+#: ../../printerdrake.pm_.c:3575
+#, c-format
 msgid "Removing printer \"%s\"..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Noòemu printeri \"%s\"..."
 
 #: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
 #: ../../proxy.pm_.c:78
-#, fuzzy
 msgid "Proxy configuration"
-msgstr "Proxy serveru konfigurâcija"
+msgstr "Proxy konfigurâcija"
 
 #: ../../proxy.pm_.c:30
 msgid ""
@@ -8881,12 +8721,11 @@ msgstr ""
 
 #: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
-#, fuzzy
 msgid "port"
-msgstr "Ports"
+msgstr "ports"
 
 #: ../../proxy.pm_.c:44
 #, fuzzy
@@ -8911,14 +8750,12 @@ msgid ""
 msgstr ""
 
 #: ../../proxy.pm_.c:80
-#, fuzzy
 msgid "login"
-msgstr "Autoreìistrçðanâs"
+msgstr "lietotâjs"
 
 #: ../../proxy.pm_.c:82
-#, fuzzy
 msgid "password"
-msgstr "Parole"
+msgstr "parole"
 
 #: ../../proxy.pm_.c:84
 #, fuzzy
@@ -8926,14 +8763,13 @@ msgid "re-type password"
 msgstr "Bez paroles"
 
 #: ../../proxy.pm_.c:88
-#, fuzzy
 msgid "The passwords don't match. Try again!"
-msgstr "Paroles nesakrît"
+msgstr "Paroles nesakrît. Mçìiniet vçlreiz!"
 
 #: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "Nevar pievienot partîciju _formatçtam_ RAID md%d"
+msgstr "Nevar pievienot sadaïu _formatçtam_ RAID md%d"
 
 #: ../../raid.pm_.c:108
 #, c-format
@@ -8951,22 +8787,44 @@ msgstr "mkraid neizdevâs (varbût nav uzstâdîti raidtools?)"
 #: ../../raid.pm_.c:153
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
-msgstr "Nepietiek diska partîciju RAID lîmenim %d\n"
+msgstr "Nepietiek diska sadaïu RAID lîmenim %d\n"
+
+#: ../../security/main.pm_.c:35
+msgid ""
+"Standard: This is the standard security recommended for a computer that will "
+"be used to connect\n"
+"               to the Internet as a client.\n"
+"\n"
+"High:       There are already some restrictions, and more automatic checks "
+"are run every night.\n"
+"\n"
+"Higher:    The security is now high enough to use the system as a server "
+"which can accept\n"
+"              connections from many clients. If your machine is only a "
+"client on the Internet, you\n"
+"\t      should choose a lower level.\n"
+"\n"
+"Paranoid:  This is similar to the previous level, but the system is entirely "
+"closed and security\n"
+"                features are at their maximum\n"
+"\n"
+"Security Administrator:\n"
+"               If the 'Security Alerts' option is set, security alerts will "
+"be sent to this user (username or\n"
+"\t       email)"
+msgstr ""
 
 #: ../../security/main.pm_.c:66
-#, fuzzy
 msgid "Security Level:"
-msgstr "Uzstâdu droðîbas lîmeni"
+msgstr "Droðîbas lîmenis:"
 
 #: ../../security/main.pm_.c:74
-#, fuzzy
 msgid "Security Alerts:"
-msgstr "Uzstâdu droðîbas lîmeni"
+msgstr "Droðîbas trauksmes:"
 
 #: ../../security/main.pm_.c:83
-#, fuzzy
 msgid "Security Administrator:"
-msgstr "Attâla lpd printera opcijas"
+msgstr "Droðîbas administrators:"
 
 #: ../../security/main.pm_.c:114 ../../security/main.pm_.c:150
 #, fuzzy, c-format
@@ -8980,6 +8838,18 @@ msgid ""
 "system security. If you need explanations, click on Help.\n"
 msgstr ""
 
+#: ../../security/main.pm_.c:226
+msgid "Network Options"
+msgstr "Tîkla opcijas"
+
+#: ../../security/main.pm_.c:235
+msgid "System Options"
+msgstr "Sistçmas opcijas"
+
+#: ../../security/main.pm_.c:242
+msgid "Periodic Checks"
+msgstr ""
+
 #: ../../security/main.pm_.c:256
 #, fuzzy
 msgid "Please wait, setting security level..."
@@ -9090,7 +8960,7 @@ msgstr ""
 
 #: ../../services.pm_.c:40
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr ""
+msgstr "Automâtiska dzelþu noteikðana un konfigurçðana sâknçðanas laikâ."
 
 #: ../../services.pm_.c:41
 msgid ""
@@ -9163,7 +9033,7 @@ msgstr ""
 
 #: ../../services.pm_.c:59
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "Atbalsta OKI 4w un savietojamus winprinterus."
 
 #: ../../services.pm_.c:60
 msgid ""
@@ -9260,7 +9130,7 @@ msgstr ""
 
 #: ../../services.pm_.c:83
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Ielâdç draiverus jûsu usb ierîcçm."
 
 #: ../../services.pm_.c:84
 #, fuzzy
@@ -9272,9 +9142,8 @@ msgid "Choose which services should be automatically started at boot time"
 msgstr "Izvçlçties, kurus servisus vajag automâtiski startçt ielâdes laikâ"
 
 #: ../../services.pm_.c:122
-#, fuzzy
 msgid "Printing"
-msgstr "Printeris"
+msgstr "Drukâðana"
 
 #
 #: ../../services.pm_.c:123
@@ -9283,22 +9152,19 @@ msgstr "Internets"
 
 #: ../../services.pm_.c:126
 msgid "File sharing"
-msgstr ""
+msgstr "Failu koplietoðana"
 
 #: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:1746
-#, fuzzy
 msgid "System"
-msgstr "Sistçmas reþîms"
+msgstr "Sistçma"
 
 #: ../../services.pm_.c:133
-#, fuzzy
 msgid "Remote Administration"
-msgstr "Attâla lpd printera opcijas"
+msgstr "Attâla administrçðana"
 
 #: ../../services.pm_.c:141
-#, fuzzy
 msgid "Database Server"
-msgstr "Serveris, Datubâzes"
+msgstr "Datubâzu serveris"
 
 #: ../../services.pm_.c:170
 #, c-format
@@ -9306,23 +9172,20 @@ msgid "Services: %d activated for %d registered"
 msgstr ""
 
 #: ../../services.pm_.c:186
-#, fuzzy
 msgid "Services"
-msgstr "ierîce"
+msgstr "Servisi"
 
 #: ../../services.pm_.c:198
-#, fuzzy
 msgid "running"
-msgstr "Uzmanîbu"
+msgstr "darbojas"
 
 #: ../../services.pm_.c:198
-#, fuzzy
 msgid "stopped"
-msgstr "Papildinât"
+msgstr "apturçts"
 
 #: ../../services.pm_.c:212
 msgid "Services and deamons"
-msgstr ""
+msgstr "Servisi un dçmoni"
 
 #: ../../services.pm_.c:217
 msgid ""
@@ -9331,27 +9194,24 @@ msgid ""
 msgstr ""
 
 #: ../../services.pm_.c:224
-#, fuzzy
 msgid "On boot"
-msgstr "Yaboot"
+msgstr "Sâknçðanas laikâ"
 
 #: ../../services.pm_.c:236
-#, fuzzy
 msgid "Start"
-msgstr "Stâvoklis:"
+msgstr "Startçt"
 
 #: ../../services.pm_.c:236
-#, fuzzy
 msgid "Stop"
-msgstr "Sektors"
+msgstr "Apturçt"
 
 #: ../../share/advertising/01-thanks.pl_.c:9
 msgid "Thank you for choosing Mandrake Linux 9.0"
-msgstr ""
+msgstr "Paldies, ka izvçlçjâties Mandrake Linux 9.0"
 
 #: ../../share/advertising/01-thanks.pl_.c:10
 msgid "Welcome to the Open Source world"
-msgstr ""
+msgstr "Esiet sveicinâti atvçrtâ koda pasaulç"
 
 #: ../../share/advertising/01-thanks.pl_.c:11
 msgid ""
@@ -9424,9 +9284,8 @@ msgid ""
 msgstr ""
 
 #: ../../share/advertising/07-desktop.pl_.c:9
-#, fuzzy
 msgid "User interfaces"
-msgstr "Tîkla interfeiss"
+msgstr "Lietotâja interfeisi"
 
 #: ../../share/advertising/07-desktop.pl_.c:10
 msgid ""
@@ -9456,8 +9315,8 @@ msgstr ""
 
 #: ../../share/advertising/09-server.pl_.c:10
 msgid ""
-"Transform your machine into a powerful Linux server with a few clicks of your "
-"mouse: Web server, mail, firewall, router, file and print server, ..."
+"Transform your machine into a powerful Linux server with a few clicks of "
+"your mouse: Web server, mail, firewall, router, file and print server, ..."
 msgstr ""
 
 #: ../../share/advertising/10-mnf.pl_.c:9
@@ -9523,9 +9382,8 @@ msgid ""
 msgstr ""
 
 #: ../../share/advertising/14-mdkexpert.pl_.c:9
-#, fuzzy
 msgid "Become a MandrakeExpert"
-msgstr "Eksperta"
+msgstr "Kïûstiet par MandrakeEkspertu"
 
 #: ../../share/advertising/14-mdkexpert.pl_.c:10
 msgid ""
@@ -9569,10 +9427,9 @@ msgid ""
 "MandrakeClub!"
 msgstr ""
 
-#: ../../standalone.pm_.c:41
-#, fuzzy
+#: ../../standalone.pm_.c:42
 msgid "Installing packages..."
-msgstr "Instalçju pakotni %s"
+msgstr "Instalçju pakotnes..."
 
 #: ../../standalone/XFdrake_.c:147
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
@@ -9584,9 +9441,8 @@ msgid "Please relog into %s to activate the changes"
 msgstr "Lai aktivizçtu izmaiòas, lûdzu aizveriet un atveriet %s sesiju"
 
 #: ../../standalone/drakTermServ_.c:188
-#, fuzzy
 msgid "Mandrake Terminal Server Configuration"
-msgstr "Interneta konfigurâcija"
+msgstr "Mandrake terminâïu servera konfigurâcija"
 
 #: ../../standalone/drakTermServ_.c:203
 #, fuzzy
@@ -9599,14 +9455,12 @@ msgid "Disable Server"
 msgstr "Serveris, Datubâzes"
 
 #: ../../standalone/drakTermServ_.c:218
-#, fuzzy
 msgid "Start Server"
-msgstr "NIS serveris"
+msgstr "Startçt serveri"
 
 #: ../../standalone/drakTermServ_.c:225
-#, fuzzy
 msgid "Stop Server"
-msgstr "NIS serveris"
+msgstr "Apturçt serveri"
 
 #: ../../standalone/drakTermServ_.c:233
 msgid "Etherboot Floppy/ISO"
@@ -9617,14 +9471,12 @@ msgid "Net Boot Images"
 msgstr ""
 
 #: ../../standalone/drakTermServ_.c:239
-#, fuzzy
 msgid "Add/Del Users"
-msgstr "Pievienot lietotâju"
+msgstr "Pielikt/noòemt lietotâjus"
 
 #: ../../standalone/drakTermServ_.c:241
-#, fuzzy
 msgid "Add/Del Clients"
-msgstr "DHCP klients"
+msgstr "Pielikt/noòemt klientus"
 
 #: ../../standalone/drakTermServ_.c:436
 msgid "Boot Floppy"
@@ -9744,9 +9596,8 @@ msgid "Need to create /etc/dhcpd.conf first!"
 msgstr ""
 
 #: ../../standalone/drakautoinst_.c:43
-#, fuzzy
 msgid "Error!"
-msgstr "Kïûda"
+msgstr "Kïûda!"
 
 #: ../../standalone/drakautoinst_.c:44
 #, c-format
@@ -9797,7 +9648,7 @@ msgid ""
 "The parameters of the auto-install are available in the sections on the left"
 msgstr ""
 
-#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:484
+#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:480
 #: ../../standalone/scannerdrake_.c:119
 msgid "Congratulations!"
 msgstr "Apsveicam!"
@@ -9829,7 +9680,7 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:723
 msgid "WARNING"
-msgstr ""
+msgstr "BRÎDINÂJUMS"
 
 #: ../../standalone/drakbackup_.c:724
 #, fuzzy
@@ -9838,7 +9689,7 @@ msgstr "FAT"
 
 #: ../../standalone/drakbackup_.c:725
 msgid "INFO"
-msgstr ""
+msgstr "INFORMÂCIJA"
 
 #: ../../standalone/drakbackup_.c:737
 msgid ""
@@ -9865,9 +9716,8 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:763 ../../standalone/drakbackup_.c:836
 #: ../../standalone/drakbackup_.c:891
-#, fuzzy
 msgid "Total progess"
-msgstr "Pârbaudît portus"
+msgstr "Kopçjais progress"
 
 #: ../../standalone/drakbackup_.c:818
 #, c-format
@@ -9972,7 +9822,7 @@ msgstr "Slikts rezerves kopijas fails"
 
 #: ../../standalone/drakbackup_.c:1264
 msgid "Hard Disk Backup Progress..."
-msgstr ""
+msgstr "Cietâ diska rezerver kopçðanas progress..."
 
 #: ../../standalone/drakbackup_.c:1317
 #, fuzzy
@@ -10027,7 +9877,7 @@ msgstr "Kïûda, nolasot failu %s"
 
 #: ../../standalone/drakbackup_.c:1406
 msgid "Can't create catalog!"
-msgstr ""
+msgstr "Nevar izveidot katalogu!"
 
 #: ../../standalone/drakbackup_.c:1519 ../../standalone/drakbackup_.c:1530
 #: ../../standalone/drakfont_.c:1004
@@ -10088,14 +9938,12 @@ msgid "Remove Selected"
 msgstr "Noòemt rindu"
 
 #: ../../standalone/drakbackup_.c:1712
-#, fuzzy
 msgid "Windows (FAT32)"
-msgstr "Noòemt Windows(TM)"
+msgstr "Windows (FAT32)"
 
 #: ../../standalone/drakbackup_.c:1751
-#, fuzzy
 msgid "Users"
-msgstr "Lietotâja vârds"
+msgstr "Lietotâji"
 
 #: ../../standalone/drakbackup_.c:1777
 #, fuzzy
@@ -10104,7 +9952,7 @@ msgstr "Slikts rezerves kopijas fails"
 
 #: ../../standalone/drakbackup_.c:1779
 msgid "Net Method:"
-msgstr ""
+msgstr "Tîkla metode:"
 
 #: ../../standalone/drakbackup_.c:1783
 msgid "Use Expect for SSH"
@@ -10177,17 +10025,17 @@ msgstr "Lûdzu izvçlieties jûsu tastatûras izkârtojumu."
 #: ../../standalone/drakbackup_.c:1931
 #, fuzzy
 msgid "Please check for multisession CD"
-msgstr "Lûdzu uzklikðíiniet uz partîcijas"
+msgstr "Lûdzu uzklikðíiniet uz sadaïas"
 
 #: ../../standalone/drakbackup_.c:1937
 #, fuzzy
 msgid "Please check if you are using CDRW media"
-msgstr "Lûdzu uzklikðíiniet uz partîcijas"
+msgstr "Lûdzu uzklikðíiniet uz sadaïas"
 
 #: ../../standalone/drakbackup_.c:1943
 #, fuzzy
 msgid "Please check if you want to erase your RW media (1st Session)"
-msgstr "Lûdzu uzklikðíiniet uz partîcijas"
+msgstr "Lûdzu uzklikðíiniet uz sadaïas"
 
 #: ../../standalone/drakbackup_.c:1944
 msgid " Erase Now "
@@ -10196,18 +10044,20 @@ msgstr ""
 #: ../../standalone/drakbackup_.c:1950
 #, fuzzy
 msgid "Please check if you are using a DVDR device"
-msgstr "Lûdzu uzklikðíiniet uz partîcijas"
+msgstr "Lûdzu uzklikðíiniet uz sadaïas"
 
 #: ../../standalone/drakbackup_.c:1956
 #, fuzzy
 msgid "Please check if you are using a DVDRAM device"
-msgstr "Lûdzu uzklikðíiniet uz partîcijas"
+msgstr "Lûdzu uzklikðíiniet uz sadaïas"
 
 #: ../../standalone/drakbackup_.c:1969
 msgid ""
 "Please enter your CD Writer device name\n"
 " ex: 0,1,0"
 msgstr ""
+"Lûdzu ievadiet CD rakstîtâja ierîces nosaukumu\n"
+"piemçram: 0,1,0"
 
 #: ../../standalone/drakbackup_.c:2002
 #, fuzzy
@@ -10221,7 +10071,7 @@ msgstr "Slikts rezerves kopijas fails"
 
 #: ../../standalone/drakbackup_.c:2053
 msgid "Please enter the device name to use for backup"
-msgstr ""
+msgstr "Lûdzu ievadiet rezerves kopçðanas ierîces nosaukumu"
 
 #: ../../standalone/drakbackup_.c:2059
 #, fuzzy
@@ -10256,42 +10106,40 @@ msgid "Use quota for backup files."
 msgstr "Slikts rezerves kopijas fails"
 
 #: ../../standalone/drakbackup_.c:2223
-#, fuzzy
 msgid "Network"
-msgstr "Tîkla interfeiss"
+msgstr "Tîkls"
 
 #: ../../standalone/drakbackup_.c:2228
 msgid "CDROM / DVDROM"
-msgstr ""
+msgstr "CDROM / DVDROM"
 
 #: ../../standalone/drakbackup_.c:2233
 msgid "HardDrive / NFS"
-msgstr ""
+msgstr "Cietais disks / NFS"
 
 #: ../../standalone/drakbackup_.c:2238
-#, fuzzy
 msgid "Tape"
-msgstr "Tips"
+msgstr "Lenta"
 
 #: ../../standalone/drakbackup_.c:2252 ../../standalone/drakbackup_.c:2256
 #: ../../standalone/drakbackup_.c:2260
 msgid "hourly"
-msgstr ""
+msgstr "ik stundu"
 
 #: ../../standalone/drakbackup_.c:2253 ../../standalone/drakbackup_.c:2257
 #: ../../standalone/drakbackup_.c:2260
 msgid "daily"
-msgstr ""
+msgstr "ik dienu"
 
 #: ../../standalone/drakbackup_.c:2254 ../../standalone/drakbackup_.c:2258
 #: ../../standalone/drakbackup_.c:2260
 msgid "weekly"
-msgstr ""
+msgstr "ik nedçïu"
 
 #: ../../standalone/drakbackup_.c:2255 ../../standalone/drakbackup_.c:2259
 #: ../../standalone/drakbackup_.c:2260
 msgid "monthly"
-msgstr ""
+msgstr "ik mçnesi"
 
 #: ../../standalone/drakbackup_.c:2273
 #, fuzzy
@@ -10321,7 +10169,7 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:2328
 msgid "Send mail report after each backup to:"
-msgstr ""
+msgstr "Pçc katras rezerves kopçðanas sûtît vçstuli uz:"
 
 #: ../../standalone/drakbackup_.c:2334
 msgid "Delete Hard Drive tar files after backup to other media."
@@ -10329,22 +10177,19 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:2373
 msgid "What"
-msgstr ""
+msgstr "Ko"
 
 #: ../../standalone/drakbackup_.c:2378
-#, fuzzy
 msgid "Where"
-msgstr "Ritenis"
+msgstr "Kur"
 
 #: ../../standalone/drakbackup_.c:2383
-#, fuzzy
 msgid "When"
-msgstr "Ritenis"
+msgstr "Kad"
 
 #: ../../standalone/drakbackup_.c:2388
-#, fuzzy
 msgid "More Options"
-msgstr "Moduïa opcijas:"
+msgstr "Vairâk opciju"
 
 #: ../../standalone/drakbackup_.c:2407 ../../standalone/drakbackup_.c:4532
 #, fuzzy
@@ -10358,19 +10203,19 @@ msgstr "Lûdzu izvçlieties pakotnes, ko vçlaties instalçt"
 
 #: ../../standalone/drakbackup_.c:2427
 msgid "on Hard Drive"
-msgstr ""
+msgstr "uz cietâ diska"
 
 #: ../../standalone/drakbackup_.c:2437
 msgid "across Network"
-msgstr ""
+msgstr "pa tîklu"
 
 #: ../../standalone/drakbackup_.c:2447
 msgid "on CDROM"
-msgstr ""
+msgstr "uz CDROM"
 
 #: ../../standalone/drakbackup_.c:2455
 msgid "on Tape Device"
-msgstr ""
+msgstr "uz lentas ierîces"
 
 #: ../../standalone/drakbackup_.c:2498
 #, fuzzy
@@ -10497,50 +10342,56 @@ msgid ""
 "\n"
 "- Daemon (%s) include:\n"
 msgstr ""
+"\n"
+"- Dçmons (%s) iekïauj:\n"
 
 #: ../../standalone/drakbackup_.c:2622
 msgid "\t-Hard drive.\n"
-msgstr ""
+msgstr "\t-Cietais disks.\n"
 
 #: ../../standalone/drakbackup_.c:2623
 msgid "\t-CDROM.\n"
-msgstr ""
+msgstr "\t-CDROM.\n"
 
 #: ../../standalone/drakbackup_.c:2624
 msgid "\t-Tape \n"
-msgstr ""
+msgstr "\t-Lenta \n"
 
 #: ../../standalone/drakbackup_.c:2625
 msgid "\t-Network by FTP.\n"
-msgstr ""
+msgstr "\t-Tîkls ar FTP.\n"
 
 #: ../../standalone/drakbackup_.c:2626
 msgid "\t-Network by SSH.\n"
-msgstr ""
+msgstr "\t-Tîkls ar SSH.\n"
 
 #: ../../standalone/drakbackup_.c:2627
 msgid "\t-Network by rsync.\n"
-msgstr ""
+msgstr "\t-Tîkls ar rsync.\n"
 
 #: ../../standalone/drakbackup_.c:2628
 msgid "\t-Network by webdav.\n"
-msgstr ""
+msgstr "\t-Tîkls ar webdav.\n"
 
 #: ../../standalone/drakbackup_.c:2630
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr ""
+msgstr "Nav konfigurâcijas, lûdzu izvçlieties Meistaru vai Izvçrstu.\n"
 
 #: ../../standalone/drakbackup_.c:2636
 msgid ""
 "List of data to restore:\n"
 "\n"
 msgstr ""
+"Atjaunojamo datu saraksts:\n"
+"\n"
 
 #: ../../standalone/drakbackup_.c:2803
 msgid ""
 "List of data corrupted:\n"
 "\n"
 msgstr ""
+"Bojâto datu saraksts:\n"
+"\n"
 
 #: ../../standalone/drakbackup_.c:2805
 #, fuzzy
@@ -10549,7 +10400,7 @@ msgstr "Lûdzu norâdiet, kuram seriâlajam portam ir pieslçgts modçms."
 
 #: ../../standalone/drakbackup_.c:2815
 msgid "Backup files are corrupted"
-msgstr ""
+msgstr "Rezerves kopijas faili ir bojâti"
 
 #: ../../standalone/drakbackup_.c:2836
 msgid "          All of your selected data have been          "
@@ -10623,19 +10474,16 @@ msgid "Other Media"
 msgstr "Cits"
 
 #: ../../standalone/drakbackup_.c:3263
-#, fuzzy
 msgid "Restore system"
-msgstr "Sistçmas instalçðana"
+msgstr "Atjaunot sistçmu"
 
 #: ../../standalone/drakbackup_.c:3264
-#, fuzzy
 msgid "Restore Users"
-msgstr "Atjaunot no faila"
+msgstr "Atjaunot lietotâjus"
 
 #: ../../standalone/drakbackup_.c:3265
-#, fuzzy
 msgid "Restore Other"
-msgstr "Atjaunot no faila"
+msgstr "Atjaunot citu"
 
 #: ../../standalone/drakbackup_.c:3267
 #, fuzzy
@@ -10673,7 +10521,7 @@ msgstr "Atjaunot no faila"
 #: ../../standalone/drakbackup_.c:3479
 #, c-format
 msgid "Backup files not found at %s."
-msgstr ""
+msgstr "Rezerves kopijas faili nav atrasti uz %s."
 
 #: ../../standalone/drakbackup_.c:3492
 #, c-format
@@ -10683,9 +10531,8 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:3492
-#, fuzzy
 msgid "Restore From CD"
-msgstr "Atjanot no disketes"
+msgstr "Atjanot no CD"
 
 #: ../../standalone/drakbackup_.c:3494
 #, c-format
@@ -10700,9 +10547,8 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:3504
-#, fuzzy
 msgid "Restore From Tape"
-msgstr "Salabot partîciju tabulu"
+msgstr "Atjaunot no lentas"
 
 #: ../../standalone/drakbackup_.c:3506
 #, c-format
@@ -10710,9 +10556,8 @@ msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:3526
-#, fuzzy
 msgid "Restore Via Network"
-msgstr "Atjaunot no faila"
+msgstr "Atjaunot pa tîklu"
 
 #: ../../standalone/drakbackup_.c:3526
 #, c-format
@@ -10729,19 +10574,16 @@ msgid "Host Path or Module"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:3535
-#, fuzzy
 msgid "Password required"
-msgstr "Parole"
+msgstr "Nepiecieðama parole"
 
 #: ../../standalone/drakbackup_.c:3541
-#, fuzzy
 msgid "Username required"
-msgstr "Lietotâja vârds"
+msgstr "Nepiecieðams lietotâja vârds"
 
 #: ../../standalone/drakbackup_.c:3544
-#, fuzzy
 msgid "Hostname required"
-msgstr "Resursa vârds: "
+msgstr "Nepiecieðams resursa vârds"
 
 #: ../../standalone/drakbackup_.c:3549
 msgid "Path or Module required"
@@ -10749,12 +10591,11 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:3562
 msgid "Files Restored..."
-msgstr ""
+msgstr "Atjaunotie faili..."
 
 #: ../../standalone/drakbackup_.c:3565
-#, fuzzy
 msgid "Restore Failed..."
-msgstr "Atjaunot no faila"
+msgstr "Atjaunoðana neizdevâs..."
 
 #: ../../standalone/drakbackup_.c:3803
 msgid "Restore all backups"
@@ -10774,14 +10615,12 @@ msgid "Browse to new restore repository."
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:3867
-#, fuzzy
 msgid "Restore From Catalog"
-msgstr "Salabot partîciju tabulu"
+msgstr "Atjaunot no kataloga"
 
 #: ../../standalone/drakbackup_.c:3895
-#, fuzzy
 msgid "Restore Progress"
-msgstr "Atjaunot no faila"
+msgstr "Atjaunoðanas progress"
 
 #: ../../standalone/drakbackup_.c:3937 ../../standalone/drakbackup_.c:3970
 #: ../../standalone/drakbackup_.c:3996 ../../standalone/drakbackup_.c:4023
@@ -10793,10 +10632,9 @@ msgid "Previous"
 msgstr "<- Atpakaï"
 
 #: ../../standalone/drakbackup_.c:3941 ../../standalone/drakbackup_.c:4027
-#: ../../standalone/logdrake_.c:223
-#, fuzzy
+#: ../../standalone/logdrake_.c:224
 msgid "Save"
-msgstr "Stâvoklis:"
+msgstr "Saglabât"
 
 #: ../../standalone/drakbackup_.c:4000
 #, fuzzy
@@ -10804,9 +10642,8 @@ msgid "Build Backup"
 msgstr "Slikts rezerves kopijas fails"
 
 #: ../../standalone/drakbackup_.c:4054 ../../standalone/drakbackup_.c:4634
-#, fuzzy
 msgid "Restore"
-msgstr "Atjaunot no faila"
+msgstr "Atjaunot"
 
 #: ../../standalone/drakbackup_.c:4233
 msgid ""
@@ -10854,32 +10691,28 @@ msgid "Under Devel ... please wait."
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:4470
-#, fuzzy
 msgid "Backup system files"
-msgstr "Slikts rezerves kopijas fails"
+msgstr "Atjaunot sistçmas failus"
 
 #: ../../standalone/drakbackup_.c:4472
-#, fuzzy
 msgid "Backup user files"
-msgstr "Slikts rezerves kopijas fails"
+msgstr "Atjaunot lietotâja failus"
 
 #: ../../standalone/drakbackup_.c:4474
-#, fuzzy
 msgid "Backup other files"
-msgstr "Slikts rezerves kopijas fails"
+msgstr "Atjaunot citus failus"
 
 #: ../../standalone/drakbackup_.c:4476 ../../standalone/drakbackup_.c:4509
 msgid "Total Progress"
-msgstr ""
+msgstr "Kopçjais progress"
 
 #: ../../standalone/drakbackup_.c:4500
 msgid "files sending by FTP"
 msgstr ""
 
 #: ../../standalone/drakbackup_.c:4504
-#, fuzzy
 msgid "Sending files..."
-msgstr "Saglabât failâ"
+msgstr "Nosûtu failus..."
 
 #: ../../standalone/drakbackup_.c:4590
 #, fuzzy
@@ -10892,14 +10725,12 @@ msgid "View Backup Configuration."
 msgstr "Tîkla konfigurâcija"
 
 #: ../../standalone/drakbackup_.c:4616
-#, fuzzy
 msgid "Wizard Configuration"
-msgstr "LAN konfigurâcija"
+msgstr "Meistara konfigurâcija"
 
 #: ../../standalone/drakbackup_.c:4621
-#, fuzzy
 msgid "Advanced Configuration"
-msgstr "LAN konfigurâcija"
+msgstr "Izvçrsta konfigurâcija"
 
 #: ../../standalone/drakbackup_.c:4626
 #, fuzzy
@@ -10908,7 +10739,7 @@ msgstr "Failu sistçmu uzstâdîðana"
 
 #: ../../standalone/drakbackup_.c:4660
 msgid "Drakbackup"
-msgstr ""
+msgstr "Drakbackup"
 
 #: ../../standalone/drakbackup_.c:4711
 msgid ""
@@ -11186,11 +11017,11 @@ msgstr ""
 
 #: ../../standalone/drakbug_.c:70
 msgid "First Time Wizard"
-msgstr ""
+msgstr "Pirmâs reizes meistars"
 
 #: ../../standalone/drakbug_.c:71
 msgid "Synchronization tool"
-msgstr ""
+msgstr "Sinhronizçðanas rîks"
 
 #: ../../standalone/drakbug_.c:72 ../../standalone/drakbug_.c:86
 #: ../../standalone/drakbug_.c:156 ../../standalone/drakbug_.c:158
@@ -11201,17 +11032,15 @@ msgstr "Konsoles rîki"
 
 #: ../../standalone/drakbug_.c:73
 msgid "HardDrake"
-msgstr ""
+msgstr "HardDrake"
 
 #: ../../standalone/drakbug_.c:74
-#, fuzzy
 msgid "Mandrake Online"
-msgstr "Pieslçgties Internetam"
+msgstr "Mandrake Online"
 
 #: ../../standalone/drakbug_.c:75
-#, fuzzy
 msgid "Menudrake"
-msgstr "Eksperta"
+msgstr "Menudrake"
 
 #: ../../standalone/drakbug_.c:76
 #, fuzzy
@@ -11230,35 +11059,31 @@ msgstr "Koplietojuma vârds"
 
 #: ../../standalone/drakbug_.c:79
 msgid "Urpmi"
-msgstr ""
+msgstr "Urpmi"
 
 #: ../../standalone/drakbug_.c:80
 msgid "Windows Migration tool"
-msgstr ""
+msgstr "Windows migrçðanas rîks"
 
 #: ../../standalone/drakbug_.c:81
-#, fuzzy
 msgid "Userdrake"
-msgstr "Printeris"
+msgstr "Userdrake"
 
 #: ../../standalone/drakbug_.c:82
-#, fuzzy
 msgid "Configuration Wizards"
-msgstr "Tîkla konfigurçðanas meistars"
+msgstr "Konfigurçðanas meistari"
 
 #: ../../standalone/drakbug_.c:97
-#, fuzzy
 msgid "Application:"
-msgstr "Autentifikâcija"
+msgstr "Aplikâcija:"
 
 #: ../../standalone/drakbug_.c:98
-#, fuzzy
 msgid "Package: "
-msgstr "Pakotòu grupu izvçle"
+msgstr "Pakotne:"
 
 #: ../../standalone/drakbug_.c:99
 msgid "Kernel:"
-msgstr ""
+msgstr "Kodols:"
 
 #: ../../standalone/drakbug_.c:100
 #, fuzzy
@@ -11283,13 +11108,12 @@ msgid "Report"
 msgstr "Ports"
 
 #: ../../standalone/drakbug_.c:171
-#, fuzzy
 msgid "Not installed"
-msgstr "Instalçðanas beigas"
+msgstr "Nav instalçts"
 
 #: ../../standalone/drakbug_.c:189
 msgid "connecting to Bugzilla wizard ..."
-msgstr ""
+msgstr "pieslçdzos Bugzilla meistaram ..."
 
 #: ../../standalone/drakbug_.c:196
 #, fuzzy
@@ -11343,7 +11167,7 @@ msgstr "Vârteja:"
 #
 #: ../../standalone/drakconnect_.c:183 ../../standalone/drakconnect_.c:375
 msgid "Interface:"
-msgstr "interfeiss:"
+msgstr "Interfeiss:"
 
 #: ../../standalone/drakconnect_.c:194
 msgid "Status:"
@@ -11351,7 +11175,7 @@ msgstr "Stâvoklis:"
 
 #: ../../standalone/drakconnect_.c:201
 msgid "Wait please"
-msgstr ""
+msgstr "Lûdzu uzgaidiet"
 
 #: ../../standalone/drakconnect_.c:219
 msgid "Configure Internet Access..."
@@ -11371,14 +11195,12 @@ msgid "Interface"
 msgstr "Interfeiss"
 
 #: ../../standalone/drakconnect_.c:231
-#, fuzzy
 msgid "Protocol"
 msgstr "Protokols"
 
 #: ../../standalone/drakconnect_.c:231
-#, fuzzy
 msgid "State"
-msgstr "Stâvoklis:"
+msgstr "Stâvoklis"
 
 #: ../../standalone/drakconnect_.c:243
 msgid "Configure Local Area Network..."
@@ -11496,93 +11318,93 @@ msgstr "Ethernet karte"
 msgid "DHCP Client"
 msgstr "DHCP klients"
 
-#: ../../standalone/drakfloppy_.c:63
+#: ../../standalone/drakfloppy_.c:64
 msgid "usage: drakfloppy\n"
 msgstr "pielietojums: drakfloppy\n"
 
-#: ../../standalone/drakfloppy_.c:67
+#: ../../standalone/drakfloppy_.c:68
 msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Module name"
 msgstr "Moduïa nosaukums"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Size"
 msgstr "Izmçrs"
 
-#: ../../standalone/drakfloppy_.c:73
+#: ../../standalone/drakfloppy_.c:74
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: ../../standalone/drakfloppy_.c:90
+#: ../../standalone/drakfloppy_.c:91
 msgid "boot disk creation"
 msgstr "sâknçðanas diska veidoðana"
 
-#: ../../standalone/drakfloppy_.c:98 ../../standalone/drakfloppy_.c:111
+#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
 msgid "default"
 msgstr "pçc noklusçðanas"
 
-#: ../../standalone/drakfloppy_.c:114
+#: ../../standalone/drakfloppy_.c:115
 #, c-format
 msgid "DrakFloppy Error: %s"
 msgstr "DrakFloppy kïûda: %s"
 
-#: ../../standalone/drakfloppy_.c:125
+#: ../../standalone/drakfloppy_.c:126
 msgid "kernel version"
 msgstr "kodola versija"
 
-#: ../../standalone/drakfloppy_.c:131
+#: ../../standalone/drakfloppy_.c:132
 msgid "General"
 msgstr "Vispârçji"
 
-#: ../../standalone/drakfloppy_.c:136
+#: ../../standalone/drakfloppy_.c:137
 msgid "Expert Area"
 msgstr "Eksperta apgabals"
 
-#: ../../standalone/drakfloppy_.c:139
+#: ../../standalone/drakfloppy_.c:140
 msgid "mkinitrd optional arguments"
 msgstr "mkinitrd papildus argumenti"
 
-#: ../../standalone/drakfloppy_.c:140
+#: ../../standalone/drakfloppy_.c:141
 msgid "Add a module"
 msgstr "Pievienot moduli"
 
-#: ../../standalone/drakfloppy_.c:160
+#: ../../standalone/drakfloppy_.c:161
 msgid "force"
 msgstr "piespiest"
 
-#: ../../standalone/drakfloppy_.c:161
+#: ../../standalone/drakfloppy_.c:162
 msgid "if needed"
 msgstr "ja nepiecieðams"
 
-#: ../../standalone/drakfloppy_.c:162
+#: ../../standalone/drakfloppy_.c:163
 msgid "omit scsi modules"
 msgstr "izlaist scsi moduïus"
 
-#: ../../standalone/drakfloppy_.c:163
+#: ../../standalone/drakfloppy_.c:164
 msgid "omit raid modules"
 msgstr "izlaist raid moduïus"
 
-#: ../../standalone/drakfloppy_.c:199
+#: ../../standalone/drakfloppy_.c:200
 msgid "Remove a module"
 msgstr "Noòemt moduli"
 
-#: ../../standalone/drakfloppy_.c:221
+#: ../../standalone/drakfloppy_.c:222
 msgid "Output"
 msgstr "Izvade"
 
-#: ../../standalone/drakfloppy_.c:233
+#: ../../standalone/drakfloppy_.c:234
 msgid "Build the disk"
 msgstr "Izveidot disku"
 
-#: ../../standalone/drakfloppy_.c:376
+#: ../../standalone/drakfloppy_.c:377
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Pârliecinieties ka datu nesçjs %s ir vajadzîgajâ vietâ"
 
-#: ../../standalone/drakfloppy_.c:381
+#: ../../standalone/drakfloppy_.c:382
 #, fuzzy, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -11591,12 +11413,12 @@ msgstr ""
 "Nav datu nesçja ierîcç %s.\n"
 "Lûdzu ielieciet kâdu."
 
-#: ../../standalone/drakfloppy_.c:383
+#: ../../standalone/drakfloppy_.c:384
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Nevar atdalît: %s"
 
-#: ../../standalone/drakfloppy_.c:387
+#: ../../standalone/drakfloppy_.c:388
 #, c-format
 msgid ""
 "Unable to close properly mkbootdisk: \n"
@@ -11620,17 +11442,15 @@ msgid "parse all fonts"
 msgstr ""
 
 #: ../../standalone/drakfont_.c:260
-#, fuzzy
 msgid "no fonts found"
-msgstr "tîkla karte nav atrasta"
+msgstr "fonti nav atrasti"
 
 #: ../../standalone/drakfont_.c:269 ../../standalone/drakfont_.c:323
 #: ../../standalone/drakfont_.c:379 ../../standalone/drakfont_.c:468
 #: ../../standalone/drakfont_.c:479 ../../standalone/drakfont_.c:506
 #: ../../standalone/drakfont_.c:520 ../../standalone/drakfont_.c:537
-#, fuzzy
 msgid "done"
-msgstr "Izdarîts"
+msgstr "izdarîts"
 
 #: ../../standalone/drakfont_.c:275
 msgid "could not find any font in your mounted partitions"
@@ -11654,9 +11474,8 @@ msgid "Fonts copy"
 msgstr "Disketes formatçðana"
 
 #: ../../standalone/drakfont_.c:381
-#, fuzzy
 msgid "True Type fonts installation"
-msgstr "Sagatavoju instalçðanu"
+msgstr "True Type fontu instalçðana"
 
 #: ../../standalone/drakfont_.c:389
 msgid "please wait during ttmkfdir..."
@@ -11664,11 +11483,11 @@ msgstr ""
 
 #: ../../standalone/drakfont_.c:394
 msgid "True Type install done"
-msgstr ""
+msgstr "True Type instalçðana pabeigta"
 
 #: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:429
 msgid "Fonts conversion"
-msgstr ""
+msgstr "Fontu konvertçðana"
 
 #: ../../standalone/drakfont_.c:409 ../../standalone/drakfont_.c:433
 #: ../../standalone/drakfont_.c:464
@@ -11681,29 +11500,27 @@ msgstr ""
 
 #: ../../standalone/drakfont_.c:452
 msgid "ttf fonts conversion"
-msgstr ""
+msgstr "ttf fontu konvertçðana"
 
 #: ../../standalone/drakfont_.c:459
 msgid "pfm fonts conversion"
-msgstr ""
+msgstr "pfm fontu konvertçðana"
 
 #: ../../standalone/drakfont_.c:470
 msgid "Suppress temporary Files"
 msgstr ""
 
 #: ../../standalone/drakfont_.c:473
-#, fuzzy
 msgid "Restart XFS"
-msgstr "ierobeþot"
+msgstr "Pârstartçt XFS"
 
 #: ../../standalone/drakfont_.c:518 ../../standalone/drakfont_.c:532
 msgid "Suppress Fonts Files"
 msgstr ""
 
 #: ../../standalone/drakfont_.c:534
-#, fuzzy
 msgid "xfs restart"
-msgstr "ierobeþot"
+msgstr "xfs pârstartçðana"
 
 #: ../../standalone/drakfont_.c:542 ../../standalone/drakfont_.c:951
 msgid ""
@@ -11715,13 +11532,12 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/drakfont_.c:630
-#, fuzzy
 msgid "Fonts Importation"
-msgstr "Diska formatçðana"
+msgstr "Fontu importçðana"
 
 #: ../../standalone/drakfont_.c:660
 msgid "Get Windows Fonts"
-msgstr ""
+msgstr "Paòemt Windows fontus"
 
 #: ../../standalone/drakfont_.c:668
 msgid "Uninstall Fonts"
@@ -11733,28 +11549,25 @@ msgid "Advanced Options"
 msgstr "LAN konfigurâcija"
 
 #: ../../standalone/drakfont_.c:687
-#, fuzzy
 msgid "Font List"
-msgstr "Montçðanas punkts"
+msgstr "Fontu saraksts"
 
 #: ../../standalone/drakfont_.c:909
 #, fuzzy
 msgid "Choose the applications that will support the fonts:"
-msgstr "Izvçlieties partîcijas, ko vçlaties formatçt"
+msgstr "Izvçlieties sadaïas, ko vçlaties formatçt"
 
 #: ../../standalone/drakfont_.c:918
 msgid "Ghostscript"
-msgstr ""
+msgstr "Ghostscript"
 
 #: ../../standalone/drakfont_.c:925
-#, fuzzy
 msgid "StarOffice"
-msgstr "Birojs"
+msgstr "StarOffice"
 
 #: ../../standalone/drakfont_.c:932
-#, fuzzy
 msgid "Abiword"
-msgstr "Pârtraukt"
+msgstr "Abiword"
 
 #: ../../standalone/drakfont_.c:939
 #, fuzzy
@@ -11820,19 +11633,19 @@ msgstr "Jûsu sistçmâ nav tîkla adaptera!"
 msgid "Post Uninstall"
 msgstr "Instalçðanas beigas"
 
-#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:188
+#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:184
 msgid "Internet Connection Sharing"
 msgstr "Interneta pieslçguma koplietoðana"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:115
 msgid "Sorry, we support only 2.4 kernels."
-msgstr ""
+msgstr "Diemþçl mçs atbalstâm tikai 2.4 kodolus."
 
-#: ../../standalone/drakgw_.c:130
+#: ../../standalone/drakgw_.c:126
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Interneta pieslçguma koplietoðana paðlaik ir ieslçgta"
 
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:127
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -11844,33 +11657,33 @@ msgstr ""
 "\n"
 "Ko jûs vçlaties darît?"
 
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:131
 msgid "disable"
 msgstr "atslçgt"
 
-#: ../../standalone/drakgw_.c:135 ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
 msgid "dismiss"
 msgstr "atmest"
 
-#: ../../standalone/drakgw_.c:135 ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
 msgid "reconfigure"
 msgstr "pârkonfigurçt"
 
-#: ../../standalone/drakgw_.c:138
+#: ../../standalone/drakgw_.c:134
 #, fuzzy
 msgid "Disabling servers..."
 msgstr "Noskaidroju ierîces..."
 
-#: ../../standalone/drakgw_.c:146
+#: ../../standalone/drakgw_.c:142
 #, fuzzy
 msgid "Internet connection sharing is now disabled."
 msgstr "Interneta pieslçguma koplietoðana paðlaik ir atslçgta"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:151
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Interneta pieslçguma koplietoðana paðlaik ir atslçgta"
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:152
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -11882,20 +11695,20 @@ msgstr ""
 "\n"
 "Ko jûs vçlaties darît?"
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:156
 msgid "enable"
 msgstr "ieslçgt"
 
-#: ../../standalone/drakgw_.c:167
+#: ../../standalone/drakgw_.c:163
 msgid "Enabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:172
+#: ../../standalone/drakgw_.c:168
 #, fuzzy
 msgid "Internet connection sharing is now enabled."
 msgstr "Interneta pieslçguma koplietoðana paðlaik ir ieslçgta"
 
-#: ../../standalone/drakgw_.c:189
+#: ../../standalone/drakgw_.c:185
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -11912,22 +11725,22 @@ msgstr ""
 "\n"
 "Vai vçlaties uzstâdît Interneta pieslçguma koplietoðanu?"
 
-#: ../../standalone/drakgw_.c:215
+#: ../../standalone/drakgw_.c:211
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
 #
-#: ../../standalone/drakgw_.c:216
-#, fuzzy, c-format
+#: ../../standalone/drakgw_.c:212
+#, c-format
 msgid "Interface %s"
-msgstr "Interfeiss"
+msgstr "Interfeiss %s"
 
-#: ../../standalone/drakgw_.c:224
+#: ../../standalone/drakgw_.c:220
 msgid "No network adapter on your system!"
 msgstr "Jûsu sistçmâ nav tîkla adaptera!"
 
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:221
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -11935,11 +11748,11 @@ msgstr ""
 "Jûsu sistçmâ nav atrasts neviens ethernet tîkla adapteris. Lûdzu izmantojiet "
 "dzelþu konfigurçðanas rîku."
 
-#: ../../standalone/drakgw_.c:231
+#: ../../standalone/drakgw_.c:227
 msgid "Network interface"
 msgstr "Tîkla interfeiss"
 
-#: ../../standalone/drakgw_.c:232
+#: ../../standalone/drakgw_.c:228
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -11954,7 +11767,7 @@ msgstr ""
 "\n"
 "Vai vçlaties uzstâdît jûsu lokâlo datortîklu ar ðo adapteri?"
 
-#: ../../standalone/drakgw_.c:241
+#: ../../standalone/drakgw_.c:237
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -11962,12 +11775,11 @@ msgstr ""
 "Lûdzu izvçlieties, kurð tîkla adapteris bûs pieslçgts jûsu lokâlajam "
 "datortîklam."
 
-#: ../../standalone/drakgw_.c:259
-#, fuzzy
+#: ../../standalone/drakgw_.c:255
 msgid "Network interface already configured"
-msgstr "Monitors nav konfigurçts"
+msgstr "Tîkla interfeiss jau ir konfigurçts"
 
-#: ../../standalone/drakgw_.c:260
+#: ../../standalone/drakgw_.c:256
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -11977,17 +11789,15 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:265
-#, fuzzy
+#: ../../standalone/drakgw_.c:261
 msgid "Automatic reconfiguration"
-msgstr "Sâknçðanas stila konfigurçðana"
+msgstr "Automâtiska pârkonfigurçðana"
 
-#: ../../standalone/drakgw_.c:266
-#, fuzzy
+#: ../../standalone/drakgw_.c:262
 msgid "Show current interface configuration"
-msgstr "Interneta konfigurâcija"
+msgstr "Parâdît paðreizçjo interfeisa konfigurâciju"
 
-#: ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:264
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -11998,7 +11808,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:280
+#: ../../standalone/drakgw_.c:276
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
 "server; in that case please verify I correctly read the C-Class Network that "
@@ -12010,42 +11820,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:285
+#: ../../standalone/drakgw_.c:281
 msgid "C-Class Local Network"
-msgstr ""
+msgstr "C-klases lokâls tîkls"
 
-#: ../../standalone/drakgw_.c:286
-#, fuzzy
+#: ../../standalone/drakgw_.c:282
 msgid "(This) DHCP Server IP"
-msgstr "CUPS servera IP"
+msgstr "(Ðî) DHCP servera IP"
 
-#: ../../standalone/drakgw_.c:287
+#: ../../standalone/drakgw_.c:283
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:294
+#: ../../standalone/drakgw_.c:290
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:305
+#: ../../standalone/drakgw_.c:301
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Potenciâls LAN adreðu konflikts atklâts ðajâ %s! konfigurâcijâ!\n"
 
-#: ../../standalone/drakgw_.c:315
+#: ../../standalone/drakgw_.c:311
 msgid "Configuring..."
 msgstr "Konfigurçju..."
 
-#: ../../standalone/drakgw_.c:316
+#: ../../standalone/drakgw_.c:312
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Tiek konfigurçti skripti, instalçtas programmas, startçti serveri..."
 
-#: ../../standalone/drakgw_.c:352
+#: ../../standalone/drakgw_.c:348
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Problçmas, instalçjot pakotni %s"
 
-#: ../../standalone/drakgw_.c:485
+#: ../../standalone/drakgw_.c:481
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -12057,7 +11866,7 @@ msgstr ""
 "konfigurçðanu\n"
 "(DHCP)."
 
-#: ../../standalone/drakgw_.c:504
+#: ../../standalone/drakgw_.c:500
 #, fuzzy
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
@@ -12066,7 +11875,7 @@ msgstr ""
 "\n"
 "Ko jûs vçlaties darît?"
 
-#: ../../standalone/drakgw_.c:505
+#: ../../standalone/drakgw_.c:501
 #, fuzzy
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
@@ -12075,17 +11884,17 @@ msgstr ""
 "\n"
 "Ko jûs vçlaties darît?"
 
-#: ../../standalone/drakgw_.c:506
+#: ../../standalone/drakgw_.c:502
 #, fuzzy
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Interneta pieslçguma koplietoðana paðlaik ir ieslçgta"
 
-#: ../../standalone/drakgw_.c:511
+#: ../../standalone/drakgw_.c:507
 #, fuzzy
 msgid "Internet connection sharing configuration"
 msgstr "Interneta pieslçgums un konfigurâcija"
 
-#: ../../standalone/drakgw_.c:518
+#: ../../standalone/drakgw_.c:514
 #, fuzzy, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -12096,46 +11905,40 @@ msgid ""
 msgstr "Interneta pieslçguma koplietoðana"
 
 #: ../../standalone/drakperm_.c:42
-#, fuzzy
 msgid "group"
-msgstr "Darba grupa"
+msgstr "grupa"
 
 #: ../../standalone/drakperm_.c:42
 msgid "path"
-msgstr ""
+msgstr "ceïð"
 
 #: ../../standalone/drakperm_.c:42
-#, fuzzy
 msgid "permissions"
-msgstr "partîcija %s"
+msgstr "tiesîbas"
 
 #: ../../standalone/drakperm_.c:42
-#, fuzzy
 msgid "user"
-msgstr "Lietotâja vârds"
+msgstr "lietotâjs"
 
 #: ../../standalone/drakperm_.c:49
 msgid "Up"
-msgstr ""
+msgstr "Uz augðu"
 
 #: ../../standalone/drakperm_.c:50
-#, fuzzy
 msgid "delete"
-msgstr "Izdzçst"
+msgstr "dzçst"
 
 #: ../../standalone/drakperm_.c:51
 msgid "edit"
-msgstr ""
+msgstr "labot"
 
 #: ../../standalone/drakperm_.c:52
-#, fuzzy
 msgid "Down"
-msgstr "Izdarîts"
+msgstr "Uz leju"
 
 #: ../../standalone/drakperm_.c:53
-#, fuzzy
 msgid "add a rule"
-msgstr "Pievienot moduli"
+msgstr "pievienot noteikumu"
 
 #: ../../standalone/drakperm_.c:54
 msgid "select perm file to see/edit"
@@ -12149,61 +11952,56 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/drakperm_.c:62
-#, fuzzy
 msgid "Add a new rule at the end"
-msgstr "Nav printera"
+msgstr "Pievienot jaunu noteikumu beigâs"
 
 #: ../../standalone/drakperm_.c:63
 msgid "Edit curent rule"
-msgstr ""
+msgstr "Labot paðreizçjo noteikumu"
 
 #: ../../standalone/drakperm_.c:64
 msgid "Up selected rule one level"
-msgstr ""
+msgstr "Pacelt izvçlçto noteikumu par vienu lîmeni"
 
 #: ../../standalone/drakperm_.c:65
 msgid "Down selected rule one level"
-msgstr ""
+msgstr "Nolaist izvçlçto noteikumu par vienu lîmeni"
 
 #: ../../standalone/drakperm_.c:66
-#, fuzzy
 msgid "Delete selected rule"
-msgstr "Noòemt rindu"
+msgstr "Dzçst izvçleto noteikumu"
 
 #: ../../standalone/drakperm_.c:237
 msgid "browse"
-msgstr ""
+msgstr "pârlûkot"
 
 #: ../../standalone/drakperm_.c:244
-#, fuzzy
 msgid "Current user"
-msgstr "Apstiprinât lietotâju"
+msgstr "Paðreizçjais lietotâjs"
 
 #: ../../standalone/drakperm_.c:249
-#, fuzzy
 msgid "Permissions"
-msgstr "Versija: %s\n"
+msgstr "Tiesîbas"
 
 #: ../../standalone/drakperm_.c:250
 msgid "Path"
-msgstr ""
+msgstr "Ceïð"
 
 #: ../../standalone/drakperm_.c:251
-#, fuzzy
 msgid "Property"
-msgstr "Ports"
+msgstr "Îpaðîba"
 
 #: ../../standalone/drakperm_.c:253
 msgid "sticky-bit"
-msgstr ""
+msgstr "sticky-bit"
 
 #: ../../standalone/drakperm_.c:254
 msgid "Set-UID"
-msgstr ""
+msgstr "Set-UID"
 
 #: ../../standalone/drakperm_.c:255
 msgid "Set-GID"
-msgstr ""
+msgstr "Set-GID"
 
 #: ../../standalone/drakperm_.c:310
 msgid ""
@@ -12224,24 +12022,20 @@ msgid "when checked, owner and group won't be changed"
 msgstr ""
 
 #: ../../standalone/drakperm_.c:318
-#, fuzzy
 msgid "Path selection"
-msgstr "Saglabât pakotòu izvçli"
+msgstr "Ceïa izvçle"
 
 #: ../../standalone/drakperm_.c:364
-#, fuzzy
 msgid "user :"
-msgstr "Lietotâja vârds"
+msgstr "lietotâjs :"
 
 #: ../../standalone/drakperm_.c:366
-#, fuzzy
 msgid "group :"
-msgstr "Darba grupa"
+msgstr "grupa :"
 
 #: ../../standalone/draksound_.c:47
-#, fuzzy
 msgid "No Sound Card detected!"
-msgstr "Nav pieslçgts"
+msgstr "Skaòu karte nav atrasta!"
 
 #: ../../standalone/draksound_.c:48
 msgid ""
@@ -12281,18 +12075,16 @@ msgid "final resolution"
 msgstr "Izðíirtspçja"
 
 #: ../../standalone/draksplash_.c:80 ../../standalone/draksplash_.c:172
-#, fuzzy
 msgid "choose image file"
-msgstr "Izvçlieties darbîbu"
+msgstr "izvçlieties attçla failu"
 
 #: ../../standalone/draksplash_.c:81
-#, fuzzy
 msgid "Theme name"
-msgstr "Koplietojuma vârds"
+msgstr "Tçmas nosaukums"
 
 #: ../../standalone/draksplash_.c:85
 msgid "Browse"
-msgstr ""
+msgstr "Pârlûkot"
 
 #: ../../standalone/draksplash_.c:99 ../../standalone/draksplash_.c:162
 #, fuzzy
@@ -12344,19 +12136,16 @@ msgid "the color of the progress bar"
 msgstr ""
 
 #: ../../standalone/draksplash_.c:121
-#, fuzzy
 msgid "Preview"
-msgstr "ierîce"
+msgstr "Paraugs"
 
 #: ../../standalone/draksplash_.c:123
-#, fuzzy
 msgid "Save theme"
-msgstr "Sistçmas instalçðana"
+msgstr "Saglabât tçmu"
 
 #: ../../standalone/draksplash_.c:124
-#, fuzzy
 msgid "Choose color"
-msgstr "Norâdiet monitoru"
+msgstr "Izvçlieties krâsu"
 
 #: ../../standalone/draksplash_.c:127
 msgid "Display logo on Console"
@@ -12376,19 +12165,16 @@ msgid "saving Bootsplash theme..."
 msgstr ""
 
 #: ../../standalone/draksplash_.c:435
-#, fuzzy
 msgid "ProgressBar color selection"
-msgstr "Printera pieslçgums"
+msgstr "ProgresaJoslas krâsas izvçle"
 
 #: ../../standalone/draksplash_.c:456
-#, fuzzy
 msgid "You must choose an image file first!"
-msgstr "Printera ierîces URI"
+msgstr "Vispirms ir jâizvçlâs attçla fails!"
 
 #: ../../standalone/draksplash_.c:465
-#, fuzzy
 msgid "Generating preview ..."
-msgstr "Noskaidroju ierîces..."
+msgstr "Ìenerçju paraugu..."
 
 #. -PO  First %s is theme name, second %s (in parenthesis) is resolution
 #: ../../standalone/draksplash_.c:511
@@ -12412,9 +12198,8 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/drakxtv_.c:66
-#, fuzzy
 msgid "Canada (cable)"
-msgstr "Kanâdas (Kvebeka)"
+msgstr "Kanâda (kabelis)"
 
 #: ../../standalone/drakxtv_.c:66
 msgid "USA (broadcast)"
@@ -12441,29 +12226,24 @@ msgid "Japan (cable)"
 msgstr ""
 
 #: ../../standalone/drakxtv_.c:68
-#, fuzzy
 msgid "East Europe"
-msgstr "Eiropa"
+msgstr "Austrumeiropa"
 
 #: ../../standalone/drakxtv_.c:68
-#, fuzzy
 msgid "France [SECAM]"
-msgstr "Francijas"
+msgstr "Francija [SECAM]"
 
 #: ../../standalone/drakxtv_.c:68
-#, fuzzy
 msgid "Ireland"
-msgstr "Islandes"
+msgstr "Îrija"
 
 #: ../../standalone/drakxtv_.c:68
-#, fuzzy
 msgid "West Europe"
-msgstr "Eiropa"
+msgstr "Rietumeiropa"
 
 #: ../../standalone/drakxtv_.c:69
-#, fuzzy
 msgid "Australia"
-msgstr "seriâla"
+msgstr "Austrâlija"
 
 #: ../../standalone/drakxtv_.c:69
 msgid "Newzealand"
@@ -12489,11 +12269,11 @@ msgstr ""
 
 #: ../../standalone/drakxtv_.c:109
 msgid "TV norm:"
-msgstr ""
+msgstr "TV formâts:"
 
 #: ../../standalone/drakxtv_.c:110
 msgid "Area:"
-msgstr ""
+msgstr "Apgabals:"
 
 #: ../../standalone/drakxtv_.c:114
 msgid "Scanning for TV channels in progress ..."
@@ -12510,11 +12290,11 @@ msgstr "Pakotòu instalçðanas laikâ atklâta kïûda:"
 
 #: ../../standalone/drakxtv_.c:126
 msgid "XawTV isn't installed!"
-msgstr ""
+msgstr "XawTV nav instalçts!"
 
 #: ../../standalone/drakxtv_.c:129
 msgid "Have a nice day!"
-msgstr ""
+msgstr "Lai jums jauka diena!"
 
 #: ../../standalone/drakxtv_.c:130
 msgid "Now, you can run xawtv (under X Window!) !\n"
@@ -12522,7 +12302,7 @@ msgstr ""
 
 #: ../../standalone/drakxtv_.c:153
 msgid "No TV Card detected!"
-msgstr ""
+msgstr "Nav atrasta TV karte!"
 
 #: ../../standalone/drakxtv_.c:154
 msgid ""
@@ -12537,11 +12317,12 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/harddrake2_.c:8
-#, fuzzy
 msgid ""
 "\n"
 "Usage: harddrake [-h|--help] [--test]\n"
-msgstr "pielietojums: keyboarddrake [--expert] [keyboard]\n"
+msgstr ""
+"\n"
+"pielietojums: harddrake [-h|--help] [--test]\n"
 
 #: ../../standalone/keyboarddrake_.c:16
 msgid "usage: keyboarddrake [--expert] [keyboard]\n"
@@ -12575,208 +12356,197 @@ msgstr "Neizdodas uzsâkt uzlaboðanu no tîkla !!!\n"
 msgid "The change is done, but to be effective you must logout"
 msgstr ""
 
-#: ../../standalone/logdrake_.c:85 ../../ugtk.pm_.c:285
+#: ../../standalone/logdrake_.c:86 ../../ugtk.pm_.c:285
 msgid "logdrake"
 msgstr "logdrake"
 
-#: ../../standalone/logdrake_.c:95
-#, fuzzy
+#: ../../standalone/logdrake_.c:96
 msgid "Show only for the selected day"
-msgstr "Râdît tikai par ðodienu"
+msgstr "Râdît tikai izvçlçtajai dienai"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "/File/_New"
 msgstr "/Fails/_Jauns"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "/File/_Open"
 msgstr "/Fails/_Atvçrt"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "/File/_Save"
 msgstr "/Fails/_Saglabât"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:106
 msgid "/File/Save _As"
 msgstr "/Fails/Saglabât _kâ"
 
-#: ../../standalone/logdrake_.c:106
+#: ../../standalone/logdrake_.c:107
 msgid "/File/-"
 msgstr "/Fails/-"
 
-#: ../../standalone/logdrake_.c:108
+#: ../../standalone/logdrake_.c:109
 msgid "/_Options"
 msgstr "/_Opcijas"
 
-#: ../../standalone/logdrake_.c:109
+#: ../../standalone/logdrake_.c:110
 msgid "/Options/Test"
 msgstr "/Opcijas/Tests"
 
-#: ../../standalone/logdrake_.c:111
+#: ../../standalone/logdrake_.c:112
 msgid "/Help/_About..."
 msgstr "/Palîdzîba/_Par..."
 
-#: ../../standalone/logdrake_.c:118
+#: ../../standalone/logdrake_.c:119
 msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:119
+#: ../../standalone/logdrake_.c:120
 msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:173
-#, fuzzy
+#: ../../standalone/logdrake_.c:174
 msgid "User"
-msgstr "Lietotâja vârds"
+msgstr "Lietotâjs"
 
-#: ../../standalone/logdrake_.c:174
-#, fuzzy
+#: ../../standalone/logdrake_.c:175
 msgid "Messages"
-msgstr "ziòojumi"
+msgstr "Ziòojumi"
 
-#: ../../standalone/logdrake_.c:175
-#, fuzzy
+#: ../../standalone/logdrake_.c:176
 msgid "Syslog"
-msgstr "syslog"
+msgstr "Syslog"
 
-#: ../../standalone/logdrake_.c:176
+#: ../../standalone/logdrake_.c:177
 msgid "Mandrake Tools Explanations"
 msgstr ""
 
-#: ../../standalone/logdrake_.c:179
+#: ../../standalone/logdrake_.c:180
 msgid "search"
 msgstr "meklçt"
 
-#: ../../standalone/logdrake_.c:185
+#: ../../standalone/logdrake_.c:186
 msgid "A tool to monitor your logs"
 msgstr "Rîks þurnâlu pârlûkoðanai"
 
-#: ../../standalone/logdrake_.c:186
+#: ../../standalone/logdrake_.c:187
 msgid "Settings"
 msgstr "Uzstâdîjumi"
 
-#: ../../standalone/logdrake_.c:191
+#: ../../standalone/logdrake_.c:192
 msgid "matching"
 msgstr "sakrît"
 
-#: ../../standalone/logdrake_.c:192
+#: ../../standalone/logdrake_.c:193
 msgid "but not matching"
 msgstr "bet nesakrît"
 
-#: ../../standalone/logdrake_.c:196
+#: ../../standalone/logdrake_.c:197
 msgid "Choose file"
-msgstr "Izvçlitesis failu"
+msgstr "Izvçlieties failu"
 
-#: ../../standalone/logdrake_.c:201
+#: ../../standalone/logdrake_.c:202
 msgid "Calendar"
 msgstr "Kalendârs"
 
-#: ../../standalone/logdrake_.c:211
+#: ../../standalone/logdrake_.c:212
 msgid "Content of the file"
 msgstr "Faila saturs"
 
-#: ../../standalone/logdrake_.c:215 ../../standalone/logdrake_.c:391
+#: ../../standalone/logdrake_.c:216 ../../standalone/logdrake_.c:392
 msgid "Mail alert"
-msgstr ""
+msgstr "Pasta trauksme"
 
-#: ../../standalone/logdrake_.c:267
+#: ../../standalone/logdrake_.c:268
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "lûdzu gaidiet, analizçju failu: %s"
 
-#: ../../standalone/logdrake_.c:408
-#, fuzzy
+#: ../../standalone/logdrake_.c:409
 msgid "Mail alert configuration"
-msgstr "LAN konfigurâcija"
+msgstr "Pasta trauksmes konfigurçðana"
 
-#: ../../standalone/logdrake_.c:409
+#: ../../standalone/logdrake_.c:410
 msgid ""
 "Welcome to the mail configuration utility.\n"
 "\n"
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
 
-#: ../../standalone/logdrake_.c:416
+#: ../../standalone/logdrake_.c:417
 msgid "Apache World Wide Web Server"
-msgstr ""
+msgstr "Apache WWW serveris"
 
-#: ../../standalone/logdrake_.c:417
+#: ../../standalone/logdrake_.c:418
 #, fuzzy
 msgid "Domain Name Resolver"
 msgstr "Domçna nosaukums"
 
-#: ../../standalone/logdrake_.c:418
-#, fuzzy
+#: ../../standalone/logdrake_.c:419
 msgid "Ftp Server"
-msgstr "NIS serveris"
+msgstr "Ftp serveris"
 
-#: ../../standalone/logdrake_.c:419
-#, fuzzy
+#: ../../standalone/logdrake_.c:420
 msgid "Postfix Mail Server"
-msgstr "Serveris, Datubâzes"
+msgstr "Postfix pasta serveris"
 
-#: ../../standalone/logdrake_.c:420
-#, fuzzy
+#: ../../standalone/logdrake_.c:421
 msgid "Samba Server"
-msgstr "NIS serveris"
+msgstr "Samba serveris"
 
-#: ../../standalone/logdrake_.c:421
-#, fuzzy
+#: ../../standalone/logdrake_.c:422
 msgid "SSH Server"
-msgstr "NIS serveris"
+msgstr "SSH serveris"
 
-#: ../../standalone/logdrake_.c:422
-#, fuzzy
+#: ../../standalone/logdrake_.c:423
 msgid "Webmin Service"
-msgstr "ierîce"
+msgstr "Webmin serviss"
 
-#: ../../standalone/logdrake_.c:423
-#, fuzzy
+#: ../../standalone/logdrake_.c:424
 msgid "Xinetd Service"
-msgstr "Printera serveris"
+msgstr "Xinetd serviss"
 
-#: ../../standalone/logdrake_.c:430
+#: ../../standalone/logdrake_.c:431
 #, fuzzy
 msgid "service setting"
 msgstr "ierîce"
 
-#: ../../standalone/logdrake_.c:431
+#: ../../standalone/logdrake_.c:432
 msgid ""
 "You will receive an alert if one of the selected services is no more running"
 msgstr ""
+"Jûs saòemsit trauksmes signâlu, ja kâds no izvelçtajiem servisiem vairs "
+"nedarbojas"
 
-#: ../../standalone/logdrake_.c:443
+#: ../../standalone/logdrake_.c:444
 #, fuzzy
 msgid "load setting"
 msgstr "Formatçju"
 
-#: ../../standalone/logdrake_.c:444
+#: ../../standalone/logdrake_.c:445
 msgid "You will receive an alert if the load is higher than this value"
-msgstr ""
+msgstr "Jûs saòemsit trauksmes signâlu, kad noslodze pârsniegs ðo vçrtîbu"
 
-#: ../../standalone/logdrake_.c:457
-#, fuzzy
+#: ../../standalone/logdrake_.c:458
 msgid "alert configuration"
-msgstr "Konfigurâcija"
+msgstr "trauksmes konfigurâcija"
 
-#: ../../standalone/logdrake_.c:458
-#, fuzzy
+#: ../../standalone/logdrake_.c:459
 msgid "Please enter your email address below "
-msgstr "Lûdzu mçìiniet vçlreiz"
+msgstr "Lûdzu zemâk ievadiet savu epasta adresi"
 
-#: ../../standalone/logdrake_.c:497
+#: ../../standalone/logdrake_.c:498
 msgid "Save as.."
 msgstr "Saglabât kâ..."
 
@@ -12789,12 +12559,10 @@ msgid "Emulate third button?"
 msgstr "Vai emulçt treðo pogu?"
 
 #: ../../standalone/printerdrake_.c:57
-#, fuzzy
 msgid "Reading printer data ..."
-msgstr "Nolasu CUPS draiveru datubâzi..."
+msgstr "Lasu printera datus..."
 
 #: ../../standalone/scannerdrake_.c:41
-#, fuzzy
 msgid "Detecting devices ..."
 msgstr "Noskaidroju ierîces..."
 
@@ -12809,24 +12577,23 @@ msgid "The %s is not supported by this version of Mandrake Linux."
 msgstr ""
 
 #: ../../standalone/scannerdrake_.c:56
-#, fuzzy, c-format
+#, c-format
 msgid "%s found on %s, configure it?"
-msgstr "Vai vçlaties konfigurçt printeri?"
+msgstr "%s atrasts uz %s, konfigurçt to?"
 
 #: ../../standalone/scannerdrake_.c:59
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
-msgstr ""
+msgstr "%s nav atrodams skeneru datubâzç, vai konfigurçt manuâli?"
 
 #: ../../standalone/scannerdrake_.c:65
-#, fuzzy
 msgid "Select a scanner"
-msgstr "Izvçlieties grafisko karti"
+msgstr "Izvçlieties skeneri"
 
 #: ../../standalone/scannerdrake_.c:93
 #, c-format
 msgid "This %s scanner is unsupported"
-msgstr ""
+msgstr "Ðis %s skeneris netiek atbalstîts"
 
 #: ../../standalone/scannerdrake_.c:107
 #, c-format
@@ -12836,9 +12603,8 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/scannerdrake_.c:109
-#, fuzzy
 msgid "choose device"
-msgstr "Sâknçjamâ ierîce"
+msgstr "izvçlieties ierîci"
 
 #: ../../standalone/scannerdrake_.c:115
 #, c-format
@@ -12887,11 +12653,11 @@ msgstr "Tastatûras izvçle"
 
 #: ../../steps.pm_.c:19
 msgid "Security"
-msgstr ""
+msgstr "Droðîba"
 
 #: ../../steps.pm_.c:20
 msgid "Setup filesystems"
-msgstr "Failu sistçmu uzstâdîðana"
+msgstr "Failsistçmu uzstâdîðana"
 
 #: ../../steps.pm_.c:21
 msgid "Format partitions"
@@ -12930,9 +12696,8 @@ msgid "Configure X"
 msgstr "X konfigurçðana"
 
 #: ../../steps.pm_.c:34
-#, fuzzy
 msgid "Install system updates"
-msgstr "Sistçmas instalçðana"
+msgstr "Sistçmas jauninâjumu instalçðana"
 
 #: ../../steps.pm_.c:35
 msgid "Exit install"
@@ -12940,21 +12705,20 @@ msgstr "Instalçðanas beigas"
 
 #: ../../ugtk.pm_.c:648
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr ""
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
-msgstr "Serveris, Tîmeklis/FTP"
+msgstr "Tîmeklis/FTP"
 
 #
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Network Computer (client)"
-msgstr "Tîkla dators, X klients"
+msgstr "Tîkla dators (klients)"
 
 #: ../../share/compssUsers:999
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
 
 #: ../../share/compssUsers:999
 msgid "Office"
@@ -12970,13 +12734,12 @@ msgstr "Rîki darbam ar Palm Pilot vai Visor"
 
 #
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Workstation"
-msgstr "KDE darbastacija"
+msgstr "Darbastacija"
 
 #: ../../share/compssUsers:999
 msgid "Firewall/Router"
-msgstr "Serveris, Ugunsmûris/Marðrutizators"
+msgstr "Ugunsmûris/Marðrutizators"
 
 #: ../../share/compssUsers:999
 msgid "Domain Name and Network Information Server"
@@ -13022,16 +12785,15 @@ msgstr "Rîki pastam, jaunumiem, tîmeklim, failu saòemðanai un èatam"
 
 #: ../../share/compssUsers:999
 msgid "Database"
-msgstr "Serveris, Datubâzes"
+msgstr "Datubâzes"
 
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgstr "PostgreSQL vai MySQL datubâzu serveris"
 
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Tools to ease the configuration of your computer"
-msgstr "Vai vçlaties izmçìinât ðo konfigurâciju?"
+msgstr "Rîki datora konfigurçðanas atviegloðanai"
 
 #
 #: ../../share/compssUsers:999
@@ -13048,7 +12810,7 @@ msgstr "Konsoles rîki"
 
 #: ../../share/compssUsers:999
 msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgstr "Postfix pasta serveris, Inn jaunumu serveris"
 
 #
 #: ../../share/compssUsers:999
@@ -13061,9 +12823,8 @@ msgid "Multimedia station"
 msgstr "Multimçdiju dators"
 
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Configuration"
-msgstr "LAN konfigurâcija"
+msgstr "Konfigurâcija"
 
 #: ../../share/compssUsers:999
 msgid "More Graphical Desktops (Gnome, IceWM)"
@@ -13074,21 +12835,20 @@ msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"K Desktop Environment, galvenâ grafiskâ vide kopa ar papildus rîku kolekciju"
+"K Desktop Environment, galvenâ grafiskâ vide kopâ ar papildus rîku kolekciju"
 
 #: ../../share/compssUsers:999
 msgid "Graphical Environment"
-msgstr ""
+msgstr "Grafiskâ vide"
 
 #
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Development"
-msgstr "Izstrâde, Tîmeklis"
+msgstr "Izstrâde"
 
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr ""
+msgstr "Apache, Pro-ftpd"
 
 #: ../../share/compssUsers:999
 msgid "Tools to create and burn CD's"
@@ -13109,20 +12869,19 @@ msgstr "Grafiskâs programmas, piemçram, The Gimp"
 
 #: ../../share/compssUsers:999
 msgid "DNS/NIS "
-msgstr ""
+msgstr "DNS/NIS"
 
 #: ../../share/compssUsers:999
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C un C++ izstrâdes bibliotçkas, programmas un include faili"
 
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Network Computer server"
-msgstr "Serveris, Tîkla datora serveris"
+msgstr "Tîkla datoru serveris"
 
 #: ../../share/compssUsers:999
 msgid "Mail/Groupware/News"
-msgstr "Serveris, Pasts/Grupu rîki/Jaunumi"
+msgstr "Pasts/Grupu rîki/Jaunumi"
 
 #
 #: ../../share/compssUsers:999
@@ -13159,22 +12918,21 @@ msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr ""
-"Grafiskâ vide ar lietotajiem draudzîgu programmu komplektu un darbavirsmas "
+"Grafiskâ vide ar lietotâjiem draudzîgu programmu komplektu un darbavirsmas "
 "rîkiem"
 
 #: ../../share/compssUsers:999
 msgid "Clients for different protocols including ssh"
-msgstr ""
+msgstr "Klienti daþâdiem protokoliem, ieskaitot ssh"
 
 #: ../../share/compssUsers:999
 msgid "LSB"
-msgstr ""
+msgstr "LSB"
 
 #
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Internet gateway"
-msgstr "Interneta pieeja"
+msgstr "Interneta vârteja"
 
 #: ../../share/compssUsers:999
 msgid "Sound and video playing/editing programs"
@@ -13202,234 +12960,780 @@ msgid "Multimedia - CD Burning"
 msgstr "Multimçdiji - CD ierakstîðana"
 
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Scientific Workstation"
-msgstr "Zinâtniskâ darbastacija"
+msgstr "Zinâtniska darbastacija"
 
-#, fuzzy
-#~ msgid "Go to lilosplash configuration"
-#~ msgstr "Pçcinstalçðanas konfigurçðana"
+#~ msgid ""
+#~ "Listed above are the existing Linux partitions detected on your hard "
+#~ "drive.\n"
+#~ "You can keep the choices made by the wizard, they are good for most "
+#~ "common\n"
+#~ "installations. If you make any changes, you must at least define a root\n"
+#~ "partition (\"/\"). Do not choose too small a partition or you will not "
+#~ "be\n"
+#~ "able to install enough software. If you want to store your data on a\n"
+#~ "separate partition, you will also need to create a partition for \"/home"
+#~ "\"\n"
+#~ "(only possible if you have more than one Linux partition available).\n"
+#~ "\n"
+#~ "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
+#~ "\n"
+#~ "\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+#~ "\"partition number\" (for example, \"hda1\").\n"
+#~ "\n"
+#~ "\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive "
+#~ "and\n"
+#~ "\"sd\" if it is a SCSI hard drive.\n"
+#~ "\n"
+#~ "\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+#~ "hard drives:\n"
+#~ "\n"
+#~ " * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+#~ "\n"
+#~ " * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+#~ "\n"
+#~ " * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+#~ "\n"
+#~ " * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+#~ "\n"
+#~ "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+#~ "\"second lowest SCSI ID\", etc."
+#~ msgstr ""
+#~ "Augstâk ir uzskaitîtas eksistçjoðâs Linux sadaïas, kas ir atrastas uz "
+#~ "jûsu\n"
+#~ "cietâ diska. Jûs varat atstât meistara izdarîto izvçli, jo tâ ir laba\n"
+#~ "parastâm vajadzîbâm. Ja jûs izmainât ðo izvçli, jums ir jâdefinç vismaz\n"
+#~ "saknes sadaïâ(\"/\"). Neizvçlieties pârâk mazu sadaïu, citâdi jûs "
+#~ "nevarçsit\n"
+#~ "instalçt visas vajadzîgâs programmas. Ja vçlaties datus glabât atseviðíâ\n"
+#~ "sadaïâ, jums ir jânorâda arî \"/home\" (to var izdarît tikai tad, ja jums "
+#~ "ir\n"
+#~ "vairâkas Linux sadaïas).\n"
+#~ "\n"
+#~ "Jûsu zinâðanai, katra sadaïa ir uzskaitîta ðâdâ veidâ: \"Nosaukums\", "
+#~ "\"Izmçrs\".\n"
+#~ "\n"
+#~ "\"Nosaukums\" ir kodçts ðâdi: \"cietâ diska tips\", \"cietâ diska numurs"
+#~ "\",\n"
+#~ "\"sadaïas numurs\" (piemçram, \"hda1\").\n"
+#~ "\n"
+#~ "\"Cietâ diska tips\" ir \"hd\", ja jûsu cietais disks ir IDE disks, \"sd"
+#~ "\",\n"
+#~ "ja tas ir SCSI cietais disks.\n"
+#~ "\n"
+#~ "\"Cietâ diska numurs\" vienmçr ir burts pçc \"hd\" vai \"sd\". IDE "
+#~ "diskiem:\n"
+#~ "\n"
+#~ "   * \"a\" nozîmç \"primârâ IDE kontroliera galvenais disks\",\n"
+#~ "\n"
+#~ "   * \"b\" nozîmç \"primârâ IDE konytroliera pakârtotais disks\",\n"
+#~ "\n"
+#~ "   * \"c\" nozîmç \"sekundârâ IDE kontroliera galvenais disks\",\n"
+#~ "\n"
+#~ "   * \"d\" nozîmç \"sekundârâ IDE kontroliera pakârtotais disks\".\n"
+#~ "\n"
+#~ "SCSI diskiem \"a\" nozîmç \"primârais cietais disks\", \"b\" nozîmç\n"
+#~ " \"sekundârais cietais disks\", utt..."
 
 #, fuzzy
-#~ msgid "Go back"
-#~ msgstr "Loopback"
-
-#~ msgid "Proxy should be ftp://..."
-#~ msgstr "Proxy bûtu jâbût ftp://..."
+#~ msgid ""
+#~ "You may now choose which services you wish to start at boot time.\n"
+#~ "\n"
+#~ "Here are presented all the services available with the current\n"
+#~ "installation. Review them carefully and uncheck those which are not "
+#~ "always\n"
+#~ "needed at boot time.\n"
+#~ "\n"
+#~ "You can get a short explanatory text about a service by selecting a\n"
+#~ "specific service. However, if you are not sure whether a service is "
+#~ "useful\n"
+#~ "or not, it is safer to leave the default behavior.\n"
+#~ "\n"
+#~ "!! At this stage, be very careful if you intend to use your machine as a\n"
+#~ "server: you will probably not want to start any services which you do "
+#~ "not\n"
+#~ "need. Please remember that several services can be dangerous if they are\n"
+#~ "enabled on a server. In general, select only the services you really "
+#~ "need.\n"
+#~ "!!"
+#~ msgstr ""
+#~ "Tagad varat norâdît servisus, kurus jûs vçlaties startçt sistçmas\n"
+#~ "palaiðanas laikâ.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kad pele pârvietojas pâr saraksta elementu, parâdâs\n"
+#~ "neliels palîdzîbas balons, kas paskaidro servisa lomu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Esiet îpaði uzmanîgs ðajâ solî, ja vçlaties sistçmu izmantot ka serveri:\n"
+#~ "iespçjams, ka nevçlaties startçt nevienu nevajadzîgu servisu. "
+#~ "Atcerieties.\n"
+#~ "ka daþi servisi var bût bîstami, ja darbojas serverî.\n"
+#~ "Parasti izvçlieties tikai tos servisus, kas jums tieðâm nepiecieðami."
 
 #, fuzzy
-#~ msgid "quit"
-#~ msgstr "Beigt"
-
-#~ msgid "LBA (doesn't work on old BIOSes)"
-#~ msgstr "LBA (nedarbojas ar veciem BIOSiem)"
-
-#~ msgid "You don't have any partitions!"
-#~ msgstr "Jums nav nevienas partîcijas!"
-
 #~ msgid ""
-#~ "DiskDrake failed to read correctly the partition table.\n"
-#~ "Continue at your own risk!"
+#~ "At this point, you need to choose where you want to install the Mandrake\n"
+#~ "Linux operating system on your hard drive. If your hard drive is empty "
+#~ "or\n"
+#~ "if an existing operating system is using all the available space, you "
+#~ "will\n"
+#~ "need to partition it. Basically, partitioning a hard drive consists of\n"
+#~ "logically dividing it to create space to install your new Mandrake Linux\n"
+#~ "system.\n"
+#~ "\n"
+#~ "Because the partitioning process' effects are usually irreversible,\n"
+#~ "partitioning can be intimidating and stressful if you are an "
+#~ "inexperienced\n"
+#~ "user. Fortunately, there is a wizard which simplifies this process. "
+#~ "Before\n"
+#~ "beginning, please consult the manual and take your time.\n"
+#~ "\n"
+#~ "If you are running the installation in Expert mode, you will enter\n"
+#~ "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
+#~ "fine-tune your partitions. See the DiskDrake section in the ``User "
+#~ "Guide''.\n"
+#~ "From the installation interface, you can use the wizards as described "
+#~ "here\n"
+#~ "by clicking the dialog's \"Wizard\" button.\n"
+#~ "\n"
+#~ "If partitions have already been defined, either from a previous\n"
+#~ "installation or from another partitioning tool, simply select those to\n"
+#~ "install your Linux system.\n"
+#~ "\n"
+#~ "If partitions are not defined, you will need to create them using the\n"
+#~ "wizard. Depending on your hard drive configuration, several options are\n"
+#~ "available:\n"
+#~ "\n"
+#~ " * \"Use free space\": this option will simply lead to an automatic\n"
+#~ "partitioning of your blank drive(s). You will not be prompted further;\n"
+#~ "\n"
+#~ " * \"Use existing partition\": the wizard has detected one or more "
+#~ "existing\n"
+#~ "Linux partitions on your hard drive. If you want to use them, choose "
+#~ "this\n"
+#~ "option. You will then be asked to choose the mount points associated to\n"
+#~ "each of the partitions. The legacy mount points are selected by default,\n"
+#~ "and you should generally keep them.\n"
+#~ "\n"
+#~ " * \"Use the free space on the Windows; partition\": if Microsoft "
+#~ "Windows\n"
+#~ "is installed on your hard drive and takes all the space available on it,\n"
+#~ "you have to create free space for Linux data. To do so, you can delete "
+#~ "your\n"
+#~ "Microsoft Windows partition and data (see ``Erase entire disk'' or "
+#~ "``Expert\n"
+#~ "mode'' solutions) or resize your Microsoft Windows partition. Resizing "
+#~ "can\n"
+#~ "be performed without the loss of any data, provided you previously\n"
+#~ "defragment the Windows partition. Backing up your data won't hurt "
+#~ "either..\n"
+#~ "This solution is recommended if you want to use both Mandrake Linux and\n"
+#~ "Microsoft Windows on the same computer.\n"
+#~ "\n"
+#~ "   Before choosing this option, please understand that after this\n"
+#~ "procedure, the size of your Microsoft Windows partition will be smaller\n"
+#~ "than at the present time. You will have less free space under Microsoft\n"
+#~ "Windows to store your data or to install new software;\n"
+#~ "\n"
+#~ " * \"Erase entire disk\": if you want to delete all data and all "
+#~ "partitions\n"
+#~ "present on your hard drive and replace them with your new Mandrake Linux\n"
+#~ "system, choose this option. Be careful with this solution because you "
+#~ "will\n"
+#~ "not be able to revert your choice after you confirm;\n"
+#~ "\n"
+#~ "   !! If you choose this option, all data on your disk will be lost. !!\n"
+#~ "\n"
+#~ " * \"Remove Windows\": this will simply erase everything on the drive "
+#~ "and\n"
+#~ "begin fresh, partitioning everything from scratch. All data on your disk\n"
+#~ "will be lost;\n"
+#~ "\n"
+#~ "   !! If you choose this option, all data on your disk will be lost. !!\n"
+#~ "\n"
+#~ " * \"Expert mode\": choose this option if you want to manually partition\n"
+#~ "your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+#~ "can very easily lose all your data. Hence, do not choose this unless you\n"
+#~ "know what you are doing. To know how do use the DiskDrake utility used\n"
+#~ "here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+#~ "Guide''''"
 #~ msgstr ""
-#~ "DiskDrake neizdevâs pareizi nolasît partîciju tabulu.\n"
-#~ "Turpiniet, ja vçlaties riskçt!"
+#~ "Paðlaik jums ir jâizvçlas, kur uz cietâ diska instalçt Mandrake Linux\n"
+#~ "operçtâjsistçmu. Ja disks ir tukðs vai cita operçtâjsistçma aizòem visu\n"
+#~ "vietu uz diska, jums bûs jâveic diska sadalîðana. Îsumâ, cietâ diska\n"
+#~ "sadalîðana nozîmç to sadalît loìiskâs daïâs, lai izveidotu vietu\n"
+#~ "Mandrake Linux sistçmas instalçðanai.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sakarâ ar to, ka diska sadalîðanas process parasti ir neatgriezenisks,\n"
+#~ "nepieredzçjuðam lietotâjam tas var bût nepatîkams un stresa pilns.\n"
+#~ "Ðis meistars vienkârðo procesu. Pirms uzsâkat dalîðanu, izlasiet\n"
+#~ "rokasgrâmatu un visu labi pârdomâjiet.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jums ir nepiecieðamas vismaz divas sadaïas. Viena vajadzîga paðai "
+#~ "sistçmai,\n"
+#~ "otra - virtuâlajai atmiòai (Swap).\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja sadaïas jau izveidotas (agrâkas instalçðanas laikâ vai ar citu diska\n"
+#~ "sadalîðanas rîku), jums tikai jânorâda tâs sadaïas, kurâs vçlaties\n"
+#~ "instalçt Linux sistçmu.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja sadaïas vçl nav izveidotas, jums tâs ir jâizveido. Lai to izdarîtu,\n"
+#~ "izmantojiet augstâk pieejamo meistaru. Atkarîbâ no jûsu cietâ diska \n"
+#~ "konfigurâcijas ir iespçjami vairâki risinâjumi:\n"
+#~ "\n"
+#~ "* Izmantot esoðu sadaïu: meistars uz cietâ diska ir atklâjis vienu vai "
+#~ "vairâkas Linux sadaïas. Ja vçlaties\n"
+#~ " tâs saglabât, izvçlieties ðo opciju. \n"
+#~ "\n"
+#~ "\n"
+#~ "* Izdzçst visu disku: ja vçlaties izdzçst visus uz diska esoðos datus un "
+#~ "sadaïas un aizstât tâs ar jaunu\n"
+#~ "  Mandrake Linux sistçmu, varat izvçlçties ðo opciju. Esiet uzmanîgi, "
+#~ "izvçloties ðo risinâjumu, jo pçc\n"
+#~ "  apstiprinâðanas jûs vairs nevarçsit atteikties no ðîs izvçles.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Izmanto brîvo vietu Windows sadaïâ: ja uz cietâ diska ir instalçts "
+#~ "Microsoft Windows, kas aizòem visu\n"
+#~ "  vietu, jums ir jâatbrîvo vieta Linux datiem. Lai to izdarîtu, jûs varat "
+#~ "nodzçst Microsoft Windows sadaïu un\n"
+#~ "  datus (skatît risinâjumus \"Izdzçst visu disku\" vai \"Eksperta reþîms"
+#~ "\") vai izmainît Microsoft\n"
+#~ "  Windows sadaïas izmçru. Sadaïas izmçru var izmainît bez datu "
+#~ "zaudçðanas. Ðis risinâjums ir ieteicams, ja\n"
+#~ "  jûs savâ datorâ vçlaties izmantot gan Mandrake Linux, gan Microsoft "
+#~ "Windows.\n"
+#~ "\n"
+#~ "\n"
+#~ "  Pirms izvçlaties ðo risinâjumu, òemiet vçrâ, ka Microsoft Windows "
+#~ "sadaïas izmçrs bûs mazâks, nekâ tas ir\n"
+#~ "  paðlaik. Tas nozîmç, ka jums Microsoft Windows sistçmâ bûs mazâk vietas "
+#~ "datiem vai programmu instalçðanai.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Eksperta reþîms: ja jûs vçlaties patstâvîgi veidot diska sadaïas, varat "
+#~ "izvçlçties ðo variantu. Esiet\n"
+#~ "  uzmanîgi, izveloties ðo risinâjumu. Tas ir ar plaðâm iespçjâm, bet ïoti "
+#~ "bîstams. Jûs varat pazaudçt\n"
+#~ "  visus datus, tâpçc izvçlieties tikai tad, ja zinat, ko darât."
 
 #~ msgid ""
-#~ "I can't read your partition table, it's too corrupted for me :(\n"
-#~ "I'll try to go on blanking bad partitions"
+#~ "Any partitions that have been newly defined must be formatted for use\n"
+#~ "(formatting means creating a filesystem).\n"
+#~ "\n"
+#~ "At this time, you may wish to reformat some already existing partitions "
+#~ "to\n"
+#~ "erase any data they contain. If you wish to do that, please select those\n"
+#~ "partitions as well.\n"
+#~ "\n"
+#~ "Please note that it is not necessary to reformat all pre-existing\n"
+#~ "partitions. You must reformat the partitions containing the operating\n"
+#~ "system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
+#~ "reformat partitions containing data that you wish to keep (typically\n"
+#~ "\"/home\").\n"
+#~ "\n"
+#~ "Please be careful when selecting partitions. After formatting, all data "
+#~ "on\n"
+#~ "the selected partitions will be deleted and you will not be able to "
+#~ "recover\n"
+#~ "any of it.\n"
+#~ "\n"
+#~ "Click on \"OK\" when you are ready to format partitions.\n"
+#~ "\n"
+#~ "Click on \"Cancel\" if you want to choose another partition for your new\n"
+#~ "Mandrake Linux operating system installation.\n"
+#~ "\n"
+#~ "Click on \"Advanced\" if you wish to select partitions that will be "
+#~ "checked\n"
+#~ "for bad blocks on the disk."
 #~ msgstr ""
-#~ "Man neizdodas nolasît partîciju tabulu, priekð manis tâ ir pârâk bojâta :"
-#~ "(\n"
-#~ "Es mçìinâðu turpinât, atslçdzot sliktâs partîcijas"
-
-#~ msgid "Choose the tool you want to use"
-#~ msgstr "Izvçlieties izmantojamo rîku"
-
-#~ msgid "no serial_usb found\n"
-#~ msgstr "nav atrasta seriâla_usb\n"
-
-#~ msgid "Choose options for server"
-#~ msgstr "Norâdiet servera opcijas"
-
-#~ msgid "Monitor not configured"
-#~ msgstr "Monitors nav konfigurçts"
-
-#~ msgid "Graphics card not configured yet"
-#~ msgstr "Grafiskâ karte vçl nav konfigurçta"
+#~ "Visas jaunizveidotâs sadaïas ir jâformatç, pirms tâs var izmantot\n"
+#~ "(formatçðana nozîmç failsistçmas izveidoðanu).\n"
+#~ "\n"
+#~ "Tagad jûs arî varat izvçlçties pârformatçt daþas jau esoðas sadaïas, lai\n"
+#~ "izdzçstu tajâs esoðo informâciju. Ja jûs vçlaties to darît, norâdiet\n"
+#~ "sadaïas, kuras vçlaties formatçt.\n"
+#~ "\n"
+#~ "Òemiet vçrâ, ka nav nepiecieðams pârformatçt visas jau eksistçjoðas "
+#~ "sadaïas.\n"
+#~ "Jums ir jâformatç sadaïas, kurâs atrodas operçtâjsistçma (piemçram, \"/"
+#~ "\",\n"
+#~ "\"/usr\" vai \"/var\"), bet nav jâformatç sadaïas, kurâs atrodas dati, "
+#~ "ko\n"
+#~ "jûs vçlaties saglabât (parasti /home).\n"
+#~ "\n"
+#~ "Esiet uzmanîgi, izvçloties sadaïas, jo pçc formatçðanas visi dati bûs\n"
+#~ "iznîcinâti un jûs vairs nevarçsit tos atjaunot.\n"
+#~ "\n"
+#~ "Noklikðíiniet \"Labi\", kad esat gatavi formatçt sadaïas.\n"
+#~ "\n"
+#~ "Noklikðíiniet \"Atcelt\", ja jûs gribat izvçlçties citas sadaïas, kur\n"
+#~ "instalçt jauno Mandrake Linux operçtâjsistçmu."
 
-#~ msgid "Resolutions not chosen yet"
-#~ msgstr "Izðíirtspçjas vçl nav izvçlçtas"
+#~ msgid ""
+#~ "Before continuing, you should read carefully the terms of the license. "
+#~ "It\n"
+#~ "covers the whole Mandrake Linux distribution, and if you do not agree "
+#~ "with\n"
+#~ "all the terms in it, click on the \"Refuse\" button which will "
+#~ "immediately\n"
+#~ "terminate the installation. To continue with the installation, click on "
+#~ "the\n"
+#~ "\"Accept\" button."
+#~ msgstr ""
+#~ "Pirms turpinât, Jums vajadzçtu uzmanîgi izlasît licences vienoðanos. Tâ "
+#~ "nosedz\n"
+#~ "visu Mandrake Linux distribûciju, un ja Jûs nepiekrîtat visiem "
+#~ "noteikumiem,\n"
+#~ "nospiediet uz pogas \"Noraidît\", kas nekavçjoties pârtrauks instalâciju. "
+#~ "Lai turpinâtu\n"
+#~ "instalâcijas procesu, nospiediet pogu \"Pieòemt\"."
 
+#, fuzzy
 #~ msgid ""
+#~ "At this point, you need to choose which partition(s) will be used for "
+#~ "the\n"
+#~ "installation of your Mandrake Linux system. If partitions have already "
+#~ "been\n"
+#~ "defined, either from a previous installation of GNU/Linux or from "
+#~ "another\n"
+#~ "partitioning tool, you can use existing partitions. Otherwise, hard "
+#~ "drive\n"
+#~ "partitions must be defined.\n"
 #~ "\n"
-#~ "try to change some parameters"
+#~ "To create partitions, you must first select a hard drive. You can select\n"
+#~ "the disk for partitioning by clicking on ``hda'' for the first IDE "
+#~ "drive,\n"
+#~ "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n"
+#~ "\n"
+#~ "To partition the selected hard drive, you can use these options:\n"
+#~ "\n"
+#~ " * \"Clear all\": this option deletes all partitions on the selected "
+#~ "hard\n"
+#~ "drive;\n"
+#~ "\n"
+#~ " * \"Auto allocate\": this option enables to automatically create ext3 "
+#~ "and\n"
+#~ "swap partitions in free space of your hard drive;\n"
+#~ "\n"
+#~ "\"More\": gives access to additional features:\n"
+#~ "\n"
+#~ " * \"Save partition table\": saves the partition table to a floppy. "
+#~ "Useful\n"
+#~ "for later partition-table recovery if necessary. It is strongly "
+#~ "recommended\n"
+#~ "to perform this step;\n"
+#~ "\n"
+#~ " * \"Restore partition table\": allows to restore a previously saved\n"
+#~ "partition table from floppy disk;\n"
+#~ "\n"
+#~ " * \"Rescue partition table\": if your partition table is damaged, you "
+#~ "can\n"
+#~ "try to recover it using this option. Please be careful and remember that "
+#~ "it\n"
+#~ "can fail;\n"
+#~ "\n"
+#~ " * \"Reload partition table\": discards all changes and loads your "
+#~ "initial\n"
+#~ "partition table;\n"
+#~ "\n"
+#~ " * \"Removable media automounting\": unchecking this option will force\n"
+#~ "users to manually mount and unmount removable medias such as floppies "
+#~ "and\n"
+#~ "CD-ROMs.\n"
+#~ "\n"
+#~ " * \"Wizard\": use this option if you wish to use a wizard to partition\n"
+#~ "your hard drive. This is recommended if you do not have a good knowledge "
+#~ "of\n"
+#~ "partitioning;\n"
+#~ "\n"
+#~ " * \"Undo\": use this option to cancel your changes;\n"
+#~ "\n"
+#~ " * \"Toggle to normal/expert mode\": allows additional actions on\n"
+#~ "partitions (type, options, format) and gives more information;\n"
+#~ "\n"
+#~ " * \"Done\": when you are finished partitioning your hard drive, this "
+#~ "will\n"
+#~ "save your changes back to disk.\n"
+#~ "\n"
+#~ "Note: you can reach any option using the keyboard. Navigate through the\n"
+#~ "partitions using [Tab] and [Up/Down] arrows.\n"
+#~ "\n"
+#~ "When a partition is selected, you can use:\n"
+#~ "\n"
+#~ " * Ctrl-c to create a new partition (when an empty partition is "
+#~ "selected);\n"
+#~ "\n"
+#~ " * Ctrl-d to delete a partition;\n"
+#~ "\n"
+#~ " * Ctrl-m to set the mount point.\n"
+#~ "\n"
+#~ "To get information about the different filesystem types available, "
+#~ "please\n"
+#~ "read the ext2FS chapter from the ``Reference Manual''.\n"
+#~ "\n"
+#~ "If you are installing on a PPC machine, you will want to create a small "
+#~ "HFS\n"
+#~ "``bootstrap'' partition of at least 1MB, which will be used by the "
+#~ "yaboot\n"
+#~ "bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
+#~ "may find it a useful place to store a spare kernel and ramdisk images "
+#~ "for\n"
+#~ "emergency boot situations."
 #~ msgstr ""
+#~ "Paðlaik jums ir jâizvçlas, kurâ(s) diska sadaïâ(s) instalçt Mandrake "
+#~ "Linux\n"
+#~ "operçtâjsistçmu. Ja sadaïas jau ir izveidotas (agrâkas GNU/Linux "
+#~ "instalçðanas\n"
+#~ "laikâ vai ar citu diska sadalîðanas rîku), jûs varat izmantot esoðâs "
+#~ "sadaïas.\n"
+#~ "Citos gadîjumos ir jâveido jaunas diska sadaïas.\n"
 #~ "\n"
-#~ "mçìiniet izmainît daþus parametrus"
-
-#~ msgid "An error occurred:"
-#~ msgstr "Atklâta kïûda:"
-
-#~ msgid "Leaving in %d seconds"
-#~ msgstr "Atliek %d sekundes"
-
-#~ msgid "Is this the correct setting?"
-#~ msgstr "Vai viss ir pareizi?"
-
-#~ msgid "An error occurred, try to change some parameters"
-#~ msgstr "Atklâta kïûda, mçìiniet izmainît daþus parametrus"
-
-#~ msgid "XFree86 server: %s"
-#~ msgstr "XFree86 serveris: %s"
-
-#~ msgid "Show all"
-#~ msgstr "Parâdît visu"
-
-#~ msgid "Preparing X-Window configuration"
-#~ msgstr "Gatavoju X-Window konfigurâciju"
-
-#~ msgid "What do you want to do?"
-#~ msgstr "Ko jûs vçlaties darît?"
-
-#~ msgid "Change Monitor"
-#~ msgstr "Monitora maiòa"
-
-#~ msgid "Change Graphics card"
-#~ msgstr "Grafiskâs kartes maiòa"
-
-#~ msgid "Change Server options"
-#~ msgstr "Servera opciju maiòa"
-
-#~ msgid "Change Resolution"
-#~ msgstr "Izðíirtspçjas maiòa"
-
-#~ msgid "Show information"
-#~ msgstr "Parâdît informâciju"
-
-#~ msgid "Test again"
-#~ msgstr "Mçìinât vçlreiz"
-
-#~ msgid "Select a graphics card"
-#~ msgstr "Izvçlieties grafisko karti"
-
-#~ msgid "Standard VGA, 640x480 at 60 Hz"
-#~ msgstr "Parasts VGA, 640x480 pie 60 Hz"
-
-#~ msgid "Super VGA, 800x600 at 56 Hz"
-#~ msgstr "Super VGA, 800x600 pie 56 Hz"
-
-#~ msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-#~ msgstr "8514 savietojams, 1024x768 pie 87 Hz ar joslâm (nav 800x600)"
-
-#~ msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
-#~ msgstr "Super VGA, 1024x768 pie 87 Hz ar joslâm, 800x600 pie 56 Hz"
-
-#~ msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-#~ msgstr "Uzlabots Super VGA, 800x600 pie 60 Hz, 640x480 pie 72 Hz"
-
-#~ msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-#~ msgstr "Ne-joslots SVGA, 1024x768 pie 60 Hz, 800x600 pie 72 Hz"
-
-#~ msgid "High Frequency SVGA, 1024x768 at 70 Hz"
-#~ msgstr "Augstas frekvences SVGA, 1024x768 pie 70 Hz"
-
-#~ msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
-#~ msgstr "Multi-frekvenèu, kas uztur 1280x1024 pie 60 Hz"
-
-#~ msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
-#~ msgstr "Multi-frekcenèu, kas uztur 1280x1024 pie 74 Hz"
-
-#~ msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
-#~ msgstr "Multi-frekvenèu, kas uztur 1280x1024 pie 76 Hz"
-
-#~ msgid "Monitor that can do 1600x1200 at 70 Hz"
-#~ msgstr "Monitors, kas uztur 1600x1200 pie 70 Hz"
-
-#~ msgid "Monitor that can do 1600x1200 at 76 Hz"
-#~ msgstr "Monitors, kas uztur 1600x1200 pie 76 Hz"
+#~ "\n"
+#~ "Lai veidotu sadaïas, jums vispirms ir jâizvçlas cietais disks. Jûs varat\n"
+#~ "norâdît sadalâmo disku, noklikðíinot uz \"hda\" pirmajam IDE diskam,\n"
+#~ "\"hdb\" - otrajam diskam, \"sda\" - pirmajam SCSI diskam, utt.\n"
+#~ "\n"
+#~ "\n"
+#~ "Lai sadalîtu izvçlçto cieto disku, varat izmantot sekojoðas opcijas:\n"
+#~ "\n"
+#~ "   * Izdzçst visu: ðî opcija izdzçð visas sadaïas, kas atrodas uz "
+#~ "izvçlçtâ cietâ diska.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Izvietot automâtiski: ðî opcija ïauj jums automâtiski izveidot Ext2 "
+#~ "un swap sadaïas jûsu cietâ diska\n"
+#~ "     brîvajâ vietâ.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Salabot sadaïu tabulu: ja sadaïu tabula ir bojâta, jûs varat mçìinât "
+#~ "to autjaunot, izmantojot ðo opciju.\n"
+#~ "     Esiet uzmanîgi un atcerieties, ka tas var neizdoties.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Atsaukt: jûs varat izmantot ðo opciju, lai atceltu izmaiòas.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Pârlâdçt: jûs varat izmantot ðo opciju, ja vçlaties atsaukt visas "
+#~ "izmaiòas un ielâdçt sâkotnçjo sadaïu tabulu.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Meistars: Ja cietâ diska sadalîðanai vçlaties izmantot meistaru, "
+#~ "varat lietot ðo opciju. Tâ ir ieteicama,\n"
+#~ "     ja jums nav labu zinâðanu par diska sadalîðanu.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Atjaunot no disketes: ja iepriekðçjâs instalçðanas laikâ saglabâjât "
+#~ "sadaïu tabulu disketç, jûs varat\n"
+#~ "     to atjaunot, izmantojot ðo opciju.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Saglabât disketç: ja vçlaties sadaïu tabulu saglabât disketç, lai "
+#~ "varçtu to atjaunot, izmantojiet ðo\n"
+#~ "     opciju. Ir ïoti ieteicams izmantot ðo opciju.\n"
+#~ "\n"
+#~ "\n"
+#~ "   * Izdarîts: kad esat pabeiguði cietâ diska dalîðanu, izmantojiet ðo "
+#~ "opciju, lai saglabâtu izmaiòas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Jûsu zinâðanai, jebkuru opciju var izsaukt ar tastatûru: pârvietojieties "
+#~ "starp sadaïâm, izmantojot Tab un Auðup/Lejup bultiòas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Kad ir izvçlçta sadaïa, jûs varat izmantot:\n"
+#~ "\n"
+#~ "           * Ctrl-c, lai izveidotu jaunu sadaïu (kad ir izvçlçta tukða "
+#~ "sadaïa)\n"
+#~ "\n"
+#~ "           * Ctrl-d, lai izdzçstu sadaïu\n"
+#~ "\n"
+#~ "           * Ctrl-m, lai uzstâdîtu montçðanas punktu"
 
 #~ msgid ""
-#~ "The total size for the groups you have selected is approximately %d MB.\n"
-#~ msgstr "Kopçjais jûsu izvçlçto grupu izmçrs ir aptuveni %d MB.\n"
+#~ "DrakX now needs to know if you want to perform a default (\"Recommended"
+#~ "\")\n"
+#~ "installation or if you want to have greater control (\"Expert\"). You "
+#~ "can\n"
+#~ "also choose to do a new install or an upgrade of an existing Mandrake "
+#~ "Linux\n"
+#~ "system:\n"
+#~ "\n"
+#~ " * \"Install\": completely wipes out the old system, however, depending "
+#~ "on\n"
+#~ "what is currently installed on your machine, you may be able to keep "
+#~ "some\n"
+#~ "old partitions (Linux or otherwise) unchanged;\n"
+#~ "\n"
+#~ " * \"Upgrade\": this installation class allows to simply update the\n"
+#~ "packages currently installed on your Mandrake Linux system. It keeps the\n"
+#~ "current partitions of your hard drives as well as user configurations. "
+#~ "All\n"
+#~ "other configuration steps remain available, similar to a normal\n"
+#~ "installation;\n"
+#~ "\n"
+#~ " * \"Upgrade Packages Only\": this new installation class allows you to\n"
+#~ "upgrade an existing Mandrake Linux system while keeping all system\n"
+#~ "configurations unchanged. Adding new packages to the current "
+#~ "installation\n"
+#~ "is also possible.\n"
+#~ "\n"
+#~ "Upgrades should work fine on Mandrake Linux systems containing version\n"
+#~ "\"8.1\" or later.\n"
+#~ "\n"
+#~ "Depending on your knowledge of GNU/Linux, select one of the following\n"
+#~ "choices:\n"
+#~ "\n"
+#~ " * Recommended: choose this if you have never installed a GNU/Linux\n"
+#~ "operating system. The installation will be very easy and you will only "
+#~ "be\n"
+#~ "asked a few questions;\n"
+#~ "\n"
+#~ " * Expert: if you have a good understanding of GNU/Linux, you may wish "
+#~ "to\n"
+#~ "perform a highly customized installation. Some of the decisions you will\n"
+#~ "have to make may be difficult if you do not have good knowledge of\n"
+#~ "GNU/Linux, so it is not recommended that those without a fair amount of\n"
+#~ "experience select this installation class."
+#~ msgstr ""
+#~ "DrakX nepiecieðams zinât, vai Jûs vçlaties veikt noklusçto (\"Rekomendçto"
+#~ "\")\n"
+#~ "instalâciju, vai arî Jûs vçlaties lielâku kontroli pâr instalâcijas "
+#~ "procesu (\"Expert\").\n"
+#~ "Jûs varat arî izvçlçties vai veikt jaunu instalâciju, vai atjauninât "
+#~ "eksistçjoðu\n"
+#~ "Mandrake Linux sistçmu:\n"
+#~ "\n"
+#~ " * \"Instalçt\": pilnîbâ izdzçð veco sistçmu, tomçr atkarîbâ no tâ, kas "
+#~ "ir patreiz\n"
+#~ "instalçts uz Jûsu maðînas, Jums var bût iespçja saglabât daþas "
+#~ "iepriekðçjâs\n"
+#~ "sadaïas (Linux vai citâdas) bez izmaiòâm;\n"
+#~ "\n"
+#~ " * \"Atjauninât\": ðî instalâcijas klase atïauj vienkârði atjauninât "
+#~ "pakotnes, kuras\n"
+#~ "patreiz ir uzinstalçtas uz Jûsu Mandrake Linux sistçmas. Tâ patur esoðâs "
+#~ "sadaïas\n"
+#~ "uz cietòiem, kâ arî lietotâju uzstâdîjumus. Visi citi konfigurçðanas soïi "
+#~ "paliek iespçjami,\n"
+#~ "lîdzîgi kâ pie jaunas instalâcijas;\n"
+#~ "\n"
+#~ " * \"Atjauninât tikai pakotnes\": ðî jaunâ instalâcijas klase atïauj Jums "
+#~ "atjauninât\n"
+#~ "eksistçjoðu Mandrake Linux sistçmu, saglabâjot visu sistçmas "
+#~ "konfigurâciju bez\n"
+#~ "izmaiòâm. Jaunu pakotòu pievienoðana esoðajai sistçmai arî ir iespçjama.\n"
+#~ "\n"
+#~ "Atjauninâðanai bûtu jânotiek vienkârði uz Mandrake Linux sistçmâm ar "
+#~ "versiju\n"
+#~ "\"8.1\" un jaunâkâm.\n"
+#~ "\n"
+#~ "Atkarîbâ no Jûsu zinâðanâm par GNU/Linux, izvçlieties vienu no sekojoðâm\n"
+#~ "iespçjâm:\n"
+#~ "\n"
+#~ " * Ieteicamâ: izvçlieties ðo, ja Jûs nekad neesat instalçjis GNU/Linux\n"
+#~ "operçtâjsistçmu. Instalâcija bûs ïoti vienkârða un Jums tiks uzdoti tikai "
+#~ "daþi jautâjumi;\n"
+#~ "\n"
+#~ " * Eksperta: ja Jûs labi saprotat GNU/Linux, Jûs varbût vçlaties veikti\n"
+#~ "stingri piemçrotu instalâciju. Daþi no lçmumiem, kas Jums bûs jâpieòem, "
+#~ "var\n"
+#~ "izrâdîties grûti, ja Jums nav labas zinâðanas par GNU/Linux, tâpçc nav "
+#~ "ieteicams\n"
+#~ "izvçlçties ðo instalâcijas klasi tiem, kam nav krietna pieredze.Lûdzu "
+#~ "izvçlieties \"Instalçt\", ja nav instalçta vecâka Linux-Mandrak versija\n"
+#~ "vai jûs vçlaties izmantot vairâkas operçtâjsistçmas.\n"
+#~ "\n"
+#~ "\n"
+#~ "Lûdzu izvçlieties \"Atjauninât\", ja jûs vçlaties atjauninât jau "
+#~ "instalçtu\n"
+#~ "Mandrake Linux versiju.\n"
+#~ "\n"
+#~ "\n"
+#~ "Atkarîbâ no jûsu GNU/Linux zinâðanâm, varat izvçlçties vienu no "
+#~ "sekojoðajiem\n"
+#~ "Mandrake Linux instalçðanas vai atjauninâðanas lîmeòiem:\n"
+#~ "\n"
+#~ "* Ieteicama: ja neesat ne reizi instalçjis GNU/Linux operçtâjsistçmu, "
+#~ "izvçlieties ðo lîmeni. Instalçðana bûs\n"
+#~ "  ïoti vienkârða, un jums tiks uzdoti tikai daþi jautâjumi.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Pielâgota: ja pietiekami labi pârzinat GNU/Linux, varat norâdît "
+#~ "sistçmas pamatpielietojumu (darbastacija, serveris,\n"
+#~ "  izstrâdei). Jums bûs jâatbild uz vairâk jautâjumiem nekâ \"Ieteicamas\" "
+#~ "instalçðanas klases gadîjumâ, tâpçc\n"
+#~ "  jums jâzina, kâ darbojas GNU/Linux, ja gribat izvçlçties ðo klasi.\n"
+#~ "\n"
+#~ "\n"
+#~ "* Eksperta: ja jûs labi zinat GNU/Linux, varat izvçlçties ðo instalçðanas "
+#~ "klasi. Tâpat kâ \"Pielâgotas\" klases\n"
+#~ "  gadîjumâ, jûs varçsit norâdît sistçmas pamatpielietojumu (darbastacija, "
+#~ "serveris, izstrâdei). Esiet ïoti\n"
+#~ "  uzmanîgi, pirms izvçlaties ðo klasi. Jûs varçsit veikt ïoti precîzi "
+#~ "pielâgotu instalçðanu.\n"
+#~ "  Uz daþiem jautâjumiem bûs grûti atbildçt, ja jûsu GNU/Linux zinâðanas "
+#~ "nav pietiekoði labas. Tâpçc neizvçlieties\n"
+#~ "  ðo instalçðanas klasi, ja neesat pârliecinâts."
 
+#, fuzzy
 #~ msgid ""
-#~ "If you wish to install less than this size,\n"
-#~ "select the percentage of packages that you want to install.\n"
+#~ "Normally, DrakX selects the right keyboard for you (depending on the\n"
+#~ "language you have chosen). However, you might not have a keyboard that\n"
+#~ "corresponds exactly to your language: for example, if you are an English\n"
+#~ "speaking Swiss person, you may still want your keyboard to be a Swiss\n"
+#~ "keyboard. Or if you speak English but are located in Quebec, you may "
+#~ "find\n"
+#~ "yourself in the same situation. In both cases, you will have to go back "
+#~ "to\n"
+#~ "this installation step and select an appropriate keyboard from the list.\n"
+#~ "\n"
+#~ "Click on the \"More\" button to be presented with the complete list of\n"
+#~ "supported keyboards.\n"
 #~ "\n"
-#~ "A low percentage will install only the most important packages;\n"
-#~ "a percentage of 100%% will install all selected packages."
+#~ "If you choose a keyboard layout based on a non-latin alphabet, you will "
+#~ "be\n"
+#~ "asked on next dialog to choose the key binding that will switch the\n"
+#~ "keyboard layout between the latin and non latin layouts."
 #~ msgstr ""
-#~ "Ja jûs vçlaties instalçt mazâk nekâ ðo izmçru,\n"
-#~ "procentuâli izvçlieties instalçjamo pakotòu daudzumu.\n"
+#~ "Parasti DrakX izvçlas tastatûras izkârtojumu priekð Jums (atkarîbâ no\n"
+#~ "valodas, kuru Jûs izvçlçjâties), tomçr Jums var nebût tastatûra, kas "
+#~ "atbilst\n"
+#~ "tieði Jûsu valodai.\n"
+#~ "ÐEIT DERÇTU KÂDS PIEMÇRS SAISTÎBÂ \n"
+#~ "AR LATVIEÐIEM :)\n"
+#~ "Klikðíiniet uz pogas \"Vairâk\" lai saòemtu pilnu sarakstu ar "
+#~ "atbalstîtiem\n"
+#~ "tastatûras izkârtojumiem.\n"
 #~ "\n"
-#~ "Zems procentu lîmenis instalçs tikai vissvarîgâkâs pakotnes;\n"
-#~ "100% lîmenî tiks instalçtas visas izvçlçtâs pakotnes."
+#~ "Ja Jûs izvçlçsieties tastatûras izkârtojumu, kas balstâs uz savâdâku, kâ\n"
+#~ "latîòu alfabçtu, nâkamajâ dialogâ jums tiks pieprasîts izvçlçties "
+#~ "taustiòa\n"
+#~ "piesaisti, kas pârslçgs tastatûras izkârtojumu starp latîòu un ne-latîòu\n"
+#~ "izkârtojumiem."
 
+#, fuzzy
 #~ msgid ""
-#~ "You have space on your disk for only %d%% of these packages.\n"
+#~ "After you have configured the general bootloader parameters, the list of\n"
+#~ "boot options which will be available at boot time will be displayed.\n"
+#~ "\n"
+#~ "If there is another operating system installed on your machine, it will\n"
+#~ "automatically be added to the boot menu. Here, you can choose to fine-"
+#~ "tune\n"
+#~ "the existing options. Select an entry and click \"Modify\" to modify or\n"
+#~ "remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+#~ "installation step.\n"
 #~ "\n"
-#~ "If you wish to install less than this,\n"
-#~ "select the percentage of packages that you want to install.\n"
-#~ "A low percentage will install only the most important packages;\n"
-#~ "a percentage of %d%% will install as many packages as possible."
+#~ "You may also not want to give access to these other operating systems to\n"
+#~ "anyone. In which case, you can delete the corresponding entries. But "
+#~ "then,\n"
+#~ "you will need a boot disk in order to boot those other operating systems!"
 #~ msgstr ""
-#~ "Jums uz diska ir vieta tikai %d%% no ðîm pakotnçm.\n"
+#~ "LILO (the LInux LOader) un Grub ir sâknçtâji: tie spçj sâknçt GNU/Linux\n"
+#~ "vai jebkuru citu operçtâjsistçmu, kas ir uzstâdîta jûsu datorâ.\n"
+#~ "Parasti citas operçtâjsistçmas tiek korekti noteiktas un instalçtas.\n"
+#~ "Ja tâ nenotiek, jûs ðajâ ekrânâ varat patstâvîgi pievienot ierakstu. "
+#~ "Esiet\n"
+#~ "uzmanîgs, izvçloties pareizus parametrus.\n"
 #~ "\n"
-#~ "Ja vçlaties instalçt mazâk, procentuâli izvçlieties instalçjamo pakotòu\n"
-#~ "daudzumu. Zems procentu lîmenis instalçs tikai vissvarîgâkâs pakotnes;\n"
-#~ "%d%% lîmenis instalçs tik daudz pakotòu, cik ir iespçjams."
-
-#~ msgid "You will be able to choose them more specifically in the next step."
-#~ msgstr "Nâkamajâ solî jûs varçsit izvçlçties daudz precîzâk."
-
-#~ msgid "Percentage of packages to install"
-#~ msgstr "Instalçjamo pakotòu procentuâlais daudzums"
-
-#~ msgid "hide expert mode"
-#~ msgstr "noslçpt eksperta reþîmu"
-
-#~ msgid "show expert mode"
-#~ msgstr "paradît eksperta reþîmu"
+#~ "\n"
+#~ "Jûs varbût arî vçlaties neïaut nevienam piekïût pârçjâm "
+#~ "operçtâjsistçmâm,\n"
+#~ "un ðajâ gadîjumâ jûs varat izdzçst attiecîgos ierakstus. Bet ðajâ\n"
+#~ "gadîjumâ jums bûs nepiecieðama sâknçðanas diskete, lai tâs sâknçtu!"
 
 #~ msgid ""
-#~ "If '%s' is a removable peripheral,\n"
-#~ " verify that a media is inserted."
+#~ "You must indicate where you wish to place the information required to "
+#~ "boot\n"
+#~ "to GNU/Linux.\n"
+#~ "\n"
+#~ "Unless you know exactly what you are doing, choose \"First sector of "
+#~ "drive\n"
+#~ "(MBR)\"."
 #~ msgstr ""
-#~ "Ja '%s' ir nomainâma ârçja iekârta,\n"
-#~ " pârliecinieties, ka ir ielikts datu nesçjs."
+#~ "Jums ir jânorâda, kur jûs vçlaties novietot\n"
+#~ "GNU/Linux sâknçðanai nepiecieðamo informâciju.\n"
+#~ "\n"
+#~ "Ja vien jûs neesat absolûti pârliecinâts par savu rîcîbu,\n"
+#~ "izvçlieties \"Diska pirmais sektors (MBR)\"."
 
+#, fuzzy
 #~ msgid ""
-#~ "WARNING! This will format '%s'.\n"
-#~ "All data will be erased on the peripheral '%s'.\n"
-#~ "If you want to continue, press OK. "
+#~ "DrakX now detects any IDE devices present in your computer. It will also\n"
+#~ "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
+#~ "found, DrakX will automatically install the appropriate driver.\n"
+#~ "\n"
+#~ "Because hardware detection does not always detect a piece of hardware,\n"
+#~ "DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes"
+#~ "\"\n"
+#~ "if you know that there is a SCSI card installed in your machine. You "
+#~ "will\n"
+#~ "be presented with a list of SCSI cards to choose from. Click \"No\" if "
+#~ "you\n"
+#~ "have no SCSI hardware. If you are unsure, you can check the list of\n"
+#~ "hardware detected in your machine by selecting \"See hardware info\" and\n"
+#~ "clicking \"OK\". Examine the list of hardware and then click on the \"OK"
+#~ "\"\n"
+#~ "button to return to the SCSI interface question.\n"
+#~ "\n"
+#~ "If you have to manually specify your adapter, DrakX will ask if you want "
+#~ "to\n"
+#~ "specify options for it. You should allow DrakX to probe the hardware for\n"
+#~ "the card-specific options which the hardware needs to initialize. This\n"
+#~ "usually works well.\n"
+#~ "\n"
+#~ "If DrakX is not able to probe for the options which need to be passed, "
+#~ "you\n"
+#~ "will need to provide options to the driver manually. Please review the\n"
+#~ "``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
+#~ "Hardware'' section) for hints on retrieving the parameters required from\n"
+#~ "hardware documentation, from the manufacturer's web site (if you have\n"
+#~ "Internet access) or from Microsoft Windows (if you used this hardware "
+#~ "with\n"
+#~ "Windows on your system)."
 #~ msgstr ""
-#~ "BRÎDINÂJUMS! '%s' tiks formatçts.\n"
-#~ "Visi ârçjâs iekârtas '%s' dati tiks izdzçsti.\n"
-#~ "Ja vçlaties turpinât, nospiediet OK. "
-
-#~ msgid "Select a module or write his name:"
-#~ msgstr "Izvçlieties moduli vai ierakstiet tâ nosaukumu:"
-
-#~ msgid "Category"
-#~ msgstr "Kategorija"
-
-#~ msgid "preload module"
-#~ msgstr "pirmsielâdçt moduli"
-
-#~ msgid "click on a category"
-#~ msgstr "uzklikðíiniet uz kategorijas"
-
-#~ msgid "Remove"
-#~ msgstr "Noòemt"
-
-#~ msgid "Tool for boot disk creation"
-#~ msgstr "Rîks sâknçðanas diska veidoðanai"
-
-#~ msgid "Show expert mode"
-#~ msgstr "Parâdît eksperta reþîmu"
-
-#~ msgid "modules"
-#~ msgstr "moduïi"
+#~ "DrakX mçìinâs sameklçt PCI SCSI adapteri(us).\n"
+#~ "Ja DrakX atradîs kâdu SCSI adapteri un zinâs, kuru draiveri izmantot,\n"
+#~ "tas tiks instalçts automâtiski.\n"
+#~ "\n"
+#~ "Ja jums nav SCSI adapteru, ir ISA SCSI adapteris vai PCI SCSI adapteris,\n"
+#~ "ko DrakX neatpazîst, jums tiks pajautâts, vai jûsu sistçmâ ir SCSI\n"
+#~ "adapteris. Ja nav SCSI adapteru, jûs varat vienkârði izvçlçties 'Nç'.\n"
+#~ "Ja jûs izvçlaties 'Jâ', jums tiks parâdîts draiveru saraksts, kurâ\n"
+#~ "varat izvçlçties vajadzîgo adapteri.\n"
+#~ "\n"
+#~ "\n"
+#~ "Ja jums nepiecieðams patstâvîgi norâdît adapteri, DrakX pajautâs, vai\n"
+#~ "vçlaties norâdît adaptera opcijas. Jums bûtu jâïauj DrakX aptaujât\n"
+#~ "dzelþus un noskaidrot opcijas. Parasti tas izdodas bez problçmâm.\n"
+#~ "\n"
+#~ "Ja neizdodas, jums patstâvîgi jânorâda draivera opcijas.\n"
+#~ "Izlasiet Instalçðanas rokasgrâmatu (3. nodaïu, apakðnodaïu \"Informâcijas "
+#~ "savâkðana par jûsu dzelþiem\"), lai uzzinâtu, kâ iegût ðo\n"
+#~ "informâciju no dzelþu dokumentâcijas, raþotâja tîkla lapas\n"
+#~ "(ja jums ir pieejams Internets) vai Windows (ja tas ir uzstâdîts jûsu "
+#~ "datorâ)."
 
-#~ msgid "Boot disk maker. Still in early stage.\n"
-#~ msgstr "Sâknçðanas disketes veidotâjs. Pagaidâm izstrâdes sâkumstadijâ.\n"
+#~ msgid ""
+#~ "Click on \"OK\" if you want to delete all data and partitions present on\n"
+#~ "this hard drive. Be careful, after clicking on \"OK\", you will not be "
+#~ "able\n"
+#~ "to recover any data and partitions present on this hard drive, including\n"
+#~ "any Windows data.\n"
+#~ "\n"
+#~ "Click on \"Cancel\" to cancel this operation without losing any data and\n"
+#~ "partitions present on this hard drive."
+#~ msgstr ""
+#~ "Nospiediet \"Labi\", ja vçlaties izdzçst visus datus un\n"
+#~ "sadaïas, kas atrodas uz ðî cietâ diska. Esiet uzmanîgi, pçc \"Labi\" "
+#~ "nospieðanas jûs nevarçsit atjaunot nekâdus datus vai sadaïas, kas "
+#~ "atradâs\n"
+#~ "uz diska, tajâ skaitâ arî Windows datus.\n"
+#~ "\n"
+#~ "Nospiediet \"Atcelt\", lai atceltu ðo operâciju bez jebkâdu uz ðî diska "
+#~ "esoðu datu vai sadaïu pazaudçðanas."
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 31cbcf525..35d6aa039 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,14 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 9.0\n"
-"POT-Creation-Date: 2002-09-11 13:59+0200\n"
-"PO-Revision-Date: 2002-09-05 18:05+0800\n"
-"Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
-"Language-Team: Simplified Chinese <zh@li.org>\n"
+"POT-Creation-Date: 2002-09-13 22:00+0200\n"
+"PO-Revision-Date: 2002-09-13 17:54+0800\n"
+"Last-Translator: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
+"Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
 
 #: ../../Xconfig/card.pm_.c:16
 msgid "256 kB"
@@ -50,11 +49,11 @@ msgstr "32 MB"
 
 #: ../../Xconfig/card.pm_.c:24
 msgid "64 MB or more"
-msgstr "64 MB »òÒÔÉÏ"
+msgstr "64 MB »ò¸ü¶à"
 
 #: ../../Xconfig/card.pm_.c:203
 msgid "Choose a X server"
-msgstr "ÇëÑ¡ÔñÒ»ÖÖ X ·þÎñÆ÷"
+msgstr "ÇëÑ¡Ôñ X ·þÎñÆ÷"
 
 #: ../../Xconfig/card.pm_.c:203
 msgid "X server"
@@ -69,7 +68,7 @@ msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
-"ÄúµÄϵͳ֧³Ö¶àÏÔʾÆ÷.\n"
+"ÄúµÄϵͳ֧³Ö¶àÏÔʾÆ÷¡£\n"
 "ÊÇ·ñ½øÐÐÅäÖÃ?"
 
 #: ../../Xconfig/card.pm_.c:286
@@ -86,7 +85,7 @@ msgstr "ÄúÏ£ÍûÓµÓÐÄĸö XFree ÅäÖÃ?"
 
 #: ../../Xconfig/card.pm_.c:381
 msgid "Configure all heads independently"
-msgstr "ÅäÖÃËùÓÐÏÔʾÆ÷"
+msgstr "¶ÀÁ¢ÅäÖÃËùÓÐÍ·"
 
 #: ../../Xconfig/card.pm_.c:382
 msgid "Use Xinerama extension"
@@ -95,7 +94,7 @@ msgstr "ʹÓà Xinerama À©Õ¹"
 #: ../../Xconfig/card.pm_.c:387
 #, c-format
 msgid "Configure only card \"%s\"%s"
-msgstr "Ö»ÅäÖà \"%s\"%s ¿¨"
+msgstr "Ö»ÅäÖá°%s%s¡±¿¨"
 
 #: ../../Xconfig/card.pm_.c:399 ../../Xconfig/card.pm_.c:400
 #: ../../Xconfig/various.pm_.c:23
@@ -115,13 +114,13 @@ msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
 "Your card is supported by XFree %s which may have a better support in 2D."
 msgstr ""
-"ʹÓà XFree %s, ÄúµÄÏÔʾ¿¨¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö.\n"
-"XFree %s Ö§³ÖÄúµÄÏÔʾ¿¨, ËüÄÜÌṩ¸üºÃµÄ 2D Ö§³Ö."
+"ʹÓà XFree %s, ÄúµÄÏÔʾ¿¨¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö¡£\n"
+"XFree %s Ö§³ÖÄúµÄÏÔʾ¿¨, ËüÄÜÌṩ¸üºÃµÄ 2D Ö§³Ö¡£"
 
 #: ../../Xconfig/card.pm_.c:416 ../../Xconfig/card.pm_.c:439
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "ʹÓà XFree %s, ÄúµÄÏÔʾ¿¨¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö."
+msgstr "ʹÓà XFree %s, ÄúµÄÏÔʾ¿¨¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö¡£"
 
 #: ../../Xconfig/card.pm_.c:424 ../../Xconfig/card.pm_.c:445
 #, c-format
@@ -135,9 +134,9 @@ msgid ""
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
 "Your card is supported by XFree %s which may have a better support in 2D."
 msgstr ""
-"Ö»ÓÐʹÓà XFree %s, ÄúµÄÏÔʾ¿¨²Å¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö.\n"
-"×¢ÒâÕâÊÇÊÔÑé½×¶ÎµÄÖ§³Ö, Ëü¿ÉÄÜ»áʹÄúµÄµçÄÔʧȥ·´Ó¦\n"
-"XFree %s Ö§³ÖÄúµÄÏÔʾ¿¨, ËüÄÜÌṩ¸üºÃµÄ 2D Ö§³Ö."
+"Ö»ÓÐʹÓà XFree %s, ÄúµÄÏÔʾ¿¨²Å¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö¡£\n"
+"×¢ÒâÕâÊÇÊÔÑé½×¶ÎµÄÖ§³Ö, Ëü¿ÉÄÜ»áʹÄúµÄµçÄÔʧȥ·´Ó¦¡£\n"
+"XFree %s Ö§³ÖÄúµÄÏÔʾ¿¨, ËüÄÜÌṩ¸üºÃµÄ 2D Ö§³Ö¡£"
 
 #: ../../Xconfig/card.pm_.c:430 ../../Xconfig/card.pm_.c:447
 #, c-format
@@ -145,8 +144,8 @@ msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
-"ʹÓà XFree %s, ÄúµÄÏÔʾ¿¨¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö.\n"
-"×¢ÒâÕâÊÇÊÔÑé½×¶ÎµÄÖ§³Ö, Ëü¿ÉÄÜ»áʹÄúµÄµçÄÔʧȥ·´Ó¦."
+"ʹÓà XFree %s, ÄúµÄÏÔʾ¿¨¿ÉÒԵõ½ 3D Ó²¼þ¼ÓËÙÖ§³Ö¡£\n"
+"×¢ÒâÕâÊÇÊÔÑé½×¶ÎµÄÖ§³Ö, Ëü¿ÉÄÜ»áʹÄúµÄµçÄÔʧȥ·´Ó¦¡£"
 
 #: ../../Xconfig/card.pm_.c:453
 msgid "Xpmac (installation display driver)"
@@ -193,10 +192,10 @@ msgid "Ok"
 msgstr "È·¶¨"
 
 #: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3155
-#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:224
+#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3203
+#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
 msgid "Quit"
-msgstr "½áÊø"
+msgstr "Í˳ö"
 
 #: ../../Xconfig/main.pm_.c:145
 #, c-format
@@ -213,7 +212,7 @@ msgstr ""
 
 #: ../../Xconfig/monitor.pm_.c:93
 msgid "Choose a monitor"
-msgstr "ÇëÑ¡ÔñÒ»ÖÖÏÔʾÆ÷"
+msgstr "ÇëÑ¡ÔñÏÔʾÆ÷"
 
 #: ../../Xconfig/monitor.pm_.c:97
 msgid "Plug'n Play"
@@ -221,7 +220,7 @@ msgstr "¼´²å¼´ÓÃ"
 
 #: ../../Xconfig/monitor.pm_.c:98 ../../mouse.pm_.c:46
 msgid "Generic"
-msgstr "ÆÕͨ"
+msgstr "ͨÓÃ"
 
 #: ../../Xconfig/monitor.pm_.c:99 ../../harddrake/ui.pm_.c:37
 msgid "Vendor"
@@ -229,7 +228,7 @@ msgstr "³§¼Ò"
 
 #: ../../Xconfig/monitor.pm_.c:109
 msgid "Plug'n Play probing failed. Please choose a precise monitor"
-msgstr "¼´²å¼´Óüì²âʧ°Ü. ÇëÃ÷È·Ñ¡ÔñÒ»¸öÏÔʾÆ÷"
+msgstr "¼´²å¼´Óüì²âʧ°Ü¡£ÇëÃ÷È·Ñ¡ÔñÒ»¸öÏÔʾÆ÷"
 
 #: ../../Xconfig/monitor.pm_.c:114
 msgid ""
@@ -245,48 +244,48 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 "Á½¸ö¹Ø¼üµÄ²ÎÊý:\n"
-"(1) ´¹Ö±¸üÐÂƵÂÊ, ÓÃÓÚÉèÖÃÆÁĻÿÃëÖÓ¸üеĴÎÊý;\n"
-"(2) ˮƽ¸üÐÂƵÂÊ, ÓÃÓÚÉèÖÃÏÔʾɨÃèÏßµÄËÙÂÊ.\n"
+"(1) ´¹Ö±Ë¢ÐÂÂÊ, ÓÃÓÚÉèÖÃÆÁĻÿÃëÖÓ¸üеĴÎÊý;\n"
+"(2) ˮƽˢÐÂÂÊ, ÓÃÓÚÉèÖÃÏÔʾɨÃèÏßµÄËÙÂÊ¡£\n"
 "\n"
-"ǧÍòСÐÄ! ²»Òª°ÑÕâЩͬ²½·¶Î§É趨µÃ³¬¹ýÄúµÄÏÔʾÆ÷µÄÄÜÁ¦.\n"
+"ǧÍòСÐÄ! ²»Òª°ÑÕâЩͬ²½·¶Î§É趨µÃ³¬¹ýÄúµÄÏÔʾÆ÷µÄÄÜÁ¦¡£\n"
 "²»Ç¡µ±µÄÉèÖÿÉÄÜ»áËðº¦ÄúµÄÏÔʾÆ÷!\n"
-"ËùÒÔû°ÑÎÕʱ, Äú¿ÉÒÔÑ¡Ôñ±£ÊصÄÉ趨."
+"ËùÒÔû°ÑÎÕʱ, Äú¿ÉÒÔÑ¡Ôñ±£ÊصÄÉ趨¡£"
 
 #: ../../Xconfig/monitor.pm_.c:121
 msgid "Horizontal refresh rate"
-msgstr "ˮƽ¸üÐÂƵÂÊ"
+msgstr "ˮƽˢÐÂÂÊ"
 
 #: ../../Xconfig/monitor.pm_.c:122
 msgid "Vertical refresh rate"
-msgstr "´¹Ö±¸üÐÂƵÂÊ"
+msgstr "´¹Ö±Ë¢ÐÂÂÊ"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:12
 msgid "256 colors (8 bits)"
-msgstr "256 ɫ (8 λԪ)"
+msgstr "256 ɫ (8 λ)"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:13
 msgid "32 thousand colors (15 bits)"
-msgstr "3 Íò 2 ǧɫ (15 λԪ)"
+msgstr "3 Íò 2 ǧɫ (15 λ)"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:14
 msgid "65 thousand colors (16 bits)"
-msgstr "6 Íò 5 ǧɫ (16 λԪ)"
+msgstr "6 Íò 5 ǧɫ (16 λ)"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:15
 msgid "16 million colors (24 bits)"
-msgstr "1 ǧ 6 °ÙÍòÉ« (24 λԪ)"
+msgstr "1 ǧ 6 °ÙÍòÉ« (24 λ)"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:16
 msgid "4 billion colors (32 bits)"
-msgstr "4 ÒÚÉ« (32 λԪ)"
+msgstr "40 ÒÚÉ« (32 λ)"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:129
 msgid "Resolutions"
-msgstr "½âÎö¶È"
+msgstr "·Ö±æÂÊ"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:254
 msgid "Choose the resolution and the color depth"
-msgstr "Ñ¡È¡ÆÁÄ»·Ö±æÂÊÒÔ¼°ÑÕÉ«Éî¶È"
+msgstr "Ñ¡ÔñÆÁÄ»·Ö±æÂÊÒÔ¼°ÑÕÉ«Éî¶È"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:255
 #, c-format
@@ -294,13 +293,13 @@ msgid "Graphics card: %s"
 msgstr "ÏÔʾ¿¨: %s"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:268 ../../any.pm_.c:1019
-#: ../../bootlook.pm_.c:343 ../../diskdrake/smbnfs_gtk.pm_.c:87
+#: ../../bootlook.pm_.c:344 ../../diskdrake/smbnfs_gtk.pm_.c:87
 #: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464
 #: ../../interactive.pm_.c:142 ../../interactive.pm_.c:354
 #: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195
 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
 #: ../../my_gtk.pm_.c:158 ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
-#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2124
+#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2169
 #: ../../security/main.pm_.c:295 ../../standalone/drakautoinst_.c:203
 #: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
 #: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
@@ -309,8 +308,8 @@ msgstr "ÏÔʾ¿¨: %s"
 #: ../../standalone/drakbackup_.c:4184 ../../standalone/drakconnect_.c:115
 #: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
 #: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:234 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:536 ../../standalone/logdrake_.c:224
+#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
+#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:225
 #: ../../ugtk.pm_.c:296
 msgid "Cancel"
 msgstr "È¡Ïû"
@@ -321,7 +320,7 @@ msgstr "²âÊÔÉ趨ֵ"
 
 #: ../../Xconfig/test.pm_.c:31
 msgid "Do you want to test the configuration?"
-msgstr "ÄúÏëÒª²âÊÔÄúµÄÉ趨ֵÂð ?"
+msgstr "ÄúÏëÒª²âÊÔÄúµÄÉ趨ֵÂð?"
 
 #: ../../Xconfig/test.pm_.c:31
 msgid "Warning: testing this graphic card may freeze your computer"
@@ -340,7 +339,7 @@ msgstr "Êó±êÀàÐÍ: %s\n"
 #: ../../Xconfig/various.pm_.c:31
 #, c-format
 msgid "Mouse device: %s\n"
-msgstr "Êó±êÁ¬½ÓÉ豸: %s\n"
+msgstr "Êó±êÉ豸: %s\n"
 
 #: ../../Xconfig/various.pm_.c:32
 #, c-format
@@ -350,12 +349,12 @@ msgstr "ÏÔʾÆ÷: %s\n"
 #: ../../Xconfig/various.pm_.c:33
 #, c-format
 msgid "Monitor HorizSync: %s\n"
-msgstr "ÏÔʾÆ÷ˮƽ¸üÐÂƵÂÊ: %s\n"
+msgstr "ÏÔʾÆ÷ˮƽˢÐÂÂÊ: %s\n"
 
 #: ../../Xconfig/various.pm_.c:34
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
-msgstr "ÏÔʾÆ÷´¹Ö±¸üÐÂƵÂÊ: %s\n"
+msgstr "ÏÔʾÆ÷´¹Ö±Ë¢ÐÂÂÊ: %s\n"
 
 #: ../../Xconfig/various.pm_.c:35
 #, c-format
@@ -389,7 +388,7 @@ msgstr "XFree86 Çý¶¯³ÌÐò: %s\n"
 
 #: ../../Xconfig/various.pm_.c:61
 msgid "Graphical interface at startup"
-msgstr "¿ª»úʱÆô¶¯ X"
+msgstr "Æô¶¯Ê±½øÈëͼÐνçÃæ"
 
 #: ../../Xconfig/various.pm_.c:62
 msgid ""
@@ -397,7 +396,7 @@ msgid ""
 "(XFree) upon booting.\n"
 "Would you like XFree to start when you reboot?"
 msgstr ""
-"ÎÒ¿ÉÒÔÉ趨ÄúµÄµçÄÔÔÚ¿ª»úʱ×Ô¶¯½øÈë X Window »·¾³£¬\n"
+"ÎÒ¿ÉÒÔÉ趨ÄúµÄµçÄÔÔÚ¿ª»úʱ×Ô¶¯½øÈë X Window »·¾³¡£\n"
 "ÄúÏ£ÍûÕâô×öÂð?"
 
 #: ../../Xconfig/various.pm_.c:73
@@ -411,11 +410,11 @@ msgid ""
 "\n"
 "Do you have this feature?"
 msgstr ""
-"¿´À´ÄúµÄͼÐο¨ÓµÓеçÊÓÊä³ö½Ó¿Ú.\n"
-"¿ÉÒÔÅäÖÃËüÓÃÖ¡»º³åÆ÷¹¤×÷.\n"
+"¿´À´ÄúµÄͼÐο¨ÓµÓеçÊÓÊä³ö½Ó¿Ú¡£\n"
+"¿ÉÒÔÅäÖÃËüÓÃÖ¡»º³åÆ÷¹¤×÷¡£\n"
 "\n"
-"Äú±ØÐëÏÈ°ÑÄúµÄµçÊÓºÍÄúµÄͼÐο¨Á¬½ÓºÃ, È»ºóÆð¶¯ÄúµÄµçÄÔ.\n"
-"È»ºóÔÚ¿ª»úÒýµ¼³ÌÐòÖÐÑ¡Ôñ \"TVout\" ÌõÄ¿\n"
+"Äú±ØÐëÏÈ°ÑÄúµÄµçÊÓºÍÄúµÄͼÐο¨Á¬½ÓºÃ, È»ºóÆô¶¯ÄúµÄµçÄÔ¡£\n"
+"È»ºóÔÚÆô¶¯Òýµ¼³ÌÐòÖÐÑ¡Ôñ¡°TVout¡±ÌõÄ¿\n"
 "\n"
 "ÄúÊÇ·ñҪʹÓÃÕâ¸öÌØÐÔ?"
 
@@ -437,7 +436,7 @@ msgstr "SILO °²×°"
 
 #: ../../any.pm_.c:113 ../../any.pm_.c:126
 msgid "Where do you want to install the bootloader?"
-msgstr "ÄúÏ£Íû¿ª»úÒýµ¼³ÌÐò°²×°µ½ÄÄÀï?"
+msgstr "ÄúÏ£ÍûÆô¶¯Òýµ¼³ÌÐò°²×°µ½ÄÄÀï?"
 
 #: ../../any.pm_.c:125
 msgid "LILO/grub Installation"
@@ -465,23 +464,23 @@ msgstr "´ÓDOS/WindowsÆô¶¯"
 
 #: ../../any.pm_.c:149 ../../any.pm_.c:151
 msgid "Yaboot"
-msgstr "¸ù·ÖÇø"
+msgstr "Yaboot"
 
 #: ../../any.pm_.c:159 ../../any.pm_.c:190
 msgid "Bootloader main options"
-msgstr "¿ª»úÒýµ¼³ÌÐòµÄÖ÷ҪѡÏî"
+msgstr "Æô¶¯Òýµ¼³ÌÐòµÄÖ÷ҪѡÏî"
 
 #: ../../any.pm_.c:160 ../../any.pm_.c:191
 msgid "Bootloader to use"
-msgstr "¿ª»úÒýµ¼³ÌÐò"
+msgstr "ҪʹÓõÄÆô¶¯Òýµ¼³ÌÐò"
 
 #: ../../any.pm_.c:162
 msgid "Bootloader installation"
-msgstr "¿ª»úÒýµ¼³ÌÐò°²×°"
+msgstr "Æô¶¯Òýµ¼³ÌÐò°²×°"
 
 #: ../../any.pm_.c:164 ../../any.pm_.c:193
 msgid "Boot device"
-msgstr "¿ª»úÒýµ¼É豸"
+msgstr "Æô¶¯É豸"
 
 #: ../../any.pm_.c:165
 msgid "Compact"
@@ -497,12 +496,12 @@ msgstr "ÏÔʾģʽ"
 
 #: ../../any.pm_.c:168
 msgid "Delay before booting default image"
-msgstr "¿ª»úµÈºòʱ¼ä"
+msgstr "Æô¶¯Ä¬ÈÏÓ³ÏñÇ°µÄÑÓ³Ù"
 
 #: ../../any.pm_.c:170 ../../any.pm_.c:789
 #: ../../diskdrake/smbnfs_gtk.pm_.c:179
 #: ../../install_steps_interactive.pm_.c:1094 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:850 ../../printerdrake.pm_.c:965
+#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
 #: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
 #: ../../standalone/drakconnect_.c:649
 msgid "Password"
@@ -523,7 +522,7 @@ msgstr "ÏÞÖÆ"
 
 #: ../../any.pm_.c:174
 msgid "Clean /tmp at each boot"
-msgstr "ÿ´Î¿ª»úʱÇå³ý /tmp"
+msgstr "ÿ´ÎÆô¶¯Ê±Çå³ý /tmp"
 
 #: ../../any.pm_.c:175
 #, c-format
@@ -536,12 +535,12 @@ msgstr "ÔËÐжàÖÖÅäÖÃ"
 
 #: ../../any.pm_.c:181
 msgid "Give the ram size in MB"
-msgstr "¸æËßÎÒÓжàÉÙ Mb µÄÄÚ´æ"
+msgstr "ÒÔÕ×Ϊµ¥Î»¸ø³öÄÚ´æ´óС"
 
 #: ../../any.pm_.c:183
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
-msgstr "ûÓпÚÁî²»ÄÜʹÓà ``ÏÞ¶¨²ÎÊýÑ¡Ïî''"
+msgstr "ûÓпÚÁî²»ÄÜʹÓá°ÏÞ¶¨²ÎÊýÑ¡Ï"
 
 #: ../../any.pm_.c:184 ../../any.pm_.c:765
 #: ../../diskdrake/interactive.pm_.c:1191
@@ -560,7 +559,7 @@ msgstr "³õʼÐÅÏ¢"
 
 #: ../../any.pm_.c:194
 msgid "Open Firmware Delay"
-msgstr "¹Ì¼þÑÓ³Ù"
+msgstr "´ò¿ª¹Ì¼þÑÓ³Ù"
 
 #: ../../any.pm_.c:195
 msgid "Kernel Boot Timeout"
@@ -568,15 +567,15 @@ msgstr "ºËÐÄÆô¶¯³¬Ê±"
 
 #: ../../any.pm_.c:196
 msgid "Enable CD Boot?"
-msgstr "CD Æô¶¯?"
+msgstr "ÆôÓà CD Æô¶¯?"
 
 #: ../../any.pm_.c:197
 msgid "Enable OF Boot?"
-msgstr "OF Æô¶¯?"
+msgstr "ÆôÓà OF Æô¶¯?"
 
 #: ../../any.pm_.c:198
 msgid "Default OS?"
-msgstr "ȱʡ²Ù×÷ϵͳ?"
+msgstr "ĬÈϲÙ×÷ϵͳ?"
 
 #: ../../any.pm_.c:232
 msgid ""
@@ -586,9 +585,9 @@ msgid ""
 "\n"
 "On which drive are you booting?"
 msgstr ""
-"Äú¾ö¶¨ÔÚÒ»¸ö·ÖÇøÉÏ°²×°¿ª»úÒýµ¼³ÌÐò.\n"
-"ÄÇôÔÚÓÃÓÚÆô¶¯µÄÓ²ÅÌÉÏÄúÓ¦¸ÃÒѾ­ÓÐÒ»¸ö°²×°¿ª»úÒýµ¼³ÌÐò(ÀýÈç: System "
-"Commander).\n"
+"Äú¾ö¶¨ÔÚÒ»¸ö·ÖÇøÉÏ°²×°Æô¶¯Òýµ¼³ÌÐò¡£\n"
+"ÄÇôÔÚÓÃÓÚÆô¶¯µÄÓ²ÅÌÉÏÄúÓ¦¸ÃÒѾ­ÓÐÒ»¸ö°²×°Æô¶¯Òýµ¼³ÌÐò(ÀýÈç: System "
+"Commander)¡£\n"
 "\n"
 "ÄúÒªÓÃÄĸöÓ²ÅÌÆô¶¯?"
 
@@ -597,8 +596,8 @@ msgid ""
 "Here are the entries on your boot menu so far.\n"
 "You can add some more or change the existing ones."
 msgstr ""
-"ÏÖÔÚÓÐÏÂÁÐÌõÄ¿.\n"
-"Äú¿ÉÒÔÔö¼Ó»òÊǸü¸ÄÒÑ´æÔÚµÄÌõÄ¿"
+"Æô¶¯²Ëµ¥ÖÐÏÖÓÐÏÂÁÐÌõÄ¿¡£\n"
+"Äú¿ÉÒÔÔö¼Ó»òÊǸü¸ÄÒÑ´æÔÚµÄÌõÄ¿¡£"
 
 #: ../../any.pm_.c:258 ../../standalone/drakbackup_.c:1560
 #: ../../standalone/drakbackup_.c:1673 ../../standalone/drakfont_.c:1011
@@ -609,7 +608,7 @@ msgstr "Ôö¼Ó"
 #: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
 #: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
 #: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printerdrake.pm_.c:3155 ../../standalone/drakbackup_.c:2774
+#: ../../printerdrake.pm_.c:3203 ../../standalone/drakbackup_.c:2774
 msgid "Done"
 msgstr "Íê³É"
 
@@ -627,23 +626,23 @@ msgstr "Linux"
 
 #: ../../any.pm_.c:267
 msgid "Other OS (SunOS...)"
-msgstr "Æä??Ù×÷ϵÍ? (SunOS...)"
+msgstr "ÆäËü²Ù×÷ϵͳ (SunOS...)"
 
 #: ../../any.pm_.c:268
 msgid "Other OS (MacOS...)"
-msgstr "ÆäËû²Ù×÷ϵͳ (MacOS...)"
+msgstr "ÆäËü²Ù×÷ϵͳ (MacOS...)"
 
 #: ../../any.pm_.c:268
 msgid "Other OS (windows...)"
-msgstr "ÆäËû²Ù×÷ϵͳ (windows...)"
+msgstr "ÆäËü²Ù×÷ϵͳ (windows...)"
 
 #: ../../any.pm_.c:287
 msgid "Image"
-msgstr "Ó³ÏóÎļþ"
+msgstr "Ó³ÏñÎļþ"
 
 #: ../../any.pm_.c:288 ../../any.pm_.c:299
 msgid "Root"
-msgstr "¸ùĿ¼ËùÔÚ·ÖÇø"
+msgstr "¸ùĿ¼"
 
 #: ../../any.pm_.c:289 ../../any.pm_.c:317
 msgid "Append"
@@ -671,11 +670,11 @@ msgstr "±êÇ©"
 
 #: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:201
 msgid "Default"
-msgstr "ȱʡ"
+msgstr "ĬÈÏ"
 
 #: ../../any.pm_.c:318
 msgid "Initrd-size"
-msgstr "Initrd´óС"
+msgstr "Initrd ´óС"
 
 #: ../../any.pm_.c:320
 msgid "NoVideo"
@@ -708,12 +707,12 @@ msgstr "ÕÒµ½ %s %s ½Ó¿Ú"
 
 #: ../../any.pm_.c:658
 msgid "Do you have another one?"
-msgstr "ÄúÓÐÆäËûµÄÂð ?"
+msgstr "ÄúÓÐÆäËüµÄÂð?"
 
 #: ../../any.pm_.c:659
 #, c-format
 msgid "Do you have any %s interfaces?"
-msgstr "Äú»¹ÓÐÆäËû %s ½Ó¿ÚÂð ?"
+msgstr "Äú»¹ÓÐÆäËü %s ½Ó¿ÚÂð?"
 
 #: ../../any.pm_.c:661 ../../any.pm_.c:824 ../../interactive.pm_.c:132
 #: ../../my_gtk.pm_.c:286
@@ -727,7 +726,7 @@ msgstr "ÊÇ"
 
 #: ../../any.pm_.c:662
 msgid "See hardware info"
-msgstr "²é¿´Ó²ÌåÐÅÏ¢"
+msgstr "²é¿´Ó²¼þÐÅÏ¢"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
@@ -747,8 +746,8 @@ msgid ""
 "You may now provide its options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
-"ÄúÏÖÔÚ¿ÉÒÔÌṩģ¿é %s µÄ²ÎÊý.\n"
-"×¢ÒâÒªÊäÈëÄÚ´æµØÖ·ÇëʹÓà 0x ǰ׺, Èç '0x123'"
+"ÄúÏÖÔÚ¿ÉÒÔÌṩģ¿é %s µÄ²ÎÊý¡£\n"
+"×¢ÒâÒªÊäÈëÄÚ´æµØÖ·ÇëʹÓà 0x ǰ׺, Èç¡°0x123¡±"
 
 #: ../../any.pm_.c:696
 #, c-format
@@ -757,19 +756,19 @@ msgid ""
 "Options are in format ``name=value name2=value2 ...''.\n"
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
-"ÏÖÔÚ¸øÄ£¿é %s Ö¸¶¨ËüµÄÑ¡Ïî. \n"
-"Ñ¡ÏîµÄ¸ñʽÊÇ ``name=value name2=value2...'' \n"
-"ÀýÈ磬 ``io=0x300 irq=7''"
+"ÏÖÔÚ¸øÄ£¿é %s Ö¸¶¨ËüµÄÑ¡Ïî¡£\n"
+"Ñ¡ÏîµÄ¸ñʽÊÇ¡°name=value name2=value2...¡±\n"
+"ÀýÈç,¡°io=0x300 irq=7¡±"
 
 #: ../../any.pm_.c:698
 msgid "Module options:"
-msgstr "Ä£¿é²ÎÊý"
+msgstr "Ä£¿é²ÎÊý:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
 #: ../../any.pm_.c:710
 #, c-format
 msgid "Which %s driver should I try?"
-msgstr "³¢ÊÔʹÓÃÄĸö %s Çý¶¯³ÌÐò ?"
+msgstr "³¢ÊÔʹÓÃÄĸö %s Çý¶¯³ÌÐò?"
 
 #: ../../any.pm_.c:719
 #, c-format
@@ -784,8 +783,8 @@ msgid ""
 msgstr ""
 "ÓÐʱºòÐèÒª¸ø %s Çý¶¯³ÌÐòÖ¸¶¨¶îÍâµÄÐÅÏ¢²ÅÄÜÕý³£ÔËÐÐ, ¾¡¹Üͨ³£²»ÐèÒª.\n"
 "Äú¿ÉÒÔÔÚÕâÀïÖ¸¶¨Ò»Ð©¶îÍâµÄÑ¡Ïî, Ò²¿ÉÒÔÈÃÇý¶¯³ÌÐò̽²âÄúµÄ»úÆ÷, ×Ô¶¯\n"
-"È·¶¨ÐèÒªµÄÐÅÏ¢. ż¶û»á·¢Éú»úÆ÷ÔÚ̽²âÖÐÍ£Ö¹·´Ó¦, ²»¹ýÕâ²»»áËð»µÊ²Ã´. \n"
-"Äú¾ö¶¨Ôõô×ö ?"
+"È·¶¨ÐèÒªµÄÐÅÏ¢¡£Å¼¶û»á·¢Éú»úÆ÷ÔÚ̽²âÖÐÍ£Ö¹·´Ó¦, ²»¹ýÕâ²»»áËð»µÊ²Ã´. \n"
+"Äú¾ö¶¨Ôõô×ö?"
 
 #: ../../any.pm_.c:723
 msgid "Autoprobe"
@@ -793,7 +792,7 @@ msgstr "×Ô¶¯Ì½²â"
 
 #: ../../any.pm_.c:723
 msgid "Specify options"
-msgstr "Ö¸¶¨²ÎÊý"
+msgstr "Ö¸¶¨Ñ¡Ïî"
 
 #: ../../any.pm_.c:735
 #, c-format
@@ -801,20 +800,20 @@ msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
-"Ä£¿é %s ¼ÓÔØʧ°Ü.\n"
-"ÄúÒª³¢ÊÔÆäËûµÄ²ÎÊýÂð ?"
+"Ä£¿é %s ¼ÓÔØʧ°Ü¡£\n"
+"ÄúÒª³¢ÊÔÆäËüµÄ²ÎÊýÂð?"
 
 #: ../../any.pm_.c:751
 msgid "access to X programs"
-msgstr "ÔÊÐíʹÓà X Window Ó¦ÓóÌÐò"
+msgstr "ÔÊÐíʹÓà X Ó¦ÓóÌÐò"
 
 #: ../../any.pm_.c:752
 msgid "access to rpm tools"
-msgstr "ÔÊÐíʹÓðü¹ÜÀí¹¤¾ß"
+msgstr "ÔÊÐíʹÓà rpm ¹¤¾ß"
 
 #: ../../any.pm_.c:753
 msgid "allow \"su\""
-msgstr "ÔÊÐíʹÓÃ\"su\"Ö¸Áî"
+msgstr "ÔÊÐíʹÓá°su¡±Ö¸Áî"
 
 #: ../../any.pm_.c:754
 msgid "access to administrative files"
@@ -839,12 +838,12 @@ msgstr "¿ÚÁîÌ«¼òµ¥"
 
 #: ../../any.pm_.c:767
 msgid "Please give a user name"
-msgstr "Çë¸ø³öÓйØÓû§Ãû"
+msgstr "Çë¸ø³öÓû§Ãû"
 
 #: ../../any.pm_.c:768
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "Óû§ÃûÖ»ÄÜÓÐСд×Öĸ¡¢Êý×Ö£¬`-' ºÍ `_'"
+msgstr "Óû§ÃûÖ»ÄÜÓÐСд×Öĸ¡¢Êý×Ö,¡°-¡±ºÍ¡°_¡±"
 
 #: ../../any.pm_.c:769
 msgid "The user name is too long"
@@ -875,8 +874,8 @@ msgstr "½ÓÊܸÃÓû§"
 msgid "Real name"
 msgstr "Óû§ÕæʵÐÕÃû"
 
-#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:849
-#: ../../printerdrake.pm_.c:964
+#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:979
 msgid "User name"
 msgstr "Óû§µÇ¼Ãû"
 
@@ -898,11 +897,11 @@ msgid ""
 "Do you want to use this feature?"
 msgstr ""
 "Äú¿ÉÒÔÔÚÕâÀïÉ趨¿ª»úʱ×Ô¶¯ÒÔijÓû§µÄÉí·ÝµÇÈëϵͳ.\n"
-"ÄúÏ£ÍûʹÓÃÕâ¸öÌØÐÔÂð ?"
+"ÄúÏ£ÍûʹÓÃÕâ¸öÌØÐÔÂð?"
 
 #: ../../any.pm_.c:825
 msgid "Choose the default user:"
-msgstr "Ñ¡ÔñȱʡµÄÓû§:"
+msgstr "Ñ¡ÔñĬÈϵÄÓû§:"
 
 #: ../../any.pm_.c:826
 msgid "Choose the window manager to run:"
@@ -910,14 +909,16 @@ msgstr "Ñ¡ÔñÒªÔËÐеĴ°¿Ú¹ÜÀí³ÌÐò:"
 
 #: ../../any.pm_.c:841
 msgid "Please choose a language to use."
-msgstr "ÇëÑ¡ÔñϵͳȱʡʹÓõÄÓïÑÔ."
+msgstr "ÇëÑ¡ÔñϵͳĬÈÏʹÓõÄÓïÑÔ¡£"
 
 #: ../../any.pm_.c:843
 msgid ""
 "Mandrake Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
-msgstr "Äú¿ÉÒÔÔÚÕâÀïÔö¼ÓϵͳÖÐÆäËû¿ÉÓõÄÓïÑÔ"
+msgstr ""
+"Mandrake Linux ¿ÉÒÔÖ§³Ö¶àÖÖÓïÑÔ¡£ÇëÑ¡ÔñÄúÏëÒª°²×°µÄÓïÑÔ¡£\n"
+"µ±°²×°Íê³É²¢ÖØÐÂÆô¶¯ÏµÍ³ºó¿ÉÒÔÑ¡Ôñ¡£"
 
 #: ../../any.pm_.c:857 ../../install_steps_interactive.pm_.c:690
 #: ../../standalone/drakxtv_.c:73
@@ -932,17 +933,17 @@ msgstr "ÔÊÐíËùÓÐÓû§Ê¹ÓÃ"
 msgid "No sharing"
 msgstr "½ûÖ¹¹²Ïí"
 
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1198 ../../standalone.pm_.c:58
+#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:59
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
-msgstr "ÐèÒª°²×°Èí¼þ°ü %s .ÄúͬÒâ°²×°Âð ?"
+msgstr "ÐèÒª°²×°Èí¼þ°ü %s¡£ÄúͬÒâ°²×°Âð?"
 
 #: ../../any.pm_.c:991
 msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
-msgstr "Äú¿ÉÒÔͨ¹ý NFS »ò Samba À´¹²ÏíÎļþ. ÄúÏ£ÍûʹÓÃÄÄÒ»¸ö? "
+msgstr "Äú¿ÉÒÔͨ¹ý NFS »ò Samba À´¹²ÏíÎļþ¡£ÄúÏ£ÍûʹÓÃÄÄÒ»¸ö? "
 
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1203 ../../standalone.pm_.c:63
+#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:64
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "ÎÞ·¨ÕÒµ½±ØÐèµÄÈí¼þ°ü %s"
@@ -956,20 +957,20 @@ msgid ""
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 "ÄúÔ¸ÒâÈÃÓû§Äܹ²ÏíËûÃǵÄĿ¼Âð?\n"
-"ÔÚÕâÀïÑ¡ÔñÔÊÐí, Óû§½«¿ÉÒÔÔÚ KDE ºÍ Gnome µÄÎļþ¹ÜÀíÆ÷Öеã»÷ \"¹²Ïí\"²Ëµ¥Ïî\n"
-"\"¶¨ÖÆ\" ÔÊÐí°´ÕÕ²»Í¬Óû§Ï¸·ÖÉèÖÃ.\n"
+"ÔÚÕâÀïÑ¡ÔñÔÊÐí, Óû§½«¿ÉÒÔÔÚ KDE ºÍ Gnome µÄÎļþ¹ÜÀíÆ÷Öеã»÷¡°¹²Ïí¡±²Ëµ¥Ïî\n"
+"¡°¶¨ÖÆ¡±ÔÊÐí°´ÕÕ²»Í¬Óû§Ï¸·ÖÉèÖá£\n"
 
 #: ../../any.pm_.c:1019
 msgid "Launch userdrake"
-msgstr "ÔËÐÐ UserdrakeħÁ¦Óû§¹ÜÀí"
+msgstr "ÔËÐÐ Userdrake"
 
 #: ../../any.pm_.c:1021
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user in this group."
 msgstr ""
-"°´Óû§µÄ¹²ÏíʹÓÃ×é\"fileshare\". \n"
-"Äú¿ÉÒÔʹÓà userdrake Ìí¼ÓÒ»¸öÓû§µ½Õâ¸ö×é."
+"°´Óû§µÄ¹²ÏíʹÓÃ×é¡°fileshare¡±¡£\n"
+"Äú¿ÉÒÔʹÓà userdrake Ìí¼ÓÒ»¸öÓû§µ½Õâ¸ö×é¡£"
 
 #: ../../any.pm_.c:1072
 msgid "Welcome To Crackers"
@@ -1001,15 +1002,15 @@ msgid ""
 "but very sensitive: it must not be used for a machine connected to others\n"
 "or to the Internet. There is no password access."
 msgstr ""
-"ÕâÒ»¼¶±ðÓ¦É÷ÖØʹÓÃ. ËüÊÇÄúµÄϵͳʹÓøü¼òµ¥, È»¶øÒ²¸ü´àÈõ:\n"
-"¼ÙÈçÕą̂»úÆ÷½«ÒªºÍÆäËû»úÆ÷ÁªÍø»òÕß½ÓÈ뻥ÁªÍø, ¾ø¶Ô²»Òª²ÉÓÃÕâ¸ö¼¶±ð.£ÜnÕâ¸ö¼¶"
-"±ðÁ¬»ù±¾µÄ¿ÚÁî¼ì²éҲûÓÐ."
+"ÕâÒ»¼¶±ðÓ¦É÷ÖØʹÓá£ËüÊÇÄúµÄϵͳʹÓøü¼òµ¥, È»¶øÒ²¸ü´àÈõ:\n"
+"¼ÙÈçÕą̂»úÆ÷½«ÒªºÍÆäËü»úÆ÷ÁªÍø»òÕß½ÓÈ뻥ÁªÍø, ¾ø¶Ô²»Òª²ÉÓÃÕâ¸ö¼¶±ð¡£\n"
+"Õâ¸ö¼¶±ðÁ¬»ù±¾µÄ¿ÚÁî¼ì²éҲûÓС£"
 
 #: ../../any.pm_.c:1083
 msgid ""
 "Password are now enabled, but use as a networked computer is still not "
 "recommended."
-msgstr "ÆôÓÃÁË¿ÚÁî¼ì²é¹¦ÄÜ. µ«ÊÇÈÔ²»½¨ÒéÓÃÓÚÁªÍøµÄµçÄÔ."
+msgstr "ÆôÓÃÁË¿ÚÁî¼ì²é¹¦ÄÜ¡£µ«ÊÇÈÔ²»½¨ÒéÓÃÓÚÁªÍøµÄµçÄÔ¡£"
 
 #: ../../any.pm_.c:1084
 msgid ""
@@ -1017,13 +1018,13 @@ msgid ""
 "to connect to the Internet as a client."
 msgstr ""
 "±ê×¼°²È«¼¶±ð: \n"
-"ÍƼöÔÚ×÷Ϊ¿Í»§Áª½Ó»¥ÁªÍøµÄµçÄÔÉÏʹÓÃ."
+"ÍƼöÔÚ×÷Ϊ¿Í»§Á¬½Ó»¥ÁªÍøµÄµçÄÔÉÏʹÓá£"
 
 #: ../../any.pm_.c:1085
 msgid ""
 "There are already some restrictions, and more automatic checks are run every "
 "night."
-msgstr "Ìí¼ÓÁËijЩÏÞÖÆ, ÿÌìÒ¹¼ä×Ô¶¯Ö´Ðиü¶à¼ì²é."
+msgstr "Ìí¼ÓÁËijЩÏÞÖÆ, ÿÌìÒ¹¼ä×Ô¶¯Ö´Ðиü¶à¼ì²é¡£"
 
 #: ../../any.pm_.c:1086
 msgid ""
@@ -1034,21 +1035,21 @@ msgid ""
 "connections from many clients. Note: if your machine is only a client on the "
 "Internet, you should choose a lower level."
 msgstr ""
-"ʹÓÃÕâ¸ö°²È«¼¶±ð, ´Ëϵͳ¿ÉÒÔ×÷Ϊ·þÎñÆ÷ʹÓÃ.\n"
-"ÓµÓÐ×ã¹»µÄ°²È«ÐÔ, ϵͳ¿ÉÒÔ×÷Ϊ·þÎñÆ÷½ÓÊÜÀ´×ÔÖÚ¶à¿Í»§µÄÁ¬½Ó.×¢Òâ: Èç¹ûÄúµÄ»úÆ÷"
-"²»ÔÚ»¥ÁªÍøÉÏÌṩ·þÎñ, ÇëÑ¡ÔñÒ»¸ö½ÏµÍ¼¶±ð."
+"ʹÓÃÕâ¸ö°²È«¼¶±ð, ´Ëϵͳ¿ÉÒÔ×÷Ϊ·þÎñÆ÷ʹÓá£\n"
+"ÓµÓÐ×ã¹»µÄ°²È«ÐÔ, ϵͳ¿ÉÒÔ×÷Ϊ·þÎñÆ÷½ÓÊÜÀ´×ÔÖÚ¶à¿Í»§µÄÁ¬½Ó¡£×¢Òâ: Èç¹ûÄúµÄ»ú"
+"Æ÷²»ÔÚ»¥ÁªÍøÉÏÌṩ·þÎñ, ÇëÑ¡ÔñÒ»¸ö½ÏµÍ¼¶±ð¡£"
 
 #: ../../any.pm_.c:1089
 msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"ÀàËÆÓÚÇ°Ò»°²È«¼¶±ð, ²»¹ýϵͳ´¦ÓÚÍêÈ«·â±Õ״̬.\n"
-"ËùÓа²È«ÌØÐÔ´ïµ½×î´óÏÞ¶È."
+"ÀàËÆÓÚÇ°Ò»°²È«¼¶±ð, ²»¹ýϵͳ´¦ÓÚÍêÈ«·â±Õ״̬¡£\n"
+"ËùÓа²È«ÌØÐÔ´ïµ½×î´óÏ޶ȡ£"
 
 #: ../../any.pm_.c:1095
 msgid "DrakSec Basic Options"
-msgstr "DrakSec°²È«ÅäÖþ«Áé »ù±¾Ñ¡Ïî"
+msgstr "DrakSec »ù±¾Ñ¡Ïî"
 
 #: ../../any.pm_.c:1096
 msgid "Please choose the desired security level"
@@ -1065,7 +1066,7 @@ msgstr "·þÎñÆ÷ʹÓà libsafe"
 #: ../../any.pm_.c:1102
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
-msgstr "·ÀÖ¹»º³åÒç³öºÍ´®¸ñʽ¹¥»÷"
+msgstr "·ÀÖ¹»º³åÒç³öºÍ´®¸ñʽ¹¥»÷µÄ¿â¡£"
 
 #: ../../any.pm_.c:1103
 msgid "Security Administrator (login or email)"
@@ -1077,7 +1078,7 @@ msgid ""
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
 msgstr ""
-"ÇëÄúÑ¡ÔñʹÓÃÄǸö°´¼ü»ò°´¼ü×éºÏ \n"
+"ÇëÄúÑ¡ÔñʹÓÃÄĸö°´¼ü»ò°´¼ü×éºÏ \n"
 "À´ÔÚ²»Í¬µÄ¼üÅ̲¼¾ÖÖ®¼äÇл»\n"
 "(ÀýÈç, Ó¢ÎĺÍÖÐÎÄ)"
 
@@ -1147,30 +1148,30 @@ msgstr "¿ªÊ¼²Ëµ¥"
 #: ../../bootloader.pm_.c:1126
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
-msgstr "%s ·ÖÇø²»ÄÜ°²×°¿ª»úÒýµ¼³ÌÐò\n"
+msgstr "%s ·ÖÇø²»ÄÜ°²×°Æô¶¯Òýµ¼³ÌÐò\n"
 
 #: ../../bootlook.pm_.c:46 ../../standalone/drakperm_.c:15
 #: ../../standalone/draksplash_.c:26
 msgid "no help implemented yet.\n"
-msgstr "°ïÖú¹¦ÄÜδʵÏÖ.\n"
+msgstr "°ïÖú¹¦ÄÜδʵÏÖ¡£\n"
 
 #: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
-msgstr "Æô¶¯ÅäÖÃ"
+msgstr "Æô¶¯ÑùʽÅäÖÃ"
 
 #: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:81
-#: ../../standalone/logdrake_.c:101
+#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:82
+#: ../../standalone/logdrake_.c:102
 msgid "/_File"
-msgstr "/_F Îļþ"
+msgstr "/Îļþ(_F)"
 
-#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:82
-#: ../../standalone/logdrake_.c:107
+#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:83
+#: ../../standalone/logdrake_.c:108
 msgid "/File/_Quit"
-msgstr "/F Îļþ/_Q Í˳ö"
+msgstr "/Îļþ/Í˳ö"
 
 #: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:63
-#: ../../standalone/drakfloppy_.c:82 ../../standalone/logdrake_.c:107
+#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:108
 msgid "<control>Q"
 msgstr "<control>Q"
 
@@ -1207,21 +1208,25 @@ msgid "Install themes"
 msgstr "°²×°Ö÷Ìâ"
 
 #: ../../bootlook.pm_.c:147
-msgid "Display theme under console"
-msgstr "¿ØÖÆ̨ÏÂÏÔʾÖ÷Ìâ"
+msgid ""
+"Display theme\n"
+"under console"
+msgstr ""
+"¿ØÖÆ̨ÏÂ\n"
+"ÏÔʾÖ÷Ìâ"
 
 #: ../../bootlook.pm_.c:148
 msgid "Create new theme"
 msgstr "´´½¨ÐµÄÖ÷Ìâ"
 
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:193
 #, c-format
 msgid "Backup %s to %s.old"
 msgstr "°Ñ %s ±¸·Ýµ½ %s.old"
 
-#: ../../bootlook.pm_.c:193 ../../bootlook.pm_.c:196 ../../bootlook.pm_.c:199
-#: ../../bootlook.pm_.c:229 ../../bootlook.pm_.c:231 ../../bootlook.pm_.c:241
-#: ../../bootlook.pm_.c:250 ../../bootlook.pm_.c:257
+#: ../../bootlook.pm_.c:194 ../../bootlook.pm_.c:197 ../../bootlook.pm_.c:200
+#: ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232 ../../bootlook.pm_.c:242
+#: ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
 #: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
 #: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:355
 #: ../../diskdrake/interactive.pm_.c:469 ../../diskdrake/interactive.pm_.c:474
@@ -1232,102 +1237,102 @@ msgstr "°Ñ %s ±¸·Ýµ½ %s.old"
 msgid "Error"
 msgstr "´íÎó"
 
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:194
 msgid "unable to backup lilo message"
 msgstr "ÎÞ·¨±¸·Ý LILO ÏûÏ¢"
 
-#: ../../bootlook.pm_.c:195
+#: ../../bootlook.pm_.c:196
 #, c-format
 msgid "Copy %s to %s"
 msgstr "°Ñ %s ¸´ÖƵ½ %s"
 
-#: ../../bootlook.pm_.c:196
+#: ../../bootlook.pm_.c:197
 msgid "can't change lilo message"
 msgstr "ÎÞ·¨ÐÞ¸Ä LILO ÏûÏ¢"
 
-#: ../../bootlook.pm_.c:199
+#: ../../bootlook.pm_.c:200
 msgid "Lilo message not found"
 msgstr "ûÓÐÕÒµ½ LILO ÏûÏ¢"
 
-#: ../../bootlook.pm_.c:229
+#: ../../bootlook.pm_.c:230
 msgid "Can't write /etc/sysconfig/bootsplash."
-msgstr "ÎÞ·¨Ð´Èë /etc/sysconfig/bootsplash."
+msgstr "ÎÞ·¨Ð´Èë /etc/sysconfig/bootsplash¡£"
 
-#: ../../bootlook.pm_.c:229
+#: ../../bootlook.pm_.c:230
 #, c-format
 msgid "Write %s"
 msgstr "дÈë %s"
 
-#: ../../bootlook.pm_.c:231
+#: ../../bootlook.pm_.c:232
 msgid ""
 "Can't write /etc/sysconfig/bootsplash\n"
 "File not found."
 msgstr ""
-"ÎÞ·¨Ð´Èë /etc/sysconfig/bootsplash.\n"
-"ûÓÐÕÒµ½Îļþ."
+"ÎÞ·¨Ð´Èë /etc/sysconfig/bootsplash¡£\n"
+"ûÓÐÕÒµ½Îļþ¡£"
 
-#: ../../bootlook.pm_.c:242
+#: ../../bootlook.pm_.c:243
 #, c-format
 msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
-msgstr "ÎÞ·¨´ò¿ª mkinitrd -f /boot/initrd-%s.img %s."
+msgstr "ÎÞ·¨´ò¿ª mkinitrd -f /boot/initrd-%s.img %s¡£"
 
-#: ../../bootlook.pm_.c:245
+#: ../../bootlook.pm_.c:246
 #, c-format
 msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
-msgstr "½¨Ôì initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
+msgstr "½¨Ôì initrd 'mkinitrd -f /boot/initrd-%s.img %s'¡£"
 
-#: ../../bootlook.pm_.c:251
+#: ../../bootlook.pm_.c:252
 msgid ""
 "Can't relaunch LiLo!\n"
 "Launch \"lilo\" as root in command line to complete LiLo theme installation."
 msgstr ""
-"ÎÞ·¨ÖØÐÂÆ𶯠LiLo!\n"
-"ÒÔ root Éí·ÖÔËÐÐ \"lilo\" ÃüÁî, ÒÔÍê³É LiLo Ö÷Ìâ°²×°."
+"ÎÞ·¨ÖØÐÂÆô¶¯ LiLo!\n"
+"ÒÔ root Éí·ÖÔËÐС°lilo¡±ÃüÁî, ÒÔÍê³É LiLo Ö÷Ìâ°²×°¡£"
 
-#: ../../bootlook.pm_.c:255
+#: ../../bootlook.pm_.c:256
 msgid "Relaunch 'lilo'"
-msgstr "ÖØÐÂÆ𶯠'liLo'"
+msgstr "ÖØÐÂÆô¶¯¡°lilo¡±"
 
-#: ../../bootlook.pm_.c:257 ../../standalone/draksplash_.c:165
+#: ../../bootlook.pm_.c:258 ../../standalone/draksplash_.c:165
 #: ../../standalone/draksplash_.c:329 ../../standalone/draksplash_.c:456
 msgid "Notice"
 msgstr "×¢Òâ"
 
-#: ../../bootlook.pm_.c:258
+#: ../../bootlook.pm_.c:259
 msgid "LiLo and Bootsplash themes installation successfull"
 msgstr "LiLo ºÍ Bootsplash Ö÷Ìâ°²×°³É¹¦"
 
-#: ../../bootlook.pm_.c:258
+#: ../../bootlook.pm_.c:259
 msgid "Theme installation failed!"
 msgstr "Ö÷Ìⰲװʧ°Ü!"
 
-#: ../../bootlook.pm_.c:266
+#: ../../bootlook.pm_.c:267
 #, c-format
 msgid ""
 "You are currently using %s as your boot manager.\n"
 "Click on Configure to launch the setup wizard."
 msgstr ""
-"ÄãĿǰʹÓà %s ×÷Ϊ¿ª»ú³ÌÐò¹ÜÀíÆ÷.\n"
-"µã»÷ 'ÅäÖÃ' °´Å¥ÔËÐÐÅäÖþ«Áé."
+"ÄãĿǰʹÓà %s ×÷Ϊ¿ª»ú³ÌÐò¹ÜÀíÆ÷¡£\n"
+"µã»÷¡°ÅäÖá±°´Å¥ÔËÐÐÅäÖÃÏòµ¼¡£"
 
-#: ../../bootlook.pm_.c:268 ../../standalone/drakbackup_.c:2429
+#: ../../bootlook.pm_.c:269 ../../standalone/drakbackup_.c:2429
 #: ../../standalone/drakbackup_.c:2439 ../../standalone/drakbackup_.c:2449
-#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:530
+#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:526
 msgid "Configure"
 msgstr "ÅäÖÃ"
 
-#: ../../bootlook.pm_.c:275
+#: ../../bootlook.pm_.c:276
 msgid "Splash selection"
-msgstr "Ñ¡ÔñÆ𶯻­Ãæ"
+msgstr "Ñ¡ÔñÆô¶¯»­Ãæ"
 
-#: ../../bootlook.pm_.c:278
+#: ../../bootlook.pm_.c:279
 msgid "Themes"
 msgstr "Ö÷Ìâ"
 
-#: ../../bootlook.pm_.c:280
+#: ../../bootlook.pm_.c:281
 msgid ""
 "\n"
-"Select a theme for\n"
+"Select theme for\n"
 "lilo and bootsplash,\n"
 "you can choose\n"
 "them separatly"
@@ -1336,31 +1341,31 @@ msgstr ""
 "Ñ¡ÔñÓÃÓÚ lilo ºÍ bootsplash µÄÖ÷Ìâ,\n"
 "Äú¿ÉÒÔ·Ö±ðÑ¡Ôñ"
 
-#: ../../bootlook.pm_.c:283
+#: ../../bootlook.pm_.c:284
 msgid "Lilo screen"
 msgstr "Lilo ÆÁÄ»"
 
-#: ../../bootlook.pm_.c:288
+#: ../../bootlook.pm_.c:289
 msgid "Bootsplash"
 msgstr "Bootsplash ¿ª»ú»­Ãæ"
 
-#: ../../bootlook.pm_.c:323
+#: ../../bootlook.pm_.c:324
 msgid "System mode"
 msgstr "ϵͳģʽ"
 
-#: ../../bootlook.pm_.c:325
+#: ../../bootlook.pm_.c:326
 msgid "Launch the graphical environment when your system starts"
-msgstr "Æô¶¯Ê±ÔËÐÐX´°¿Ú"
+msgstr "ϵͳÆô¶¯Ê±×°ÈëͼÐλ·¾³"
 
-#: ../../bootlook.pm_.c:330
+#: ../../bootlook.pm_.c:331
 msgid "No, I don't want autologin"
-msgstr "²»£¬²»Òª×Ô¶¯Â¼Èë"
+msgstr "²», ²»Òª×Ô¶¯Â¼Èë"
 
-#: ../../bootlook.pm_.c:332
+#: ../../bootlook.pm_.c:333
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "ÊÇ, ÒÔ(Óû§,×ÀÃæ)¼Èë"
 
-#: ../../bootlook.pm_.c:342 ../../network/netconnect.pm_.c:97
+#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:97
 #: ../../standalone/drakTermServ_.c:173 ../../standalone/drakTermServ_.c:300
 #: ../../standalone/drakTermServ_.c:405 ../../standalone/drakbackup_.c:4193
 #: ../../standalone/drakbackup_.c:4956 ../../standalone/drakconnect_.c:108
@@ -1373,46 +1378,46 @@ msgstr "ÊÇ, ÒÔ(Óû§,×ÀÃæ)¼Èë"
 msgid "OK"
 msgstr "È·¶¨"
 
-#: ../../bootlook.pm_.c:402
+#: ../../bootlook.pm_.c:403
 #, c-format
 msgid "can not open /etc/inittab for reading: %s"
 msgstr "ÎÞ·¨´ò¿ª /etc/inittab ¶Á: %s"
 
-#: ../../common.pm_.c:94
+#: ../../common.pm_.c:99
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:94
+#: ../../common.pm_.c:99
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:94
+#: ../../common.pm_.c:99
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:102
+#: ../../common.pm_.c:107
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:110
+#: ../../common.pm_.c:115
 #, c-format
 msgid "%d minutes"
 msgstr "%d ·ÖÖÓ"
 
-#: ../../common.pm_.c:112
+#: ../../common.pm_.c:117
 msgid "1 minute"
 msgstr "1 ·ÖÖÓ"
 
-#: ../../common.pm_.c:114
+#: ../../common.pm_.c:119
 #, c-format
 msgid "%d seconds"
 msgstr " %d ÃëÖÓ"
 
-#: ../../common.pm_.c:159
+#: ../../common.pm_.c:164
 msgid "Can't make screenshots before partitioning"
 msgstr "ÎÞ·¨ÔÚ·ÖÇøÍê³É֮ǰ½øÐÐÆÁÄ»²¶×½"
 
-#: ../../common.pm_.c:166
+#: ../../common.pm_.c:171
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Äú¿ÉÒÔÔÚ°²×°µ½ %s Ö®ºóÔÙʹÓÃÆÁÄ»²¶×½¹¦ÄÜ"
@@ -1477,6 +1482,9 @@ msgid ""
 "configured as a WebDAV server). If you would like to add WebDAV mount\n"
 "points, select \"New\"."
 msgstr ""
+"WebDAV ÊÇÒ»ÖÖЭÒé, ËüÔÊÐíÄ㽫 Web ·þÎñÆ÷µÄĿ¼װÔص½±¾µØ, ²¢½«Æä¿´×÷±¾\n"
+"µØµÄÎļþϵͳ(¼ÙÉè¸Ã Web ·þÎñÆ÷ÒѾ­ÅäÖÃΪ WebDAV ·þÎñÆ÷)¡£Èç¹ûÄãÏëÒªÌí¼Ó\n"
+"WebDAV ÔØÈëµã, ÇëÑ¡Ôñ¡°Ð½¨¡±¡£"
 
 #: ../../diskdrake/dav.pm_.c:27
 msgid "New"
@@ -1509,7 +1517,7 @@ msgstr "ÇëÊäÈë WebDAV ·þÎñÆ÷µÄ URL"
 
 #: ../../diskdrake/dav.pm_.c:88
 msgid "The URL must begin with http:// or https://"
-msgstr "Url Ó¦¸ÃÊÇÒÔ 'http://' »ò 'https://'¿ªÍ·"
+msgstr "Url Ó¦¸ÃÊÇÒÔ http:// »ò https:// ¿ªÍ·"
 
 #: ../../diskdrake/dav.pm_.c:109
 msgid "Server: "
@@ -1519,7 +1527,7 @@ msgstr "·þÎñÆ÷:"
 #: ../../diskdrake/interactive.pm_.c:1089
 #: ../../diskdrake/interactive.pm_.c:1164
 msgid "Mount point: "
-msgstr "¼ÓÔصã:"
+msgstr "×°Ôصã:"
 
 #: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1170
 #, c-format
@@ -1560,10 +1568,10 @@ msgid ""
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
 msgstr ""
-"ÄúÓÐÒ»¸öºÜ´óµÄ FAT ·ÖÇø£¬\n"
-"(ͨ³£ÊÇ Microsoft Dos/Windows Õ¼ÓõÄ).\n"
+"ÄúÓÐÒ»¸öºÜ´óµÄ FAT ·ÖÇø, \n"
+"(ͨ³£ÊÇ Microsoft Dos/Windows Õ¼ÓõÄ)¡£\n"
 "½¨ÒéÄúÏÈÖØÉèÕâ¸ö·ÖÇøµÄ´óС\n"
-"(µãÖÐËü£¬È»ºó°´ \"¸Ä±ä´óС\")"
+"(µãÖÐËü, È»ºó°´ \"¸Ä±ä´óС\")"
 
 #: ../../diskdrake/hd_gtk.pm_.c:191
 msgid "Please click on a partition"
@@ -1576,7 +1584,7 @@ msgstr "ÏêϸÇé¿ö"
 
 #: ../../diskdrake/hd_gtk.pm_.c:252
 msgid "No hard drives found"
-msgstr "ûÓз¢ÏÖ´òÓ¡»ú"
+msgstr "ûÓз¢ÏÖÓ²ÅÌ"
 
 #: ../../diskdrake/hd_gtk.pm_.c:323
 msgid "Ext2"
@@ -1592,7 +1600,7 @@ msgstr "HFS"
 
 #: ../../diskdrake/hd_gtk.pm_.c:323
 msgid "Journalised FS"
-msgstr "ÈÕÖ¾Îļþϵͳ"
+msgstr "Journalised FS"
 
 #: ../../diskdrake/hd_gtk.pm_.c:323
 msgid "SunOS"
@@ -1600,7 +1608,7 @@ msgstr "SunOS"
 
 #: ../../diskdrake/hd_gtk.pm_.c:323
 msgid "Swap"
-msgstr "½»»»·ÖÇø"
+msgstr "Swap"
 
 #: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1105
 msgid "Empty"
@@ -1610,7 +1618,7 @@ msgstr "¿Õ"
 #: ../../install_steps_gtk.pm_.c:383 ../../mouse.pm_.c:165
 #: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:1756
 msgid "Other"
-msgstr "ÆäËû"
+msgstr "ÆäËü"
 
 #: ../../diskdrake/hd_gtk.pm_.c:328
 msgid "Filesystem types:"
@@ -1629,7 +1637,7 @@ msgstr "ÀàÐÍ"
 #: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/hd_gtk.pm_.c:347
 #, c-format
 msgid "Use ``%s'' instead"
-msgstr "ÓÃ ``%s'' ´úÌæ"
+msgstr "Óá°%s¡±´úÌæ"
 
 #: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:389
 msgid "Delete"
@@ -1637,7 +1645,7 @@ msgstr "ɾ³ý"
 
 #: ../../diskdrake/hd_gtk.pm_.c:351
 msgid "Use ``Unmount'' first"
-msgstr "ÇëÏÈ×ö ``Unmount'' "
+msgstr "ÇëÏÈ¡°Unmount¡±"
 
 #: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:518
 #, c-format
@@ -1651,7 +1659,7 @@ msgstr "Ñ¡Ôñ·ÖÇø"
 
 #: ../../diskdrake/interactive.pm_.c:174
 msgid "Choose another partition"
-msgstr "Ñ¡ÔñÆäËû·ÖÇø"
+msgstr "Ñ¡ÔñÆäËü·ÖÇø"
 
 #: ../../diskdrake/interactive.pm_.c:199
 msgid "Exit"
@@ -1683,7 +1691,7 @@ msgstr "²»Ð´Èë·ÖÇø±í¶øÍ˳ö?"
 
 #: ../../diskdrake/interactive.pm_.c:250
 msgid "Do you want to save /etc/fstab modifications"
-msgstr "ÄúÏëÒª±£´æ /etc/fstab ÐÞ¸ÄÂð ?"
+msgstr "ÄúÏëÒª±£´æ /etc/fstab ÐÞ¸ÄÂð?"
 
 #: ../../diskdrake/interactive.pm_.c:263
 msgid "Auto allocate"
@@ -1714,7 +1722,7 @@ msgstr "ÎÒÎÞ·¨ÔÙÐÂÔöÈκηÖÇøÁË"
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
-msgstr "Èç¹ûÐèÒª¸ü¶àµÄ·ÖÇø£¬Çëɾ³ýÒ»¸öÖ÷·ÖÇøÒÔ´´½¨À©Õ¹·ÖÇø"
+msgstr "Èç¹ûÐèÒª¸ü¶àµÄ·ÖÇø, Çëɾ³ýÒ»¸öÖ÷·ÖÇøÒÔ´´½¨À©Õ¹·ÖÇø"
 
 #: ../../diskdrake/interactive.pm_.c:310
 msgid "Save partition table"
@@ -1746,7 +1754,7 @@ msgid ""
 "Still continue?"
 msgstr ""
 "±¸·Ý·ÖÇø±íµÄ´óСºÍÔ­À´µÄ²»Í¬\n"
-"¼ÌÐøÂð ?"
+"¼ÌÐøÂð?"
 
 #: ../../diskdrake/interactive.pm_.c:349 ../../harddrake/sound.pm_.c:200
 msgid "Warning"
@@ -1782,23 +1790,23 @@ msgstr "¸ñʽ»¯"
 
 #: ../../diskdrake/interactive.pm_.c:386
 msgid "Add to RAID"
-msgstr "¼ÓÈë´ÅÅÌÕóÁÐ"
+msgstr "¼ÓÈë RAID"
 
 #: ../../diskdrake/interactive.pm_.c:387
 msgid "Add to LVM"
-msgstr "¼ÓÈë´ÅÅÌÕóÁÐ"
+msgstr "¼ÓÈë LVM"
 
 #: ../../diskdrake/interactive.pm_.c:390
 msgid "Remove from RAID"
-msgstr "´Ó´ÅÅÌÕóÁÐÖÐÒƳö"
+msgstr "´Ó RAID ÖÐÒƳö"
 
 #: ../../diskdrake/interactive.pm_.c:391
 msgid "Remove from LVM"
-msgstr "´Ó´ÅÅÌÕóÁÐÖÐÒƳö"
+msgstr "´Ó LVM ÖÐÒƳö"
 
 #: ../../diskdrake/interactive.pm_.c:392
 msgid "Modify RAID"
-msgstr "¸ü¸Ä´ÅÅÌÕóÁÐÉ趨"
+msgstr "ÐÞ¸Ä RAID"
 
 #: ../../diskdrake/interactive.pm_.c:393
 msgid "Use for loopback"
@@ -1806,7 +1814,7 @@ msgstr "ÓÃÓڻػ·"
 
 #: ../../diskdrake/interactive.pm_.c:433
 msgid "Create a new partition"
-msgstr "´´½¨Ò»¸öеķÖÇø"
+msgstr "´´½¨Ò»¸öзÖÇø"
 
 #: ../../diskdrake/interactive.pm_.c:436
 msgid "Start sector: "
@@ -1814,7 +1822,7 @@ msgstr "¿ªÊ¼ÉÈÇø: "
 
 #: ../../diskdrake/interactive.pm_.c:438 ../../diskdrake/interactive.pm_.c:815
 msgid "Size in MB: "
-msgstr "´óС (MB) "
+msgstr "´óС(MB): "
 
 #: ../../diskdrake/interactive.pm_.c:439 ../../diskdrake/interactive.pm_.c:816
 msgid "Filesystem type: "
@@ -1822,7 +1830,7 @@ msgstr "ÎļþϵͳÀàÐÍ: "
 
 #: ../../diskdrake/interactive.pm_.c:444
 msgid "Preference: "
-msgstr "Æ«ºÃÉ趨"
+msgstr "Ê×Ñ¡Ïî: "
 
 #: ../../diskdrake/interactive.pm_.c:469
 msgid ""
@@ -1831,8 +1839,8 @@ msgid ""
 "First remove a primary partition and create an extended partition."
 msgstr ""
 "ÄúÎÞ·¨´´½¨Ð·ÖÇø\n"
-"(Äú³¬¹ýÁËÔÊÐíµÄÖ÷·ÖÇøÊýÁ¿).\n"
-"ÇëÏÈɾ³ýÒ»¸öÖ÷·ÖÇø, È»ºó´´½¨Ò»¸öÀ©Õ¹·ÖÇø."
+"(Äú³¬¹ýÁËÔÊÐíµÄÖ÷·ÖÇøÊýÁ¿)¡£\n"
+"ÇëÏÈɾ³ýÒ»¸öÖ÷·ÖÇø, È»ºó´´½¨Ò»¸öÀ©Õ¹·ÖÇø¡£"
 
 #: ../../diskdrake/interactive.pm_.c:499
 msgid "Remove the loopback file?"
@@ -1865,7 +1873,7 @@ msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"ÎÞ·¨È¡ÏûÉ趨µÄ×°Ôصã, Õâ¸ö·ÖÇøÕýÓÃÓڻػ·.\n"
+"ÎÞ·¨È¡ÏûÉ趨µÄ×°Ôصã, Õâ¸ö·ÖÇøÕýÓÃÓڻػ·¡£\n"
 "ÇëÏÈɾ³ý»Ø»·"
 
 #: ../../diskdrake/interactive.pm_.c:594
@@ -1905,7 +1913,7 @@ msgstr "дóС (MB): "
 
 #: ../../diskdrake/interactive.pm_.c:716
 msgid "Which disk do you want to move it to?"
-msgstr "ÄúÏëÒƶ¯µ½ÄĸöÅÌ ?"
+msgstr "ÄúÏëÒƶ¯µ½ÄĸöÅÌ?"
 
 #: ../../diskdrake/interactive.pm_.c:717
 msgid "Sector"
@@ -1913,7 +1921,7 @@ msgstr "ÉÈÇø"
 
 #: ../../diskdrake/interactive.pm_.c:718
 msgid "Which sector do you want to move it to?"
-msgstr "ÄúÏëÒƶ¯µ½ÄĸöÉÈÇø ?"
+msgstr "ÄúÏëÒƶ¯µ½ÄĸöÉÈÇø?"
 
 #: ../../diskdrake/interactive.pm_.c:721
 msgid "Moving"
@@ -1937,7 +1945,7 @@ msgstr "Ñ¡Ôñ¼ÓÈëÒ»¸öÒÑ´æÔÚµÄ LVM"
 
 #: ../../diskdrake/interactive.pm_.c:759
 msgid "LVM name?"
-msgstr "LVMÃû³Æ?"
+msgstr "LVM Ãû³Æ?"
 
 #: ../../diskdrake/interactive.pm_.c:800
 msgid "This partition can't be used for loopback"
@@ -1957,11 +1965,11 @@ msgstr "ÎļþÃû"
 
 #: ../../diskdrake/interactive.pm_.c:822
 msgid "File already used by another loopback, choose another one"
-msgstr "ÎļþÒѾ­±»ÁíÒ»¸ö»Ø»·Ê¹ÓÃ, ÇëÑ¡ÔñÆäËû"
+msgstr "ÎļþÒѾ­±»ÁíÒ»¸ö»Ø»·Ê¹ÓÃ, ÇëÑ¡ÔñÆäËü"
 
 #: ../../diskdrake/interactive.pm_.c:823
 msgid "File already exists. Use it?"
-msgstr "ÎļþÒѾ­´æÔÚ. ʹÓÃÏÖÓеÄÎļþ?"
+msgstr "ÎļþÒѾ­´æÔÚ¡£Ê¹ÓÃÏÖÓеÄÎļþ?"
 
 #: ../../diskdrake/interactive.pm_.c:846
 msgid "Mount options"
@@ -1971,7 +1979,7 @@ msgstr "×°ÔØÑ¡Ïî"
 msgid "Various"
 msgstr "±äÁ¿"
 
-#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:103
+#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:104
 msgid "device"
 msgstr "É豸"
 
@@ -1985,7 +1993,7 @@ msgstr "×é¿é´óС"
 
 #: ../../diskdrake/interactive.pm_.c:934
 msgid "Be careful: this operation is dangerous."
-msgstr "СÐÄ: Õâ¸ö²Ù×÷ÓÐΣÏÕ."
+msgstr "СÐÄ: Õâ¸ö²Ù×÷ÓÐΣÏÕ¡£"
 
 #: ../../diskdrake/interactive.pm_.c:949
 msgid "What type of partitioning?"
@@ -1994,7 +2002,7 @@ msgstr "ÇëÎÊÄú·ÖÇøÀàÐÍ?"
 #: ../../diskdrake/interactive.pm_.c:965
 #, c-format
 msgid "The package %s is needed. Install it?"
-msgstr "ÐèÒª°²×°Èí¼þ°ü %s . ÄúͬÒâ°²×°Âð?"
+msgstr "ÐèÒª°²×°Èí¼þ°ü %s¡£ÄúͬÒâ°²×°Âð?"
 
 #: ../../diskdrake/interactive.pm_.c:979
 msgid ""
@@ -2003,7 +2011,7 @@ msgid ""
 "Either you use LILO and it won't work, or you don't use LILO and you don't "
 "need /boot"
 msgstr ""
-"Çë²»ÒªÔÚÓ²Å̵ÄÖùÃæ 1024 Ö®ºó´´½¨ /boot ·ÖÇø.\n"
+"Çë²»ÒªÔÚÓ²Å̵ÄÖùÃæ 1024 Ö®ºó´´½¨ /boot ·ÖÇø¡£\n"
 "Èç¹ûÄúʹÓà LILO, Ëüû·¨Õý³£¹¤×÷; ¼ÙÈçÄú²»Ê¹Óà LILO, \n"
 "Ôò²»ÐèÒª´´½¨ /boot ·ÖÇø"
 
@@ -2015,8 +2023,8 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 "ÄúÑ¡Ôñ×÷Ϊ¸ù (/) ¼ÓÈëµÄ·ÖÇø, ÔÚÓ²ÅÌÉϵÄλÖÃλÓÚµÚ 1024 ÖùÃæÖ®ºó,\n"
-"²¢ÇÒÄúûÓд´½¨ /boot ·ÖÇø.\n"
-"Èç¹ûÄú¼Æ»®Ê¹Óà LILO Æô¶¯¹ÜÀí³ÌÐò, ÇëÔÚÊʵ±Î»ÖüÓÈë /boot ·ÖÇø."
+"²¢ÇÒÄúûÓд´½¨ /boot ·ÖÇø/\n"
+"Èç¹ûÄú¼Æ»®Ê¹Óà LILO Æô¶¯¹ÜÀí³ÌÐò, ÇëÔÚÊʵ±Î»ÖüÓÈë /boot ·ÖÇø¡£"
 
 #: ../../diskdrake/interactive.pm_.c:989
 msgid ""
@@ -2024,14 +2032,14 @@ msgid ""
 "No bootloader is able to handle this without a /boot partition.\n"
 "So be careful to add a /boot partition"
 msgstr ""
-"ÄúÑ¡ÔñÁË°ÑÈí¼þ RAID ·ÖÇø×÷Ϊ¸ù (/).\n"
-"Èç¹ûûÓÐ /boot ·ÖÇø, ¿ª»úÒýµ¼³ÌÐòÎÞ·¨´¦ÀíÕâÖÖÇé¿ö.\n"
-"ËùÒÔ, ÇëÔö¼ÓÒ»¸ö /boot ·ÖÇø."
+"ÄúÑ¡ÔñÁË°ÑÈí¼þ RAID ·ÖÇø×÷Ϊ¸ù (/)¡£\n"
+"Èç¹ûûÓÐ /boot ·ÖÇø, Æô¶¯Òýµ¼³ÌÐòÎÞ·¨´¦ÀíÕâÖÖÇé¿ö¡£\n"
+"ËùÒÔ, ÇëÔö¼ÓÒ»¸ö /boot ·ÖÇø¡£"
 
 #: ../../diskdrake/interactive.pm_.c:1009
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Çý¶¯Æ÷ %s µÄ·ÖÇø±í½«»áдÈë´ÅÅÌÖÐ !"
+msgstr "Çý¶¯Æ÷ %s µÄ·ÖÇø±í½«»áдÈë´ÅÅÌÖÐ!"
 
 #: ../../diskdrake/interactive.pm_.c:1013
 msgid "You'll need to reboot before the modification can take place"
@@ -2081,12 +2089,12 @@ msgstr "ÕýÔÚÒƶ¯Îļþµ½Ð·ÖÇø"
 #: ../../diskdrake/interactive.pm_.c:1055
 #, c-format
 msgid "Copying %s"
-msgstr "¿½±´ %s"
+msgstr "ÕýÔÚ¸´ÖÆ %s"
 
 #: ../../diskdrake/interactive.pm_.c:1059
 #, c-format
 msgid "Removing %s"
-msgstr "ɾ³ý %s"
+msgstr "ÕýÔÚɾ³ý %s"
 
 #: ../../diskdrake/interactive.pm_.c:1069
 #, c-format
@@ -2126,12 +2134,12 @@ msgstr "´óС: %s"
 #: ../../diskdrake/interactive.pm_.c:1110
 #, c-format
 msgid ", %s sectors"
-msgstr ", µÚ %s ÉÈÇø"
+msgstr ", %s ÉÈÇø"
 
 #: ../../diskdrake/interactive.pm_.c:1112
 #, c-format
 msgid "Cylinder %d to %d\n"
-msgstr " ÖùÃæ %d µ½ %d\n"
+msgstr "ÖùÃæ %d µ½ %d\n"
 
 #: ../../diskdrake/interactive.pm_.c:1113
 msgid "Formatted\n"
@@ -2148,7 +2156,7 @@ msgstr "ÒÑ×°ÔØ\n"
 #: ../../diskdrake/interactive.pm_.c:1116
 #, c-format
 msgid "RAID md%s\n"
-msgstr "´ÅÅÌÕóÁÐ (RAID) md%s\n"
+msgstr "RAID md%s\n"
 
 #: ../../diskdrake/interactive.pm_.c:1118
 #, c-format
@@ -2164,8 +2172,8 @@ msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"Ô¤ÉèµÄ¿ª»ú·ÖÇø\n"
-"    (¸ø MS-DOS ¿ª»ú³ÌÐòÓõÄ, ¸ú lilo ÎÞ¹Ø)\n"
+"Ô¤ÉèµÄÆô¶¯·ÖÇø\n"
+"    (¸ø MS-DOS Æô¶¯ÓõÄ, ¸ú lilo ÎÞ¹Ø)\n"
 
 #: ../../diskdrake/interactive.pm_.c:1121
 #, c-format
@@ -2195,8 +2203,8 @@ msgid ""
 "probably leave it alone.\n"
 msgstr ""
 "\n"
-"±¾·ÖÇøÊÇÇý¶¯·ÖÇø\n"
-"Çë²»Òª¸ü¸Ä.\n"
+"±¾·ÖÇøºÜÓпÉÄÜÊÇÇý¶¯·ÖÇø,\n"
+"Çë²»Òª¸ü¸Ä¡£\n"
 
 #: ../../diskdrake/interactive.pm_.c:1131
 msgid ""
@@ -2206,8 +2214,8 @@ msgid ""
 "dual-booting your system.\n"
 msgstr ""
 "\n"
-"¸ÃÆô¶¯·ÖÇøÌرð\n"
-"ÊDZ£Áô¸øË«ÖØÆô¶¯ÏµÍ³\n"
+"¸Ã Bootstrap ·ÖÇøÌرð\n"
+"ÊDZ£Áô¸øË«ÖØÆô¶¯ÏµÍ³¡£\n"
 
 #: ../../diskdrake/interactive.pm_.c:1150
 msgid "Read-only"
@@ -2244,28 +2252,28 @@ msgstr "ͨµÀ %d id %d\n"
 
 #: ../../diskdrake/interactive.pm_.c:1186
 msgid "Filesystem encryption key"
-msgstr "Îļþϵͳ¿ÚÁî"
+msgstr "Îļþϵͳ¼ÓÃÜÃÜÔ¿"
 
 #: ../../diskdrake/interactive.pm_.c:1187
 msgid "Choose your filesystem encryption key"
-msgstr "ÇëÑ¡Ôñ¸ÃÎļþϵͳµÄ¿ÚÁî"
+msgstr "ÇëÑ¡Ôñ¸ÃÎļþϵͳµÄ¼ÓÃÜÃÜÔ¿"
 
 #: ../../diskdrake/interactive.pm_.c:1190
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
-msgstr "Õâ¸ö¿ÚÁîÌ«¼òµ¥ÁË (ÖÁÉÙÒªÓÐ %d ¸ö×Ö·û)"
+msgstr "Õâ¸ö¼ÓÃÜÃÜÔ¿Ì«¼òµ¥ÁË (ÖÁÉÙÒªÓÐ %d ¸ö×Ö·û)"
 
 #: ../../diskdrake/interactive.pm_.c:1191
 msgid "The encryption keys do not match"
-msgstr "Á½´Î¿ÚÁî²»·û"
+msgstr "Á½´Î¼ÓÃÜÃÜÔ¿²»·û"
 
 #: ../../diskdrake/interactive.pm_.c:1194
 msgid "Encryption key"
-msgstr "¿ÚÁî"
+msgstr "¼ÓÃÜÃÜÔ¿"
 
 #: ../../diskdrake/interactive.pm_.c:1195
 msgid "Encryption key (again)"
-msgstr "¿ÚÁî (ÔÙÒ»´Î)"
+msgstr "¼ÓÃÜÃÜÔ¿ (ÔÙÒ»´Î)"
 
 #: ../../diskdrake/removable.pm_.c:47
 msgid "Change type"
@@ -2369,7 +2377,7 @@ msgstr "Äú²»ÄÜ°Ñ ReiserFS ÓÃÓÚСÓÚ 32 MB µÄ·ÖÇø"
 
 #: ../../fsedit.pm_.c:521
 msgid "Mount points must begin with a leading /"
-msgstr "ÔØÈëµã±ØÐèÒªÒÔ / Ϊ¿ªÍ·"
+msgstr "×°Ôصã±ØÐèÒªÒÔ / Ϊ¿ªÍ·"
 
 #: ../../fsedit.pm_.c:522
 #, c-format
@@ -2379,7 +2387,7 @@ msgstr "ÒѾ­ÓÐÒ»¸ö·ÖÇøµÄ×°ÔصãÊÇ %s\n"
 #: ../../fsedit.pm_.c:526
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr "²»ÄÜÓÃLVMÂß¼­¾í×ö %s ÔØÈëµã"
+msgstr "²»ÄÜÓÃLVMÂß¼­¾í×ö %s ×°Ôصã"
 
 #: ../../fsedit.pm_.c:528
 msgid "This directory should remain within the root filesystem"
@@ -2414,11 +2422,11 @@ msgid "No alternative driver"
 msgstr "ûÓÐÌæ´úµÄÇý¶¯³ÌÐò"
 
 #: ../../harddrake/sound.pm_.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
-msgstr "ûÓÐÒÑÖªµÄ OSS/ALSA Ìæ´úÇý¶¯³ÌÐò¿ÉÒÔÓÃÔÚÄúµÄÉù¿¨ (%s) ÉÏ"
+msgstr "ûÓÐÒÑÖªµÄ OSS/ALSA Ìæ´úÇý¶¯³ÌÐò¿ÉÒÔÓÃÔÚÄúµÄÉù¿¨ (%s) ÉÏ, ÏÖÕýʹÓá°%s¡±"
 
 #: ../../harddrake/sound.pm_.c:171
 msgid "Sound configuration"
@@ -2430,7 +2438,8 @@ msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr ""
-"Äú¿ÉÒÔÔÚÕâÀïÅäÖÿÉÒÔÓÃÔÚÄúµÄÉù¿¨ (%s) ÉϵÄÌæ´úÇý¶¯³ÌÐò (¿ÉÒÔÑ¡ÔñOSS »ò ALSA)"
+"Äú¿ÉÒÔÔÚÕâÀïÅäÖÿÉÒÔÓÃÔÚÄúµÄÉù¿¨ (%s) ÉϵÄÌæ´úÇý¶¯³ÌÐò (¿ÉÒÔÑ¡ÔñOSS »ò "
+"ALSA)¡£"
 
 #: ../../harddrake/sound.pm_.c:174
 #, c-format
@@ -2440,6 +2449,9 @@ msgid ""
 "Your card currently use the %s\"%s\" driver (default driver for your card is "
 "\"%s\")"
 msgstr ""
+"\n"
+"\n"
+"ÄãµÄÉù¿¨ÏÖÔÚÕýÔÚʹÓÃ%s¡°%s¡±Çý¶¯³ÌÐò(ÆäĬÈÏÇý¶¯³ÌÐòΪ¡°%s¡±)"
 
 #: ../../harddrake/sound.pm_.c:176
 msgid "Driver:"
@@ -2457,7 +2469,7 @@ msgstr "°ïÖú"
 
 #: ../../harddrake/sound.pm_.c:183
 msgid "Switching between ALSA and OSS help"
-msgstr ""
+msgstr "ÔÚ ALSA ºÍ OSS °ïÖú¼äÇл»"
 
 #: ../../harddrake/sound.pm_.c:184
 msgid ""
@@ -2487,10 +2499,15 @@ msgid ""
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
+"¾ÉµÄ¡°%s¡±Çý¶¯³ÌÐòÒÑÁÐÓÚºÚÃûµ¥¡£\n"
+"\n"
+"¾Ý±¨¸æ¸Ã³ÌÐò¿ÉÄÜÔÚжװʱʹÄں˱ÀÀ£¡£\n"
+"\n"
+"еġ°%s¡±Çý¶¯³ÌÐò½ö»áÔÚÏ´ËÆô¶¯Ê±Ê¹Óá£"
 
 #: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301
 msgid "Please Wait... Applying the configuration"
-msgstr "ÇëµÈ´ý...É趨ÅäÖÃ"
+msgstr "ÇëµÈ´ý...Ó¦ÓÃÅäÖÃ"
 
 #: ../../harddrake/sound.pm_.c:203 ../../harddrake/ui.pm_.c:111
 #: ../../interactive.pm_.c:391
@@ -2548,7 +2565,7 @@ msgstr "×ÜÏß"
 #: ../../harddrake/ui.pm_.c:20
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr "É豸Ëù²åÔÚµÄÎïÀí×ÜÏß (ÀýÈç:  PCI, USB, ...)"
+msgstr "É豸Ëù²åÔÚµÄÎïÀí×ÜÏß (ÀýÈç: PCI, USB, ...)"
 
 #: ../../harddrake/ui.pm_.c:21
 msgid "Module"
@@ -2566,7 +2583,7 @@ msgstr "½éÖÊ·ÖÀà"
 msgid "class of hardware device"
 msgstr "Ó²¼þÉ豸µÄ·ÖÀà"
 
-#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1517
+#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1562
 msgid "Description"
 msgstr "ÃèÊö"
 
@@ -2583,7 +2600,7 @@ msgid ""
 "- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
 "PCI/USB ids"
 msgstr ""
-"- PCI ºÍ USB É豸 :Áгö PCI/USB µÄ vendor, device, subvendor ºÍ subdevice ´ú"
+"- PCI ºÍ USB É豸: Áгö PCI/USB µÄ vendor, device, subvendor ºÍ subdevice ´ú"
 "Âë"
 
 #: ../../harddrake/ui.pm_.c:28
@@ -2634,17 +2651,17 @@ msgstr "Õâ¸öÉù¿¨µÄÌæ´úÇý¶¯³ÌÐòÁбí"
 
 #: ../../harddrake/ui.pm_.c:63
 msgid "/_Quit"
-msgstr "_Q ½áÊø"
+msgstr "/½áÊø(_Q)"
 
 #: ../../harddrake/ui.pm_.c:64 ../../harddrake/ui.pm_.c:65
 #: ../../harddrake/ui.pm_.c:71 ../../harddrake/ui.pm_.c:73
-#: ../../standalone/logdrake_.c:110
+#: ../../standalone/logdrake_.c:111
 msgid "/_Help"
-msgstr "/_H °ïÖú"
+msgstr "/°ïÖú(_H)"
 
 #: ../../harddrake/ui.pm_.c:65
 msgid "/_Help..."
-msgstr "/_H °ïÖú..."
+msgstr "/°ïÖú(_H)..."
 
 #: ../../harddrake/ui.pm_.c:66
 msgid "Harddrake help"
@@ -2664,23 +2681,23 @@ msgstr "/¹ÊÕϱ¨¸æ(_R)"
 
 #: ../../harddrake/ui.pm_.c:73
 msgid "/_About..."
-msgstr "/_A ¹ØÓÚ..."
+msgstr "/¹ØÓÚ(_A)..."
 
 #: ../../harddrake/ui.pm_.c:74
 msgid "About Harddrake"
-msgstr "¹ØÓÚ HarddrakeħÁ¦Ó²¼þÅäÖÃ"
+msgstr "¹ØÓÚ Harddrake"
 
 #: ../../harddrake/ui.pm_.c:75
 msgid ""
 "This is HardDrake, a Mandrake hardware configuration tool.\n"
 "Version:"
 msgstr ""
-"ÕâÊÇ HarddrakeħÁ¦Ó²¼þÅäÖÃ, Mandrake µÄÓ²¼þÅäÖù¤¾ß.\n"
-"°æ±¾ :"
+"ÕâÊÇ Harddrake, Mandrake µÄÓ²¼þÅäÖù¤¾ß¡£\n"
+"°æ±¾:"
 
 #: ../../harddrake/ui.pm_.c:76
 msgid "Author:"
-msgstr "×÷Õß :"
+msgstr "×÷Õß:"
 
 #: ../../harddrake/ui.pm_.c:86
 msgid "Harddrake2 version "
@@ -2708,12 +2725,12 @@ msgstr "¼ì²â½øÐÐÖÐ"
 
 #: ../../harddrake/ui.pm_.c:148
 msgid "You can configure each parameter of the module here."
-msgstr "Äú¿ÉÒÔÅäÖÃÄ£¿éµÄ¸÷¸ö²ÎÊý"
+msgstr "Äú¿ÉÒÔÅäÖÃÄ£¿éµÄ¸÷¸ö²ÎÊý¡£"
 
 #: ../../harddrake/ui.pm_.c:166
 #, c-format
 msgid "Running \"%s\" ..."
-msgstr "ÕýÔÚÔËÐÐ \"%s\" ..."
+msgstr "ÕýÔÚÔËÐС°%s¡±..."
 
 #: ../../harddrake/ui.pm_.c:180
 #, c-format
@@ -2751,66 +2768,73 @@ msgid ""
 "If your card is misdetected, you can force the right tuner and card types "
 "here. Just select your tv card parameters if needed"
 msgstr ""
-"¶ÔÓÚ´ó¶àÊýÏÖ´úµÄµçÊÓ¿¨, GNU/Linux ÄÚºËµÄ bttv Ä£¿éÄÜ×Ô¶¯¼ì²âÕýÈ·µÄ²ÎÊý.\n"
-"Èç¹û×Ô¶¯¼ì²â²»ÊʺÏÄúµÄ¿¨, Äú¿ÉÒÔÔÚÕâÀïÇ¿ÖÆÉ趨ÕýÈ·µÄµ÷ЭÆ÷¼°¿¨µÄÀàÐÍ.Ö»ÓбØÒª"
-"ʱ²ÅÉèÖõçÊÓ¿¨²ÎÊý"
+"¶ÔÓÚ´ó¶àÊýÏÖ´úµÄµçÊÓ¿¨, GNU/Linux ÄÚºËµÄ bttv Ä£¿éÄÜ×Ô¶¯¼ì²âÕýÈ·µÄ²ÎÊý¡£\n"
+"Èç¹û×Ô¶¯¼ì²â²»ÊʺÏÄúµÄ¿¨, Äú¿ÉÒÔÔÚÕâÀïÇ¿ÖÆÉ趨ÕýÈ·µÄµ÷ЭÆ÷¼°¿¨µÄÀàÐÍ¡£Ö»ÓбØ"
+"Ҫʱ²ÅÉèÖõçÊÓ¿¨²ÎÊý"
 
 #: ../../harddrake/v4l.pm_.c:213
 msgid "Card model:"
-msgstr "¿¨µÄÐͺŠ:"
+msgstr "¿¨µÄÐͺÅ:"
 
 #: ../../harddrake/v4l.pm_.c:214
 msgid "Tuner type:"
-msgstr "µ÷ЭÆ÷ÀàÐÍ :"
+msgstr "µ÷ЭÆ÷ÀàÐÍ:"
 
 #: ../../harddrake/v4l.pm_.c:215
 msgid "Number of capture buffers:"
-msgstr "²¶»ñ»º³åÇøÊýÁ¿ :"
+msgstr "²¶»ñ»º³åÇøÊýÁ¿:"
 
 #: ../../harddrake/v4l.pm_.c:215
 msgid "number of capture buffers for mmap'ed capture"
-msgstr "ÓÃÓÚmmap²¶»ñµÄ»º³åÇøÊýÁ¿ :"
+msgstr "ÓÃÓÚmmap²¶»ñµÄ»º³åÇøÊýÁ¿:"
 
 #: ../../harddrake/v4l.pm_.c:217
 msgid "PLL setting:"
-msgstr "PLL ÉèÖÃ :"
+msgstr "PLL ÉèÖÃ:"
 
 #: ../../harddrake/v4l.pm_.c:218
 msgid "Radio support:"
-msgstr "ÎÞÏßµçÖ§³Ö :"
+msgstr "ÎÞÏßµçÖ§³Ö:"
 
 #: ../../harddrake/v4l.pm_.c:218
 msgid "enable radio support"
-msgstr "ʹÓÃÎÞÏßµçÖ§³Ö :"
+msgstr "ʹÓÃÎÞÏßµçÖ§³Ö:"
 
 #: ../../help.pm_.c:13
 msgid ""
 "GNU/Linux is a multiuser system, and this means that each user can have his\n"
 "own preferences, his own files and so on. You can read the ``User Guide''\n"
-"to learn more. But unlike \"root\", which is the administrator, the users\n"
-"you add here will not be entitled to change anything except their own files\n"
-"and their own configuration. You will have to create at least one regular\n"
-"user for yourself. That account is where you should log in for routine use.\n"
-"Although it is very practical to log in as \"root\" everyday, it may also\n"
-"be very dangerous! The slightest mistake could mean that your system would\n"
-"not work any more. If you make a serious mistake as a regular user, you may\n"
-"only lose some information, but not the entire system.\n"
-"\n"
-"First, you have to enter your real name. This is not mandatory, of course -\n"
-"as you can actually enter whatever you want. DrakX will then take the first\n"
-"word you have entered in the box and will bring it over to the \"User\n"
+"to learn more this concept. But unlike \"root\", which is the\n"
+"administrator, the users you add here will not be entitled to change\n"
+"anything except their own files and their own configurations. You will have\n"
+"to create at least one regular user for yourself. That account is where you\n"
+"should log in for routine use. Although it is very practical to log in as\n"
+"\"root\" everyday, it may also be very dangerous! The slightest mistake\n"
+"could mean that your system would not work any more. If you make a serious\n"
+"mistake as a regular user, you may only lose some information, but not the\n"
+"entire system.\n"
+"\n"
+"First, you have to enter your real name. This is not mandatory, of course\n"
+"-- as you can actually enter whatever you want. DrakX will then take the\n"
+"first word you have entered in the box and will bring it over to the \"User\n"
 "name\". This is the name this particular user will use to log onto the\n"
 "system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as the \"root\"'\n"
+"non-privileged (regular) user's password is not as crucial as the \"root\"\n"
 "one from a security point of view, but that is no reason to neglect it:\n"
 "after all, your files are at risk.\n"
 "\n"
 "If you click on \"Accept user\", you can then add as many as you want. Add\n"
-"a user for each one of your friends: your father or your sister, for\n"
-"example. When you finish adding all the users you want, select \"Done\".\n"
+"a user for each one of the people meant to use that computer. When you are\n"
+"finish adding all the users you want, select \"Done\".\n"
 "\n"
 "Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default)."
+"for that user (bash by default).\n"
+"\n"
+"When you are finished adding all users, you will be proposed to choose a\n"
+"user which can automatically log into the system when the computer boots\n"
+"up. If you are interested in that feature (and do not care much about local\n"
+"security), choose the desired user and window manager, then click \"Yes\".\n"
+"If you are not interested in this feature, click \"No\"."
 msgstr ""
 "GNU/Linux ÊÇÒ»¸ö¶àÓû§ÏµÍ³, Òò´Ëÿ¸öÓû§¿ÉÒÔÓÐ×Ô¼ºµÄϲºÃÉèÖÃ, ×Ô¼ºµÄÎļþ, µÈ"
 "µÈ.\n"
@@ -2838,14 +2862,14 @@ msgstr ""
 "µã»÷ \"¸ß¼¶\" °´Å¥ÔÊÐíÄúÐÞ¸ÄÓû§µÄ \"shell\"\n"
 "(ȱʡÉèÖÃÊÇ bash )."
 
-#: ../../help.pm_.c:41
+#: ../../help.pm_.c:48
 msgid ""
 "Listed above are the existing Linux partitions detected on your hard drive.\n"
 "You can keep the choices made by the wizard, they are good for most common\n"
 "installations. If you make any changes, you must at least define a root\n"
 "partition (\"/\"). Do not choose too small a partition or you will not be\n"
 "able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a partition for \"/home\"\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
 "(only possible if you have more than one Linux partition available).\n"
 "\n"
 "Each partition is listed as follows: \"Name\", \"Capacity\".\n"
@@ -2877,16 +2901,16 @@ msgstr ""
 "\n"
 "ÿ¸ö·ÖÇø°´ \"Ãû³Æ\",\"ÈÝÁ¿\"Áбí."
 
-#: ../../help.pm_.c:72
+#: ../../help.pm_.c:79
 msgid ""
 "The Mandrake Linux installation is spread out over several CD-ROMs. DrakX\n"
 "knows if a selected package is located on another CD-ROM and will eject the\n"
 "current CD and ask you to insert a different one as required."
 msgstr ""
-"Mandrake Linux °²×°·ÖΪ¼¸ÕŹâÅÌ. DrakeX ÖªµÀÑ¡ÖеÄÈí¼þ°üÔÚÄÄÕŹâÅÌ\n"
-"ÐèҪʱ»áµ¯³öµ±Ç°¹âÅÌ, ÒªÇóÄã²åÈëÁíÍâÒ»ÕÅ."
+"Mandrake Linux °²×°·ÖΪ¼¸ÕŹâÅÌ¡£DrakeX ÖªµÀÑ¡ÖеÄÈí¼þ°üÔÚÄÄÕŹâÅÌ\n"
+"ÐèҪʱ»áµ¯³öµ±Ç°¹âÅÌ, ÒªÇóÄã²åÈëÁíÍâÒ»ÕÅ¡£"
 
-#: ../../help.pm_.c:77
+#: ../../help.pm_.c:84
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
 "system. There are thousands of packages available for Mandrake Linux, and\n"
@@ -2919,7 +2943,7 @@ msgid ""
 "installation (by opposition to an upgrade), a dialog will pop up proposing\n"
 "different options for a minimal installation:\n"
 "\n"
-" * \"With X\": install the fewer packages possible to have a working\n"
+" * \"With X\": install the fewest packages possible to have a working\n"
 "graphical desktop;\n"
 "\n"
 " * \"With basic documentation\": installs the base system plus basic\n"
@@ -2935,8 +2959,8 @@ msgid ""
 "total control over what will be installed.\n"
 "\n"
 "If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"groups to avoid installing any new package. This is useful to repair or\n"
+"update an existing system."
 msgstr ""
 "ÏÖÔÚÊÇÖ¸¶¨°²×°³ÌÐòµÄʱºòÁË. Mandrake Linux °üº¬ÁËÊýǧӦÓóÌÐò, Äúµ±È»²»±Ø¼Çס"
 "ÿһ¸ö.\n"
@@ -2974,7 +2998,7 @@ msgstr ""
 "×°\n"
 "ÈκÎеÄÈí¼þ°ü. ÔÚÐÞ¸´»òÉý¼¶ÒÑÓÐϵͳʱÕâ¸ö·½·¨»áÓаïÖú."
 
-#: ../../help.pm_.c:128
+#: ../../help.pm_.c:135
 msgid ""
 "Finally, depending on whether or not you chose to be able to select\n"
 "individual packages, you will be presented a tree containing all packages\n"
@@ -2985,9 +3009,9 @@ msgid ""
 "right. When your selection is finished, click the \"Install\" button which\n"
 "will then launch the installation process. Depending on the speed of your\n"
 "hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. An estimate of the time it will take to\n"
-"install everything is displayed on the screen, to help you gauge if there\n"
-"is sufficient time to enjoy a cup of coffee.\n"
+"a while to complete the process. An installation time estimate is displayed\n"
+"on the screen, to help you gauge if there is sufficient time to enjoy a cup\n"
+"of coffee.\n"
 "\n"
 "!! If a server package has been selected, either intentionally or because\n"
 "it was part of a whole group, you will be asked to confirm that you really\n"
@@ -3008,8 +3032,8 @@ msgid ""
 "The tiny floppy disk icon at the bottom of the list allows to load the\n"
 "package list chosen during a previous installation. Clicking on this icon\n"
 "will ask you to insert a floppy disk previously created at the end of\n"
-"another installation. See the second tip of last step on how to create such\n"
-"a floppy."
+"another installation. See the second tip of the previous step on how to\n"
+"create such a floppy disk."
 msgstr ""
 "×îºó, Äú½«¿´µ½Ò»¸ö°üº¬ËùÓÐÈí¼þ°üµÄÊ÷ͼ, °´ÕÕ×éºÍС×é·ÖÀà. \n"
 "Äú¿ÉÒÔÑ¡Ôñ°²×°»ò²»°²×°Õû¸ö×é. Èç¹ûÄúÔÚÇ°Ò»²½Ñ¡ÔñÁËÖ¸¶¨µ¥¶ÀµÄÈí¼þ°ü, Äú¿ÉÒÔÖð"
@@ -3037,12 +3061,12 @@ msgstr ""
 "¾Í»áÒªÇóÄú²åÈëÉϴΰ²×°½áÊøʱ´´½¨µÄÒ»ÕÅÈíÅÌ. \n"
 "ÒªÁ˽âÈç¹û´´½¨ÕâÑùµÄÈíÅÌ, Çë¿´×îºóÒ»²½µÄÌáʾ."
 
-#: ../../help.pm_.c:164
+#: ../../help.pm_.c:171
 msgid ""
 "You are now able to set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"OK\".\n"
 "The autodetection of network devices and modem will be launched. If this\n"
-"detection fails, uncheck the \"Use auto detection\" box next time. You may\n"
+"detection fails, uncheck the \"Use auto-detection\" box next time. You may\n"
 "also choose not to configure the network, or do it later; in that case,\n"
 "simply click the \"Cancel\" button.\n"
 "\n"
@@ -3053,8 +3077,8 @@ msgid ""
 "all the parameters from your Internet Service Provider or system\n"
 "administrator.\n"
 "\n"
-"You can consult the ``User Guide'' chapter about Internet connections for\n"
-"details about the configuration, or simply wait until your system is\n"
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
 "installed and use the program described there to configure your connection.\n"
 "\n"
 "If you wish to configure the network later after installation, or if you\n"
@@ -3078,13 +3102,13 @@ msgstr ""
 "Á˽âÅäÖõÄϸ½Ú, Ò²¿ÉÒԵȵ½ÄúµÄϵͳ°²×°½áÊøÖ®ºó\n"
 "ʹÓÃÊÖ²áÖÐÌáµ½µÄ³ÌÐò½øÐÐÅäÖÃ."
 
-#: ../../help.pm_.c:186
+#: ../../help.pm_.c:193
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
-"Here are presented all the services available with the current\n"
-"installation. Review them carefully and uncheck those which are not always\n"
-"needed at boot time.\n"
+"Here are listed all the services available with the current installation.\n"
+"Review them carefully and uncheck those which are not always needed at boot\n"
+"time.\n"
 "\n"
 "You can get a short explanatory text about a service by selecting a\n"
 "specific service. However, if you are not sure whether a service is useful\n"
@@ -3109,7 +3133,7 @@ msgstr ""
 "Äú²»ÐèÒªµÄ·þÎñ. Çë×¢ÒâijЩ·þÎñ¶Ô·þÎñÆ÷ÓÐDZÔÚµÄΣÏÕ.ͨ³£, ֻѡÔñÄúȷʵҪʹÓõÄ"
 "ÄÇЩ·þÎñ.!!"
 
-#: ../../help.pm_.c:203
+#: ../../help.pm_.c:210
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
 "local time according to the time zone you selected. It is however possible\n"
@@ -3125,24 +3149,24 @@ msgid ""
 "by other machines on your local network."
 msgstr ""
 "GNU/Linux ÄÚ²¿Ê¹Óà GMT (¸ñÁÖÄáÖαê׼ʱ¼ä)²¢°ÑËüת»»³ÉÄúÑ¡ÔñµÄʱÇøµÄµØ·½Ê±"
-"¼ä.\n"
-"Èç¹û²»ÏëʹÓÃÕâ¸öÌØÐÔ, ²»ÒªÑ¡ÖÐ \"Ó²¼þʱÖÓÉèÖÃ³É GMT\", ÕâÑù¾Í»á°Ñ\n"
-"Ó²¼þʱÖÓµ±³ÉµØ·½Ê±¼ä. Èç¹ûÔÚÕą̂µçÄÔÉÏ»¹Òª°²×° Windows ¾ÍµÃÕâÑùÉèÖÃ.\n"
+"¼ä¡£\n"
+"Èç¹û²»ÏëʹÓÃÕâ¸öÌØÐÔ, ²»ÒªÑ¡ÖС°Ó²¼þʱÖÓÉèÖÃ³É GMT¡±, ÕâÑù¾Í»á°Ñ\n"
+"Ó²¼þʱÖÓµ±³ÉµØ·½Ê±¼ä¡£Èç¹ûÔÚÕą̂µçÄÔÉÏ»¹Òª°²×° Windows ¾ÍµÃÕâÑùÉèÖá£\n"
 "\n"
-"\"×Ô¶¯Ð£×¼Ê±¼ä\" Ñ¡Ïî»áÁ¬½Óµ½»¥ÁªÍøÉϵıê׼ʱ¼ä·þÎñÆ÷À´Ð£×¼ÏµÍ³Ê±¼ä. \n"
-"´ÓÁбíÖÐÑ¡Ôñ¾àÀëÄú×î½üµÄ·þÎñÆ÷. µ±È»Õâ¸ö¹¦ÄÜÐèÒª¿ÉÓõÄÍøÂçÁ¬½Ó. \n"
-"Èç¹û¿ªÆôÁËÕâ¸ö¹¦ÄÜ, ÄúµÄ±¾µØÍøÂçÉÏÆäËü»úÆ÷¿ÉÒÔ°ÑÕą̂µçÄÔ×÷Ϊʱ¼ä·þÎñÆ÷."
+"¡°×Ô¶¯Ð£×¼Ê±¼ä¡±Ñ¡Ïî»áÁ¬½Óµ½»¥ÁªÍøÉϵıê׼ʱ¼ä·þÎñÆ÷À´Ð£×¼ÏµÍ³Ê±¼ä¡£\n"
+"´ÓÁбíÖÐÑ¡Ôñ¾àÀëÄú×î½üµÄ·þÎñÆ÷¡£µ±È»Õâ¸ö¹¦ÄÜÐèÒª¿ÉÓõÄÍøÂçÁ¬½Ó¡£\n"
+"Èç¹û¿ªÆôÁËÕâ¸ö¹¦ÄÜ, ÄúµÄ±¾µØÍøÂçÉÏÆäËü»úÆ÷¿ÉÒÔ°ÑÕą̂µçÄÔ×÷Ϊʱ¼ä·þÎñÆ÷¡£"
 
-#: ../../help.pm_.c:217
+#: ../../help.pm_.c:224
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely. In this section, DrakX\n"
-"will try to configure X automatically.\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
 "\n"
-"It is extremely rare for it to fail, unless the hardware is very old (or\n"
-"very new). If it succeeds, it will start X automatically with the best\n"
-"resolution possible, depending on the size of the monitor. A window will\n"
+"You will be presented the list of available resolutions and color depth\n"
+"available for your hardware. Choose the one that best suit your needs (you\n"
+"will be able to change that after installation though). When you are\n"
+"satisfied with the sample shown in the monitor, click \"OK\". A window will\n"
 "then appear and ask you if you can see it.\n"
 "\n"
 "If you are doing an \"Expert\" installation, you will enter the X\n"
@@ -3152,7 +3176,7 @@ msgid ""
 "If you can see the message during the test, and answer \"Yes\", then DrakX\n"
 "will proceed to the next step. If you cannot see the message, it simply\n"
 "means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen. Refer then to the Video\n"
+"after 10 seconds, restoring the screen. Refer then to the video\n"
 "configuration section of the user guide for more information on how to\n"
 "configure your display."
 msgstr ""
@@ -3169,7 +3193,7 @@ msgstr ""
 "Èç¹ûÄú¿ÉÒÔ¿´µ½²âÊÔµÄÌáÎÊ, ²¢»Ø´ð \"ÊÇ\", DrakX »á½øÈëÏÂÒ»²½.\n"
 "Èç¹ûÄú²»ÄÜ¿´µ½ÌáÎÊ, ÏÔÈ»ÅäÖÃÓдíÎó, ²âÊÔ»áÔÚ 10 ÃëÖÓºó½áÊø²¢»Ö¸´ÏÔʾ."
 
-#: ../../help.pm_.c:239
+#: ../../help.pm_.c:246
 msgid ""
 "Finally, you will be asked whether you want to see the graphical interface\n"
 "at boot. Note this question will be asked even if you chose not to test the\n"
@@ -3177,23 +3201,23 @@ msgid ""
 "act as a server, or if you were not successful in getting the display\n"
 "configured."
 msgstr ""
-"×îºó, Äã»á±»ÎÊ¿ª»úÊÇ·ñ½øÈëͼÐνçÃæ. ×¢Ò⼴ʹÄúûÓÐÑ¡Ôñ²âÊÔÅäÖÃ, Ò²»áÌá³öÕâ¸ö"
+"×îºó, Äã»á±»ÎÊ¿ª»úÊÇ·ñ½øÈëͼÐνçÃæ¡£×¢Ò⼴ʹÄúûÓÐÑ¡Ôñ²âÊÔÅäÖÃ, Ò²»áÌá³öÕâ¸ö"
 "ÎÊÌâ\n"
-"ÏÔÈ», Èç¹ûÕâ¸ö»úÆ÷½«×÷Ϊ·þÎñÆ÷, »òÕßÄúµÄÏÔʾÅäÖû¹Ã»Óгɹ¦, ÄúÓ¦¸ÃÑ¡Ôñ\"·ñ\"."
+"ÏÔÈ», Èç¹ûÕâ¸ö»úÆ÷½«×÷Ϊ·þÎñÆ÷, »òÕßÄúµÄÏÔʾÅäÖû¹Ã»Óгɹ¦, ÄúÓ¦¸ÃÑ¡Ôñ¡°·ñ¡±¡£"
 
-#: ../../help.pm_.c:246
+#: ../../help.pm_.c:253
 msgid ""
 "The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
 "booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
 "at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
 "should come back to this step for help in at least two situations:\n"
 "\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
-"of your main disk (unless you are using another boot manager), to allow you\n"
-"to start up with either Windows or GNU/Linux (assuming you have Windows in\n"
-"your system). If you need to reinstall Windows, the Microsoft install\n"
-"process will rewrite the boot sector, and then you will not be able to\n"
-"start GNU/Linux!\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (\n"
+"MBR) of your main disk (unless you are using another boot manager), to\n"
+"allow you to start up with either Windows or GNU/Linux (assuming you have\n"
+"Windows in your system). If you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector, and then you will not be able\n"
+"to start GNU/Linux!\n"
 "\n"
 " * if a problem arises and you cannot start up GNU/Linux from the hard\n"
 "disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
@@ -3224,14 +3248,13 @@ msgstr ""
 "ÄúʹÓõÄÈíÅ̱ØÐëÊǿյĻòÕßÄú²»ÔÙÐèÒªÉÏÃæµÄÊý¾Ý.\n"
 "DrakX »áÖØдÕû¸öÅÌƬ, ËùÒÔÄú²»±ØÊÂÏȸñʽ»¯."
 
-#: ../../help.pm_.c:270
+#: ../../help.pm_.c:277
 msgid ""
-"At this point, you need to choose where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space, you will\n"
-"need to partition it. Basically, partitioning a hard drive consists of\n"
-"logically dividing it to create space to install your new Mandrake Linux\n"
-"system.\n"
+"You now need to choose where you want to install the Mandrake Linux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
 "Because the partitioning process' effects are usually irreversible,\n"
 "partitioning can be intimidating and stressful if you are an inexperienced\n"
@@ -3240,9 +3263,9 @@ msgid ""
 "\n"
 "If you are running the installation in Expert mode, you will enter\n"
 "DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
-"fine-tune your partitions. See the DiskDrake section in the ``User Guide''.\n"
-"From the installation interface, you can use the wizards as described here\n"
-"by clicking the dialog's \"Wizard\" button.\n"
+"fine-tune your partitions. See the DiskDrake section in the ``Starter\n"
+"Guide''. From the installation interface, you can use the wizards as\n"
+"described here by clicking the dialog's \"Wizard\" button.\n"
 "\n"
 "If partitions have already been defined, either from a previous\n"
 "installation or from another partitioning tool, simply select those to\n"
@@ -3250,7 +3273,7 @@ msgid ""
 "\n"
 "If partitions are not defined, you will need to create them using the\n"
 "wizard. Depending on your hard drive configuration, several options are\n"
-"available:\n"
+"available.\n"
 "\n"
 " * \"Use free space\": this option will simply lead to an automatic\n"
 "partitioning of your blank drive(s). You will not be prompted further;\n"
@@ -3261,9 +3284,9 @@ msgid ""
 "each of the partitions. The legacy mount points are selected by default,\n"
 "and you should generally keep them.\n"
 "\n"
-" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
-"is installed on your hard drive and takes all the space available on it,\n"
-"you have to create free space for Linux data. To do so, you can delete your\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
 "Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
 "mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
 "be performed without the loss of any data, provided you previously\n"
@@ -3290,10 +3313,10 @@ msgid ""
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
 " * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"your hard drive. Be careful -- it is a powerful but dangerous option. You\n"
 "can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing. To know how do use the DiskDrake utility used\n"
-"here, refer to the section ``Managing Your Partitions'' of the ````User\n"
+"know what you are doing. To know how to use the DiskDrake utility used\n"
+"here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
 "Guide''''"
 msgstr ""
 "ÕâÀï, ÄúÐèÒªÔÚÓ²ÅÌÉÏÑ¡ÔñÓÃÀ´°²×° Mandrake Linux ²Ù×÷ϵͳµÄλÖÃ.\n"
@@ -3343,9 +3366,9 @@ msgstr ""
 "  ¿ªÊ¼Ö®Ç°Çë×Ðϸ¿¼ÂÇ.  Õâ¸ö·½·¨·Ç³£ÓÐÁ¦Ò²·Ç³£Î£ÏÕ.\n"
 "  Äú¿ÉÄÜÇáÒ׵ĻٻµËùÓеÄÊý¾Ý. Èç¹ûÄú²»Çå³þÇ벻ҪʹÓÃËü.."
 
-#: ../../help.pm_.c:341
+#: ../../help.pm_.c:347
 msgid ""
-"There you are. Installation is now complete and your GNU/Linux system is\n"
+"There you are. Installation is now completed and your GNU/Linux system is\n"
 "ready to use. Just click \"OK\" to reboot the system. You can start\n"
 "GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
 "soon as the computer has booted up again.\n"
@@ -3398,10 +3421,10 @@ msgstr ""
 "(*) ÄúÐèÒª FAT ¸ñʽ»¯µÄÈíÅÌ (ÒªÔÚ GNU/Linux ÏÂÃæÖÆ×÷, ÊäÈëÃüÁî\n"
 "\"mformat a:\")"
 
-#: ../../help.pm_.c:372
+#: ../../help.pm_.c:378
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a filesystem).\n"
+"(formatting means creating a filesystem on it).\n"
 "\n"
 "At this time, you may wish to reformat some already existing partitions to\n"
 "erase any data they contain. If you wish to do that, please select those\n"
@@ -3415,7 +3438,7 @@ msgid ""
 "\n"
 "Please be careful when selecting partitions. After formatting, all data on\n"
 "the selected partitions will be deleted and you will not be able to recover\n"
-"any of it.\n"
+"it.\n"
 "\n"
 "Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
@@ -3439,7 +3462,7 @@ msgstr ""
 "\n"
 "µã»÷\"È¡Ïû\"Ñ¡ÔñÆäËû·ÖÇø°²×° Mandrake Linux ϵͳ."
 
-#: ../../help.pm_.c:398
+#: ../../help.pm_.c:404
 msgid ""
 "Your new Mandrake Linux operating system is currently being installed.\n"
 "Depending on the number of packages you will be installing and the speed of\n"
@@ -3448,13 +3471,13 @@ msgid ""
 "\n"
 "Please be patient."
 msgstr ""
-"ÕýÔÚΪÄú°²×°Ð嵀 Mandrake Linux ²Ù×÷ϵͳ. \n"
+"ÕýÔÚΪÄú°²×°Ð嵀 Mandrake Linux ²Ù×÷ϵͳ¡£\n"
 "°²×°Ê±¼äÒÀ¾ÝÄúµÄ¼ÆËã»úËٶȺÍÄúËùÑ¡µÄ°²×°Èí¼þ°ü¶ø²»Í¬,\n"
-"´Ó¼¸·ÖÖÓµ½ºÜ³¤Ê±¼ä.\n"
+"´Ó¼¸·ÖÖÓµ½ºÜ³¤Ê±¼ä¡£\n"
 "\n"
-"ÇëÄÍÐĵȴý."
+"ÇëÄÍÐĵȴý¡£"
 
-#: ../../help.pm_.c:406
+#: ../../help.pm_.c:412
 msgid ""
 "At the time you are installing Mandrake Linux, it is likely that some\n"
 "packages have been updated since the initial release. Some bugs may have\n"
@@ -3468,31 +3491,30 @@ msgid ""
 "appears: review the selection, and press \"Install\" to retrieve and\n"
 "install the selected package(s), or \"Cancel\" to abort."
 msgstr ""
-"ÔÚÄú°²×° Mandrake Linux µÄÕâ¸öʱºò, ºÜ¿ÉÄÜÓÐЩÈí¼þ°üÔÚ·¢ÐÐÖ®ºóÒѾ­¸üÐÂ.\n"
-"ÓÐЩ¹ÊÕÏÒѾ­±»ÐÞÕý, ÓÐЩÎÊÌâÒѾ­±»½â¾ö. ΪÁËÀûÓÃÕâЩ¸üÐÂ, Äú×îºÃ´Ó»¥ÁªÍøÉÏÏÂ"
-"ÔØËüÃÇ.\n"
-"Èç¹ûÄúµÄ»¥ÁªÍøÁ¬½ÓÒѾ­¿ÉÒÔʹÓÃ, Ñ¡Ôñ\"ÊÇ\". Èç¹ûÄúÔ¸ÒâÒÔºóÔÙÉý¼¶, Ñ¡Ôñ \"·ñ"
-"\".\n"
+"ÔÚÄú°²×° Mandrake Linux µÄÕâ¸öʱºò, ºÜ¿ÉÄÜÓÐЩÈí¼þ°üÔÚ·¢ÐÐÖ®ºóÒѾ­¸üС£\n"
+"ÓÐЩ¹ÊÕÏÒѾ­±»ÐÞÕý, ÓÐЩÎÊÌâÒѾ­±»½â¾ö¡£ÎªÁËÀûÓÃÕâЩ¸üÐÂ, Äú×îºÃ´Ó»¥ÁªÍøÉÏÏÂ"
+"ÔØËüÃÇ¡£\n"
+"Èç¹ûÄúµÄ»¥ÁªÍøÁ¬½ÓÒѾ­¿ÉÒÔʹÓÃ, Ñ¡Ôñ¡°ÊÇ¡±¡£Èç¹ûÄúÔ¸ÒâÒÔºóÔÙÉý¼¶, Ñ¡Ôñ¡°·ñ¡±¡£\n"
 "\n"
-"Ñ¡Ôñ\"ÊÇ\" ½«ÏÔʾһ¸öÇåµ¥, ÁгöºÜ¶àµØ·½, ¿ÉÒÔ´ÓÄÇÀï»ñÈ¡¸üеÄÈí¼þ°ü.\n"
-"ÇëÑ¡ÔñÆäÖÐÁ¬½ÓËÙ¶È×î¿ìµÄÒ»¸ö, ͨ³£ÔÚÄúËùÔÚͬһ¸ö¹ú¼Ò»á¿ìһЩ. \n"
-"Ö®ºó»á³öÏÖÒ»¸ö¿ÉÒÔÏÂÔصÄÈí¼þ°üÇåµ¥: ¼ì²éÑ¡ÏîÈ»ºóµã»÷ \"°²×°\" À´»ñÈ¡\n"
-"²¢°²×°Ñ¡ÖеÄÈí¼þ°ü, ҲֹͣÇëÑ¡Ôñ\"È¡Ïû\"."
+"Ñ¡Ôñ¡°ÊÇ¡±½«ÏÔʾһ¸öÇåµ¥, ÁгöºÜ¶àµØ·½, ¿ÉÒÔ´ÓÄÇÀï»ñÈ¡¸üеÄÈí¼þ°ü¡£\n"
+"ÇëÑ¡ÔñÆäÖÐÁ¬½ÓËÙ¶È×î¿ìµÄÒ»¸ö, ͨ³£ÔÚÄúËùÔÚͬһ¸ö¹ú¼Ò»á¿ìһЩ¡£\n"
+"Ö®ºó»á³öÏÖÒ»¸ö¿ÉÒÔÏÂÔصÄÈí¼þ°üÇåµ¥: ¼ì²éÑ¡ÏîÈ»ºóµã»÷¡°°²×°¡±À´»ñÈ¡\n"
+"²¢°²×°Ñ¡ÖеÄÈí¼þ°ü, ҲֹͣÇëÑ¡Ôñ¡°È¡Ïû¡±¡£"
 
-#: ../../help.pm_.c:419
+#: ../../help.pm_.c:425
 msgid ""
 "Before continuing, you should read carefully the terms of the license. It\n"
 "covers the whole Mandrake Linux distribution, and if you do not agree with\n"
-"all the terms in it, click on the \"Refuse\" button which will immediately\n"
-"terminate the installation. To continue with the installation, click on the\n"
-"\"Accept\" button."
+"all the terms included in it, click on the \"Refuse\" button which will\n"
+"immediately terminate the installation. To continue with the installation,\n"
+"click on the \"Accept\" button."
 msgstr ""
 "ÇëÄúÈÏÕæÔĶÁÐí¿ÉÌõ¿î. Õû¸ö Mandrake Linux ·¢Ðа涼ÊÜËüµÄÔ¼Êø, Èç¹ûÄú²»Í¬ÒâËü"
 "µÄ\n"
 "È«²¿Ìõ¿î, Çëµã»÷ \"¾Ü¾ø\" °´Å¥, °²×°¹ý³Ì½«Á¢¼´Í£Ö¹. \n"
 "µã»÷\"½ÓÊÜ\" °´Å¥½«¼ÌÐø°²×°."
 
-#: ../../help.pm_.c:426
+#: ../../help.pm_.c:432
 msgid ""
 "At this point, it is time to choose the security level desired for the\n"
 "machine. As a rule of thumb, the more exposed the machine is, and the more\n"
@@ -3503,15 +3525,15 @@ msgid ""
 "\n"
 "If you do not know what to choose, keep the default option."
 msgstr ""
-"ÏÖÔÚÄúÐèҪѡÔñÒ»¸öºÏÊʵݲȫ¼¶±ð. ¼òµ¥½², ·ÃÎÊÕâ¸ö»úÆ÷µÄÈËÔ½¶à, Ëü±£´æµÄÊý¾Ý"
+"ÏÖÔÚÄúÐèҪѡÔñÒ»¸öºÏÊʵݲȫ¼¶±ð¡£¼òµ¥½², ·ÃÎÊÕâ¸ö»úÆ÷µÄÈËÔ½¶à, Ëü±£´æµÄÊý¾Ý"
 "Ô½ÖØÒª,\n"
-"ÐèÒªµÄ°²È«¼¶±ðÔ½¸ß.\n"
-"È»¶ø°²È«¼¶±ðÔ½¸ß, Ô½Òª¸¶³öʹÓò»·½±ãµÄ´ú¼Û. Çë²éÔÄ`²Î¿¼ÊÖ²á''µÄÔÓÏ·Ö,\n"
-"Á˽âÕâЩ¼¶±ðµÄÏêϸÄÚÈÝ.\n"
+"ÐèÒªµÄ°²È«¼¶±ðÔ½¸ß¡£\n"
+"È»¶ø°²È«¼¶±ðÔ½¸ß, Ô½Òª¸¶³öʹÓò»·½±ãµÄ´ú¼Û¡£Çë²éÔÄ¡°²Î¿¼ÊֲᡱµÄÔÓÏ·Ö,\n"
+"Á˽âÕâЩ¼¶±ðµÄÏêϸÄÚÈÝ¡£\n"
 "\n"
-"ûÓÐÌرðÐèÒª¾Í²ÉÓÃȱʡÉèÖÃ."
+"ûÓÐÌرðÐèÒª¾Í²ÉÓÃĬÈÏÉèÖá£"
 
-#: ../../help.pm_.c:436
+#: ../../help.pm_.c:442
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
@@ -3529,16 +3551,16 @@ msgid ""
 "drive;\n"
 "\n"
 " * \"Auto allocate\": this option enables to automatically create ext3 and\n"
-"swap partitions in free space of your hard drive;\n"
+"swap partitions on your hard drive's free space;\n"
 "\n"
 "\"More\": gives access to additional features:\n"
 "\n"
 " * \"Save partition table\": saves the partition table to a floppy. Useful\n"
-"for later partition-table recovery if necessary. It is strongly recommended\n"
-"to perform this step;\n"
+"for later partition-table recovery, if necessary. It is strongly\n"
+"recommended to perform this step;\n"
 "\n"
 " * \"Restore partition table\": allows to restore a previously saved\n"
-"partition table from floppy disk;\n"
+"partition table from a floppy disk;\n"
 "\n"
 " * \"Rescue partition table\": if your partition table is damaged, you can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
@@ -3639,7 +3661,7 @@ msgstr ""
 "1MB, Ëü½«ÓÃÓÚ°²×°¿ª»ú³ÌÐò yaboot. Èç¹ûÄúÏëÈÃÕâ¸ö·ÖÇø¸ü´óһЩ, ±ÈÈç 50MB, \n"
 "Äú»á·¢ÏÖÕâÀïºÜÊʺϴæ·Å½ô¼±Æð¶¯Ê±»áÓõ½µÄ±¸ÓÃÄÚºË, ÒÔ¼° ramdisk ¾µÏñ."
 
-#: ../../help.pm_.c:507
+#: ../../help.pm_.c:513
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one you want to resize in order to install your new\n"
@@ -3671,53 +3693,69 @@ msgid ""
 "\"Windows name\" is the letter of your hard drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
-"·¢ÏÖÒ»¸ö»ò¶à¸öWindows·ÖÇø.\n"
-"Ñ¡ÔñÒ»¸ö·ÖÇø¸Ä±ä´óС,ÒԱ㰲װLinux.\n"
+"ÔÚÓ²ÅÌÉϼì²âµ½Á˶à¸ö Microsoft ·ÖÇø¡£\n"
+"ÇëÑ¡ÔñÒ»¸ö·ÖÇø¸Ä±ä´óС,ÒԱ㰲װLinux¡£\n"
+"\n"
+"\n"
+"·ÖÇø°´¡°Linux Ãû³Æ¡±,¡°Windows Ãû³Æ¡±,¡°ÈÝÁ¿¡±µÄ˳ÐòÁгö¡£\n"
+"¡°Linux Ãû³Æ¡±µÄ½á¹¹Îª:¡°Ó²ÅÌÀàÐÍ¡±,¡°Ó²Å̱àºÅ¡±,\n"
+"¡°·ÖÇø±àºÅ¡±(ÀýÈç,¡°hda1¡±)¡£\n"
+"\n"
+"¡°Ó²ÅÌÀàÐÍ¡±Îª¡°hd¡±, Èç¹ûÄãµÄÓ²ÅÌÊÇ IDE Ó²ÅÌ; Èç¹ûΪ SCSI Ó²ÅÌÔòΪ¡°sd¡±¡£\n"
+"\n"
+"¡°Ó²Å̱àºÅ¡±×ÜÊǸúÔÚ¡°hd¡±»ò¡°sd¡±ºóÃæµÄ×Ö·û¡£¶ÔÓÚ IDE Ó²ÅÌÀ´Ëµ:\n"
+"\n"
+" *¡°a¡±Òâζ×Å¡°Ö÷ IDE ¿ØÖÆÆ÷µÄÖ÷Ó²ÅÌ¡±;\n"
 "\n"
+" *¡°b¡±Òâζ×Å¡°Ö÷ IDE ¿ØÖÆÆ÷µÄ´ÓÓ²ÅÌ¡±;\n"
 "\n"
-"·ÖÇø°´ \"Linux Ãû³Æ\", \"Windows Ãû³Æ\", \"ÈÝÁ¿\"Áбí."
+" *¡°c¡±Òâζ×Å¡°´Ó IDE ¿ØÖÆÆ÷µÄÖ÷Ó²ÅÌ¡±;\n"
+"\n"
+" *¡°d¡±Òâζ×Å¡°´Ó IDE ¿ØÖÆÆ÷µÄ´ÓÓ²ÅÌ¡±¡£\n"
+"\n"
+"¶ÔÓÚ SCSI Ó²ÅÌ,¡°a¡±Òâζ×Å¡°×îµÍµÄ SCSI ID¡±,¡°b¡±Òâζ×Å¡°µÚ¶þµÍµÄ SCSI ID¡±, µÈ"
+"µÈ¡£\n"
+"¡°Windows Ãû³Æ¡±¾ÍÊÇÓ²ÅÌÔÚ Windows ϵÄÅÌ·û(µÚÒ»¸ö´ËÅÌ»ò·ÖÇø¾ÍÊÇ¡°C:¡±¡£"
 
-#: ../../help.pm_.c:538
+#: ../../help.pm_.c:544
 msgid "Please be patient. This operation can take several minutes."
-msgstr "ÇëÄÍÐĵȴý. ¸Ã²Ù×÷¿ÉÄÜ»¨ºÃ¼¸·ÖÖÓ."
+msgstr "ÇëÄÍÐĵȴý¡£¸Ã²Ù×÷¿ÉÄÜ»¨ºÃ¼¸·ÖÖÓ¡£"
 
-#: ../../help.pm_.c:541
+#: ../../help.pm_.c:547
 msgid ""
 "DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\"). You can\n"
-"also choose to do a new install or an upgrade of an existing Mandrake Linux\n"
-"system:\n"
+"installation or if you want to have greater control (\"Expert\") over your\n"
+"installation. You can also choose to do a new installation or upgrade your\n"
+"existing Mandrake Linux system:\n"
 "\n"
-" * \"Install\": completely wipes out the old system, however, depending on\n"
+" * \"Install\": completely wipes out the old system. However, depending on\n"
 "what is currently installed on your machine, you may be able to keep some\n"
 "old partitions (Linux or otherwise) unchanged;\n"
 "\n"
 " * \"Upgrade\": this installation class allows to simply update the\n"
-"packages currently installed on your Mandrake Linux system. It keeps the\n"
-"current partitions of your hard drives as well as user configurations. All\n"
-"other configuration steps remain available, similar to a normal\n"
-"installation;\n"
+"packages currently installed on your Mandrake Linux system. It keeps your\n"
+"hard drives' current partitions as well as user configurations. All other\n"
+"configuration steps remain available, similar to a normal installation;\n"
 "\n"
 " * \"Upgrade Packages Only\": this new installation class allows you to\n"
 "upgrade an existing Mandrake Linux system while keeping all system\n"
 "configurations unchanged. Adding new packages to the current installation\n"
 "is also possible.\n"
 "\n"
-"Upgrades should work fine on Mandrake Linux systems containing version\n"
-"\"8.1\" or later.\n"
+"Upgrades should work fine on Mandrake Linux systems using version \"8.1\"\n"
+"or later.\n"
 "\n"
-"Depending on your knowledge of GNU/Linux, select one of the following\n"
-"choices:\n"
+"Depending on your GNU/Linux knowledge, select one of the following choices:\n"
 "\n"
 " * Recommended: choose this if you have never installed a GNU/Linux\n"
 "operating system. The installation will be very easy and you will only be\n"
 "asked a few questions;\n"
 "\n"
-" * Expert: if you have a good understanding of GNU/Linux, you may wish to\n"
+" * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
 "perform a highly customized installation. Some of the decisions you will\n"
-"have to make may be difficult if you do not have good knowledge of\n"
-"GNU/Linux, so it is not recommended that those without a fair amount of\n"
-"experience select this installation class."
+"have to make may be difficult if you do not have good GNU/Linux knowledge,\n"
+"so it is not recommended that those without a fair amount of experience\n"
+"select this installation class."
 msgstr ""
 "DrakX ÏÖÔÚÐèÒªÖªµÀÄãÑ¡ÔñȱʡµÄ(\"½¨Òé\")°²×°»¹ÊÇÔ¸Òâ×Ô¼º¿ØÖƾÖÃæ(\"ר¼Ò\").\n"
 "Äú»¹¿ÉÒÔÑ¡Ôñ×öȫа²×°, »òÕßÉý¼¶Ò»¸öÏÖÓÐµÄ Mandrake Linux ϵͳ.\n"
@@ -3745,7 +3783,7 @@ msgstr ""
 " µÄÁ˽â, Äú½«ºÜÄѻشðijЩÎÊÌâ. ËùÒÔ, Èç¹ûÄú²»Çå³þ»á·¢Éúʲô, Ç벻ҪѡÔñÕâ¸ö¼¶"
 "±ð."
 
-#: ../../help.pm_.c:578
+#: ../../help.pm_.c:582
 msgid ""
 "Normally, DrakX selects the right keyboard for you (depending on the\n"
 "language you have chosen). However, you might not have a keyboard that\n"
@@ -3759,15 +3797,15 @@ msgid ""
 "supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
-"asked on next dialog to choose the key binding that will switch the\n"
-"keyboard layout between the latin and non latin layouts."
+"asked in the next dialog to choose the key binding that will switch the\n"
+"keyboard layout between the latin and non-latin layouts."
 msgstr ""
 "ͨ³£, DrakX ¸ù¾ÝÄúÑ¡ÔñµÄÓïÑÔÑ¡ÔñÅäÖúÏÊʵļüÅÌ. \n"
 "Èç¹ûÄúµÄ¼üÅ̲¢²»Ñϸñ·ûºÏÓïÑÔµÄÒªÇó, Äú¿ÉÒÔ´ÓÁбíÖÐÑ¡ÔñÐèÒªµÄ¼üÅÌ.\n"
 "\n"
 "µã»÷ \"¸ü¶à\" °´Å¥½«ÁгöËùÓÐÖ§³ÖµÄ¼üÅÌ."
 
-#: ../../help.pm_.c:594
+#: ../../help.pm_.c:598
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -3776,12 +3814,16 @@ msgid ""
 "Clicking on the \"Advanced\" button will allow you to select other\n"
 "languages to be installed on your workstation. Selecting other languages\n"
 "will install the language-specific files for system documentation and\n"
-"applications. For example, if you will host users from Spain on your\n"
-"machine, select English as the main language in the tree view and in the\n"
-"Advanced section click on the box corresponding to \"Spanish|Spain\".\n"
+"applications. For example, if you host users from Spain on your machine,\n"
+"select English as the main language in the tree view and in the Advanced\n"
+"section, click on the box corresponding to \"Spanish|Spain\".\n"
 "\n"
 "Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales, click the \"OK\" button to continue."
+"additional locales, click the \"OK\" button to continue.\n"
+"\n"
+"To switch from one language to the other, you can launch the\n"
+"\"/usr/sbin/localedrake\" command as \"root\" to change the whole system\n"
+"language, or as a simple user to only change that user's default language."
 msgstr ""
 "ÇëÑ¡ÔñÄúÏëÒªÔÚ°²×°ºÍƽ³£²Ù×÷ϵͳʱʹÓõÄÓïÑÔ.\n"
 "\n"
@@ -3791,14 +3833,14 @@ msgstr ""
 "\n"
 "Äú¿ÉÒÔÑ¡Ôñ¶àÖÖ¸½¼ÓµÄÓïÑԺ͵ØÇøÉèÖÃ, µã»÷\"È·ÈÏ\" ¼ÌÐø."
 
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:617
 msgid ""
-"DrakX generally detects the number of buttons your mouse has. If not, it\n"
-"assumes you have a two-button mouse and will set it up for third-button\n"
+"DrakX generally detects the number of buttons your mouse possesses. If not,\n"
+"it assumes you have a two-button mouse and will set it up for third-button\n"
 "emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
 "USB mouse.\n"
 "\n"
-"If you wish to specify a different type of mouse select the appropriate\n"
+"If you wish to specify a different type of mouse, select the appropriate\n"
 "type from the provided list.\n"
 "\n"
 "If you choose a mouse other than the default, a test screen will be\n"
@@ -3806,12 +3848,12 @@ msgid ""
 "correct. If the mouse is not working well, press the space bar or [Return]\n"
 "to \"Cancel\" and choose again.\n"
 "\n"
-"Wheel mouses are sometimes not automatically detected. You will need to\n"
+"Sometimes, wheel mouses are not automatically detected. You will need to\n"
 "manually select it in the list. Be sure to select the one corresponding to\n"
 "the correct port it is attached to. After you have pressed the \"OK\"\n"
-"button, a mouse image is displayed. You then need to move the wheel of your\n"
-"mouse to activate it correctly. Then test all buttons and movements are\n"
-"correct."
+"button, a mouse image will be displayed. You then need to move the wheel of\n"
+"your mouse to activate it correctly. Then test that all buttons and\n"
+"movements are correct."
 msgstr ""
 "DrakX ͨ³£Äܼì²âÄúµÄÊó±êÓжàÉÙ°´¼ü. Èç¹ûûÓмì²âµ½, Ëü¼ÙÉèÄúÓÐÁ½¼üÊó±ê,\n"
 "²¢ÉèÖÃÄ£ÄâµÚÈý¼ü. DrakX »á×Ô¶¯·Ö±æ PS/2, ´®¿Ú, »ò USB Êó±ê.\n"
@@ -3821,31 +3863,31 @@ msgstr ""
 "Èç¹ûÄúÑ¡ÔñµÄ²»ÊÇȱʡÉèÖÃ, »á³öÏÖ²âÊÔ´°¿Ú, Äú¿ÉÒÔ°´¸÷¸ö°´¼üºÍ¹öÂÖ, È·ÈÏ\n"
 "ÉèÖÃÕýÈ·, Èç¹ûÊó±ê²»Õý³£¹¤×÷, °´¿Õ¸ñ¼ü»ò [Return] ¿ÉÒÔ \"È¡Ïû\" È»ºóÖØÐÂÑ¡Ôñ."
 
-#: ../../help.pm_.c:630
+#: ../../help.pm_.c:638
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
-"ÇëÑ¡ÔñÕýÈ·µÄ¶Ë¿Ú.  ÀýÈç, \n"
-"MS Windows ÀïµÄ COM1, ÔÚ GNU/Linux ÀïÃæ½Ð×ö ttyS0."
+"ÇëÑ¡ÔñÕýÈ·µÄ¶Ë¿Ú¡£ÀýÈç, \n"
+"MS Windows ÀïµÄ COM1, ÔÚ GNU/Linux ÀïÃæ½Ð×ö ttyS0¡£"
 
-#: ../../help.pm_.c:634
+#: ../../help.pm_.c:642
 msgid ""
-"This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"root\" is the system\n"
-"administrator and is the only one authorized to make updates, add users,\n"
-"change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
-"choose not to enter a password, but we strongly advise you against this if\n"
-"only for one reason: do not think that because you booted GNU/Linux that\n"
-"your other operating systems are safe from mistakes. Since \"root\" can\n"
-"overcome all limitations and unintentionally erase all data on partitions\n"
-"by carelessly accessing the partitions themselves, it is important for it\n"
-"to be difficult to become \"root\".\n"
+"This is the most crucial decision in regards with the security of your\n"
+"GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the\n"
+"system administrator and is the only one authorized to make updates, add\n"
+"users, change the overall system configuration, and so on. In short,\n"
+"\"root\" can do everything! That is why you must choose a password that is\n"
+"difficult to guess -- DrakX will tell you if it is too easy. As you can\n"
+"see, you can choose not to enter a password, but we strongly advise you\n"
+"against this if only for one reason: do not think that because you booted\n"
+"GNU/Linux that your other operating systems are safe from mistakes. Since\n"
+"\"root\" can overcome all limitations and unintentionally erase all data on\n"
+"partitions by carelessly accessing the partitions themselves, it is\n"
+"important for it to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password - it makes it too\n"
+"characters long. Never write down the \"root\" password -- it makes it too\n"
 "easy to compromise a system.\n"
 "\n"
 "However, please do not make the password too long or complicated because\n"
@@ -3859,9 +3901,9 @@ msgid ""
 "In Expert mode, you will be asked if you will be connecting to an\n"
 "authentication server, like NIS or LDAP.\n"
 "\n"
-"If your network uses either of the LDAP, NIS, or PDC Windows Domain\n"
-"authentication services, select the appropriate one as \"authentication\".\n"
-"If you do not know, ask your network administrator.\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one as \"authentication\". If you have no\n"
+"clue, ask your network administrator.\n"
 "\n"
 "If your computer is not connected to any administrated network, you will\n"
 "want to choose \"Local files\" for authentication."
@@ -3900,11 +3942,11 @@ msgstr ""
 "Èç¹ûÄúµÄµçÄÔûÓкÍÍøÂçÁ¬½Ó, Äú¿ÉÒÔÑ¡Ôñ\n"
 "ʹÓà \"±¾µØÎļþ\" ÈÏÖ¤."
 
-#: ../../help.pm_.c:670
+#: ../../help.pm_.c:678
 msgid ""
-"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
+"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
 "automated. In fact, DrakX analyzes the disk boot sector and acts\n"
-"accordingly, depending on what it finds here:\n"
+"accordingly, depending on what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
 "boot sector. Hence, you will be able to load either GNU/Linux or another\n"
@@ -3913,14 +3955,14 @@ msgid ""
 " * if a grub or LILO boot sector is found, it will replace it with a new\n"
 "one.\n"
 "\n"
-"If in doubt, DrakX will display a dialog with various options.\n"
+"if in doubt, DrakX will display a dialog with various options.\n"
 "\n"
 " * \"Bootloader to use\": you have three choices:\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu).\n"
+"    * \"GRUB\": if you prefer grub (text menu);\n"
 "\n"
 "    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface.\n"
+"interface;\n"
 "\n"
 "    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
 "interface.\n"
@@ -3930,7 +3972,7 @@ msgid ""
 "second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
 " * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose - in the bootloader menu,\n"
+"this is the delay granted to the user to choose -- in the bootloader menu,\n"
 "another boot entry than the default one.\n"
 "\n"
 "!! Beware that if you choose not to install a bootloader (by selecting\n"
@@ -3989,7 +4031,7 @@ msgstr ""
 "\"Ìí¼Ó\" ´´½¨Ò»¸öÐÂÌõÄ¿; ¶ø\"Íê³É\" ½«½øÈë\n"
 "ÏÂÒ»¸ö°²×°²½Öè."
 
-#: ../../help.pm_.c:710
+#: ../../help.pm_.c:718
 msgid ""
 "After you have configured the general bootloader parameters, the list of\n"
 "boot options which will be available at boot time will be displayed.\n"
@@ -3997,7 +4039,7 @@ msgid ""
 "If there is another operating system installed on your machine, it will\n"
 "automatically be added to the boot menu. Here, you can choose to fine-tune\n"
 "the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it; \"Add\" creates a new entry; and \"Done\" goes on to the next\n"
+"remove it. \"Add\" creates a new entry. and \"Done\" goes on to the next\n"
 "installation step.\n"
 "\n"
 "You may also not want to give access to these other operating systems to\n"
@@ -4014,10 +4056,10 @@ msgstr ""
 "ÁË.\n"
 "²»¹ýÄúÐèÒªÏÈ×¼±¸ÄÇЩÆäËü²Ù×÷ϵͳµÄ¿ª»úÈíÅÌ, ²ÅÄÜÔÚÐèÒªµÄʱºòÒýµ¼ËüÃÇ."
 
-#: ../../help.pm_.c:724
+#: ../../help.pm_.c:732
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
-"to GNU/Linux.\n"
+"GNU/Linux.\n"
 "\n"
 "Unless you know exactly what you are doing, choose \"First sector of drive\n"
 "(MBR)\"."
@@ -4026,34 +4068,26 @@ msgstr ""
 "\n"
 "Ñ¡Ôñ\"Ó²Å̵ĵÚÒ»¸öÉÈÇø (MBR)\", ³ý·ÇÄúÇå³þÆäËüÑ¡ÔñµÄºó¹û."
 
-#: ../../help.pm_.c:731
+#: ../../help.pm_.c:739
 msgid ""
-"Here, we select a printing system for your computer. Other OSs may offer\n"
-"you one, but Mandrake Linux offers three.\n"
+"Here, we select a printing system for your computer. Other OSes may offer\n"
+"you one, but Mandrake Linux offers two.\n"
 "\n"
-" * \"pdq\" - which means ``print, don't queue'', is the choice if you have\n"
+" * \"pdq\" -- which means ``print, don't queue'', is the choice if you have\n"
 "a direct connection to your printer and you want to be able to panic out of\n"
 "printer jams, and you do not have networked printers. It will handle only\n"
 "very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
-"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
+"if this is your first voyage to GNU/Linux. You can change your choices\n"
 "after installation by running PrinterDrake from the Mandrake Control Center\n"
 "and clicking the expert button.\n"
 "\n"
-" * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing to\n"
+" * \"CUPS\" -- ``Common Unix Printing System'', is excellent at printing to\n"
 "your local printer and also halfway-around the planet. It is simple and can\n"
 "act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
 "it is compatible with the systems that went before. It can do many tricks,\n"
 "but the basic setup is almost as easy as \"pdq\". If you need this to\n"
 "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
-"graphical front-ends for printing or choosing printer options.\n"
-"\n"
-" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
-"approximately the same things the others can do, but it will print to\n"
-"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
-"and it can print directly to shell commands. If you have need of Novell or\n"
-"printing to commands without using a separate pipe construct, use lprNG.\n"
-"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
-"networks."
+"graphical front-ends for printing or choosing printer options."
 msgstr ""
 "ÎÒÃÇÔÚÕâÀïÑ¡ÔñÒ»¸ö´òӡϵͳ. ÆäËü²Ù×÷ϵͳһ°ãÌṩ\n"
 "Ò»¸ö, ¶ø Mandrake Linux ÌṩÁËÈýÖÖ.\n"
@@ -4084,7 +4118,7 @@ msgstr ""
 
 #: ../../help.pm_.c:759
 msgid ""
-"DrakX now detects any IDE devices present in your computer. It will also\n"
+"DrakX now detects any IDE device present in your computer. It will also\n"
 "scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
 "found, DrakX will automatically install the appropriate driver.\n"
 "\n"
@@ -4094,7 +4128,7 @@ msgid ""
 "be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
 "have no SCSI hardware. If you are unsure, you can check the list of\n"
 "hardware detected in your machine by selecting \"See hardware info\" and\n"
-"clicking \"OK\". Examine the list of hardware and then click on the \"OK\"\n"
+"clicking \"OK\". Examine the hardware list and then click on the \"OK\"\n"
 "button to return to the SCSI interface question.\n"
 "\n"
 "If you have to manually specify your adapter, DrakX will ask if you want to\n"
@@ -4103,12 +4137,7 @@ msgid ""
 "usually works well.\n"
 "\n"
 "If DrakX is not able to probe for the options which need to be passed, you\n"
-"will need to provide options to the driver manually. Please review the\n"
-"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
-"Hardware'' section) for hints on retrieving the parameters required from\n"
-"hardware documentation, from the manufacturer's web site (if you have\n"
-"Internet access) or from Microsoft Windows (if you used this hardware with\n"
-"Windows on your system)."
+"will need to manually provide options to the driver."
 msgstr ""
 "DrakX ½«Òª³¢ÊÔÑ°ÕÒÄúϵͳÖа²×°µÄ IDE É豸. Ëü»¹»áËÑË÷ÄúϵͳÖÐËùÓÐµÄ PCI SCSI "
 "¿¨.\n"
@@ -4131,12 +4160,12 @@ msgstr ""
 " ä¯ÀÀÖÆÔìÉ̵ÄÍøÕ¾ (Èç¹ûÄúÓа취ÉÏÍø) »ò´Ó Windows ÖлñÈ¡ÓйصÄÐÅÏ¢\n"
 "(Èç¹ûÄúÔø¾­ÄÜÔÚ Windows ÖÐʹÓÃÓйØÓ²¼þ)"
 
-#: ../../help.pm_.c:786
+#: ../../help.pm_.c:781
 msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
+"For other OSes, the entry consists only of a label and the \"root\"\n"
 "partition.\n"
 "\n"
 "For Linux, there are a few possible options:\n"
@@ -4167,7 +4196,7 @@ msgid ""
 "need to allocate a large ramdisk, this option can be used;\n"
 "\n"
 " * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
+"read-only, to allow a filesystem check before the system becomes ``live''.\n"
 "Here, you can override this option;\n"
 "\n"
 " * NoVideo: should the Apple video hardware prove to be exceptionally\n"
@@ -4224,7 +4253,7 @@ msgstr ""
 "also be highlighted with a ``*'', if you press [Tab] to see the boot\n"
 "selections."
 
-#: ../../help.pm_.c:833
+#: ../../help.pm_.c:828
 msgid ""
 "Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
 "either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
@@ -4257,14 +4286,14 @@ msgid ""
 " * Default OS: you can select which OS will boot by default when the Open\n"
 "Firmware Delay expires."
 msgstr ""
-"YabootÊÇ NewWorld MacIntoshµÄ¿ª»úÒýµ¼ÏµÍ³, ¿ÉÒÔÒýµ¼ GNU/Linux, MacOS, ºÍ "
+"YabootÊÇ NewWorld MacIntoshµÄÆô¶¯Òýµ¼ÏµÍ³, ¿ÉÒÔÒýµ¼ GNU/Linux, MacOS, ºÍ "
 "MacOSX.\n"
 "\n"
 "\n"
 "YabootÖ÷ҪѡÏî:\n"
 "\n"
 "\n"
-"  - ³õʼÐÅÏ¢: ¿ª»úÒýµ¼ÐÅÏ¢.\n"
+"  - ³õʼÐÅÏ¢: Æô¶¯Òýµ¼ÐÅÏ¢.\n"
 "\n"
 "\n"
 "  - Òýµ¼É豸: ¿ª»ú³ÌÐò°²×°µØ.\n"
@@ -4278,12 +4307,12 @@ msgstr ""
 "\n"
 "  - ʹÄÜCDÒýµ¼?: 'C' CDÒýµ¼.\n"
 "  - ʹÄÜOFÒýµ¼?: 'N' ¹Ì¼þÒýµ¼.\n"
-"  - ȱʡ²Ù×÷ϵͳ: ¹Ì¼þȱʡÒýµ¼µÄ²Ù×÷ϵͳ."
+"  - ĬÈϲÙ×÷ϵͳ: ¹Ì¼þĬÈÏÒýµ¼µÄ²Ù×÷ϵͳ."
 
-#: ../../help.pm_.c:865
+#: ../../help.pm_.c:860
 msgid ""
 "Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may - or not, see the following entries:\n"
+"your installed hardware, you may (or may not), see the following entries:\n"
 "\n"
 " * \"Mouse\": check the current mouse configuration and click on the button\n"
 "to change it if necessary;\n"
@@ -4298,19 +4327,19 @@ msgid ""
 "order to configure the clock according to the time zone you are in;\n"
 "\n"
 " * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``User\n"
+"configuration wizard. Consult the correpsonding chapter of the ``Starter\n"
 "Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation;\n"
+"presented there is similar to the one used at installation time;\n"
 "\n"
-" * \"Sound card\": if a sound card is detected on your system, it is\n"
+" * \"Sound card\": if a sound card is detected on your system, it will be\n"
 "displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
-"here. No modification possible at installation time;\n"
+" * \"TV card\": if a TV card is detected on your system, it will be\n"
+"displayed here. No modification possible at installation time;\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
 "displayed here. You can click on the button to change the parameters\n"
-"associated with it."
+"associated to it."
 msgstr ""
 "ÕâÀïÁгöÁËÓйØÄúµÄµçÄԵĸ÷ÖÖÐÅÏ¢. ¸ù¾ÝÄú°²×°µÄ\n"
 "µÄÓ²¼þ²»Í¬, Äú¿ÉÄÜ¿´µ½ÏÂÁÐÏîÄ¿:\n"
@@ -4340,23 +4369,23 @@ msgstr ""
 "Ëü»áÔÚÕâÀïÏÔʾ. Äú¿ÉÒÔµã»÷°´Å¥, \n"
 "ÐÞ¸ÄÓëËüÓйصIJÎÊý."
 
-#: ../../help.pm_.c:896
+#: ../../help.pm_.c:891
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
 "Mandrake Linux partition. Be careful, all data present on it will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Ñ¡ÔñÓ²ÅÌÄú×¼±¸Çå¿ÕÀ´°²×° Mandrake·ÖÇø.\n"
-"×¢Ò⣬ËùÓÐÊý¾Ý½«¶ªÊ§²¢ÇÒÎÞ·¨»Ö¸´."
+"Ñ¡ÔñÓ²ÅÌÄú×¼±¸Çå¿ÕÀ´°²×° Mandrake·ÖÇø¡£\n"
+"×¢Òâ, ËùÓÐÊý¾Ý½«¶ªÊ§²¢ÇÒÎÞ·¨»Ö¸´¡£"
 
-#: ../../help.pm_.c:901
+#: ../../help.pm_.c:896
 msgid ""
 "Click on \"OK\" if you want to delete all data and partitions present on\n"
 "this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
 "to recover any data and partitions present on this hard drive, including\n"
 "any Windows data.\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"Click on \"Cancel\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
 "µã»÷ \"È·¶¨\"ɾ³ý¸ÃÓ²ÅÌËùÓÐÊý¾Ý¼°·ÖÇø.\n"
@@ -4372,7 +4401,7 @@ msgid ""
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
-"ÎÞ·¨¶ÁÈ¡ÓëÄúµÄÄÚºËÅäÌ×µÄÄÚºËÄ£¿é (ȱÉÙÎļþ %s ), ͨ³£ÊÇÒòΪÆð¶¯ÈíÅÌÓë°²×°½éÖÊ"
+"ÎÞ·¨¶ÁÈ¡ÓëÄúµÄÄÚºËÅäÌ×µÄÄÚºËÄ£¿é (ȱÉÙÎļþ %s ), ͨ³£ÊÇÒòΪÆô¶¯ÈíÅÌÓë°²×°½éÖÊ"
 "²»ÅäÌ×(ÇëÖÆ×÷еĿª»úÈíÅÌ)"
 
 #: ../../install2.pm_.c:167
@@ -4380,7 +4409,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Äú»¹±ØÐë¸ñʽ»¯ %s"
 
-#: ../../install_any.pm_.c:424
+#: ../../install_any.pm_.c:423
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4397,13 +4426,13 @@ msgstr ""
 "ÄúÑ¡ÔñÁËÒÔÏ·þÎñ³ÌÐò: %s\n"
 "\n"
 "\n"
-"ÕâЩ·þÎñÈ´Ê¡»á±»¼¤»î¡£ËüÃÇûÓÐÒÑÖªµÄ°²È«ÎÊÌ⣬µ«¿ÉÄÜ»áз¢ÏÖ¡£\n"
-"Èç¹û·¢ÏÖ£¬ÄãµÃÁ¢¼´Éý¼¶.\n"
+"ÕâЩ·þÎñÈ´Ê¡»á±»¼¤»î¡£ËüÃÇûÓÐÒÑÖªµÄ°²È«ÎÊÌâ, µ«¿ÉÄÜ»áз¢ÏÖ¡£\n"
+"Èç¹û·¢ÏÖ, ÄãµÃÁ¢¼´Éý¼¶¡£\n"
 "\n"
 "\n"
 "¹ûÕæ°²×°ÕâЩ·þÎñ?\n"
 
-#: ../../install_any.pm_.c:442
+#: ../../install_any.pm_.c:441
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4416,37 +4445,37 @@ msgstr ""
 "\n"
 "ÄúÈ·¶¨ÒªÉ¾³ýÕâЩÈí¼þ°üÂð?\n"
 
-#: ../../install_any.pm_.c:472
+#: ../../install_any.pm_.c:471
 msgid "Can't use broadcast with no NIS domain"
-msgstr "ûÓÐNISÓò£¬ ÎÞ·¨Ê¹Óù㲥"
+msgstr "ûÓÐNISÓò, ÎÞ·¨Ê¹Óù㲥"
 
-#: ../../install_any.pm_.c:869
+#: ../../install_any.pm_.c:870
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Çë²åÈëÒ»ÕÅDOSÈíÅ̵½Çý¶¯Æ÷ %s"
 
-#: ../../install_any.pm_.c:873
+#: ../../install_any.pm_.c:874
 msgid "This floppy is not FAT formatted"
 msgstr "²»ÊÇDOS¸ñʽµÄÈíÅÌ"
 
-#: ../../install_any.pm_.c:885
+#: ../../install_any.pm_.c:886
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr "ʹÓñ£´æµÄÈí¼þ°üÑ¡Ôñ, ÒÔ''linux defcfg=floppy''Æô¶¯"
 
-#: ../../install_any.pm_.c:908 ../../partition_table.pm_.c:767
+#: ../../install_any.pm_.c:909 ../../partition_table.pm_.c:767
 #, c-format
 msgid "Error reading file %s"
 msgstr "ÇëÈ¡Îļþ %s ³ö´í "
 
-#: ../../install_any.pm_.c:1030
+#: ../../install_any.pm_.c:1031
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
 "·¢Éú´íÎó! н¨ÎļþϵͳʱÕÒ²»µ½¿ÉÓõÄÉ豸¡£\n"
-"Çë¼ì²éÄúµÄÓ²¼þÒÔÈ·¶¨ÎÊÌâµÄÔ­Òò !"
+"Çë¼ì²éÄúµÄÓ²¼þÒÔÈ·¶¨ÎÊÌâµÄÔ­Òò!"
 
 #: ../../install_interactive.pm_.c:23
 #, c-format
@@ -4454,7 +4483,7 @@ msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
 msgstr ""
-"ÄúϵͳÖеIJ¿·ÖÓ²¼þÐèÒª 'רÓÐ' µÄÇý¶¯³ÌÐò²ÅÄܹ¤×÷. \n"
+"ÄúϵͳÖеIJ¿·ÖÓ²¼þÐèÒª¡°×¨ÓС±µÄÇý¶¯³ÌÐò²ÅÄܹ¤×÷¡£\n"
 "ÓйØËüÃǵÄÇé¿ö, ÇëÄú²é¿´: %s"
 
 #: ../../install_interactive.pm_.c:58
@@ -4465,7 +4494,7 @@ msgid ""
 msgstr ""
 "±ØÐëÖ¸¶¨Ò»¸ö¸ù·ÖÇø.\n"
 "ÇëÏÈ´´½¨Ò»¸ö Linux ·ÖÇø (»òÔÚͼÖеã»÷ÏÖÓеÄÒ»¸ö).\n"
-"È»ºóÔÚÁбíÀïÑ¡Ôñ \"×°Ôصã\", ÉèΪ '/'."
+"È»ºóÔÚÁбíÀïÑ¡Ôñ¡°×°Ôص㡱, ÉèΪ¡°/¡±¡£"
 
 #: ../../install_interactive.pm_.c:63
 msgid "You must have a swap partition"
@@ -4483,7 +4512,7 @@ msgstr ""
 
 #: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:169
 msgid "You must have a FAT partition mounted in /boot/efi"
-msgstr "Äú±ØÐëÓÐÒ»¸öFAT·ÖÇø ÔØÈë /boot/efi"
+msgstr "Äú±ØÐëÓÐÒ»¸öFAT·ÖÇøÔØÈë /boot/efi"
 
 #: ../../install_interactive.pm_.c:92
 msgid "Use free space"
@@ -4548,8 +4577,8 @@ msgid ""
 "Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
 "installation."
 msgstr ""
-"ÄúµÄ Windows ·ÖÇøÓÐÌ«¶àËéƬ, ÇëÖØÐÂÆð¶¯, ½øÈë Windows, ÔËÐÐ ``defrag''È»ºóÖØ"
-"пªÊ¼°²×° Mandrake Linux"
+"ÄúµÄ Windows ·ÖÇøÓÐÌ«¶àËéƬ, ÇëÖØÐÂÆô¶¯, ½øÈë Windows, ÔËÐС°defrag¡±È»ºóÖØпª"
+"ʼ°²×° Mandrake Linux"
 
 #: ../../install_interactive.pm_.c:140
 msgid ""
@@ -4564,14 +4593,14 @@ msgid ""
 msgstr ""
 "¾¯¸æ!\n"
 "\n"
-"DrakX ÏÖÔÚÒªµ÷ÕûÄúµÄ Windows ·ÖÇøµÄ´óС. ΪÁË°²È«, ÄúÓ¦¸ÃÏÈÔÚ Windows ÏÂÔË\n"
-"ÐÐ scandisk, ²¢¸ù¾ÝÐèÒªÔËÐÐ defreg. ÏÖÔÚÄú¿ÉÒÔÍ˳ö Linux °²×°È¥×öÕâЩ\n"
+"DrakX ÏÖÔÚÒªµ÷ÕûÄúµÄ Windows ·ÖÇøµÄ´óС¡£ÎªÁË°²È«, ÄúÓ¦¸ÃÏÈÔÚ Windows ÏÂÔË\n"
+"ÐÐ scandisk, ²¢¸ù¾ÝÐèÒªÔËÐÐ defreg¡£ÏÖÔÚÄú¿ÉÒÔÍ˳ö Linux °²×°È¥×öÕâЩ\n"
 "×¼±¸, È»ºóÖØпªÊ¼°²×°.\n"
-"Ò»ÇоÍÐ÷ºó, Çë°´ \"È·¶¨\"."
+"Ò»ÇоÍÐ÷ºó, Çë°´¡°È·¶¨¡±¡£"
 
 #: ../../install_interactive.pm_.c:150
 msgid "Which size do you want to keep for Windows on"
-msgstr "Äú½«±£Áô¶àÉÙ¿Õ¼ä¸ø windows?"
+msgstr "Äú½«±£Áô¶àÉÙ¿Õ¼ä¸ø Windows?"
 
 #: ../../install_interactive.pm_.c:151
 #, c-format
@@ -4633,7 +4662,7 @@ msgstr "ÎÒÎÞ·¨ÕÒµ½°²×°ÐèÒªµÄ¿Õ¼ä"
 
 #: ../../install_interactive.pm_.c:248
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX ·ÖÇø´óʦ½¨ÒéÕâЩ½â¾ö°ì·¨:"
+msgstr "DrakX ·ÖÇøÏòµ¼½¨ÒéÕâЩ½â¾ö°ì·¨:"
 
 #: ../../install_interactive.pm_.c:252
 #, c-format
@@ -4653,8 +4682,8 @@ msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
-"·¢Éú´íÎó, ¿ÉÊÇÎÒ²»ÖªµÀ¸ÃÔõÑù´¦Àí²ÅºÃ.\n"
-"¼ÌÐøÏÂÈ¥»áÔõÑù¾Í¿´ÄúµÄÔËÆøÁË."
+"·¢Éú´íÎó, ¿ÉÊÇÎÒ²»ÖªµÀ¸ÃÔõÑù´¦Àí²ÅºÃ¡£\n"
+"¼ÌÐøÏÂÈ¥»áÔõÑù¾Í¿´ÄúµÄÔËÆøÁË¡£"
 
 #: ../../install_steps.pm_.c:211
 #, c-format
@@ -4670,22 +4699,22 @@ msgid ""
 msgstr ""
 "һЩÖØÒªÈí¼þ°üûÓÐÕýÈ·µÄ°²×°. ÄúµÄ¹âÅÌ»òÕßÇý¶¯Æ÷¿ÉÄÜÓÐȱÏÝ.\n"
 "ÇëÔÚһ̨°²×°ºÃµÄµçÄÔÉϼì²é¹âÅÌ, ÃüÁîÊÇ\n"
-"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+"¡°rpm -qpl Mandrake/RPMS/*.rpm¡±\n"
 
 #: ../../install_steps.pm_.c:452
 #, c-format
 msgid "Welcome to %s"
 msgstr "»¶Ó­À´µ½ %s"
 
-#: ../../install_steps.pm_.c:531 ../../install_steps.pm_.c:770
+#: ../../install_steps.pm_.c:542 ../../install_steps.pm_.c:781
 msgid "No floppy drive available"
-msgstr "ûÓпÉÓõÄÈíÅÌÇý¶¯Æ÷."
+msgstr "ûÓпÉÓõÄÈíÅÌÇý¶¯Æ÷"
 
 #: ../../install_steps_auto_install.pm_.c:76
 #: ../../install_steps_stdio.pm_.c:22
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "½øÈë²½Öè `%s'\n"
+msgstr "½øÈë²½Öè¡°%s¡±\n"
 
 #: ../../install_steps_gtk.pm_.c:150
 msgid ""
@@ -4694,9 +4723,9 @@ msgid ""
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"ÄúµÄϵͳ×ÊÔ´²»×ã.  ÄúÔÚ°²×° Mandrake Linux ʱ¿ÉÄÜÓöµ½ÎÊÌâ.\n"
-"Èç¹ûÕâÑù, Äú¿ÉÒÔ³¢ÊÔÎı¾Ä£Ê½µÄ°²×°. \n"
-"ÔÚ´Ó¹âÅÌÆô¶¯ºó°´ 'F1' ¼ü, È»ºóÊäÈë 'text'."
+"ÄúµÄϵͳ×ÊÔ´²»×ã¡£ÄúÔÚ°²×° Mandrake Linux ʱ¿ÉÄÜÓöµ½ÎÊÌâ¡£\n"
+"Èç¹ûÕâÑù, Äú¿ÉÒÔ³¢ÊÔÎı¾Ä£Ê½µÄ°²×°¡£\n"
+"ÔÚ´Ó¹âÅÌÆô¶¯ºó°´¡°F1¡±¼ü, È»ºóÊäÈë 'text'¡£"
 
 #: ../../install_steps_gtk.pm_.c:161 ../../install_steps_interactive.pm_.c:231
 msgid "Install Class"
@@ -4766,7 +4795,7 @@ msgstr "Õâ¸öÈí¼þ°üÊDZØÐèµÄ, ²»ÄÜÈ¡ÏûÑ¡¶¨"
 
 #: ../../install_steps_gtk.pm_.c:393
 msgid "You can't unselect this package. It is already installed"
-msgstr "Äú²»¿ÉÒÔÈ¡ÏûÑ¡ÔñÕâ¸öÈí¼þ°ü. ËüÒѾ­°²×°¹ýÁË."
+msgstr "Äú²»¿ÉÒÔÈ¡ÏûÑ¡ÔñÕâ¸öÈí¼þ°ü. ËüÒѾ­°²×°¹ýÁË"
 
 #: ../../install_steps_gtk.pm_.c:396
 msgid ""
@@ -4820,17 +4849,17 @@ msgstr "Ê£Óàʱ¼ä"
 
 #: ../../install_steps_gtk.pm_.c:470
 msgid "Please wait, preparing installation..."
-msgstr "ÕýÔÚ×¼±¸°²×°"
+msgstr "ÇëÉÔºò, ÕýÔÚ×¼±¸°²×°..."
 
 #: ../../install_steps_gtk.pm_.c:554
 #, c-format
 msgid "%d packages"
-msgstr "%d Èí¼þ°ü"
+msgstr "%d ¸öÈí¼þ°ü"
 
 #: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid "Installing package %s"
-msgstr "ÕýÔÚ°²×°³ÌÐò %s"
+msgstr "ÕýÔÚ°²×°°ü %s"
 
 #: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
 #: ../../install_steps_interactive.pm_.c:784
@@ -4854,14 +4883,14 @@ msgid ""
 msgstr ""
 "Çë»»ÁíһƬ¹âÅÌ!\n"
 "\n"
-"ÇëÔÚÇý¶¯Æ÷ÖвåÈë±êÓÐ \"%s\" µÄ¹âÅÌ, È»ºóµã»÷ 'È·¶¨'.\n"
-"Èç¹ûÄúûÓÐÕâÕŹâÅÌ, Çëµã»÷ 'È¡Ïû', ·ÅÆú°²×°Õâ¸ö¹âÅÌÉϵÄÈí¼þ."
+"ÇëÔÚÇý¶¯Æ÷ÖвåÈë±êÓС°%s¡±µÄ¹âÅÌ, È»ºóµã»÷¡°È·¶¨¡±¡£\n"
+"Èç¹ûÄúûÓÐÕâÕŹâÅÌ, Çëµã»÷¡°È¡Ïû¡±, ·ÅÆú°²×°Õâ¸ö¹âÅÌÉϵÄÈí¼þ¡£"
 
 #: ../../install_steps_gtk.pm_.c:611 ../../install_steps_gtk.pm_.c:615
 #: ../../install_steps_interactive.pm_.c:797
 #: ../../install_steps_interactive.pm_.c:801
 msgid "Go on anyway?"
-msgstr "ÕæµÄÒª¼ÌÐø"
+msgstr "ÕæµÄÒª¼ÌÐø?"
 
 #: ../../install_steps_gtk.pm_.c:611 ../../install_steps_interactive.pm_.c:797
 msgid "There was an error ordering packages:"
@@ -4905,27 +4934,27 @@ msgstr ""
 "\n"
 "¾¯¸æ\n"
 "\n"
-"Çë×ÐϸÔĶÁÏÂÁеÄÌõ¿î. Èç¹ûÄú²»Í¬ÒâÆäÖÐÈκβ¿·Ö, Äú¾Í²»¿ÉÒÔ°²×°ÏÂÒ»¸ö\n"
-"¹âÅÌÉϵÄÈí¼þ. Ñ¡Ôñ '¾Ü¾ø' \n"
-"½«¼ÌÐø°²×°ÆäËû½éÖÊÉϵÄÈí¼þ. \n"
+"Çë×ÐϸÔĶÁÏÂÁеÄÌõ¿î¡£Èç¹ûÄú²»Í¬ÒâÆäÖÐÈκβ¿·Ö, Äú¾Í²»¿ÉÒÔ°²×°ÏÂÒ»¸ö\n"
+"¹âÅÌÉϵÄÈí¼þ¡£Ñ¡Ôñ¡°¾Ü¾ø¡±\n"
+"½«¼ÌÐø°²×°ÆäËü½éÖÊÉϵÄÈí¼þ¡£\n"
 "\n"
 "\n"
-"ÏÂÒ»¸ö¹âÅ̵IJ¿·ÖÄÚÈݵÄÐí¿ÉЭÒé²»ÊÇ GPL »òÀàËƵÄЭÒé. ÿ¸öÕâÑùµÄÄÚÈÝ\n"
-"Êܵ½¸÷×Ô²»Í¬µÄÌõ¼þºÍÌõ¿îµÄÏÞÖÆ. \n"
+"ÏÂÒ»¸ö¹âÅ̵IJ¿·ÖÄÚÈݵÄÐí¿ÉЭÒé²»ÊÇ GPL »òÀàËƵÄЭÒ顣ÿ¸öÕâÑùµÄÄÚÈÝ\n"
+"Êܵ½¸÷×Ô²»Í¬µÄÌõ¼þºÍÌõ¿îµÄÏÞÖÆ¡£\n"
 "ÔÚÄúʹÓûòÖØзַ¢¸ÃÄÚÈÝ֮ǰ, Çë×ÐϸÔĶÁ²¢×ñÊØÆäÌض¨µÄ\n"
-"Ðí¿ÉЭÒé. \n"
+"Ðí¿ÉЭÒé¡£\n"
 "ͨ³£ÕâЩЭÒé»áÏÞÖƶԸÃÄÚÈݽøÐÐת»»,  ¸´ÖÆ \n"
 "(±¸·ÝÄ¿µÄ³ýÍâ), Ôٴηַ¢, ·´Ïò¹¤³Ì, ·´»ã±à, ·´±àÒë \n"
-"»òÆäËüÐÞ¸Ä. \n"
-"Èç¹ûÎ¥±³ÈκÎЭÒéµÄÌõ¿î, ЭÒ鸳ÓèÄúµÄȨÀûÒ²Á¢¼´ÖÕÖ¹. \n"
+"»òÆäËüÐ޸ġ£\n"
+"Èç¹ûÎ¥±³ÈκÎЭÒéµÄÌõ¿î, ЭÒ鸳ÓèÄúµÄȨÀûÒ²Á¢¼´ÖÕÖ¹¡£\n"
 "³ý·ÇЭÒéÖÐÓÐÌض¨µÄÌõ¿î¸³ÓèÄúÏà¹ØȨÀû, \n"
 "Äúͨ³£²»ÄÜÔÚ³¬¹ýһ̨ϵͳÖа²×°¸Ã³ÌÐò, »ò°ÑËüÓ¦ÓÃÔÚÍøÂçÉÏ.\n"
-"Èç¹ûÓÐÒÉÎÊ, ÇëÖ±½ÓÓë¸ÃÄÚÈݵķ¢ÐÐÕß»ò×÷ÕßÁªÏµ. \n"
+"Èç¹ûÓÐÒÉÎÊ, ÇëÖ±½ÓÓë¸ÃÄÚÈݵķ¢ÐÐÕß»ò×÷ÕßÁªÏµ¡£\n"
 "ÏòµÚÈý·½×ªÈûò¸´ÖÆÕâЩÄÚÈÝ, °üÀ¨ÆäÎĵµÍ¨³£ÊDZ»½ûÖ¹µÄ.\n"
 "\n"
 "\n"
 "ÏÂÒ»¸ö¹âÅ̵ÄÄÚÈݵÄÈ«²¿È¨Àû·Ö±ðÊôÓÚËüÃǸ÷×ÔµÄ×÷Õß, \n"
-"²¢Êܵ½¿ÉÓ¦ÓÃÓëÈí¼þ³ÌÐòµÄ֪ʶ²úȨºÍ°æȨ·¨Âɵı£»¤.\n"
+"²¢Êܵ½¿ÉÓ¦ÓÃÓëÈí¼þ³ÌÐòµÄ֪ʶ²úȨºÍ°æȨ·¨Âɵı£»¤¡£\n"
 
 #: ../../install_steps_interactive.pm_.c:67
 msgid "An error occurred"
@@ -5189,7 +5218,7 @@ msgstr "¼üÅÌ"
 
 #: ../../install_steps_interactive.pm_.c:212
 msgid "Please choose your keyboard layout."
-msgstr "ÇëÑ¡ÔñÄúʹÓõļüÅ̲¼¾Ö."
+msgstr "ÇëÑ¡ÔñÄúʹÓõļüÅ̲¼¾Ö¡£"
 
 #: ../../install_steps_interactive.pm_.c:213
 msgid "Here is the full list of keyboards available"
@@ -5228,7 +5257,7 @@ msgstr "Ö»¸üÐÂÈí¼þ°ü"
 
 #: ../../install_steps_interactive.pm_.c:275
 msgid "Please choose the type of your mouse."
-msgstr "ÇëÑ¡ÔñÄúµÄÊó±êÀàÐÍ."
+msgstr "ÇëÑ¡ÔñÄúµÄÊó±êÀàÐÍ¡£"
 
 #: ../../install_steps_interactive.pm_.c:281 ../../standalone/mousedrake_.c:60
 msgid "Mouse Port"
@@ -5236,7 +5265,7 @@ msgstr "Êó±ê¶Ë¿Ú"
 
 #: ../../install_steps_interactive.pm_.c:282 ../../standalone/mousedrake_.c:61
 msgid "Please choose on which serial port your mouse is connected to."
-msgstr "ÇëÑ¡ÔñÄúµÄÊó±êÊÇÁ¬½Óµ½ÄǸö´®ÐÐ¿Ú ?"
+msgstr "ÇëÑ¡ÔñÄúµÄÊó±êÊÇÁ¬½Óµ½ÄǸö´®Ðпڡ£"
 
 #: ../../install_steps_interactive.pm_.c:290
 msgid "Buttons emulation"
@@ -5296,7 +5325,7 @@ msgstr "¸ù·ÖÇø"
 
 #: ../../install_steps_interactive.pm_.c:390
 msgid "What is the root partition (/) of your system?"
-msgstr "ÄúµÄ¸ù·ÖÇø(/)ÊÇÄÄÒ»¸ö ?"
+msgstr "ÄúµÄ¸ù·ÖÇø(/)ÊÇÄÄÒ»¸ö?"
 
 #: ../../install_steps_interactive.pm_.c:404
 msgid "You need to reboot for the partition table modifications to take place"
@@ -5328,23 +5357,23 @@ msgstr "¼ì²éÎļþϵͳ %s ʧ°Ü. ÄúÏëÐÞ¸´´íÎóÂð? (×¢Òâ, ÓпÉÄܶªÊ§Êý¾Ý)"
 
 #: ../../install_steps_interactive.pm_.c:465
 msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "¶Ô»»¿Õ¼äÌ«ÉÙ, ÎÞ·¨Íê³É°²×°, ÇëÀ©´ó¶Ô»»·ÖÇø."
+msgstr "½»»»¿Õ¼äÌ«ÉÙ, ÎÞ·¨Íê³É°²×°, ÇëÀ©´ó½»»»·ÖÇø¡£"
 
 #: ../../install_steps_interactive.pm_.c:472
 msgid "Looking for available packages and rebuilding rpm database..."
-msgstr "Ñ°ÕÒ¿É°²×°µÄ³ÌÐò²¢Öؽ¨ rpm Êý¾Ý¿â..."
+msgstr "ÕýÔÚÑ°ÕÒ¿É°²×°µÄ³ÌÐò²¢Öؽ¨ rpm Êý¾Ý¿â..."
 
 #: ../../install_steps_interactive.pm_.c:473
 msgid "Looking for available packages..."
-msgstr "Ñ°ÕÒ¿É°²×°µÄ³ÌÐò..."
+msgstr "ÕýÔÚÑ°ÕÒ¿É°²×°µÄ³ÌÐò..."
 
 #: ../../install_steps_interactive.pm_.c:476
 msgid "Looking at packages already installed..."
-msgstr "²éÕÒÒѾ­°²×°¹ýµÄÈí¼þ°ü."
+msgstr "ÕýÔÚ²éÕÒÒѾ­°²×°¹ýµÄÈí¼þ°ü..."
 
 #: ../../install_steps_interactive.pm_.c:480
 msgid "Finding packages to upgrade..."
-msgstr "Ñ°ÕÒ¿ÉÉý¼¶µÄ³ÌÐò..."
+msgstr "ÕýÔÚÑ°ÕÒ¿ÉÉý¼¶µÄ³ÌÐò..."
 
 #: ../../install_steps_interactive.pm_.c:498
 #, c-format
@@ -5358,8 +5387,8 @@ msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
 msgstr ""
-"ÇëÑ¡ÔñÓÃÈíÅÌÔØÈë»ò±£´æÈí¼þ°üÑ¡ÔñÐÅÏ¢.\n"
-"¸ñʽÓë×Ô¶¯°²×°Éú³ÉµÄÈíÅÌÒ»Ñù"
+"ÇëÑ¡ÔñÓÃÈíÅÌÔØÈë»ò±£´æÈí¼þ°üÑ¡ÔñÐÅÏ¢¡£\n"
+"¸ñʽÓë×Ô¶¯°²×°Éú³ÉµÄÈíÅÌÒ»Ñù¡£"
 
 #: ../../install_steps_interactive.pm_.c:536
 msgid "Load from floppy"
@@ -5393,7 +5422,7 @@ msgstr "°²×°ÀàÐÍ"
 msgid ""
 "You haven't selected any group of packages.\n"
 "Please choose the minimal installation you want:"
-msgstr "ÄúûÓÐÑ¡ÔñÈκεÄ×é¼þ, ÇëÑ¡Ôñ×îС°²×°"
+msgstr "ÄúûÓÐÑ¡ÔñÈκεÄ×é¼þ, ÇëÑ¡Ôñ×îС°²×°:"
 
 #: ../../install_steps_interactive.pm_.c:646
 msgid "With X"
@@ -5413,14 +5442,14 @@ msgid ""
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
-"Èç¹ûÄúÓµÓÐÏÂÁÐËùÓеĹâÅÌ, µã»÷ È·ÈÏ.\n"
-"Èç¹ûÄúûÓÐÈκÎÒ»ÕÅ, µã»÷ È¡Ïû.\n"
-"Èç¹ûÄúֻȱÆäÖÐһЩ, ²»Ñ¡ÖÐËü, È»ºóµã»÷ È·ÈÏ."
+"Èç¹ûÄúÓµÓÐÏÂÁÐËùÓеĹâÅÌ, µã»÷ È·¶¨¡£\n"
+"Èç¹ûÄúûÓÐÈκÎÒ»ÕÅ, µã»÷ È¡Ïû¡£\n"
+"Èç¹ûÄúֻȱÆäÖÐһЩ, ²»Ñ¡ÖÐËü, È»ºóµã»÷ È·ÈÏ¡£"
 
 #: ../../install_steps_interactive.pm_.c:739
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "±êºÅ %s µÄCD-ROM "
+msgstr "±êºÅ %s µÄ¹âÅÌ"
 
 #: ../../install_steps_interactive.pm_.c:760
 msgid "Preparing installation"
@@ -5487,23 +5516,23 @@ msgid ""
 "Altadena California 91001\n"
 "USA"
 msgstr ""
-"ÏÖÔÚÄúÒª¾ö¶¨ÊÇ·ñÏÂÔØÓÃÓÚ¼ÓÃܵÄÈí¼þ°ü.\n"
+"ÏÖÔÚÄúÒª¾ö¶¨ÊÇ·ñÏÂÔØÓÃÓÚ¼ÓÃܵÄÈí¼þ°ü¡£\n"
 "\n"
 "¾¯¸æ!\n"
 "\n"
-"ÔÚ²»Í¬µÄ·¨ÂÉÖƶÈÖÐ, ÊÊÓÃÓÚÕâЩÈí¼þµÄÒ»°ãÒªÇóºÍÇ¿ÖƽûÁîÓкܴó²»Í¬. \n"
+"ÔÚ²»Í¬µÄ·¨ÂÉÖƶÈÖÐ, ÊÊÓÃÓÚÕâЩÈí¼þµÄÒ»°ãÒªÇóºÍÇ¿ÖƽûÁîÓкܴó²»Í¬¡£\n"
 "¿Í»§ºÍ/»ò×îÖÕÓû§±ØÐëÇå³þµÄÁ˽âËùÔÚ¹ú¼ÒµÄ·¨ÂÉÊÇ·ñÔÊÐí×Ô¼ºÏÂÔØ, ±£´æ, ºÍ/»ò\n"
-"ʹÓÃÕâЩÈí¼þ.\n"
+"ʹÓÃÕâЩÈí¼þ¡£\n"
 "\n"
-"ÁíÍâ, ¿Í»§ºÍ/»ò×îÖÕÓû§±ØÐëÇå³þ, ²»µÃÎ¥·´ËùÔÚ¹ú¼ÒµÄ·¨ÂÉ. Î¥·´ÓйØÊÊÓ÷¨Âɽû"
+"ÁíÍâ, ¿Í»§ºÍ/»ò×îÖÕÓû§±ØÐëÇå³þ, ²»µÃÎ¥·´ËùÔÚ¹ú¼ÒµÄ·¨ÂÉ¡£Î¥·´ÓйØÊÊÓ÷¨Âɽû"
 "Áî\n"
-"µÄºó¹û, ¿ÉÄÜÊÇÊܵ½ÑÏÀ÷µÄ³Í·£.\n"
+"µÄºó¹û, ¿ÉÄÜÊÇÊܵ½ÑÏÀ÷µÄ³Í·£¡£\n"
 "\n"
 "¿Í»§ºÍ/»ò×îÖÕÓû§ÔÚͬÒâÇ©ÊðÏÂÁÐЭÒéÖ®ºó, ²»ÂÛºÎÖÖÇé¿ö, Mandrakesoft, ÒÔ¼°Æä\n"
 "ÖÆÔìÉ̺;­ÏúÉÌ, ²»³Ðµ£ÈκÎÔðÈÎ, ¼´Ê¹¿Í»§ºÍ/»ò×îÖÕÓû§ÒòÏÂÔØ, ÓµÓкÍ/»òʹÓÃ\n"
 "ÕâЩÈí¼þ¶øÔâÊÜÈκÎÌض¨µÄ, ¼ä½ÓµÄ»ò¸½´øµÄË𺦠(°üÀ¨, µ«²»ÏÞÓÚÀûÈóµÄËðʧ, Éú"
 "Òâ\n"
-"µÄÖжÏ, ¹Ø¼üÊý¾ÝµÄ¶ªÊ§¼°ÆäËû²ÆÎïËðʧ, ºÍ¿ÉÄÜÓÉ·¨ÔºÅоö²úÉúµÄÕ®ÎñºÍÅâ³¥).\n"
+"µÄÖжÏ, ¹Ø¼üÊý¾ÝµÄ¶ªÊ§¼°ÆäËü²ÆÎïËðʧ, ºÍ¿ÉÄÜÓÉ·¨ÔºÅоö²úÉúµÄÕ®ÎñºÍÅâ³¥)¡£\n"
 "\n"
 "\n"
 "¶ÔÓÚÏÂÁÐЭÒéµÄÈκÎÒÉÎÊ, ÇëÁªÏµ\n"
@@ -5571,11 +5600,11 @@ msgstr "ÄúÓÐ ISA Éù¿¨Âð?"
 
 #: ../../install_steps_interactive.pm_.c:1010
 msgid "Run \"sndconfig\" after installation to configure your sound card"
-msgstr "°²×°Ö®ºóÔËÐÐ \"sndconfig\"À´ÅäÖÃÄúµÄÉù¿¨"
+msgstr "°²×°Ö®ºóÔËÐС°sndconfig¡±À´ÅäÖÃÄúµÄÉù¿¨"
 
 #: ../../install_steps_interactive.pm_.c:1012
 msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "ûÓÐÕÒµ½Éù¿¨. ÇëÔÚ°²×°Ö®ºó³¢ÊÔ\"harddrake\"."
+msgstr "ûÓÐÕÒµ½Éù¿¨. ÇëÔÚ°²×°Ö®ºó³¢ÊÔ¡°harddrake¡±¡£"
 
 #: ../../install_steps_interactive.pm_.c:1017 ../../steps.pm_.c:27
 msgid "Summary"
@@ -5589,8 +5618,8 @@ msgstr "Êó±ê"
 msgid "Timezone"
 msgstr "ʱÇø"
 
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2937
-#: ../../printerdrake.pm_.c:3026
+#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2985
+#: ../../printerdrake.pm_.c:3074
 msgid "Printer"
 msgstr "´òÓ¡»ú"
 
@@ -5617,7 +5646,7 @@ msgstr "LDAP"
 #: ../../install_steps_interactive.pm_.c:1097
 #: ../../install_steps_interactive.pm_.c:1110
 msgid "NIS"
-msgstr "ʹÓÃNIS"
+msgstr "NIS"
 
 #: ../../install_steps_interactive.pm_.c:1074
 #: ../../install_steps_interactive.pm_.c:1097
@@ -5646,7 +5675,7 @@ msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Õâ¸ö¿ÚÁîÌ«¼òµ¥ÁË (ÖÁÉÙÒªÓÐ %d ¸ö×Ö·û)"
 
 #: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:49
-#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:172
+#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
 msgid "Authentication"
 msgstr "ÈÏÖ¤"
 
@@ -5689,14 +5718,14 @@ msgid ""
 "The command 'wbinfo -t' will test whether your authentication secrets are "
 "good."
 msgstr ""
-"ΪÁËÔÚ W2K PDC ·þÎñÆ÷µÄ»·¾³ÖÐÕý³£Ê¹ÓÃ, Äú¿ÉÄܵÃÇë W2K ¹ÜÀíÔ± ÔËÐÐ 'C:\\>net "
-"localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add'²¢ÖØÆð·þÎñ"
+"ΪÁËÔÚ W2K PDC ·þÎñÆ÷µÄ»·¾³ÖÐÕý³£Ê¹ÓÃ, Äú¿ÉÄܵÃÇë W2K ¹ÜÀíÔ± ÔËÐС°C:\\>net "
+"localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add¡±²¢ÖØÆð·þÎñ"
 "Æ÷.\n"
-"Äú»¹ÐèÒªÒ»¸öÓò¹ÜÀíÔ±µÄÓû§Ãû/¿ÚÁî ÒÔ±ã°ÑÕâ¸ö»úÆ÷ Ìí¼Óµ½ Windows(TM) Óò.\n"
-"Èç¹ûÍøÂ绹ûÓÐÆð¶¯, Drakx »áÔÚÍøÂçÉèÖò½ÖèÖ®ºó³¢ÊÔ¼ÓÈëÓò.\n"
-"Èç¹ûÕâ¸öÉèÖÃÒòΪʲôʧ°ÜÁ˶øÇÒÓòÈÏÖ¤²»Æð×÷ÓÃ, Æð¶¯ÏµÍ³Ö®ºóÔËÐÐ 'smbpasswd -j "
-"ÓòÃû -U Óû§%¿ÚÁî' ÌîÈëÄúµÄ Windows(tm) ÓòÃû, ºÍ¹ÜÀíÔ±µÄÓû§Ãû/¿ÚÁî.\n"
-"ÃüÁî 'wbinfo -t' »á²âÊÔÄúµÄÈÏÖ¤ÃÜÂëÊÇ·ñÍêºÃ."
+"Äú»¹ÐèÒªÒ»¸öÓò¹ÜÀíÔ±µÄÓû§Ãû/¿ÚÁîÒÔ±ã°ÑÕâ¸ö»úÆ÷Ìí¼Óµ½ Windows(TM) Óò¡£\n"
+"Èç¹ûÍøÂ绹ûÓÐÆô¶¯, Drakx »áÔÚÍøÂçÉèÖò½ÖèÖ®ºó³¢ÊÔ¼ÓÈëÓò¡£\n"
+"Èç¹ûÕâ¸öÉèÖÃÒòΪʲôʧ°ÜÁ˶øÇÒÓòÈÏÖ¤²»Æð×÷ÓÃ, Æô¶¯ÏµÍ³Ö®ºóÔËÐС°smbpasswd -j "
+"ÓòÃû -U Óû§%¿ÚÁÌîÈëÄúµÄ Windows(tm) ÓòÃû, ºÍ¹ÜÀíÔ±µÄÓû§Ãû/¿ÚÁî¡£\n"
+"ÃüÁî¡°wbinfo -t¡±»á²âÊÔÄúµÄÈÏÖ¤ÃÜÂëÊÇ·ñÍêºÃ¡£"
 
 #: ../../install_steps_interactive.pm_.c:1123
 msgid "Authentication Windows Domain"
@@ -5727,12 +5756,13 @@ msgid ""
 "first\n"
 "drive and press \"Ok\"."
 msgstr ""
-"¶¨ÖƵĿª»úÈíÅÌÈÃÄúÄܲ»ÒÀÀµ³£¹æµÄ¿ª»úÒýµ¼³ÌÐò¶øÖ±½ÓÆô¶¯ÄúµÄ Linux ϵͳ.\n"
-"Èç¹ûÄú²»Ïë°²×° SILO, »òÕßÆäËû²Ù×÷ϵͳ°Ñ SILO ɾ³ýÁË, »òÕß\n"
-" SILO ÔÚÄúµÄÓ²¼þÉϲ»Äܹ¤×÷, ÄÇôÕâ¾ÍºÜÓÐÓô¦ÁË. \n"
-"¿ª»úÈíÅÌ»¹¿ÉÒÔºÍ Mandrake ÐÞ¸´ÅÌÅäºÏʹÓÃ, °ïÖúÄú¸üÇáËɵĻָ´ÑÏÖعÊÕϵÄϵͳ.\n"
+"¶¨ÖƵĿª»úÈíÅÌÈÃÄúÄܲ»ÒÀÀµ³£¹æµÄÆô¶¯Òýµ¼³ÌÐò¶øÖ±½ÓÆô¶¯ÄúµÄ Linux ϵͳ¡£\n"
+"Èç¹ûÄú²»Ïë°²×° SILO, »òÕßÆäËü²Ù×÷ϵͳ°Ñ SILO ɾ³ýÁË, »òÕß\n"
+" SILO ÔÚÄúµÄÓ²¼þÉϲ»Äܹ¤×÷, ÄÇôÕâ¾ÍºÜÓÐÓô¦ÁË¡£\n"
+"¿ª»úÈíÅÌ»¹¿ÉÒÔºÍ Mandrake ÐÞ¸´ÅÌÅäºÏʹÓÃ, °ïÖúÄú¸üÇáËɵĻָ´ÑÏÖعÊÕϵÄϵ"
+"ͳ¡£\n"
 "ÏÖÔھ͸øÄúµÄϵͳ×öÒ»ÕÅ¿ª»úÈíÅÌ, ºÃÂð? \n"
-"ÔÚµÚÒ»¸öÈíÅÌÇý¶¯Æ÷Àï·ÅһƬÈíÅÌ, È»ºó°´\"È·¶¨\""
+"ÔÚµÚÒ»¸öÈíÅÌÇý¶¯Æ÷Àï·ÅһƬÈíÅÌ, È»ºó°´¡°È·¶¨¡±"
 
 #: ../../install_steps_interactive.pm_.c:1177
 msgid "First floppy drive"
@@ -5742,7 +5772,7 @@ msgstr "µÚÒ»¸öÈíÅÌÇý¶¯Æ÷"
 msgid "Second floppy drive"
 msgstr "µÚ¶þ¸öÈíÅÌÇý¶¯Æ÷"
 
-#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2470
+#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2515
 msgid "Skip"
 msgstr "ÂÔ¹ý"
 
@@ -5761,10 +5791,11 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?\n"
 "%s"
 msgstr ""
-"¶¨ÖƵĿª»úÈíÅÌÈÃÄúÄܲ»ÒÀÀµ³£¹æµÄ¿ª»úÒýµ¼³ÌÐò¶øÖ±½ÓÆô¶¯ÄúµÄ Linux ϵͳ.\n"
-"Èç¹ûÄú²»Ïë°²×° LILO (»ò grub), »òÕßÆäËû²Ù×÷ϵͳ°Ñ LILO ɾ³ýÁË, »òÕß\n"
-" LILO ÔÚÄúµÄÓ²¼þÉϲ»Äܹ¤×÷, ÄÇôÕâ¾ÍºÜÓÐÓô¦ÁË. \n"
-"¿ª»úÈíÅÌ»¹¿ÉÒÔºÍ Mandrake ÐÞ¸´ÅÌÅäºÏʹÓÃ, °ïÖúÄú¸üÇáËɵĻָ´ÑÏÖعÊÕϵÄϵͳ.\n"
+"¶¨ÖƵĿª»úÈíÅÌÈÃÄúÄܲ»ÒÀÀµ³£¹æµÄÆô¶¯Òýµ¼³ÌÐò¶øÖ±½ÓÆô¶¯ÄúµÄ Linux ϵͳ¡£\n"
+"Èç¹ûÄú²»Ïë°²×° LILO (»ò grub), »òÕßÆäËü²Ù×÷ϵͳ°Ñ LILO ɾ³ýÁË, »òÕß\n"
+" LILO ÔÚÄúµÄÓ²¼þÉϲ»Äܹ¤×÷, ÄÇôÕâ¾ÍºÜÓÐÓô¦ÁË¡£\n"
+"¿ª»úÈíÅÌ»¹¿ÉÒÔºÍ Mandrake ÐÞ¸´ÅÌÅäºÏʹÓÃ, °ïÖúÄú¸üÇáËɵĻָ´ÑÏÖعÊÕϵÄϵ"
+"ͳ¡£\n"
 "ÏÖÔھ͸øÄúµÄϵͳ×öÒ»ÕÅ¿ª»úÈíÅÌ, ºÃÂð?\n"
 "%s"
 
@@ -5779,16 +5810,16 @@ msgstr ""
 "\n"
 "\n"
 "(¾¯¸æ! ÄúÑ¡ÔñÁËʹÓà XFS ×÷ΪÄúµÄ¸ù·ÖÇø,\n"
-"ºÜ¿ÉÄÜÎÞ·¨ÔÚÒ»¸ö 1.44 Mb ÈíÅÌÉÏ´´½¨Æð¶¯ÅÌ,\n"
-"ÒòΪ XFS ÐèÒªÒ»¸öºÜ´óµÄÇý¶¯³ÌÐò)."
+"ºÜ¿ÉÄÜÎÞ·¨ÔÚÒ»¸ö 1.44 Mb ÈíÅÌÉÏ´´½¨Æô¶¯ÅÌ,\n"
+"ÒòΪ XFS ÐèÒªÒ»¸öºÜ´óµÄÇý¶¯³ÌÐò)¡£"
 
 #: ../../install_steps_interactive.pm_.c:1198
 msgid "Sorry, no floppy drive available"
-msgstr "±§Ç¸£¬Ã»ÓпÉÓõÄÈíÅÌ»ú"
+msgstr "±§Ç¸, ûÓпÉÓõÄÈíÅÌÇý¶¯Æ÷"
 
 #: ../../install_steps_interactive.pm_.c:1202
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr "Ñ¡ÔñÄúÒªÖÆ×÷¿ª»úÈíÅ̵ÄÈíÅÌ»ú"
+msgstr "Ñ¡ÔñÄúÒªÖÆ×÷¿ª»úÈíÅ̵ÄÈíÅÌÇý¶¯Æ÷"
 
 #: ../../install_steps_interactive.pm_.c:1206
 #, c-format
@@ -5797,11 +5828,11 @@ msgstr "Çë²åÈëÒ»ÕÅÈíÅ̵½Çý¶¯Æ÷ %s"
 
 #: ../../install_steps_interactive.pm_.c:1209
 msgid "Creating bootdisk..."
-msgstr "ÕýÔÚÖÆ×÷¿ª»úÈíÅÌ"
+msgstr "ÕýÔÚÖÆ×÷Æô¶¯ÈíÅÌ"
 
 #: ../../install_steps_interactive.pm_.c:1216
 msgid "Preparing bootloader..."
-msgstr "×¼±¸¿ª»úÒýµ¼³ÌÐò"
+msgstr "×¼±¸Æô¶¯Òýµ¼³ÌÐò"
 
 #: ../../install_steps_interactive.pm_.c:1227
 msgid ""
@@ -5811,7 +5842,7 @@ msgid ""
 " need to use BootX to boot your machine"
 msgstr ""
 "ÄãºÃÏñÓõÄÊÇÀϵôÑÀ»ò²»ÈÏʶµÄ»úÆ÷,\n"
-"yabootÎÞ·¨¿ª»úÆô¶¯.\n"
+"yabootÎÞ·¨¿ª»úÆô¶¯¡£\n"
 "Òª¼ÌÐø°²×°, ÄãµÃʹÓÃBootXÆô¶¯"
 
 #: ../../install_steps_interactive.pm_.c:1233
@@ -5832,7 +5863,7 @@ msgstr "°²×°Òýµ¼³ÌÐò"
 
 #: ../../install_steps_interactive.pm_.c:1249
 msgid "Installation of bootloader failed. The following error occured:"
-msgstr "°²×°ÏµÍ³Òýµ¼³ÌÐòʧ°Ü£¬³öÏÖÏÂÁдíÎó:"
+msgstr "°²×°ÏµÍ³Òýµ¼³ÌÐòʧ°Ü, ³öÏÖÏÂÁдíÎó:"
 
 #: ../../install_steps_interactive.pm_.c:1257
 #, c-format
@@ -5844,11 +5875,11 @@ msgid ""
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
-"Äã¿ÉÄܵøıä¹Ì¼þÒýµ¼É豸À´Ê¹ÄÜ¿ª»úÒýµ¼³ÌÐò.\n"
+"Äã¿ÉÄܵøıä¹Ì¼þÒýµ¼É豸À´Ê¹ÄÜÆô¶¯Òýµ¼³ÌÐò¡£\n"
 "Èç¹û¿ª»úʱûÓÐÒýµ¼³ÌÐòÌáʾ, °´Command-Option-O-FÈ»ºóÊäÈë:\n"
 " setenv boot-device %s,\\\\:tbxi\n"
 " È»ºóÊäÈë: shut-down\n"
-"Ä㽫ÔÚÏ´οª»úʱ¿´µ½Òýµ¼³ÌÐòÌáʾ."
+"Ä㽫ÔÚÏ´οª»úʱ¿´µ½Òýµ¼³ÌÐòÌáʾ¡£"
 
 #: ../../install_steps_interactive.pm_.c:1291
 #: ../../standalone/drakautoinst_.c:79
@@ -5858,7 +5889,7 @@ msgstr "ÇëÔÚÇý¶¯Æ÷ %s ÖвåÈëÒ»ÕÅ¿Õ°×ÈíÅÌ"
 
 #: ../../install_steps_interactive.pm_.c:1295
 msgid "Creating auto install floppy..."
-msgstr "ÕýÔÚ´´½¨×Ô¶¯°²×°ÈíÅÌ"
+msgstr "ÕýÔÚ´´½¨×Ô¶¯°²×°ÈíÅÌ..."
 
 #: ../../install_steps_interactive.pm_.c:1306
 msgid ""
@@ -5888,8 +5919,8 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
-"¹§Ï². °²×°Íê³ÉÁË.\n"
-"È¡³ö¿ª»úµÄ¹âÅÌ»òÈíÅÌ, È»ºó°´ ENTER, ÖØÐÂÆô¶¯ÄúµÄϵͳ.\n"
+"¹§Ï²¡£°²×°Íê³ÉÁË¡£\n"
+"È¡³ö¿ª»úµÄ¹âÅÌ»òÈíÅÌ, È»ºó°´ ENTER, ÖØÐÂÆô¶¯ÄúµÄϵͳ¡£\n"
 "\n"
 "\n"
 "ÒªÁ˽â Mandrake Linux µÄÐ޸ĺ͸üÐÂ,\n"
@@ -5899,7 +5930,7 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"¹ØÓÚÈçºÎÅäÖÃÄúµÄϵͳ, Çë²é¿´ Mandrake Linux Óû§ÊÖ²á."
+"¹ØÓÚÈçºÎÅäÖÃÄúµÄϵͳ, Çë²é¿´ Mandrake Linux Óû§Êֲᡣ"
 
 #: ../../install_steps_interactive.pm_.c:1330
 msgid "http://www.mandrakelinux.com/en/90errata.php3"
@@ -5916,7 +5947,7 @@ msgid ""
 "(this is meant for installing on another box).\n"
 "\n"
 "You may prefer to replay the installation.\n"
-msgstr "×Ô¶¯°²×°ÄÜÈ«×Ô¶¯´¦ÀíÓ²ÅÌ°²×°, Äã¿ÉÄÜÔ¸ÒâÖØÏÖ°²×°.\n"
+msgstr "×Ô¶¯°²×°ÄÜÈ«×Ô¶¯´¦ÀíÓ²ÅÌ°²×°, Äã¿ÉÄÜÔ¸ÒâÖØÏÖ°²×°¡£\n"
 
 #: ../../install_steps_interactive.pm_.c:1342
 msgid "Automated"
@@ -5943,7 +5974,7 @@ msgstr "  <Tab>/<Alt-Tab> ÔÚÏîÄ¿¼äÒƶ¯  |  <Space> Ñ¡Ôñ  |  <F12> ϸö»­Ãæ  "
 
 #: ../../interactive.pm_.c:87
 msgid "kdesu missing"
-msgstr "ȱÉÙkdesu"
+msgstr "ȱÉÙ kdesu"
 
 #: ../../interactive.pm_.c:89 ../../interactive.pm_.c:100
 msgid "consolehelper missing"
@@ -5957,14 +5988,14 @@ msgstr "Ñ¡ÔñÎļþ"
 msgid "Advanced"
 msgstr "¸ß¼¶"
 
-#: ../../interactive.pm_.c:321
+#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:220
 msgid "Basic"
 msgstr "»ù±¾"
 
 #: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:158
-#: ../../printerdrake.pm_.c:2124
+#: ../../printerdrake.pm_.c:2169
 msgid "<- Previous"
-msgstr "<-Ç°Ò»²½"
+msgstr "<- ÉÏÒ»²½"
 
 #: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
 #: ../../standalone/drakbackup_.c:4114 ../../standalone/drakbackup_.c:4141
@@ -5974,12 +6005,12 @@ msgstr "ÏÂÒ»²½"
 
 #: ../../interactive/stdio.pm_.c:29 ../../interactive/stdio.pm_.c:149
 msgid "Bad choice, try again\n"
-msgstr "´íÎóµÄÑ¡Ôñ£¬ÇëÖØÊÔ\n"
+msgstr "´íÎóµÄÑ¡Ôñ, ÇëÖØÊÔ\n"
 
 #: ../../interactive/stdio.pm_.c:30 ../../interactive/stdio.pm_.c:150
 #, c-format
 msgid "Your choice? (default %s) "
-msgstr "ÄúµÄÑ¡Ôñ ? (ȱʡ %s) "
+msgstr "ÄúµÄÑ¡Ôñ? (ĬÈÏ %s) "
 
 #: ../../interactive/stdio.pm_.c:54
 #, c-format
@@ -5993,7 +6024,7 @@ msgstr ""
 #: ../../interactive/stdio.pm_.c:70
 #, c-format
 msgid "Your choice? (0/1, default `%s') "
-msgstr "ÄúµÄÑ¡Ôñ ? (0/1, ȱʡ %s) "
+msgstr "ÄúµÄÑ¡Ôñ? (0/1, ĬÈÏ %s) "
 
 #: ../../interactive/stdio.pm_.c:95
 #, c-format
@@ -6011,7 +6042,7 @@ msgstr "ÊäÈë `void' Èç¹ûÄÇÒ»ÏîûÓÐÄÚÈÝ"
 #: ../../interactive/stdio.pm_.c:105
 #, c-format
 msgid "Your choice? (default `%s'%s) "
-msgstr "ÄúµÄÑ¡Ôñ ? (ȱʡ `%s'%s) "
+msgstr "ÄúµÄÑ¡Ôñ? (ĬÈÏ `%s'%s) "
 
 #: ../../interactive/stdio.pm_.c:123
 #, c-format
@@ -6255,11 +6286,11 @@ msgstr "Á¢ÌÕÍð AZERTY (ÐÂʽ)"
 
 #: ../../keyboard.pm_.c:222
 msgid "Lithuanian \"number row\" QWERTY"
-msgstr "Á¢ÌÕÍð \"number row\" QWERTY"
+msgstr "Á¢ÌÕÍð¡°number row¡±QWERTY"
 
 #: ../../keyboard.pm_.c:223
 msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr "Á¢ÌÕÍð \"phonetic\" QWERTY"
+msgstr "Á¢ÌÕÍð¡°phonetic¡±QWERTY"
 
 #: ../../keyboard.pm_.c:224
 msgid "Latvian"
@@ -6351,11 +6382,11 @@ msgstr "Ì©¹úÓï"
 
 #: ../../keyboard.pm_.c:253
 msgid "Turkish (traditional \"F\" model)"
-msgstr "ÍÁ¶úÆä (´«Í³ \"F\" ʽ)"
+msgstr "ÍÁ¶úÆä (´«Í³¡°F¡±Ê½)"
 
 #: ../../keyboard.pm_.c:254
 msgid "Turkish (modern \"Q\" model)"
-msgstr "ÍÁ¶úÆä (ÏÖ´ú \"Q\" ʽ)"
+msgstr "ÍÁ¶úÆä (ÏÖ´ú¡°Q¡±Ê½)"
 
 #: ../../keyboard.pm_.c:256
 msgid "Ukrainian"
@@ -6367,7 +6398,7 @@ msgstr "ÃÀʽ¼üÅÌ (¹ú¼Ê)"
 
 #: ../../keyboard.pm_.c:260
 msgid "Vietnamese \"numeric row\" QWERTY"
-msgstr "Ô½ÄϼüÅÌ \"number row\" QWERTY"
+msgstr "Ô½ÄϼüÅÌ¡°number row¡±QWERTY"
 
 #: ../../keyboard.pm_.c:261
 msgid "Yugoslavian (latin)"
@@ -6399,15 +6430,15 @@ msgstr "ͬʱ°´ Alt ºÍ Shift ¼ü"
 
 #: ../../keyboard.pm_.c:274
 msgid "\"Menu\" key"
-msgstr "\"²Ëµ¥\"¼ü"
+msgstr "¡°²Ëµ¥¡±¼ü"
 
 #: ../../keyboard.pm_.c:275
 msgid "Left \"Windows\" key"
-msgstr "×ó \"´°¿Ú\" ¼ü"
+msgstr "×ó¡°Windows¡±¼ü"
 
 #: ../../keyboard.pm_.c:276
 msgid "Right \"Windows\" key"
-msgstr "ÓÒ \"´°¿Ú\" ¼ü"
+msgstr "ÓÒ¡°Windows¡±¼ü"
 
 #: ../../loopback.pm_.c:32
 #, c-format
@@ -6443,7 +6474,7 @@ msgstr "¶ººÅ·ÖÀ¸µÄ´ÊÓï"
 #: ../../modules.pm_.c:293
 msgid ""
 "PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
-msgstr "2.2 µÄÄں˲»Ö§³Ö PCMCIA É豸, ÇëʹÓà 2.4 µÄÄÚºË."
+msgstr "2.2 µÄÄں˲»Ö§³Ö PCMCIA É豸, ÇëʹÓà 2.4 µÄÄںˡ£"
 
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
@@ -6475,11 +6506,11 @@ msgstr "Genius NetScroll"
 
 #: ../../mouse.pm_.c:39 ../../mouse.pm_.c:48
 msgid "Microsoft Explorer"
-msgstr "΢Èíä¯ÀÀÆ÷"
+msgstr "Microsoft Explorer"
 
 #: ../../mouse.pm_.c:44 ../../mouse.pm_.c:70
 msgid "1 button"
-msgstr "µ¥ ¼ü"
+msgstr "µ¥¼ü"
 
 #: ../../mouse.pm_.c:45 ../../mouse.pm_.c:53
 msgid "Generic 2 Button Mouse"
@@ -6551,7 +6582,7 @@ msgstr "ûÓÐÊó±ê"
 
 #: ../../mouse.pm_.c:486
 msgid "Please test the mouse"
-msgstr "Çë²âÊÔÄúµÄÊó±ê."
+msgstr "Çë²âÊÔÄúµÄÊó±ê¡£"
 
 #: ../../mouse.pm_.c:487
 msgid "To activate the mouse,"
@@ -6569,7 +6600,7 @@ msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
 msgid "Finish"
 msgstr "Íê³É"
 
-#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2126
+#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2171
 msgid "Next ->"
 msgstr "ÏÂÒ»²½ ->"
 
@@ -6603,9 +6634,9 @@ msgid ""
 "Some connections use pptp, a few ones use dhcp.\n"
 "If you don't know, choose 'use pppoe'"
 msgstr ""
-"ÀûÓà ADSL Á¬½Ó×î³£Óõķ½·¨ÊÇ dhcp + pppoe.\n"
-"²»¹ý, ȷʵÓÐһЩÁ¬½ÓÊÇÖ»Óà dhcp. \n"
-"Èç¹ûÄúûÓаÑÎÕ¾ÍÑ¡Ôñ 'ʹÓà pppoe'"
+"ÀûÓà ADSL Á¬½Ó×î³£Óõķ½·¨ÊÇ dhcp + pppoe¡£\n"
+"²»¹ý, ȷʵÓÐһЩÁ¬½ÓÊÇÖ»Óà dhcp¡£\n"
+"Èç¹ûÄúûÓаÑÎÕ¾ÍÑ¡Ôñ¡°pppoe¡±"
 
 #: ../../network/adsl.pm_.c:26
 msgid "Alcatel speedtouch usb"
@@ -6625,7 +6656,7 @@ msgstr "ʹÓà pptp"
 
 #: ../../network/drakfirewall.pm_.c:12
 msgid "Web Server"
-msgstr "WEB ·þÎñÆ÷"
+msgstr "Web ·þÎñÆ÷"
 
 #: ../../network/drakfirewall.pm_.c:17
 msgid "Domain Name Server"
@@ -6653,9 +6684,9 @@ msgid ""
 msgstr ""
 "drakfirewall ·À»ðǽÅäÖÃ\n"
 "\n"
-"Õâ¸ö³ÌÐòΪÄúµÄ Mandrake Linux »úÆ÷ÅäÖøöÈË·À»ðǽ.\n"
+"Õâ¸ö³ÌÐòΪÄúµÄ Mandrake Linux »úÆ÷ÅäÖøöÈË·À»ðǽ¡£\n"
 "Èç¹ûÒªÅäÖÃÇ¿´óµÄרÓ÷À»ðǽ, Ç뿼ÂÇʹÓÃרÃŵÄ\n"
-"MandrakeSecurity ·À»ðǽ·¢Ðаæ."
+"MandrakeSecurity ·À»ðǽ·¢Ðа档"
 
 #: ../../network/drakfirewall.pm_.c:147
 msgid "Which services would you like to allow the Internet to connect to?"
@@ -6667,9 +6698,9 @@ msgid ""
 "Valid examples are: 139/tcp 139/udp.\n"
 "Have a look at /etc/services for information."
 msgstr ""
-"Äú¿ÉÒÔÊäÈë¸÷Öֶ˿Ú. \n"
-"ÀýÈç, ¿ÉÒÔÕâÑù: 139/tcp 139/udp.\n"
-"Çë²Î¿¼ /etc/services Îļþ."
+"Äú¿ÉÒÔÊäÈë¸÷Öֶ˿ڡ£\n"
+"ÀýÈç, ¿ÉÒÔÕâÑù: 139/tcp 139/udp¡£\n"
+"Çë²Î¿¼ /etc/services Îļþ¡£"
 
 #: ../../network/drakfirewall.pm_.c:154
 #, c-format
@@ -6678,9 +6709,9 @@ msgid ""
 "The proper format is \"port/tcp\" or \"port/udp\", \n"
 "where port is between 1 and 65535."
 msgstr ""
-"Ö¸¶¨µÄ¶Ë¿ÚÎÞЧ: %s.\n"
+"Ö¸¶¨µÄ¶Ë¿ÚÎÞЧ: %s¡£\n"
 "ÕýÈ·µÄ¸ñʽÊÇ \"port/tcp\" »ò \"port/udp\", \n"
-"ÆäÖÐ port ÒªÔÚ 1 ºÍ 65535 Ö®¼ä."
+"ÆäÖÐ port ÒªÔÚ 1 ºÍ 65535 Ö®¼ä¡£"
 
 #: ../../network/drakfirewall.pm_.c:162
 msgid "Everything (no firewall)"
@@ -6696,28 +6727,28 @@ msgid ""
 "Default is dhcpcd"
 msgstr ""
 "ÄúÏëҪʹÓÃÄÄÖÖ DHCP ¿Í»§³ÌÐò?\n"
-"ȱʡµÄÊÇ dhcpcd"
+"ĬÈϵÄÊÇ dhcpcd"
 
 #: ../../network/ethernet.pm_.c:88
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
 msgstr ""
-"ûÓÐÔÚÄúµÄϵͳÀï·¢ÏÖÒÔÌ«Íø¿¨. \n"
-"ÎÞ·¨ÉèÖÃÕâ¸öÁ¬½ÓÀàÐÍ."
+"ûÓÐÔÚÄúµÄϵͳÀï·¢ÏÖÒÔÌ«Íø¿¨¡£\n"
+"ÎÞ·¨ÉèÖÃÕâ¸öÁ¬½ÓÀàÐÍ¡£"
 
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:240
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:236
 msgid "Choose the network interface"
 msgstr "Ñ¡ÔñÍøÂç½Ó¿Ú"
 
 #: ../../network/ethernet.pm_.c:93
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet"
-msgstr "ÇëÑ¡ÔñÓÃÄĸöÍø¿¨Á¬½Ó»¥ÁªÍø."
+msgstr "ÇëÑ¡ÔñÓÃÄĸöÍø¿¨Á¬½Ó»¥ÁªÍø¡£"
 
 #: ../../network/ethernet.pm_.c:178
 msgid "no network card found"
-msgstr "ÕÒ²»µ½ÍøÂ翨"
+msgstr "ÕÒ²»µ½Íø¿¨"
 
 #: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:362
 msgid "Configuring network"
@@ -6732,12 +6763,12 @@ msgid ""
 msgstr ""
 "Èç¹ûÄúÖªµÀ, ¾ÍÇëÊäÈëÄúµÄÖ÷»úÃû×Ö\n"
 "ÓÐЩ DHCP ·þÎñÆ÷ÐèÒªÖ÷»úÃû³Æ²ÅÄܹ¤×÷.\n"
-"ÄúµÄÖ÷»úÃû³Æ±ØÐèÊǸöÍêÈ«ÏÞ¶¨Ö÷»úÃû×Ö£¬\n"
-"ÀýÈç ``mybox.mylab.myco.com''"
+"ÄúµÄÖ÷»úÃû³Æ±ØÐèÊǸöÍêÈ«ÏÞ¶¨Ö÷»úÃû×Ö, \n"
+"ÀýÈç¡°mybox.mylab.myco.com¡±"
 
 #: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:367
 msgid "Host name"
-msgstr "Ö÷»úÃû×Ö"
+msgstr "Ö÷»úÃû"
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
 #: ../../network/netconnect.pm_.c:90 ../../network/netconnect.pm_.c:104
@@ -6745,7 +6776,7 @@ msgstr "Ö÷»úÃû×Ö"
 #: ../../network/netconnect.pm_.c:201 ../../network/netconnect.pm_.c:224
 #: ../../network/netconnect.pm_.c:232
 msgid "Network Configuration Wizard"
-msgstr "ÍøÂçÅäÖÃ"
+msgstr "ÍøÂçÅäÖÃÏòµ¼"
 
 #: ../../network/isdn.pm_.c:22
 msgid "External ISDN modem"
@@ -6773,9 +6804,9 @@ msgid ""
 msgstr ""
 "Äãϲ»¶ÄĸöISDNÅäÖÃ?\n"
 "\n"
-"* ÀϵÄÅäÖÃʹÓÃisdn4net, ¹¦ÄÜÇ¿´ó, ÅäÖÃÀ§ÄÑ.\n"
+"* ÀϵÄÅäÖÃʹÓÃisdn4net, ¹¦ÄÜÇ¿´ó, ÅäÖÃÀ§ÄÑ¡£\n"
 "\n"
-"* еÄÅäÖüòµ¥Ò׶®£¬±ê×¼£¬¹¤¾ß½ÏÉÙ.\n"
+"* еÄÅäÖüòµ¥Ò׶®, ±ê×¼, ¹¤¾ß½ÏÉÙ¡£\n"
 
 #: ../../network/isdn.pm_.c:54
 msgid "New configuration (isdn-light)"
@@ -6796,8 +6827,8 @@ msgid ""
 "Select your provider.\n"
 "If it isn't listed, choose Unlisted."
 msgstr ""
-"ÌôÑ¡ÄúµÄÌṩÉÌ. \n"
-"Èç¹ûËü²»ÔÚÁбíÀï, Ñ¡Ôñ Unlisted"
+"ÌôÑ¡ÄúµÄÌṩÉÌ¡£\n"
+"Èç¹ûËü²»ÔÚÁбíÀï, Ñ¡ÔñδÁгö¡£"
 
 #: ../../network/isdn.pm_.c:183
 msgid "Europe protocol"
@@ -6805,18 +6836,18 @@ msgstr "Å·ÖÞЭÒé"
 
 #: ../../network/isdn.pm_.c:183
 msgid "Europe protocol (EDSS1)"
-msgstr "Å·ÖÞЭÒé(EDSS1), ÖйúҲʹÓÃ"
+msgstr "Å·ÖÞЭÒé(EDSS1)"
 
 #: ../../network/isdn.pm_.c:185
 msgid "Protocol for the rest of the world"
-msgstr "ÆäËûµØÇøЭÒé"
+msgstr "ÆäËüµØÇøЭÒé"
 
 #: ../../network/isdn.pm_.c:185
 msgid ""
 "Protocol for the rest of the world\n"
 "No D-Channel (leased lines)"
 msgstr ""
-"ÆäËûµØÇø \n"
+"ÆäËüµØÇø \n"
 " ûÓÐ D-ÐŵÀ(רÏß)"
 
 #: ../../network/isdn.pm_.c:189
@@ -6853,9 +6884,9 @@ msgid ""
 "card.\n"
 msgstr ""
 "\n"
-"Èç¹ûÄúµÄ¿¨ÊÇ ISA ¿¨, ÏÂÒ»ÆÁÄ»ÏÔʾµÄÖµÓ¦¸ÃÊÇÕýÈ·µÄ.\n"
+"Èç¹ûÄúµÄ¿¨ÊÇ ISA ¿¨, ÏÂÒ»ÆÁÄ»ÏÔʾµÄÖµÓ¦¸ÃÊÇÕýÈ·µÄ¡£\n"
 "\n"
-"Èç¹ûÄúµÄ¿¨ ÊÇ PCMCIA ¿¨, Äú±ØÐëÖªµÀËüµÄ irq ºÍ io.\n"
+"Èç¹ûÄúµÄ¿¨ ÊÇ PCMCIA ¿¨, Äú±ØÐëÖªµÀËüµÄ irq ºÍ io¡£\n"
 
 #: ../../network/isdn.pm_.c:218
 msgid "Abort"
@@ -6874,20 +6905,20 @@ msgid ""
 "I have detected an ISDN PCI card, but I don't know its type. Please select a "
 "PCI card on the next screen."
 msgstr ""
-"ÎÒ̽²âµ½Ò»¿é ISDN PCI ¿¨, ²»¹ýÎÞ·¨Ê¶±ðËüµÄÐͺÅ. ÇëÔÚÏÂÒ»ÆÁÄ»Àï\n"
-"Ñ¡ÔñÄúµÄ PCI ¿¨"
+"ÎÒ̽²âµ½Ò»¿é ISDN PCI ¿¨, ²»¹ýÎÞ·¨Ê¶±ðËüµÄÐͺš£ÇëÔÚÏÂÒ»ÆÁÄ»Àï\n"
+"Ñ¡ÔñÄúµÄ PCI ¿¨¡£"
 
 #: ../../network/isdn.pm_.c:252
 msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "ûÓÐ̽²âµ½ ISDN PCI ¿¨. ÇëÔÚÏÂÒ»ÆÁÄ»ÀïÌôÑ¡Ò»ÖÖ."
+msgstr "ûÓÐ̽²âµ½ ISDN PCI ¿¨¡£ÇëÔÚÏÂÒ»ÆÁÄ»ÀïÌôÑ¡Ò»ÖÖ¡£"
 
 #: ../../network/modem.pm_.c:39
 msgid "Please choose which serial port your modem is connected to."
-msgstr "ÇëÎÊÄúµÄµ÷Öƽâµ÷Æ÷ÊÇÁ¬½Óµ½ÄǸö´®Ðж˿Ú?"
+msgstr "ÇëÑ¡ÔñÄúµÄµ÷Öƽâµ÷Æ÷ÊÇÁ¬½Óµ½Äĸö´®Ðж˿ڡ£"
 
 #: ../../network/modem.pm_.c:44
 msgid "Dialup options"
-msgstr "²¦ºÅ½ÓÈëÑ¡Ïî"
+msgstr "²¦ºÅÑ¡Ïî"
 
 #: ../../network/modem.pm_.c:45 ../../standalone/drakconnect_.c:621
 msgid "Connection name"
@@ -6935,7 +6966,7 @@ msgid ""
 "You can disconnect or reconfigure your connection."
 msgstr ""
 "\n"
-"Äú¿ÉÒÔÇжϵ½»¥ÁªÍøµÄÁ¬½Ó,»òÖØÐÂÅäÖÃÍøÂçÁ¬½Ó"
+"Äú¿ÉÒÔÇжϵ½»¥ÁªÍøµÄÁ¬½Ó»òÖØÐÂÅäÖÃÍøÂçÁ¬½Ó¡£"
 
 #: ../../network/netconnect.pm_.c:29 ../../network/netconnect.pm_.c:32
 msgid ""
@@ -6943,11 +6974,11 @@ msgid ""
 "You can reconfigure your connection."
 msgstr ""
 "\n"
-"Äú¿ÉÒÔÖØÐÂÅäÖû¥ÁªÍøÁ¬½Ó"
+"Äú¿ÉÒÔÖØÐÂÅäÖû¥ÁªÍøÁ¬½Ó¡£"
 
 #: ../../network/netconnect.pm_.c:29
 msgid "You are currently connected to internet."
-msgstr "ÄúÏÖÔÚÕýÁ¬½Óµ½»¥ÁªÍø"
+msgstr "ÄúÏÖÔÚÕýÁ¬½Óµ½»¥ÁªÍø¡£"
 
 #: ../../network/netconnect.pm_.c:32
 msgid ""
@@ -6955,11 +6986,11 @@ msgid ""
 "You can connect to Internet or reconfigure your connection."
 msgstr ""
 "\n"
-"Á¬½Óµ½»¥ÁªÍø, »òÖØÐÂÅäÖÃÍøÂçÁ¬½Ó"
+"Á¬½Óµ½»¥ÁªÍø, »òÖØÐÂÅäÖÃÍøÂçÁ¬½Ó¡£"
 
 #: ../../network/netconnect.pm_.c:32
 msgid "You are not currently connected to Internet."
-msgstr "ÄúÏÖÔÚûÓÐÁ¬½Óµ½»¥ÁªÍø"
+msgstr "ÄúÏÖÔÚûÓÐÁ¬½Óµ½»¥ÁªÍø¡£"
 
 #: ../../network/netconnect.pm_.c:36
 msgid "Connect"
@@ -6980,7 +7011,7 @@ msgstr "»¥ÁªÍøÁ¬½ÓºÍÅäÖÃ"
 #: ../../network/netconnect.pm_.c:95
 #, c-format
 msgid "We are now going to configure the %s connection."
-msgstr "ÏÖÔÚÅäÖÃ%sÍøÂçÁ¬½Ó."
+msgstr "ÏÖÔÚÅäÖÃ%sÍøÂçÁ¬½Ó¡£"
 
 #: ../../network/netconnect.pm_.c:104
 #, c-format
@@ -6996,10 +7027,10 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"ÏÖÔÚ½«ÅäÖà %s ÍøÂçÁ¬½Ó.\n"
+"ÏÖÔÚ½«ÅäÖà %s ÍøÂçÁ¬½Ó¡£\n"
 "\n"
 "\n"
-"°´ Íê³É ¼ÌÐø."
+"°´È·¶¨¼ÌÐø¡£"
 
 #: ../../network/netconnect.pm_.c:133 ../../network/netconnect.pm_.c:251
 #: ../../network/netconnect.pm_.c:271 ../../network/tools.pm_.c:63
@@ -7013,8 +7044,8 @@ msgid ""
 "Click on Ok to keep your configuration, or cancel to reconfigure your "
 "Internet & Network connection.\n"
 msgstr ""
-"ÄãÕýÔÚ°²×°ÍøÂç,ÄãµÄÍøÂçÒѾ­ÅäÖúÃ.\n"
-"µã»÷ È·¶¨ ±£´æÅäÖÃ, »ò È¡Ïû ÖØÐÂÅäÖÃÍøÂç.\n"
+"ÄãÕýÔÚ°²×°ÍøÂç,ÄãµÄÍøÂçÒѾ­ÅäÖúá£\n"
+"µã»÷ È·¶¨ ±£´æÅäÖÃ, »ò È¡Ïû ÖØÐÂÅäÖÃÍøÂç¡£\n"
 
 #: ../../network/netconnect.pm_.c:160
 msgid ""
@@ -7023,28 +7054,28 @@ msgid ""
 "We are about to configure your internet/network connection.\n"
 "If you don't want to use the auto detection, deselect the checkbox.\n"
 msgstr ""
-"»¶Ó­Ê¹ÓÃÍøÂçÅäÖþ«Áé\n"
+"»¶Ó­Ê¹ÓÃÍøÂçÅäÖÃÏòµ¼\n"
 "\n"
-"ÅäÖÃinternet/ÍøÂçÁ¬½Ó.\n"
-"Èç¹ûÄã²»Ïë×Ô¶¯¼ì²â, ²»Ñ¡ ¼ìÑéºÐ.\n"
+"ÅäÖÃInternet/ÍøÂçÁ¬½Ó¡£\n"
+"Èç¹ûÄã²»Ïë×Ô¶¯¼ì²â, ²»ÒªÑ¡Ôò´ËÑ¡Ïî¡£\n"
 
 #: ../../network/netconnect.pm_.c:166
 msgid "Choose the profile to configure"
-msgstr "Ñ¡ÔñÒªÅäÖõÄprofile"
+msgstr "Ñ¡ÔñÒªÅäÖõÄÅäÖÃÎļþ"
 
 #: ../../network/netconnect.pm_.c:167
 msgid "Use auto detection"
 msgstr "ʹÓÃ×Ô¶¯¼ì²â"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3151
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3199
 #: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
-#: ../../standalone/drakfloppy_.c:145
+#: ../../standalone/drakfloppy_.c:146
 msgid "Expert Mode"
 msgstr "ר¼Òģʽ"
 
-#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:386
+#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:399
 msgid "Detecting devices..."
-msgstr "ÕýÔÚ̽²âÉ豸..."
+msgstr "ÕýÔÚ¼ì²âÉ豸..."
 
 #: ../../network/netconnect.pm_.c:185 ../../network/netconnect.pm_.c:194
 msgid "Normal modem connection"
@@ -7062,11 +7093,11 @@ msgstr "ÅäÖà ISDN Á¬½Ó"
 #: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
 #, c-format
 msgid "detected %s"
-msgstr "¼ì²â %s"
+msgstr "¼ì²âµ½ %s"
 
 #: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
 msgid "ADSL connection"
-msgstr "ADSLÁ¬½Ó"
+msgstr "ADSL Á¬½Ó"
 
 #: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
 #, c-format
@@ -7099,13 +7130,13 @@ msgid ""
 "Choose the one you want to use.\n"
 "\n"
 msgstr ""
-"ÄãÅäÖÃÁ˶àÖÖInternet·ÃÎÊ·½Ê½.\n"
-"Ñ¡ÔñÄãҪʹÓõÄÒ»ÖÖ.\n"
+"ÄãÅäÖÃÁ˶àÖÖInternet·ÃÎÊ·½Ê½¡£\n"
+"Ñ¡ÔñÄãҪʹÓõÄÒ»ÖÖ¡£\n"
 "\n"
 
 #: ../../network/netconnect.pm_.c:226
 msgid "Internet connection"
-msgstr "¹²Ïí»¥ÁªÍøÁ¬½Ó"
+msgstr "Internet Á¬½Ó"
 
 #: ../../network/netconnect.pm_.c:232
 msgid "Do you want to start the connection at boot?"
@@ -7135,13 +7166,13 @@ msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
 "The configuration will now be applied to your system.\n"
 "\n"
-msgstr "×£ºØ,ÍøÂçºÍinternetÅäÖÃÍê³É.\n"
+msgstr "×£ºØ,ÍøÂçºÍInternetÅäÖÃÍê³É¡£\n"
 
 #: ../../network/netconnect.pm_.c:265
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
-msgstr "½¨ÒéÖØÆô¶¯ X »·¾³ÒÔ±ÜÃâÈκÎÓÚÖ÷»úÃûÓйصÄÎÊÌâ. "
+msgstr "½¨ÒéÖØÆô¶¯ X »·¾³ÒÔ±ÜÃâÈκÎÓÚÖ÷»úÃûÓйصÄÎÊÌâ¡£"
 
 #: ../../network/netconnect.pm_.c:266
 msgid ""
@@ -7149,8 +7180,8 @@ msgid ""
 "Test your connection via net_monitor or mcc. If your connection doesn't "
 "work, you might want to relaunch the configuration."
 msgstr ""
-"ÅäÖùý³ÌÖгöÏÖ´íÎó.\n"
-"Çë´ÓÍøÂç¼àÊÓÆ÷»òÕßÅäÖÃÖÐÐIJâÊÔÄúµÄÁ¬½Ó. Èç¹ûËü²»¹¤×÷, ¿ÉÒÔÖØÐÂÅäÖÃ."
+"ÅäÖùý³ÌÖгöÏÖ´íÎó¡£\n"
+"Çë´ÓÍøÂç¼àÊÓÆ÷»òÕßÅäÖÃÖÐÐIJâÊÔÄúµÄÁ¬½Ó. Èç¹ûËü²»¹¤×÷, ¿ÉÒÔÖØÐÂÅäÖá£"
 
 #: ../../network/network.pm_.c:291
 msgid ""
@@ -7159,9 +7190,9 @@ msgid ""
 "Simply accept to keep this device configured.\n"
 "Modifying the fields below will override this configuration."
 msgstr ""
-"¾¯¸æ: Õâ¸öÉ豸ÒѾ­±»ÅäÖÃÓÃÓÚ»¥ÁªÍøÁ¬½Ó..\n"
-"Òª±£ÁôÏÖÓеÄÅäÖÃֻҪѡÔñ È·¶¨.\n"
-"ÐÞ¸ÄÒÔϵÄÏîÄ¿½«¸²¸ÇÔ­ÓеÄÉ趨.."
+"¾¯¸æ: Õâ¸öÉ豸ÒѾ­±»ÅäÖÃÓÃÓÚ»¥ÁªÍøÁ¬½Ó¡£\n"
+"Òª±£ÁôÏÖÓеÄÅäÖÃֻҪѡÔñ È·¶¨¡£\n"
+"ÐÞ¸ÄÒÔϵÄÏîÄ¿½«¸²¸ÇÔ­ÓеÄÉ趨¡£"
 
 #: ../../network/network.pm_.c:296
 msgid ""
@@ -7169,8 +7200,8 @@ msgid ""
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
 msgstr ""
-"ÇëÊäÈëÕą̂µçÄ﵀ IP ÅäÖÃ. \n"
-"ÏÂÁÐÏîÄ¿ÒªÇóÊäÈëÒÔ¾äµã·Ö¸ôÊ®½øÖƸñʽ±íʾµÄ IP µØÖ·.\n"
+"ÇëÊäÈëÕą̂µçÄ﵀ IP ÅäÖá£\n"
+"ÏÂÁÐÏîÄ¿ÒªÇóÊäÈëÒÔ¾äµã·Ö¸ôÊ®½øÖƸñʽ±íʾµÄ IP µØÖ·¡£\n"
 " (ÀýÈç 192.168.1.1) "
 
 #: ../../network/network.pm_.c:306 ../../network/network.pm_.c:307
@@ -7190,7 +7221,7 @@ msgstr "IP µØÖ·"
 
 #: ../../network/network.pm_.c:310 ../../standalone/drakconnect_.c:468
 msgid "Netmask"
-msgstr "×ÓÍøÑÚÂë:"
+msgstr "×ÓÍøÑÚÂë"
 
 #: ../../network/network.pm_.c:311
 msgid "(bootp/dhcp)"
@@ -7198,13 +7229,13 @@ msgstr "(bootp/dhcp)"
 
 #: ../../network/network.pm_.c:311
 msgid "Automatic IP"
-msgstr "×Ô¶¯ÉèÖà IP"
+msgstr "×Ô¶¯ IP"
 
 #: ../../network/network.pm_.c:312
 msgid "Start at boot"
 msgstr "¿ª»úʱÆô¶¯"
 
-#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:860
+#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:875
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP µØÖ·µÄ¸ñʽӦ¸ÃÊÇ 1.2.3.4"
 
@@ -7216,8 +7247,8 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 "ÇëÊäÈëÄúµÄÖ÷»úÃû³Æ\n"
-"ÄúµÄÖ÷»úÃû³Æ±ØÐèÊǸöÍêÈ«ÏÞ¶¨µÄÃû³Æ£¬ÀýÈç ``mybox.mylab.myco.com''\n"
-"Èç¹ûÄúÓÐÍø¹ØµÄ»°£¬Ò²ÇëÊäÈëÆä IP µØÖ·"
+"ÄúµÄÖ÷»úÃû³Æ±ØÐèÊǸöÍêÈ«ÏÞ¶¨µÄÃû³Æ, ÀýÈç¡°mybox.mylab.myco.com¡±\n"
+"Èç¹ûÄúÓÐÍø¹ØµÄ»°, Ò²ÇëÊäÈëÆä IP µØÖ·"
 
 #: ../../network/network.pm_.c:368
 msgid "DNS server"
@@ -7233,14 +7264,12 @@ msgid "Gateway device"
 msgstr "Íø¹ØÉ豸"
 
 #: ../../network/network.pm_.c:376
-#, fuzzy
 msgid "DNS server address should be in format 1.2.3.4"
-msgstr "IP µØÖ·µÄ¸ñʽӦ¸ÃÊÇ 1.2.3.4"
+msgstr "DNS ·þÎñÆ÷µÄ¸ñʽӦ¸ÃÊÇ 1.2.3.4"
 
 #: ../../network/network.pm_.c:380
-#, fuzzy
 msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP µØÖ·µÄ¸ñʽӦ¸ÃÊÇ 1.2.3.4"
+msgstr "Íø¹ØµØÖ·µÄ¸ñʽӦ¸ÃÊÇ 1.2.3.4"
 
 #: ../../network/network.pm_.c:394
 msgid "Proxies configuration"
@@ -7264,7 +7293,7 @@ msgstr "´úÀí·þÎñÆ÷Ó¦¸ÃÊÇÏó http://..."
 
 #: ../../network/network.pm_.c:401 ../../proxy.pm_.c:65
 msgid "Url should begin with 'ftp:' or 'http:'"
-msgstr "Url Ó¦¸ÃÊÇÒÔ 'ftp:' »ò 'http:'¿ªÍ·"
+msgstr "Url Ó¦¸ÃÊÇÒÔ¡°ftp:¡±»ò¡°http:¡±¿ªÍ·"
 
 #: ../../network/shorewall.pm_.c:24
 msgid "Firewalling configuration detected!"
@@ -7275,8 +7304,8 @@ msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
 msgstr ""
-"¾¯¸æ! ·¢ÏÖÔ­À´µÄÅäÖÃÀûÓÃÁË·À»ðǽ¹¦ÄÜ.\n"
-"ÄúÐèÒªÔÚ°²×°Ö®ºóÊÖ¹¤ÐÞ¸Ä."
+"¾¯¸æ! ·¢ÏÖÔ­À´µÄÅäÖÃÀûÓÃÁË·À»ðǽ¹¦ÄÜ¡£\n"
+"ÄúÐèÒªÔÚ°²×°Ö®ºóÊÖ¹¤Ð޸ġ£"
 
 #: ../../network/tools.pm_.c:41
 msgid "Internet configuration"
@@ -7296,15 +7325,15 @@ msgstr "ÄúÏÖÔÚÕýÁ¬½Óµ½»¥ÁªÍø"
 
 #: ../../network/tools.pm_.c:57
 msgid "For security reason, it will be disconnected now."
-msgstr "ΪÁË°²È«, ¶Ï¿ªÁª½Ó"
+msgstr "ΪÁË°²È«, ÇëÏÖÔڶϿªÁª½Ó¡£"
 
 #: ../../network/tools.pm_.c:58
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
-"ϵͳûÓÐÁ¬½Óµ½»¥ÁªÍø.\n"
-"ÇëÖØг¢ÊÔÅäÖÃÄúµÄÁ¬½Ó."
+"ϵͳûÓÐÁ¬½Óµ½»¥ÁªÍø¡£\n"
+"ÇëÖØг¢ÊÔÅäÖÃÄúµÄÁ¬½Ó¡£"
 
 #: ../../network/tools.pm_.c:82
 msgid "Connection Configuration"
@@ -7320,19 +7349,19 @@ msgstr "Íø¿¨µÄ IRQÖжÏ"
 
 #: ../../network/tools.pm_.c:86 ../../standalone/drakconnect_.c:608
 msgid "Card mem (DMA)"
-msgstr "Card mem (DMA)"
+msgstr "Íø¿¨ÄÚ´æ(DMA)"
 
 #: ../../network/tools.pm_.c:87 ../../standalone/drakconnect_.c:609
 msgid "Card IO"
-msgstr "Card IO"
+msgstr "Íø¿¨ IO"
 
 #: ../../network/tools.pm_.c:88 ../../standalone/drakconnect_.c:610
 msgid "Card IO_0"
-msgstr "Card IO_0"
+msgstr "Íø¿¨ IO_0"
 
 #: ../../network/tools.pm_.c:89 ../../standalone/drakconnect_.c:611
 msgid "Card IO_1"
-msgstr "Card IO_1"
+msgstr "Íø¿¨ IO_1"
 
 #: ../../network/tools.pm_.c:90 ../../standalone/drakconnect_.c:612
 msgid "Your personal phone number"
@@ -7397,8 +7426,8 @@ msgid ""
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 msgstr ""
-"·ÖÇø±íÀïÓÐÒ»¶ÎÊÇ¿ÕµÄ, ¿ÉÊÇÎÒû·¨Ê¹ÓÃËü.\n"
-"ΨһµÄ°ì·¨ÊÇÒƶ¯ÄúµÄÖ÷·ÖÇø, °Ñ¿ÕÏв¿·Ö»»µ½ÓëÀ©Õ¹·ÖÇøÏàÁÚµÄλÖÃ."
+"·ÖÇø±íÀïÓÐÒ»¶ÎÊÇ¿ÕµÄ, ¿ÉÊÇÎÒû·¨Ê¹ÓÃËü¡£\n"
+"ΨһµÄ°ì·¨ÊÇÒƶ¯ÄúµÄÖ÷·ÖÇø, °Ñ¿ÕÏв¿·Ö»»µ½ÓëÀ©Õ¹·ÖÇøÏàÁÚµÄλÖá£"
 
 #: ../../partition_table.pm_.c:774
 #, c-format
@@ -7420,8 +7449,8 @@ msgid ""
 "A test to check the integrity of data has failed. \n"
 "It means writing anything on the disk will end up with random trash"
 msgstr ""
-"ÄãµÄÓ²ÅÌÓÐÑÏÖØÎÊÌâ.\n"
-"ÍêÕûÐÔ¼ì²éʧ°Ü.\n"
+"ÄãµÄÓ²ÅÌÓÐÑÏÖØÎÊÌâ¡£\n"
+"ÍêÕûÐÔ¼ì²éʧ°Ü¡£\n"
 "ÔÚÕâ¸öÓ²ÅÌÉϱ£´æÈκÎÊý¾Ý¶¼»á¶ªÊ§"
 
 #: ../../pkgs.pm_.c:26
@@ -7454,13 +7483,13 @@ msgstr "LPRng - ÐÂÒ»´úLPR"
 
 #: ../../printer.pm_.c:28
 msgid "LPD - Line Printer Daemon"
-msgstr "LPD - ÐÐʽ´òÓ¡¾«Áé"
+msgstr "LPD - ÐÐʽ´òÓ¡Ïòµ¼"
 
 #: ../../printer.pm_.c:29
 msgid "PDQ - Print, Don't Queue"
-msgstr "PDQ - ´òÓ¡£¬ ²»ÅŶÓÁÐ"
+msgstr "PDQ - ´òÓ¡, ²»ÅŶÓ"
 
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1125
+#: ../../printer.pm_.c:34 ../../printer.pm_.c:1144
 msgid "CUPS"
 msgstr "CUPS"
 
@@ -7488,9 +7517,9 @@ msgstr "Ô¶³Ì´òÓ¡»ú"
 msgid "Printer on remote CUPS server"
 msgstr "Ô¶³Ì CUPS ·þÎñÆ÷µÄ´òÓ¡»ú"
 
-#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:883
+#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:898
 msgid "Printer on remote lpd server"
-msgstr "Ô¶¶Ë lpd ·þÎñÆ÷µÄ´òÓ¡»ú"
+msgstr "Ô¶³Ì lpd ·þÎñÆ÷µÄ´òÓ¡»ú"
 
 #: ../../printer.pm_.c:53
 msgid "Network printer (TCP/Socket)"
@@ -7498,13 +7527,13 @@ msgstr "ÍøÂç´òÓ¡»ú (TCP/Socket)"
 
 #: ../../printer.pm_.c:54
 msgid "Printer on SMB/Windows 95/98/NT server"
-msgstr "SMB/Windows 95/98/NTÉϵĴòÓ¡»ú"
+msgstr "SMB/Windows 95/98/NT ·þÎñÆ÷ÉϵĴòÓ¡»ú"
 
 #: ../../printer.pm_.c:55
 msgid "Printer on NetWare server"
-msgstr "Novell·þÎñÆ÷´òÓ¡»ú"
+msgstr "NetWare ·þÎñÆ÷ÉϵĴòÓ¡»ú"
 
-#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:887
+#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:902
 msgid "Enter a printer device URI"
 msgstr "´òÓ¡»úÉ豸URI"
 
@@ -7512,104 +7541,104 @@ msgstr "´òÓ¡»úÉ豸URI"
 msgid "Pipe job into a command"
 msgstr "×÷Òµpipe¶¨Ïòµ½ÃüÁî"
 
-#: ../../printer.pm_.c:324 ../../printer.pm_.c:366 ../../printer.pm_.c:533
+#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:552
 msgid "Unknown Model"
 msgstr "δ֪ÐͺÅ"
 
-#: ../../printer.pm_.c:735 ../../printer.pm_.c:926 ../../printer.pm_.c:1318
-#: ../../printerdrake.pm_.c:2260 ../../printerdrake.pm_.c:3414
+#: ../../printer.pm_.c:754 ../../printer.pm_.c:945 ../../printer.pm_.c:1337
+#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3462
 msgid "Unknown model"
 msgstr "δ֪ģʽ"
 
-#: ../../printer.pm_.c:763
+#: ../../printer.pm_.c:782
 msgid "Local Printers"
 msgstr "±¾»ú´òÓ¡»ú"
 
-#: ../../printer.pm_.c:765 ../../printer.pm_.c:1126
+#: ../../printer.pm_.c:784 ../../printer.pm_.c:1145
 msgid "Remote Printers"
 msgstr "Ô¶³Ì´òÓ¡»ú"
 
-#: ../../printer.pm_.c:772 ../../printerdrake.pm_.c:404
+#: ../../printer.pm_.c:791 ../../printerdrake.pm_.c:417
 #, c-format
 msgid " on parallel port \\/*%s"
 msgstr " ²¢ÐÐ¿Ú \\/*%s"
 
-#: ../../printer.pm_.c:775 ../../printerdrake.pm_.c:406
+#: ../../printer.pm_.c:794 ../../printerdrake.pm_.c:419
 #, c-format
 msgid ", USB printer \\/*%s"
 msgstr ", USB ´òÓ¡»ú \\/*%s"
 
-#: ../../printer.pm_.c:780
+#: ../../printer.pm_.c:799
 #, c-format
 msgid ", multi-function device on parallel port \\/*%s"
 msgstr ", ²¢Ðж˿ÚÉϵĶ๦ÄÜÉ豸 \\/*%s"
 
-#: ../../printer.pm_.c:783
+#: ../../printer.pm_.c:802
 msgid ", multi-function device on USB"
 msgstr ", USB ¶Ë¿ÚÉϵĶ๦ÄÜÉ豸"
 
-#: ../../printer.pm_.c:785
+#: ../../printer.pm_.c:804
 msgid ", multi-function device on HP JetDirect"
 msgstr ", HP JetDirect ´òÓ¡·þÎñÆ÷ÉϵĶ๦ÄÜÉ豸"
 
-#: ../../printer.pm_.c:787
+#: ../../printer.pm_.c:806
 msgid ", multi-function device"
 msgstr ", ¶à¹¦ÄÜÉ豸"
 
-#: ../../printer.pm_.c:790
+#: ../../printer.pm_.c:809
 #, c-format
 msgid ", printing to %s"
 msgstr ", ´òÓ¡µ½ %s"
 
-#: ../../printer.pm_.c:792
+#: ../../printer.pm_.c:811
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
-msgstr "LPD ·þÎñÆ÷ \"%s\" ÉϵĴòÓ¡»ú \"%s\""
+msgstr "LPD ·þÎñÆ÷¡°%s¡±ÉϵĴòÓ¡»ú¡°%s¡±"
 
-#: ../../printer.pm_.c:794
+#: ../../printer.pm_.c:813
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
-msgstr ", TCP/IP Ö÷»ú \"%s\", ¶Ë¿Ú %s"
+msgstr ", TCP/IP Ö÷»ú¡°%s¡±, ¶Ë¿Ú %s"
 
-#: ../../printer.pm_.c:798
+#: ../../printer.pm_.c:817
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
-msgstr "SMB/Windows ·þÎñÆ÷ \"%s\" ÉϵĹ²Ïí \"%s\""
+msgstr "SMB/Windows ·þÎñÆ÷¡°%s¡±ÉϵĹ²Ïí¡°%s¡±"
 
-#: ../../printer.pm_.c:802
+#: ../../printer.pm_.c:821
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
-msgstr "Novell ´òÓ¡·þÎñÆ÷ \"%s\"ÉϵĴòÓ¡»ú \"%s\""
+msgstr "Novell ´òÓ¡·þÎñÆ÷¡°%s¡±ÉϵĴòÓ¡»ú¡°%s¡±"
 
-#: ../../printer.pm_.c:804
+#: ../../printer.pm_.c:823
 #, c-format
 msgid ", using command %s"
 msgstr ", ʹÓÃÃüÁî %s"
 
-#: ../../printer.pm_.c:923 ../../printerdrake.pm_.c:1656
+#: ../../printer.pm_.c:942 ../../printerdrake.pm_.c:1701
 msgid "Raw printer (No driver)"
 msgstr "Ö±½Ó´òÓ¡Êä³ö (²»Ê¹ÓÃÇý¶¯³ÌÐò)"
 
-#: ../../printer.pm_.c:1095
+#: ../../printer.pm_.c:1114
 #, c-format
 msgid "(on %s)"
 msgstr "(ÔÚ %s)"
 
-#: ../../printer.pm_.c:1097
+#: ../../printer.pm_.c:1116
 msgid "(on this machine)"
 msgstr "(ÔڸûúÆ÷ÉÏ)"
 
-#: ../../printer.pm_.c:1122
+#: ../../printer.pm_.c:1141
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "ÔÚ CUPS ·þÎñÆ÷ \"%s\""
 
-#: ../../printer.pm_.c:1128 ../../printerdrake.pm_.c:3071
-#: ../../printerdrake.pm_.c:3082 ../../printerdrake.pm_.c:3303
-#: ../../printerdrake.pm_.c:3355 ../../printerdrake.pm_.c:3381
-#: ../../printerdrake.pm_.c:3556 ../../printerdrake.pm_.c:3558
+#: ../../printer.pm_.c:1147 ../../printerdrake.pm_.c:3119
+#: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3351
+#: ../../printerdrake.pm_.c:3403 ../../printerdrake.pm_.c:3429
+#: ../../printerdrake.pm_.c:3604 ../../printerdrake.pm_.c:3606
 msgid " (Default)"
-msgstr " (ȱʡ)"
+msgstr " (ĬÈÏ)"
 
 #: ../../printerdrake.pm_.c:25
 msgid "Select Printer Connection"
@@ -7626,17 +7655,17 @@ msgid ""
 "printers will be automatically detected."
 msgstr ""
 "\n"
-"Äú²»ÐèÒªÅäÖÃÔ¶³ÌµÄ CUPS ·þÎñÆ÷;ËüÃǻᱻ×Ô¶¯Ì½²âµ½."
+"Äú²»ÐèÒªÅäÖÃÔ¶³ÌµÄ CUPS ·þÎñÆ÷;ËüÃǻᱻ×Ô¶¯Ì½²âµ½¡£"
 
 #: ../../printerdrake.pm_.c:36
 msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
 msgstr "´òÓ¡»ú×Ô¶¯¼ì²â (±¾µØ, TCP/Socket ºÍ SMB ´òÓ¡»ú)"
 
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3135
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3183
 msgid "CUPS configuration"
 msgstr "CUPS ´òÓ¡ÅäÖÃ"
 
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3136
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3184
 msgid "Specify CUPS server"
 msgstr "Ö¸¶¨ CUPS ´òÓ¡·þÎñÆ÷"
 
@@ -7650,12 +7679,12 @@ msgid ""
 "to enter the CUPS server IP address and optionally the port number to get "
 "the printer information from the server, otherwise leave these fields blank."
 msgstr ""
-"ʹÓÃÄúµÄ±¾µØÍøÂçÖÐÔ¶³ÌCUPS·þÎñÆ÷µÄ´òÓ¡»ú£¬Äã²»±Ø×öÈκÎÅäÖã»CUPS·þÎñÆ÷»á×Ô¶¯"
-"֪ͨÄúµÄ»úÆ÷Æä´òÓ¡»úÐÅÏ¢.ËùÓÐÄã»úÆ÷ÖªµÀµÄ´òÓ¡»úÁÐÔÚ PrinterdrakeħÁ¦´òÓ¡ÅäÖÃ"
-"Ö÷´°¿ÚµÄ\"Ô¶³Ì´òÓ¡»ú\"½Ú.\n"
-"Èç¹ûÄãµÄCUPS·þÎñÆ÷ÔÚÆäËûµÄÍøÂ磬ÄãÐèÒªÊäÈë CUPS ·þÎñÆ÷µÄ IP µØÖ·¼°¿ÉÑ¡µÄ¶Ë"
+"ʹÓÃÄúµÄ±¾µØÍøÂçÖÐÔ¶³ÌCUPS·þÎñÆ÷µÄ´òÓ¡»ú, Äã²»±Ø×öÈκÎÅäÖã»CUPS·þÎñÆ÷»á×Ô¶¯"
+"֪ͨÄúµÄ»úÆ÷Æä´òÓ¡»úÐÅÏ¢¡£ËùÓÐÄã»úÆ÷ÖªµÀµÄ´òÓ¡»úÁÐÔÚ PrinterdrakeÖ÷´°¿ÚµÄ¡°Ô¶"
+"³Ì´òÓ¡»ú¡±½Ú¡£\n"
+"Èç¹ûÄãµÄCUPS·þÎñÆ÷ÔÚÆäËüµÄÍøÂç, ÄãÐèÒªÊäÈë CUPS ·þÎñÆ÷µÄ IP µØÖ·¼°¿ÉÑ¡µÄ¶Ë"
 "¿Ú, ÒÔ±ã´Ó·þÎñÆ÷»ñÈ¡´òÓ¡»úÐÅÏ¢,\n"
-"·ñÔò, ÇëÈÃÕâЩ×ֶοÕ×Å."
+"·ñÔò, ÇëÈÃÕâЩ×ֶοÕ×Å¡£"
 
 #: ../../printerdrake.pm_.c:87
 msgid ""
@@ -7675,7 +7704,7 @@ msgstr ""
 msgid "The IP address should look like 192.168.1.20"
 msgstr "IP µØÖ·µÄ¸ñʽӦ¸ÃÊÇÏó 1.2.3.4"
 
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1094
+#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1109
 msgid "The port number should be an integer!"
 msgstr "¶Ë¿ÚÐëΪÊý×Ö!"
 
@@ -7683,34 +7712,34 @@ msgstr "¶Ë¿ÚÐëΪÊý×Ö!"
 msgid "CUPS server IP"
 msgstr "CUPS ·þÎñÆ÷ IP"
 
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1114
+#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1129
 msgid "Port"
 msgstr "¶Ë¿Ú"
 
 #: ../../printerdrake.pm_.c:105
 msgid "Automatic CUPS configuration"
-msgstr "CUPS×Ô¶¯²½ÖèÅäÖÃ"
+msgstr "CUPS×Ô¶¯ÅäÖÃ"
 
 #: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
-#: ../../printerdrake.pm_.c:1529 ../../printerdrake.pm_.c:1533
-#: ../../printerdrake.pm_.c:1651 ../../printerdrake.pm_.c:2203
-#: ../../printerdrake.pm_.c:2356 ../../printerdrake.pm_.c:2415
-#: ../../printerdrake.pm_.c:2488 ../../printerdrake.pm_.c:2509
-#: ../../printerdrake.pm_.c:2699 ../../printerdrake.pm_.c:2740
-#: ../../printerdrake.pm_.c:2745 ../../printerdrake.pm_.c:2779
-#: ../../printerdrake.pm_.c:2784 ../../printerdrake.pm_.c:2821
-#: ../../printerdrake.pm_.c:2874 ../../printerdrake.pm_.c:2894
-#: ../../printerdrake.pm_.c:2908 ../../printerdrake.pm_.c:2942
-#: ../../printerdrake.pm_.c:2988 ../../printerdrake.pm_.c:3006
-#: ../../printerdrake.pm_.c:3095 ../../printerdrake.pm_.c:3169
-#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3526
-#: ../../printerdrake.pm_.c:3579 ../../standalone/printerdrake_.c:57
+#: ../../printerdrake.pm_.c:1574 ../../printerdrake.pm_.c:1578
+#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
+#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
+#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
+#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2788
+#: ../../printerdrake.pm_.c:2793 ../../printerdrake.pm_.c:2827
+#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2869
+#: ../../printerdrake.pm_.c:2922 ../../printerdrake.pm_.c:2942
+#: ../../printerdrake.pm_.c:2956 ../../printerdrake.pm_.c:2990
+#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3054
+#: ../../printerdrake.pm_.c:3143 ../../printerdrake.pm_.c:3217
+#: ../../printerdrake.pm_.c:3519 ../../printerdrake.pm_.c:3574
+#: ../../printerdrake.pm_.c:3627 ../../standalone/printerdrake_.c:57
 msgid "Printerdrake"
-msgstr "´òÓ¡»úÅäÖÃÏòµ¼"
+msgstr "Printerdrake"
 
 #: ../../printerdrake.pm_.c:178
 msgid "Checking your system..."
-msgstr "¼ì²éÄúµÄϵͳ ..."
+msgstr "ÕýÔÚ¼ì²éÄúµÄϵͳ ..."
 
 #: ../../printerdrake.pm_.c:186
 msgid ""
@@ -7722,7 +7751,7 @@ msgid ""
 "The following printers\n"
 "\n"
 msgstr ""
-"ÏÂÁÐÈí¼þ°ü½«Òª±»Ð¶ÔØ\n"
+"ÏÂÁдòÓ¡»ú\n"
 "\n"
 
 #: ../../printerdrake.pm_.c:199
@@ -7789,7 +7818,7 @@ msgstr ""
 
 #: ../../printerdrake.pm_.c:221
 msgid " (Make sure that all your printers are connected and turned on).\n"
-msgstr " (ÇëÈ·ÈÏÄúµÄ´òÓ¡»úÒѾ­Á¬½ÓºÃ²¢ÇÒ½ÓͨÁ˵çÔ´).\n"
+msgstr " (ÇëÈ·ÈÏÄúµÄ´òÓ¡»úÒѾ­Á¬½ÓºÃ²¢ÇÒ½ÓͨÁ˵çÔ´)¡£\n"
 
 #: ../../printerdrake.pm_.c:235
 msgid ""
@@ -7816,14 +7845,15 @@ msgid ""
 "additional software will be installed."
 msgstr ""
 "×¢Òâ: ¸ù¾Ý²»Í¬µÄ´òÓ¡»úÐͺźʹòӡϵͳ, ÐèÒª°²×°¸½¼ÓµÄÈí¼þ, ×î¶à»áÐèÒª %d MB ¿Õ"
-"¼ä."
+"¼ä¡£"
 
-#: ../../printerdrake.pm_.c:269 ../../printerdrake.pm_.c:278
-#: ../../printerdrake.pm_.c:3117 ../../printerdrake.pm_.c:3242
+#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
+#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3165
+#: ../../printerdrake.pm_.c:3290
 msgid "Add a new printer"
 msgstr "Ôö¼Ó´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:270
+#: ../../printerdrake.pm_.c:280
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7836,11 +7866,14 @@ msgid ""
 "connection types."
 msgstr ""
 "\n"
-"»¶Ó­Ê¹ÓôòÓ¡»úÉèÖþ«Áé\n"
+"»¶Ó­Ê¹ÓôòÓ¡»úÉèÖÃÏòµ¼\n"
+"\n"
+"´ËÏòµ¼ÔÊÐíÄã°²×°±¾µØ»òÔ¶³Ì´òÓ¡»ú, ÒÔ±ãÔÚ±¾»ú»òÍøÂçÉϵÄÆäËü´òÓ¡»úÉÏʹÓá£\n"
 "\n"
-"°ïÖúÄúÉèÖñ¾»ú»òÍøÂçÉϵĴòÓ¡»ú."
+"Ëü»áѯÎÊËùÓбØÒªµÄÐÅÏ¢½øÐдòÓ¡»úÉèÖÃ, ²¢ÔÊÐíÄã·ÃÎÊËùÓпÉÓõĴòÓ¡»úÇý¶¯³ÌÐò, "
+"Çý¶¯³ÌÐòÑ¡ÏîºÍ´òÓ¡»úÁ¬½ÓÀàÐÍ¡£"
 
-#: ../../printerdrake.pm_.c:280
+#: ../../printerdrake.pm_.c:293
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7862,20 +7895,20 @@ msgid ""
 "want to set up your printer(s) now."
 msgstr ""
 "\n"
-"´òÓ¡»úÅäÖþ«Á黶ӭÄú!\n"
+"´òÓ¡»úÅäÖÃÏòµ¼»¶Ó­Äú!\n"
 "\n"
 "ÎÒ½«°ïÖúÄúÅäÖÃÄúµÄ´òÓ¡»ú, ²»ÂÛÊÇÖ±½ÓÁ¬½ÓÔÚ Õą̂µçÄÔ, Ö±½ÓÁ¬½ÓÔÚÍøÂç, »¹ÊÇÁ¬½Ó"
-"ÔÚÔ¶³ÌµÄ Windows »úÆ÷ÉÏ.\n"
+"ÔÚÔ¶³ÌµÄ Windows »úÆ÷ÉÏ¡£\n"
 "\n"
 "Èç¹ûÄúµÄ´òÓ¡»úÒªÖ±½ÓÁ¬ÔÚÕą̂µçÄÔ, Çë°ÑËü(ÃÇ)²å½Óµ½ Õą̂µçÄÔ²¢´ò¿ªµçÔ´, ÕâÑù²Å"
-"ÄÜ×Ô¶¯¼ì²â. ÄúµÄÍøÂç´òÓ¡»úºÍÄúµÄ Windows »úÆ÷Ò²ÒªÁ¬½ÓºÃ²¢¿ªÍ¨µçÔ´.\n"
+"ÄÜ×Ô¶¯¼ì²â¡£ÄúµÄÍøÂç´òÓ¡»úºÍÄúµÄ Windows »úÆ÷Ò²ÒªÁ¬½ÓºÃ²¢¿ªÍ¨µçÔ´¡£\n"
 "\n"
-"×¢Òâ×Ô¶¯¼ì²âÍøÂçÉϵĴòÓ¡»ú±È¼ì²âÁ¬½ÓÔÚ±¾»úµÄ´òÓ¡»ú»¨·Ñʱ¼äÒª³¤. Èç¹û Äú²»Ðè"
-"Òª, Çë¹Ø±Õ¶ÔÍøÂç´òÓ¡»ú»òWindows´òÓ¡»úµÄ×Ô¶¯¼ì²â.\n"
+"×¢Òâ×Ô¶¯¼ì²âÍøÂçÉϵĴòÓ¡»ú±È¼ì²âÁ¬½ÓÔÚ±¾»úµÄ´òÓ¡»ú»¨·Ñʱ¼äÒª³¤¡£Èç¹û Äú²»Ðè"
+"Òª, Çë¹Ø±Õ¶ÔÍøÂç´òÓ¡»ú»òWindows´òÓ¡»úµÄ×Ô¶¯¼ì²â¡£\n"
 "\n"
-"×¼±¸ºÃ¾Íµã»÷ \"ÏÂÒ»²½\" , Èç¹ûÄú²»ÏëÏÖÔÚÅäÖôòÓ¡»ú, µã»÷ \"È¡Ïû\"."
+"×¼±¸ºÃ¾Íµã»÷¡°ÏÂÒ»²½¡±, Èç¹ûÄú²»ÏëÏÖÔÚÅäÖôòÓ¡»ú, µã»÷¡°È¡Ïû¡±¡£"
 
-#: ../../printerdrake.pm_.c:289 ../../printerdrake.pm_.c:306
+#: ../../printerdrake.pm_.c:302 ../../printerdrake.pm_.c:319
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7890,16 +7923,16 @@ msgid ""
 "want to set up your printer(s) now."
 msgstr ""
 "\n"
-"´òÓ¡»úÅäÖþ«Á黶ӭÄú!\n"
+"´òÓ¡»úÅäÖÃÏòµ¼»¶Ó­Äú!\n"
 "\n"
-"ÎÒ½«°ïÖúÄúÅäÖÃÖ±½ÓÁ¬½ÓÔÚÕą̂µçÄԵĴòÓ¡»ú.\n"
+"ÎÒ½«°ïÖúÄúÅäÖÃÖ±½ÓÁ¬½ÓÔÚÕą̂µçÄԵĴòÓ¡»ú¡£\n"
 "\n"
 "Èç¹ûÄúµÄ´òÓ¡»úÖ±½ÓÁ¬ÔÚÕą̂µçÄÔ, Çë°ÑËü(ÃÇ)²å½Óµ½ Õą̂µçÄÔ²¢´ò¿ªµçÔ´, ÕâÑù²ÅÄÜ"
-"×Ô¶¯¼ì²â.\n"
+"×Ô¶¯¼ì²â¡£\n"
 "\n"
-"×¼±¸ºÃ¾Íµã»÷ \"ÏÂÒ»²½\" , Èç¹ûÄú²»ÏëÏÖÔÚÅäÖôòÓ¡»ú, µã»÷ \"È¡Ïû\"."
+"×¼±¸ºÃ¾Íµã»÷¡°ÏÂÒ»²½¡±, Èç¹ûÄú²»ÏëÏÖÔÚÅäÖôòÓ¡»ú, µã»÷¡°È¡Ïû¡±¡£"
 
-#: ../../printerdrake.pm_.c:297
+#: ../../printerdrake.pm_.c:310
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7919,36 +7952,31 @@ msgid ""
 "want to set up your printer(s) now."
 msgstr ""
 "\n"
-"´òÓ¡»úÅäÖþ«Á黶ӭÄú!\n"
+"´òÓ¡»úÅäÖÃÏòµ¼»¶Ó­Äú!\n"
 "\n"
-"ÎÒ½«°ïÖúÄúÅäÖÃÄúµÄ´òÓ¡»ú, ²»ÂÛÊÇÁ¬½ÓÔÚ Õą̂µçÄÔ,  »¹ÊÇÖ±½ÓÁ¬½ÓÔÚÍøÂç.\n"
+"ÎÒ½«°ïÖúÄúÅäÖÃÄúµÄ´òÓ¡»ú, ²»ÂÛÊÇÁ¬½ÓÔÚ Õą̂µçÄÔ,  »¹ÊÇÖ±½ÓÁ¬½ÓÔÚÍøÂç¡£\n"
 "\n"
 "Èç¹ûÄúµÄ´òÓ¡»úÒªÖ±½ÓÁ¬ÔÚÕą̂µçÄÔ, Çë°ÑËü(ÃÇ)²å½Óµ½ Õą̂µçÄÔ²¢´ò¿ªµçÔ´, ÕâÑù²Å"
-"ÄÜ×Ô¶¯¼ì²â. ÄúµÄÍøÂç´òÓ¡»úÒ²ÒªÁ¬½ÓºÃ²¢¿ªÍ¨µçÔ´..\n"
+"ÄÜ×Ô¶¯¼ì²â¡£ÄúµÄÍøÂç´òÓ¡»úÒ²ÒªÁ¬½ÓºÃ²¢¿ªÍ¨µçÔ´¡£\n"
 "\n"
 "×¢Òâ×Ô¶¯¼ì²âÍøÂçÉϵĴòÓ¡»ú±È¼ì²âÁ¬½ÓÔÚ±¾»úµÄ´òÓ¡»ú»¨·Ñʱ¼äÒª³¤. Èç¹û Äú²»Ðè"
-"Òª, Çë¹Ø±Õ¶ÔÍøÂç´òÓ¡»úµÄ×Ô¶¯¼ì²â.\n"
+"Òª, Çë¹Ø±Õ¶ÔÍøÂç´òÓ¡»úµÄ×Ô¶¯¼ì²â¡£\n"
 "\n"
-"×¼±¸ºÃ¾Íµã»÷ \"ÏÂÒ»²½\" , Èç¹ûÄú²»ÏëÏÖÔÚÅäÖôòÓ¡»ú, µã»÷ \"È¡Ïû\"."
+"×¼±¸ºÃ¾Íµã»÷¡°ÏÂÒ»²½¡±, Èç¹ûÄú²»ÏëÏÖÔÚÅäÖôòÓ¡»ú, µã»÷¡°È¡Ïû¡±¡£"
 
-#: ../../printerdrake.pm_.c:315
+#: ../../printerdrake.pm_.c:328
 msgid "Auto-detect printers connected to this machine"
 msgstr "×Ô¶¯Ì½²âÕą̂»úÆ÷Á¬½ÓµÄ´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:318
+#: ../../printerdrake.pm_.c:331
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "×Ô¶¯Ì½²âÖ±½ÓÁ¬½Óµ½±¾µØÍøÂçµÄ´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:334
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "×Ô¶¯Ì½²âÔËÐÐ Microsoft Windows µÄ»úÆ÷Á¬½ÓµÄ´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:348 ../../printerdrake.pm_.c:562
-#: ../../printerdrake.pm_.c:587
-msgid "Local Printer"
-msgstr "±¾»ú´òÓ¡»ú"
-
-#: ../../printerdrake.pm_.c:349
+#: ../../printerdrake.pm_.c:362
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -7964,54 +7992,58 @@ msgstr ""
 "\n"
 "×£ºØ, ÄúµÄ´òÓ¡»úÒѾ­°²×°ÅäÖÃÍê³É!\n"
 "\n"
-"¿ÉÒÔʹÓÃÓ¦ÓóÌÐòµÄ \"´òÓ¡\" ÃüÁî(ͨ³£ÔÚ \"FileÎļþ\" ²Ëµ¥Àï).\n"
+"¿ÉÒÔʹÓÃÓ¦ÓóÌÐòµÄ \"´òÓ¡\" ÃüÁî(ͨ³£ÔÚ \"FileÎļþ\" ²Ëµ¥Àï)¡£\n"
 "\n"
-"Èç¹ûÒÔºóÒªÌí¼Ó, ɾ³ý´òÓ¡»ú, ¸Ä±ä´òÓ¡»úÃû×Ö, »òÕßÐèÒªÐÞ¸Äȱʡ´òÓ¡²ÎÊý (½øÖ½"
-"ÅÌ, Êä³öÖÊÁ¿, ...), ÔÚ Mandrake ¿ØÖÆÖÐÐÄµÄ \"Ó²¼þ\"²¿·ÖÑ¡Ôñ\"´òÓ¡»ú\"."
+"Èç¹ûÒÔºóÒªÌí¼Ó, ɾ³ý´òÓ¡»ú, ¸Ä±ä´òÓ¡»úÃû×Ö, »òÕßÐèÒªÐÞ¸ÄĬÈÏ´òÓ¡²ÎÊý (½øÖ½"
+"ÅÌ, Êä³öÖÊÁ¿, ...), ÔÚ Mandrake ¿ØÖÆÖÐÐÄµÄ \"Ó²¼þ\"²¿·ÖÑ¡Ôñ\"´òÓ¡»ú\"¡£"
 
-#: ../../printerdrake.pm_.c:386 ../../printerdrake.pm_.c:577
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:590
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Printer auto-detection"
 msgstr "´òÓ¡»ú×Ô¶¯¼ì²â"
 
-#: ../../printerdrake.pm_.c:408
+#: ../../printerdrake.pm_.c:421
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", ÍøÂç´òÓ¡»ú \"%s\", ¶Ë¿Ú %s"
 
-#: ../../printerdrake.pm_.c:410
+#: ../../printerdrake.pm_.c:423
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", ´òÓ¡»ú \"%s\" ÔÚ SMB/Windows ·þÎñÆ÷ \"%s\" ÉÏ"
 
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:429
 #, c-format
 msgid "Detected %s"
 msgstr "¼ì²âµ½ %s"
 
-#: ../../printerdrake.pm_.c:420 ../../printerdrake.pm_.c:451
-#: ../../printerdrake.pm_.c:470
+#: ../../printerdrake.pm_.c:433 ../../printerdrake.pm_.c:464
+#: ../../printerdrake.pm_.c:483
 #, c-format
 msgid "Printer on parallel port \\/*%s"
 msgstr "²¢Ðж˿ڴòÓ¡»ú \\/*%s"
 
-#: ../../printerdrake.pm_.c:422 ../../printerdrake.pm_.c:453
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:435 ../../printerdrake.pm_.c:466
+#: ../../printerdrake.pm_.c:488
 #, c-format
 msgid "USB printer \\/*%s"
 msgstr "USB ´òÓ¡»ú \\/*%s"
 
-#: ../../printerdrake.pm_.c:424
+#: ../../printerdrake.pm_.c:437
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "ÍøÂç´òÓ¡»ú \"%s\", ¶Ë¿Ú %s"
 
-#: ../../printerdrake.pm_.c:426
+#: ../../printerdrake.pm_.c:439
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "´òÓ¡»ú \"%s\" ÔÚ SMB/Windows ·þÎñÆ÷´òÓ¡»ú \"%s\" ÉÏ"
 
-#: ../../printerdrake.pm_.c:563
+#: ../../printerdrake.pm_.c:575 ../../printerdrake.pm_.c:600
+msgid "Local Printer"
+msgstr "±¾»ú´òÓ¡»ú"
+
+#: ../../printerdrake.pm_.c:576
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
 "file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
@@ -8020,21 +8052,21 @@ msgid ""
 msgstr ""
 "ûÓз¢ÏÖ±¾µØ´òÓ¡»ú! ÒªÊÖ¹¤ÉèÖôòÓ¡»úÇëÔÚÊäÈëÐÐдÎļþÃû/É豸Ãû(²¢Ðж˿Ú: /dev/"
 "lp0, /dev/lp1, ..., Ï൱ÓÚ LPT1:, LPT2:, ..., µÚÒ»¸ö USB ´òÓ¡»ú: /dev/usb/"
-"lp0, µÚ¶þ¸ö USB ´òÓ¡»ú: /dev/usb/lp1, ...)."
+"lp0, µÚ¶þ¸ö USB ´òÓ¡»ú: /dev/usb/lp1, ...)¡£"
 
-#: ../../printerdrake.pm_.c:567
+#: ../../printerdrake.pm_.c:580
 msgid "You must enter a device or file name!"
 msgstr "ÄúÐèÒªÊäÈë´òÓ¡»úÉ豸Ãû»òÒ»ÎļþÃû!"
 
-#: ../../printerdrake.pm_.c:578
+#: ../../printerdrake.pm_.c:591
 msgid "No printer found!"
 msgstr "ûÓз¢ÏÖ´òÓ¡»ú!"
 
-#: ../../printerdrake.pm_.c:588
+#: ../../printerdrake.pm_.c:601
 msgid "Available printers"
 msgstr "¿ÉÓôòÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:592
+#: ../../printerdrake.pm_.c:605
 msgid ""
 "The following printer was auto-detected, if it is not the one you want to "
 "configure, enter a device name/file name in the input line"
@@ -8042,7 +8074,7 @@ msgstr ""
 "×Ô¶¯¼ì²â·¢ÏÖÁËÏÂÁдòÓ¡»ú, Èç¹ûÄúҪʹÓõĴòÓ¡»ú²»ÔÚÆäÖÐÇëÔÚÊäÈëÐÐÊäÈëÒ»¸öÉ豸"
 "Ãû»òÎļþÃû"
 
-#: ../../printerdrake.pm_.c:593
+#: ../../printerdrake.pm_.c:606
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up or enter a device name/file name in the input line"
@@ -8050,7 +8082,7 @@ msgstr ""
 "×Ô¶¯¼ì²â·¢ÏÖÁËÏÂÁдòÓ¡»ú, ÇëÑ¡ÔñÄúҪʹÓõĴòÓ¡»ú, »òÕßÔÚÊäÈëÐÐÊäÈëÒ»¸öÉ豸Ãû"
 "»òÎļþÃû"
 
-#: ../../printerdrake.pm_.c:595
+#: ../../printerdrake.pm_.c:608
 msgid ""
 "The following printer was auto-detected. The configuration of the printer "
 "will work fully automatically. If your printer was not correctly detected or "
@@ -8060,7 +8092,7 @@ msgstr ""
 "×Ô¶¯¼ì²â·¢ÏÖÁËÏÂÁдòÓ¡»ú, ´òÓ¡»úµÄÅäÖà »áÍêÈ«×Ô¶¯¹¤×÷. Èç¹ûÄúµÄ´òÓ¡»úûÓб»Õý"
 "È·¼ì²â »òÕßÄúÏ붨ÖÆ´òÓ¡»úÅäÖÃ, Ñ¡Ôñ \"ÊÖ¹¤ ÅäÖÃ\"."
 
-#: ../../printerdrake.pm_.c:596
+#: ../../printerdrake.pm_.c:609
 msgid ""
 "Here is a list of all auto-detected printers. Please choose the printer you "
 "want to set up. The configuration of the printer will work fully "
@@ -8070,17 +8102,17 @@ msgstr ""
 "ÕâÀïÁгöÁËËùÓмì²âµ½µÄ´òÓ¡»ú. ÇëÑ¡ÔñÄúÏ£ÍûÅäÖõĴòÓ¡»ú. Èç¹ûÄúµÄ´òÓ¡»úûÓб»"
 "ÕýÈ·¼ì²â »òÕßÄúÏ붨ÖÆ´òÓ¡»úÅäÖÃ, Ñ¡Ôñ \"ÊÖ¹¤ ÅäÖÃ\"."
 
-#: ../../printerdrake.pm_.c:598
+#: ../../printerdrake.pm_.c:611
 msgid ""
 "Please choose the port where your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr "ÇëÑ¡ÔñÄú´òÓ¡»úʹÓõĶ˿ڻòÊäÈëÀ¸ÄÚÌîÈëÒ»ºÏ·¨É豸»òÎļþ"
 
-#: ../../printerdrake.pm_.c:599
+#: ../../printerdrake.pm_.c:612
 msgid "Please choose the port where your printer is connected to."
 msgstr "ÇëÎÊÄúµÄ´òÓ¡»úÊÇÁ¬½Óµ½ÄǸö¶Ë¿Ú?"
 
-#: ../../printerdrake.pm_.c:601
+#: ../../printerdrake.pm_.c:614
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
@@ -8088,66 +8120,66 @@ msgstr ""
 " (²¢ÐпÚ: /dev/lp0, /dev/lp1, ..., Ï൱ÓÚ LPT1:, LPT2:, ..., µÚÒ»¸ö USB É豸"
 "¿Ú: /dev/usb/lp0, µÚ¶þ¸ö USB É豸¿Ú: /dev/usb/lp1, ...)."
 
-#: ../../printerdrake.pm_.c:606
+#: ../../printerdrake.pm_.c:619
 msgid "You must choose/enter a printer/device!"
 msgstr "ÄúÐèÒªÅäÖÃһ̨´òÓ¡»úÉ豸"
 
-#: ../../printerdrake.pm_.c:626
+#: ../../printerdrake.pm_.c:639
 msgid "Manual configuration"
 msgstr "ÊÖ¹¤ÅäÖÃ"
 
-#: ../../printerdrake.pm_.c:680
+#: ../../printerdrake.pm_.c:693
 msgid "Remote lpd Printer Options"
-msgstr "Ô¶¶Ë lpd ´òÓ¡»úÑ¡Ïî"
+msgstr "Ô¶³Ì lpd ´òÓ¡»úÑ¡Ïî"
 
-#: ../../printerdrake.pm_.c:681
+#: ../../printerdrake.pm_.c:694
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
 msgstr ""
-"ҪʹÓÃÒ»¸öÔ¶¶ËµÄ lpd ´òÓ¡¶ÓÁÐ, ÄúÐèÒªÖ¸¶¨´òÓ¡·þÎñÆ÷µÄ\n"
+"ҪʹÓÃÒ»¸öÔ¶³ÌµÄ lpd ´òÓ¡¶ÓÁÐ, ÄúÐèÒªÖ¸¶¨´òÓ¡·þÎñÆ÷µÄ\n"
 "Ö÷»úÃûºÍ´òÓ¡ÈÎÎñÒªËÍÍùµÄ´òÓ¡¶ÓÁеÄÃû×Ö."
 
-#: ../../printerdrake.pm_.c:682
+#: ../../printerdrake.pm_.c:695
 msgid "Remote host name"
-msgstr "Ô¶¶ËÖ÷»úÃû"
+msgstr "Ô¶³ÌÖ÷»úÃû"
 
-#: ../../printerdrake.pm_.c:683
+#: ../../printerdrake.pm_.c:696
 msgid "Remote printer name"
 msgstr "Ô¶³Ì´òÓ¡»úÃû"
 
-#: ../../printerdrake.pm_.c:686
+#: ../../printerdrake.pm_.c:699
 msgid "Remote host name missing!"
-msgstr "δÕÒµ½Ô¶¶ËÖ÷»ú!"
+msgstr "δÕÒµ½Ô¶³ÌÖ÷»ú!"
 
-#: ../../printerdrake.pm_.c:690
+#: ../../printerdrake.pm_.c:703
 msgid "Remote printer name missing!"
-msgstr "ûÓÐÕÒµ½Ô¶¶Ë´òÓ¡»ú!"
+msgstr "ûÓÐÕÒµ½Ô¶³Ì´òÓ¡»ú!"
 
-#: ../../printerdrake.pm_.c:712 ../../printerdrake.pm_.c:1225
+#: ../../printerdrake.pm_.c:727 ../../printerdrake.pm_.c:1244
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "¼ì²âµ½ÐͺÅ: %s %s"
 
-#: ../../printerdrake.pm_.c:790 ../../printerdrake.pm_.c:1030
+#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
 msgid "Scanning network..."
 msgstr "ÕýÔÚɨÃèÍøÂç..."
 
-#: ../../printerdrake.pm_.c:799 ../../printerdrake.pm_.c:820
+#: ../../printerdrake.pm_.c:814 ../../printerdrake.pm_.c:835
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", ´òÓ¡»ú \"%s\"ÔÚ·þÎñÆ÷ \"%s\"ÉÏ"
 
-#: ../../printerdrake.pm_.c:802 ../../printerdrake.pm_.c:823
+#: ../../printerdrake.pm_.c:817 ../../printerdrake.pm_.c:838
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "´òÓ¡»ú \"%s\"ÔÚ·þÎñÆ÷ \"%s\"ÉÏ"
 
-#: ../../printerdrake.pm_.c:843
+#: ../../printerdrake.pm_.c:858
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) ´òÓ¡»úÑ¡Ïî"
 
-#: ../../printerdrake.pm_.c:844
+#: ../../printerdrake.pm_.c:859
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
 "may be different from its TCP/IP hostname!) and possibly the IP address of "
@@ -8157,49 +8189,49 @@ msgstr ""
 "Èç¹ûÄúҪʹÓõÄÊÇ SMB ´òÓ¡»ú (¾ÍÊÇ Windows 9x/NT ÍøÂç¹²Ïí´òÓ¡»ú),\n"
 "ÄúÐèҪ˵Ã÷Ö÷»úµÄ SMB Ãû×Ö (×¢Òâ! ÊÇÄúÔÚ Windows ÍøÂç\n"
 "ÁÚ¾ÓÀï¿´µ½µÄÖ÷»úÃû, ¿ÉÄÜÓëËüµÄ TCP/IP Ö÷»úÃû²»Í¬,), ¿ÉÄÜ»¹ÐèÒªËüµÄ IP µØÖ·,\n"
-"ÒÔ¼°ÓÐȨ·ÃÎÊ´òÓ¡»úµÄÓû§Ãû, ¹¤×÷×éºÍ¿ÚÁî, µ±È»»¹ÓдòÓ¡»úµÄ¹²ÏíÃû. "
+"ÒÔ¼°ÓÐȨ·ÃÎÊ´òÓ¡»úµÄÓû§Ãû, ¹¤×÷×éºÍ¿ÚÁî, µ±È»»¹ÓдòÓ¡»úµÄ¹²ÏíÃû¡£"
 
-#: ../../printerdrake.pm_.c:845
+#: ../../printerdrake.pm_.c:860
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
 "Èç¹û×Ô¶¯¼ì²â·¢ÏÖÁËÏëÒªµÄ´òÓ¡»ú, Ö»Òª´ÓÁбíÖÐÑ¡ÔñËü, È»ºóÌí¼ÓÓû§Ãû, ¿ÚÁî, ÒÔ"
-"¼°¿ÉÄÜÐèÒªµÄÍøÂç×éÃû."
+"¼°¿ÉÄÜÐèÒªµÄÍøÂç×éÃû¡£"
 
-#: ../../printerdrake.pm_.c:846
+#: ../../printerdrake.pm_.c:861
 msgid "SMB server host"
 msgstr "SMB ·þÎñÆ÷Ö÷»ú"
 
-#: ../../printerdrake.pm_.c:847
+#: ../../printerdrake.pm_.c:862
 msgid "SMB server IP"
 msgstr "SMB ·þÎñÆ÷ IP"
 
-#: ../../printerdrake.pm_.c:848
+#: ../../printerdrake.pm_.c:863
 msgid "Share name"
 msgstr "¹²ÏíÃû"
 
-#: ../../printerdrake.pm_.c:851
+#: ../../printerdrake.pm_.c:866
 msgid "Workgroup"
 msgstr "¹¤×÷×é"
 
-#: ../../printerdrake.pm_.c:853
+#: ../../printerdrake.pm_.c:868
 msgid "Auto-detected"
 msgstr "×Ô¶¯¼ì²âµ½"
 
-#: ../../printerdrake.pm_.c:864
+#: ../../printerdrake.pm_.c:879
 msgid "Either the server name or the server's IP must be given!"
-msgstr "ÊäÈë·þÎñÆ÷Ãû»ò·þÎñÆ÷µÄIP"
+msgstr "ÊäÈë·þÎñÆ÷Ãû»ò·þÎñÆ÷µÄIP!"
 
-#: ../../printerdrake.pm_.c:868
+#: ../../printerdrake.pm_.c:883
 msgid "Samba share name missing!"
 msgstr "ȱÉÙ Samba ¹²ÏíÃû!"
 
-#: ../../printerdrake.pm_.c:874
+#: ../../printerdrake.pm_.c:889
 msgid "SECURITY WARNING!"
 msgstr "°²È«¾¯¸æ!"
 
-#: ../../printerdrake.pm_.c:875
+#: ../../printerdrake.pm_.c:890
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -8222,21 +8254,21 @@ msgid ""
 "type in Printerdrake.\n"
 "\n"
 msgstr ""
-"Äú½«ÒªÅäÖÃʹÓà Windows ÕÊ»§ºÍ¿ÚÁîµÄ´òÓ¡. ÓÉÓÚ Samba ¿Í»§Èí¼þµÄÌåϵȱÏÝ, ¿ÚÁî"
-"½«ÒÔÃ÷ÎÄ ³öÏÖÔÚ Samba Ïò Windows ·þÎñÆ÷·¢ËÍ´òÓ¡ÈÎÎñ µÄÃüÁîÐÐÖÐ. ËùÒÔÕâ¸öϵͳ"
-"µÄËùÓÐÓû§¶¼¿ÉÒÔ ÓÃÏÂÁÐÃüÁî¿´µ½¿ÚÁî, \"ps auxwww\".\n"
+"Äú½«ÒªÅäÖÃʹÓà Windows ÕÊ»§ºÍ¿ÚÁîµÄ´òÓ¡¡£ÓÉÓÚ Samba ¿Í»§Èí¼þµÄÌåϵȱÏÝ, ¿ÚÁî"
+"½«ÒÔÃ÷ÎÄ ³öÏÖÔÚ Samba Ïò Windows ·þÎñÆ÷·¢ËÍ´òÓ¡ÈÎÎñ µÄÃüÁîÐÐÖС£ËùÒÔÕâ¸öϵͳ"
+"µÄËùÓÐÓû§¶¼¿ÉÒÔ ÓÃÏÂÁÐÃüÁî¿´µ½¿ÚÁî,¡°ps auxwww¡±¡£\n"
 "\n"
 "ÎÒÃǽ¨ÒéÄúʹÓÃÏÂÃæÁгöµÄÌæ´ú·½·¨Ö®Ò» (ËùÓÐÇé¿ö ÖÐÄú±ØÐëÉè·¨±£Ö¤Ö»ÓÐÄúµÄ±¾µØÍø"
 "ÂçµÄ¼ÆËã»ú ¿ÉÒÔ·ÃÎÊÄúµÄ Windows ·þÎñÆ÷, ÀýÈçʹÓ÷À»ðǽ):\n"
 "\n"
-"ʹÓà Windows ·þÎñÆ÷ÉÏûÓпÚÁîµÄÕÊ»§, Èç \"GUEST\" ÕÊ»§ »òÕß´òӡרÓõÄÕÊ»§. ²»"
-"ÒªÇå³ýÒ»¸öÆÕͨÓû§µÄ¿ÚÁî±£»¤,»òÕßÈ¡Ïû¹ÜÀíÔ±Óû§µÄ¿ÚÁî.\n"
+"ʹÓà Windows ·þÎñÆ÷ÉÏûÓпÚÁîµÄÕÊ»§, Èç¡°GUEST¡±ÕÊ»§ »òÕß´òӡרÓõÄÕÊ»§¡£²»ÒªÇå"
+"³ýÒ»¸öÆÕͨÓû§µÄ¿ÚÁî±£»¤,»òÕßÈ¡Ïû¹ÜÀíÔ±Óû§µÄ¿ÚÁî¡£\n"
 "\n"
-"ÔÚÄúµÄ Windows ·þÎñÆ÷ÉÏÉèÖôòÓ¡»úÖ§³Ö LPD ЭÒé.È»ºóÔÚÕâ¸öµçÄÔÉÏÓôòÓ¡»úÅäÖþ«"
-"Áé°´ÕÕ \"%s\" Á¬½Ó·½Ê½ ÅäÖôòÓ¡»ú.\n"
+"ÔÚÄúµÄ Windows ·þÎñÆ÷ÉÏÉèÖôòÓ¡»úÖ§³Ö LPD ЭÒ顣ȻºóÔÚÕâ¸öµçÄÔÉÏÓôòÓ¡»úÅäÖÃ"
+"Ïòµ¼°´ÕÕ¡°%s¡±Á¬½Ó·½Ê½ ÅäÖôòÓ¡»ú¡£\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:885
+#: ../../printerdrake.pm_.c:900
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -8244,26 +8276,26 @@ msgid ""
 "type in Printerdrake.\n"
 "\n"
 msgstr ""
-"ÔÚÄúµÄ Windows ·þÎñÆ÷ÉÏÉèÖôòÓ¡»úÖ§³Ö IPP ЭÒé.È»ºóÔÚÕâ¸öµçÄÔÉÏÓôòÓ¡»úÅäÖþ«"
-"Áé°´ÕÕ \"%s\" Á¬½Ó·½Ê½ ÅäÖôòÓ¡»ú.\n"
+"ÔÚÄúµÄ Windows ·þÎñÆ÷ÉÏÉèÖôòÓ¡»úÖ§³Ö IPP ЭÒ顣ȻºóÔÚÕâ¸öµçÄÔÉÏÓôòÓ¡»úÅäÖÃ"
+"¾«Áé°´ÕÕ¡°%s¡±Á¬½Ó·½Ê½ÅäÖôòÓ¡»ú¡£\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:888
+#: ../../printerdrake.pm_.c:903
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
 "connect to it as a client.\n"
 "\n"
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
-"°Ñ´òÓ¡»úÁ¬½Óµ½Ò»¸ö Linux ·þÎñÆ÷È»ºóÈà Windows »úÆ÷ ×÷Ϊ¿Í»§Á¬½Ó·þÎñÆ÷.\n"
+"°Ñ´òÓ¡»úÁ¬½Óµ½Ò»¸ö Linux ·þÎñÆ÷È»ºóÈà Windows »úÆ÷×÷Ϊ¿Í»§Á¬½Ó·þÎñÆ÷¡£\n"
 "\n"
 "Äú¼á³ÖÒª¼ÌÐøÕâÑùÅäÖôòÓ¡»úÂð?"
 
-#: ../../printerdrake.pm_.c:960
+#: ../../printerdrake.pm_.c:975
 msgid "NetWare Printer Options"
 msgstr "NetWare ´òÓ¡»úÑ¡Ïî"
 
-#: ../../printerdrake.pm_.c:961
+#: ../../printerdrake.pm_.c:976
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
 "name (Note! it may be different from its TCP/IP hostname!) as well as the "
@@ -8272,47 +8304,47 @@ msgid ""
 msgstr ""
 "Èç¹ûÄúҪʹÓõÄÊÇ NetWare ´òÓ¡»ú, ÄúÐèҪ˵Ã÷Ö÷»úµÄ NetWare Ãû×Ö (×¢Òâ! \n"
 "¿ÉÄÜÓëËüµÄ TCP/IP Ö÷»úÃû²»Í¬), ÒÔ¼°ÓÐȨ·ÃÎÊ´òÓ¡»úµÄÓû§ÃûºÍ¿ÚÁî, \n"
-"µ±È»»¹ÓдòÓ¡»úµÄ´òÓ¡¶ÓÁÐÃû. "
+"µ±È»»¹ÓдòÓ¡»úµÄ´òÓ¡¶ÓÁÐÃû¡£"
 
-#: ../../printerdrake.pm_.c:962
+#: ../../printerdrake.pm_.c:977
 msgid "Printer Server"
-msgstr "´òÓ¡·þÎñÆ÷"
+msgstr "´òÓ¡»ú·þÎñÆ÷"
 
-#: ../../printerdrake.pm_.c:963
+#: ../../printerdrake.pm_.c:978
 msgid "Print Queue Name"
 msgstr "´òÓ¡¶ÓÁÐÃû"
 
-#: ../../printerdrake.pm_.c:968
+#: ../../printerdrake.pm_.c:983
 msgid "NCP server name missing!"
 msgstr "NCP ·þÎñÆ÷δÕÒµ½"
 
-#: ../../printerdrake.pm_.c:972
+#: ../../printerdrake.pm_.c:987
 msgid "NCP queue name missing!"
 msgstr "NCP ¶ÓÁÐÃûδÕÒµ½"
 
-#: ../../printerdrake.pm_.c:1039 ../../printerdrake.pm_.c:1059
+#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1074
 #, c-format
 msgid ", host \"%s\", port %s"
-msgstr ", Ö÷»ú \"%s\", ¶Ë¿Ú %s"
+msgstr ", Ö÷»ú¡°%s¡±, ¶Ë¿Ú %s"
 
-#: ../../printerdrake.pm_.c:1042 ../../printerdrake.pm_.c:1062
+#: ../../printerdrake.pm_.c:1057 ../../printerdrake.pm_.c:1077
 #, c-format
 msgid "Host \"%s\", port %s"
-msgstr "Ö÷»ú \"%s\", ¶Ë¿Ú %s"
+msgstr "Ö÷»ú¡°%s¡±, ¶Ë¿Ú %s"
 
-#: ../../printerdrake.pm_.c:1082
+#: ../../printerdrake.pm_.c:1097
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Socket ´òÓ¡»úÑ¡Ïî"
 
-#: ../../printerdrake.pm_.c:1084
+#: ../../printerdrake.pm_.c:1099
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) into the input fields."
 msgstr ""
 "´Ó×Ô¶¯¼ì²âµ½µÄ´òÓ¡»úÁбíÖÐÑ¡ÔñÒ»¸ö, »òÕßÔÚÊäÈë×Ö¶ÎÖÐÊäÈëÖ÷»úÃû»ò IP, ÒÔ¼°¿ÉÑ¡"
-"µÄ¶Ë¿ÚºÅ (ȱʡÊÇ 9100)."
+"µÄ¶Ë¿ÚºÅ (ĬÈÏÊÇ 9100)¡£"
 
-#: ../../printerdrake.pm_.c:1085
+#: ../../printerdrake.pm_.c:1100
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
 "of the printer and optionally the port number (default is 9100). On HP "
@@ -8320,63 +8352,63 @@ msgid ""
 "vary. See the manual of your hardware."
 msgstr ""
 "Òª´òÓ¡µ½Ò»Ì¨ TCP »ò socket ´òÓ¡»ú, ÄúÐèÒªÌṩ´òÓ¡»úµÄÖ÷»úÃûºÍ¿ÉÑ¡µÄ¶Ë¿ÚºÅÂë"
-"(ȱʡÊÇ 9100). HP JetDirect ´òÓ¡·þÎñÆ÷ͨ³£Óö˿Ú9100, ÆäËü·þÎñÆ÷¿ÉÄÜÓÃÆäËüµÄ"
-"¶Ë¿Ú. Çë²éÔÄÄúµÄÓ²¼þÊÖ²á."
+"(ĬÈÏÊÇ 9100). HP JetDirect ´òÓ¡·þÎñÆ÷ͨ³£Óö˿Ú9100, ÆäËü·þÎñÆ÷¿ÉÄÜÓÃÆäËüµÄ"
+"¶Ë¿Ú¡£Çë²éÔÄÄúµÄÓ²¼þÊֲᡣ"
 
-#: ../../printerdrake.pm_.c:1090
+#: ../../printerdrake.pm_.c:1105
 msgid "Printer host name or IP missing!"
 msgstr "ȱÉÙ´òÓ¡»úÖ÷»úÃû»ò IP µØÖ·!"
 
-#: ../../printerdrake.pm_.c:1112
+#: ../../printerdrake.pm_.c:1127
 msgid "Printer host name or IP"
 msgstr "´òÓ¡»úÖ÷»úÃû»ò IP µØÖ·"
 
-#: ../../printerdrake.pm_.c:1160 ../../printerdrake.pm_.c:1162
+#: ../../printerdrake.pm_.c:1177 ../../printerdrake.pm_.c:1179
 msgid "Printer Device URI"
 msgstr "´òÓ¡»úÉ豸 URI"
 
-#: ../../printerdrake.pm_.c:1161
+#: ../../printerdrake.pm_.c:1178
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
-"Äã¿ÉÒÔÖ±½ÓʹÓà URI ·ÃÎÊ´òÓ¡»ú. URI ±ØÐë·ûºÏCUPS »ò Foomatic ¹æ¶¨.µ«×¢Òâ²»ÊÇËù"
-"ÓеĴòÓ¡¶ÓÁÐ (spooler) ¶¼Ö§³Ö URI."
+"Äã¿ÉÒÔÖ±½ÓʹÓà URI ·ÃÎÊ´òÓ¡»ú¡£URI ±ØÐë·ûºÏCUPS »ò Foomatic ¹æ¶¨¡£µ«×¢Òâ²»ÊÇ"
+"ËùÓеĴòÓ¡¶ÓÁÐ (spooler) ¶¼Ö§³Ö URI¡£"
 
-#: ../../printerdrake.pm_.c:1176
+#: ../../printerdrake.pm_.c:1193
 msgid "A valid URI must be entered!"
 msgstr "±ØÐëÊÇÓÐЧµÄURI!"
 
-#: ../../printerdrake.pm_.c:1515
+#: ../../printerdrake.pm_.c:1560
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
-"ÿ̨´òÓ¡»úÐèÒªÒ»¸öÃû×Ö(Èç \"printer\").\n"
-"´òÓ¡»úÃèÊöºÍλÖÃÊÇ¿ÉÑ¡Ïî."
+"ÿ̨´òÓ¡»úÐèÒªÒ»¸öÃû×Ö(Èç¡°printer¡±)¡£\n"
+"´òÓ¡»úÃèÊöºÍλÖÃÊÇ¿ÉÑ¡Ïî¡£"
 
-#: ../../printerdrake.pm_.c:1516
+#: ../../printerdrake.pm_.c:1561
 msgid "Name of printer"
 msgstr "´òÓ¡»úÃû×Ö"
 
-#: ../../printerdrake.pm_.c:1518
+#: ../../printerdrake.pm_.c:1563
 msgid "Location"
 msgstr "λÖÃ"
 
-#: ../../printerdrake.pm_.c:1530 ../../printerdrake.pm_.c:1652
+#: ../../printerdrake.pm_.c:1575 ../../printerdrake.pm_.c:1697
 msgid "Reading printer database..."
 msgstr "¶ÁÈ¡´òÓ¡»úÊý¾Ý¿â..."
 
-#: ../../printerdrake.pm_.c:1534
+#: ../../printerdrake.pm_.c:1579
 msgid "Preparing printer database..."
 msgstr "×¼±¸´òÓ¡»úÊý¾Ý..."
 
-#: ../../printerdrake.pm_.c:1631
+#: ../../printerdrake.pm_.c:1676
 msgid "Your printer model"
 msgstr "ÄúµÄ´òÓ¡»úÐͺÅ"
 
-#: ../../printerdrake.pm_.c:1632
+#: ../../printerdrake.pm_.c:1677
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -8391,32 +8423,32 @@ msgid ""
 "%s"
 msgstr ""
 "Printerdrake ͨ¹ý±È½Ï×Ô¶¯¼ì²âµÃµ½µÄ´òÓ¡»úÐͺÅÐÅÏ¢ºÍËü×Ô¼ºµÄ´òÓ¡»úÊý¾Ý¿âÖÐÁгö"
-"µÄÐͺÅÒÔ·¢ÏÖ×î½Ó½üµÄÆ¥Åä. Èç¹ûÄúµÄ´òÓ¡»úûÓÐÁÐÔÚÊý¾Ý¿âÖÐ, Æ¥Åä½á¹û¿ÉÄÜÊÇ´í"
-"µÄ. Çë¼ì²é½á¹ûÊÇ·ñÕýÈ·, Èç¹ûÊÇ ÇëÑ¡Ôñ\"ÐͺÅÕýÈ·\" ·ñÔò \"ÊÖ¹¤Ñ¡ÔñÐͺÅ\" »áÏÔ"
-"ʾÏÂÒ»ÆÁÄ»ÈÃÄúÊÖ¹¤Ñ¡Ôñ´òÓ¡»úÐͺÅ.\n"
+"µÄÐͺÅÒÔ·¢ÏÖ×î½Ó½üµÄÆ¥Åä¡£Èç¹ûÄúµÄ´òÓ¡»úûÓÐÁÐÔÚÊý¾Ý¿âÖÐ, Æ¥Åä½á¹û¿ÉÄÜÊÇ´í"
+"µÄ. Çë¼ì²é½á¹ûÊÇ·ñÕýÈ·, Èç¹ûÊÇ ÇëÑ¡Ôñ¡°ÐͺÅÕýÈ·¡±·ñÔò¡°ÊÖ¹¤Ñ¡ÔñÐͺš±»áÏÔʾÏÂÒ»ÆÁ"
+"Ä»ÈÃÄúÊÖ¹¤Ñ¡Ôñ´òÓ¡»úÐͺš£\n"
 "\n"
 "Printerdrake ·¢ÏÖÄúµÄ´òÓ¡»úÊÇ:\n"
 "\n"
 "%s"
 
-#: ../../printerdrake.pm_.c:1637 ../../printerdrake.pm_.c:1640
+#: ../../printerdrake.pm_.c:1682 ../../printerdrake.pm_.c:1685
 msgid "The model is correct"
 msgstr "ÐͺÅÕýÈ·"
 
-#: ../../printerdrake.pm_.c:1638 ../../printerdrake.pm_.c:1639
-#: ../../printerdrake.pm_.c:1642
+#: ../../printerdrake.pm_.c:1683 ../../printerdrake.pm_.c:1684
+#: ../../printerdrake.pm_.c:1687
 msgid "Select model manually"
 msgstr "ÊÖ¹¤Ñ¡ÔñÐͺÅ"
 
-#: ../../printerdrake.pm_.c:1659
+#: ../../printerdrake.pm_.c:1704
 msgid "Printer model selection"
 msgstr "´òÓ¡»úÐͺÅÑ¡Ôñ"
 
-#: ../../printerdrake.pm_.c:1660
+#: ../../printerdrake.pm_.c:1705
 msgid "Which printer model do you have?"
-msgstr "ÇëÎÊÄú´òÓ¡»úµÄÐͺŠ?"
+msgstr "ÇëÎÊÄú´òÓ¡»úµÄÐͺÅ?"
 
-#: ../../printerdrake.pm_.c:1661
+#: ../../printerdrake.pm_.c:1706
 msgid ""
 "\n"
 "\n"
@@ -8426,20 +8458,20 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"¼ì²é×Ô¶¯¼ì²âÑ¡ÔñµÄÐͺÅÊÇ·ñÕýÈ·. Óùâ±êÖ¸¶¨²»ÕýÈ·µÄÐͺŻò\"δ֪´òÓ¡»ú\", È»ºó"
-"´ÓÁбíÖÐÑ¡ÔñÕýÈ·µÄÐͺÅ."
+"¼ì²é×Ô¶¯¼ì²âÑ¡ÔñµÄÐͺÅÊÇ·ñÕýÈ·. Óùâ±êÖ¸¶¨²»ÕýÈ·µÄÐͺŻò¡°Î´Öª´òÓ¡»ú¡±, È»ºó´Ó"
+"ÁбíÖÐÑ¡ÔñÕýÈ·µÄÐͺš£"
 
-#: ../../printerdrake.pm_.c:1664
+#: ../../printerdrake.pm_.c:1709
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
-msgstr "È»ºóÄúµÄ´òÓ¡»ú²»ÔÚÁбíÖÐ, Ñ¡Ôñ¼æÈݵÄ(²Î¿¼´òÓ¡»úÊÖ²á) »òÀàËƵÄÐͺÅ."
+msgstr "È»ºóÄúµÄ´òÓ¡»ú²»ÔÚÁбíÖÐ, Ñ¡Ôñ¼æÈݵÄ(²Î¿¼´òÓ¡»úÊÖ²á) »òÀàËƵÄÐͺš£"
 
-#: ../../printerdrake.pm_.c:1741
+#: ../../printerdrake.pm_.c:1786
 msgid "OKI winprinter configuration"
 msgstr "OKI winprinter ´òÓ¡»úÅäÖÃ"
 
-#: ../../printerdrake.pm_.c:1742
+#: ../../printerdrake.pm_.c:1787
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
 "use a very special communication protocol and therefore they work only when "
@@ -8447,13 +8479,14 @@ msgid ""
 "another port or to a print server box please connect the printer to the "
 "first parallel port before you print a test page. Otherwise the printer will "
 "not work. Your connection type setting will be ignored by the driver."
-msgstr "ÄãÕýÔÚÅäÖÃOKI win´òÓ¡»ú, ÒòÆäʹÓÃÌرðµÄͨѶЭÒé, Ö»ÄÜÁ¬ÔÚµÚÒ»¸ö´òÓ¡¿Ú."
+msgstr ""
+"ÄãÕýÔÚÅäÖÃOKI win´òÓ¡»ú, ÒòÆäʹÓÃÌرðµÄͨѶЭÒé, Ö»ÄÜÁ¬ÔÚµÚÒ»¸ö´òÓ¡¿Ú¡£"
 
-#: ../../printerdrake.pm_.c:1785 ../../printerdrake.pm_.c:1812
+#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1857
 msgid "Lexmark inkjet configuration"
 msgstr "ÀûÃË(Lexmark)ÅçÄ«´òÓ¡»úÉ趨"
 
-#: ../../printerdrake.pm_.c:1786
+#: ../../printerdrake.pm_.c:1831
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
 "no printers on remote machines or print server boxes. Please connect your "
@@ -8461,9 +8494,9 @@ msgid ""
 "to."
 msgstr ""
 "ÀûÃËÌṩµÄÅçÄ«´òÓ¡»úÇý¶¯³ÌÐò½ö½öÖ§³Ö±¾µØ´òÓ¡»ú, ¶ø·ÇÔ¶³ÌÖ÷»ú»ò´òÓ¡·þÎñºÐÉϵÄ"
-"´òÓ¡»ú.Çë°Ñ´òÓ¡»úÁ¬½Óµ½ÄúµÄ±¾»ú¶Ë¿Ú, »òÕßÔÚÁ¬½ÓÁË´òÓ¡»úµÄµçÄÔÉϽøÐÐÅäÖÃ."
+"´òÓ¡»ú¡£Çë°Ñ´òÓ¡»úÁ¬½Óµ½ÄúµÄ±¾»ú¶Ë¿Ú, »òÕßÔÚÁ¬½ÓÁË´òÓ¡»úµÄµçÄÔÉϽøÐÐÅäÖá£"
 
-#: ../../printerdrake.pm_.c:1813
+#: ../../printerdrake.pm_.c:1858
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
 "need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
@@ -8475,16 +8508,16 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 "ÒªÅäÖÃÀûÃËÅçÄ«´òÓ¡»úÐèÒª´ÓÀûÃËÍøÕ¾(http://www.lexmark.com/)\n"
-"ÏÂÔØÅçÄ«´òÓ¡»úÇý¶¯³ÌÐò. µã»÷ \"Drivers\" Á´½Ó. È»ºóÌôÑ¡ÄúµÄÐͺŠ²¢Ñ¡Ôñ\"Linux"
-"\"²Ù×÷ϵͳ. Çý¶¯³ÌÐòµÄÐÎʽÓÐ RPM °ü»ò´øÓл¥¶¯Ê½Í¼ÐνçÃæµÄ½Å±¾³ÌÐò. Èç¹ûÄúʹÓÃ"
-"Õâ¸öÅäÖù¤¾ß, ¾Í²»±ØʹÓÃͼÐνçÃæµÄ°²×°³ÌÐò. ÔÚÐí¿ÉЭÒéÖ®ºóÖ±½Ó°´ Cancel.  Óà "
-"\"lexmarkmaintain\" ÃüÁî´òÓ¡ÅçÍ·¶ÔÆë²âÊÔÒ³, È»ºóÓÃÕâ¸ö³ÌÐòµ÷½ÚÅçÍ·¶ÔÆë."
+"ÏÂÔØÅçÄ«´òÓ¡»úÇý¶¯³ÌÐò¡£µã»÷¡°Drivers¡±Á´½Ó. È»ºóÌôÑ¡ÄúµÄÐͺŠ²¢Ñ¡Ôñ¡°Linux¡±²Ù×÷"
+"ϵͳ¡£Çý¶¯³ÌÐòµÄÐÎʽÓÐ RPM °ü»ò´øÓл¥¶¯Ê½Í¼ÐνçÃæµÄ½Å±¾³ÌÐò. Èç¹ûÄúʹÓÃÕâ¸öÅä"
+"Öù¤¾ß, ¾Í²»±ØʹÓÃͼÐνçÃæµÄ°²×°³ÌÐò¡£ÔÚÐí¿ÉЭÒéÖ®ºóÖ±½Ó°´È¡Ïû¡£Óà "
+"¡°lexmarkmaintain¡±ÃüÁî´òÓ¡ÅçÍ·¶ÔÆë²âÊÔÒ³, È»ºóÓÃÕâ¸ö³ÌÐòµ÷½ÚÅçÍ·¶ÔÆë¡£"
 
-#: ../../printerdrake.pm_.c:1816
+#: ../../printerdrake.pm_.c:1861
 msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
 msgstr "ʹÓà Zenographics ZJ-Stream ¸ñʽµÄGDI ¼¤¹â´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:1817
+#: ../../printerdrake.pm_.c:1862
 msgid ""
 "Your printer belongs to the group of GDI laser printers (winprinters) sold "
 "by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -8507,21 +8540,21 @@ msgid ""
 "as root. After having done so you can print normally.\n"
 msgstr ""
 "ÄúµÄ´òÓ¡»úÊôÓÚGDI ¼¤¹â´òÓ¡»ú (Ëùν winprinter), ¾¡¹ÜÅÆ×Ó²»Í¬ ËüÃǶ¼²ÉÓà "
-"Zenographics ZJ-stream ¹âÕ¤¸ñʽ°ÑÊý¾Ý´«Êäµ½´òÓ¡»ú. ÕâÀà´òÓ¡»úµÄÇý¶¯³ÌÐòÈÔÈ»´¦"
-"ÓÚÇ°ÆÚ¿ª·¢½×¶Î, ËùÒÔËüδ±Ø×ÜÄÜÕý³£¹¤×÷. ÌرðÊÇ´òÓ¡»ú¿ÉÄÜÖ»ÓÐÑ¡Ôñ A4 Ö½Õųߴç"
-"ʱ²ÅÄܹ¤×÷.\n"
+"Zenographics ZJ-stream ¹âÕ¤¸ñʽ°ÑÊý¾Ý´«Êäµ½´òÓ¡»ú¡£ÕâÀà´òÓ¡»úµÄÇý¶¯³ÌÐòÈÔÈ»´¦"
+"ÓÚÇ°ÆÚ¿ª·¢½×¶Î, ËùÒÔËüδ±Ø×ÜÄÜÕý³£¹¤×÷¡£ÌرðÊÇ´òÓ¡»ú¿ÉÄÜÖ»ÓÐÑ¡Ôñ A4 Ö½Õųߴç"
+"ʱ²ÅÄܹ¤×÷¡£\n"
 "\n"
-"ÓÐЩ´òÓ¡»úÈç HP LaserJet 1000, ÐèÒªÔÚ¿ª»úÖ®ºóÉÏÔع̼þ. ¶Ô HP LaserJet 1000,  "
-"ÄúÐèÒªÔÚ´òÓ¡»úµÄ Windows Çý¶¯³ÌÐò¹âÅÌ»ò Windows ´ÅÅÌ·ÖÇøÉϲéÕÒ \"sihp1000.img"
-"\" È»ºóʹÓÃÏÂÁÐÃüÁîÖ®Ò»°ÑÕâ¸öÎļþ´«µ½´òÓ¡»ú:\n"
+"ÓÐЩ´òÓ¡»úÈç HP LaserJet 1000, ÐèÒªÔÚ¿ª»úÖ®ºóÉÏÔع̼þ¡£¶Ô HP LaserJet 1000,  "
+"ÄúÐèÒªÔÚ´òÓ¡»úµÄ Windows Çý¶¯³ÌÐò¹âÅÌ»ò Windows ´ÅÅÌ·ÖÇøÉϲéÕÒ¡°sihp1000."
+"img¡±È»ºóʹÓÃÏÂÁÐÃüÁîÖ®Ò»°ÑÕâ¸öÎļþ´«µ½´òÓ¡»ú:\n"
 "\n"
 "     lpr -o raw sihp1000.img\n"
 "     cat sihp1000.img > /dev/usb/lp0\n"
 "\n"
 "ÈκÎÆÕͨÓû§¶¼¿ÉÒÔʹÓõÚÒ»¸öÃüÁî, µÚ¶þ¸öÃüÁî±ØÐëÓÉ root Ö´ÐÐ.Éý¼¶¹Ì¼þÖ®ºóÄú¾Í"
-"¿ÉÒÔÕý³£´òÓ¡ÁË.\n"
+"¿ÉÒÔÕý³£´òÓ¡ÁË¡£\n"
 
-#: ../../printerdrake.pm_.c:2040
+#: ../../printerdrake.pm_.c:2085
 msgid ""
 "Printer default settings\n"
 "\n"
@@ -8530,81 +8563,83 @@ msgid ""
 "duplex unit, extra trays) are set correctly. Note that with a very high "
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
-"´òÓ¡»úȱʡÉèÖÃ\n"
-"ÈçÖ½ÕÅ´óС¡¢Ä«Ë®ÀàÐ͵ȵÈ."
+"´òÓ¡»úĬÈÏÉèÖÃ\n"
+"\n"
+"ÄãÓ¦¸ÃÈ·¶¨Ò³Ãæ´óСºÍÄ«Ë®ÀàÐÍ/´òӡģʽ(Èô¿ÉÓÃ)ºÍ¼¤¹â´òÓ¡»úµÄÓ²¼þÅäÖÃ(ÄÚ´æ,Ë«µ¥"
+"Ôª, ÍÐÖ½ÅÌ)ÉèÖÃÕýÈ·¡£×¢Òⳬ¸ßÖÊÁ¿/·Ö±æÂÊ´òÓ¡¿ÉÄÜ»á±äµÃºÜÂý¡£"
 
-#: ../../printerdrake.pm_.c:2049
+#: ../../printerdrake.pm_.c:2094
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Ñ¡Ïî %s ±ØÐëÊÇÕûÊý!"
 
-#: ../../printerdrake.pm_.c:2053
+#: ../../printerdrake.pm_.c:2098
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Ñ¡Ïî %s ±ØÐëÊÇÊý×Ö!"
 
-#: ../../printerdrake.pm_.c:2058
+#: ../../printerdrake.pm_.c:2103
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Ñ¡Ïî %s ³¬³ö·¶Î§!"
 
-#: ../../printerdrake.pm_.c:2097
+#: ../../printerdrake.pm_.c:2142
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr ""
-"ÄãÏ£ÍûÉèÖÃÕâ¸ö´òÓ¡»ú(\"%s\")\n"
-"×÷Ϊȱʡ´òÓ¡»úÂð?"
+"ÄãÏ£ÍûÉèÖÃÕâ¸ö´òÓ¡»ú(¡°%s¡±)\n"
+"×÷ΪĬÈÏ´òÓ¡»úÂð?"
 
-#: ../../printerdrake.pm_.c:2120
+#: ../../printerdrake.pm_.c:2165
 msgid "Test pages"
 msgstr "²âÊÔÒ³"
 
-#: ../../printerdrake.pm_.c:2121
+#: ../../printerdrake.pm_.c:2166
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed and on "
 "laser printers with too low memory it can even not come out. In most cases "
 "it is enough to print the standard test page."
 msgstr ""
-"ÇëÑ¡ÔñÒª´òÓ¡µÄ²âÊÔÒ³.\n"
-"×¢Òâ: ÔÚijЩ´òÓ¡»úÉÏ´òÓ¡ÕÕƬ¿ÉÄÜÒª»¨Ï൱³¤µÄʱ¼ä.\n"
-"Ò»°ãÇëÑ¡Ôñ±ê×¼²âÊÔÒ³."
+"ÇëÑ¡ÔñÒª´òÓ¡µÄ²âÊÔÒ³¡£\n"
+"×¢Òâ: ÔÚijЩ´òÓ¡»úÉÏ´òÓ¡ÕÕƬ¿ÉÄÜÒª»¨Ï൱³¤µÄʱ¼ä¡£\n"
+"Ò»°ãÇëÑ¡Ôñ±ê×¼²âÊÔÒ³¡£"
 
-#: ../../printerdrake.pm_.c:2125
+#: ../../printerdrake.pm_.c:2170
 msgid "No test pages"
 msgstr "ûÓвâÊÔÒ³"
 
-#: ../../printerdrake.pm_.c:2126
+#: ../../printerdrake.pm_.c:2171
 msgid "Print"
 msgstr "´òÓ¡"
 
-#: ../../printerdrake.pm_.c:2183
+#: ../../printerdrake.pm_.c:2228
 msgid "Standard test page"
 msgstr "±ê×¼²âÊÔÒ³"
 
-#: ../../printerdrake.pm_.c:2186
+#: ../../printerdrake.pm_.c:2231
 msgid "Alternative test page (Letter)"
 msgstr "¿É»»²âÊÔÒ³(ÐÅÖ½)"
 
-#: ../../printerdrake.pm_.c:2189
+#: ../../printerdrake.pm_.c:2234
 msgid "Alternative test page (A4)"
 msgstr "Ìæ»»²âÊÔÒ³ (A4)"
 
-#: ../../printerdrake.pm_.c:2191
+#: ../../printerdrake.pm_.c:2236
 msgid "Photo test page"
 msgstr "ÕÕƬ²âÊÔÒ³"
 
-#: ../../printerdrake.pm_.c:2195
+#: ../../printerdrake.pm_.c:2240
 msgid "Do not print any test page"
 msgstr "²»´òÓ¡ÈκβâÊÔÒ³"
 
-#: ../../printerdrake.pm_.c:2204 ../../printerdrake.pm_.c:2357
+#: ../../printerdrake.pm_.c:2249 ../../printerdrake.pm_.c:2402
 msgid "Printing test page(s)..."
 msgstr "ÕýÔÚ´òÓ¡²âÊÔÒ³..."
 
-#: ../../printerdrake.pm_.c:2229
+#: ../../printerdrake.pm_.c:2274
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -8613,26 +8648,26 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"²âÊÔÒ³ÒѾ­·¢Ë͵½´òÓ¡»úºǫ́³ÌÐò. ¹ýһС¶Îʱ¼ä´òÓ¡»ú½«¿ªÊ¼¹¤×÷.\n"
+"²âÊÔÒ³ÒѾ­·¢Ë͵½´òÓ¡»úºǫ́³ÌÐò¡£¹ýһС¶Îʱ¼ä´òÓ¡»ú½«¿ªÊ¼¹¤×÷¡£\n"
 "´òӡ״̬:\n"
 "%s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2233
+#: ../../printerdrake.pm_.c:2278
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
-msgstr "²âÊÔÒ³ÒѾ­·¢Ë͵½´òÓ¡»úºǫ́³ÌÐò. ¹ýÒ»ÉÙ¶Îʱ¼ä´òÓ¡»ú½«¿ªÊ¼¹¤×÷.\n"
+msgstr "²âÊÔÒ³ÒѾ­·¢Ë͵½´òÓ¡»úºǫ́³ÌÐò¡£¹ýÒ»ÉÙ¶Îʱ¼ä´òÓ¡»ú½«¿ªÊ¼¹¤×÷¡£\n"
 
-#: ../../printerdrake.pm_.c:2240
+#: ../../printerdrake.pm_.c:2285
 msgid "Did it work properly?"
 msgstr "¹¤×÷Õý³£?"
 
-#: ../../printerdrake.pm_.c:2262 ../../printerdrake.pm_.c:3416
+#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3464
 msgid "Raw printer"
 msgstr "Âã´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:2288
+#: ../../printerdrake.pm_.c:2333
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -8640,20 +8675,20 @@ msgid ""
 "\"kprinter <file>\". The graphical tools allow you to choose the printer and "
 "to modify the option settings easily.\n"
 msgstr ""
-"Òª´ÓÃüÁîÐдòÓ¡Îļþ¿ÉʹÓÃÃüÁî\"%s <Îļþ>\" »òͼÐδòÓ¡¹¤¾ß: \"xpp <Îļþ>\" »ò "
-"\"kprinter <Îļþ>\". ͼÐι¤¾ßÈÃÄú±È½ÏÈÝÒ×µÄÑ¡Ôñ´òÓ¡»úºÍÐ޸ĴòÓ¡Ñ¡Ïî.\n"
+"Òª´ÓÃüÁîÐдòÓ¡Îļþ¿ÉʹÓÃÃüÁî¡°%s <Îļþ>¡±»òͼÐδòÓ¡¹¤¾ß:¡°xpp <Îļþ>¡±»ò "
+"¡°kprinter <Îļþ>¡±¡£Í¼Ðι¤¾ßÈÃÄú±È½ÏÈÝÒ×µÄÑ¡Ôñ´òÓ¡»úºÍÐ޸ĴòÓ¡Ñ¡Ïî¡£\n"
 
-#: ../../printerdrake.pm_.c:2290
+#: ../../printerdrake.pm_.c:2335
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications, but here do not supply the file name "
 "because the file to print is provided by the application.\n"
 msgstr ""
-"¸ÃÃüÁîÄã¿ÉÓÃÔÚÐí¶àÓ¦ÓõĴòÓ¡¶Ô»°¿òµÄ\"´òÓ¡ÃüÁî\"ÖÐ,ÒòΪӦÓóÌÐò»áÌṩҪ´òÓ¡µÄ"
-"Îļþ, ËùÒÔÄÇÀï²»ÓÃдÎļþÃû.\n"
+"¸ÃÃüÁîÄã¿ÉÓÃÔÚÐí¶àÓ¦ÓõĴòÓ¡¶Ô»°¿òµÄ¡°´òÓ¡ÃüÁÖÐ,ÒòΪӦÓóÌÐò»áÌṩҪ´òÓ¡µÄÎÄ"
+"¼þ, ËùÒÔÄÇÀï²»ÓÃдÎļþÃû¡£\n"
 
-#: ../../printerdrake.pm_.c:2293 ../../printerdrake.pm_.c:2310
-#: ../../printerdrake.pm_.c:2320
+#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:2365
 #, c-format
 msgid ""
 "\n"
@@ -8662,19 +8697,20 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 "\n"
-"\"%s\"ÃüÁîÒ²¿ÉÓÃÀ´Ð޸ĴòÓ¡×÷ÒµµÄÑ¡Ïî, ÀýÈç: \"%s <file>\". "
+"¡°%s¡±ÃüÁîÒ²¿ÉÓÃÀ´Ð޸ĴòÓ¡×÷ÒµµÄÑ¡Ïî, ÀýÈç:¡°%s <file>¡±¡£"
 
-#: ../../printerdrake.pm_.c:2296 ../../printerdrake.pm_.c:2336
+#: ../../printerdrake.pm_.c:2341 ../../printerdrake.pm_.c:2381
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
 "list shown below or click on the \"Print option list\" button.%s%s\n"
 "\n"
 msgstr ""
-"ÒªÁ˽⵱ǰ´òÓ¡»ú¿ÉÓõÄÑ¡Ïî, Çë¿´ÏÂÃæµÄÁбí, »òÕßµã»÷\"´òÓ¡Ñ¡ÏîÁбí\".%s%s\n"
+"ÒªÁ˽⵱ǰ´òÓ¡»ú¿ÉÓõÄÑ¡Ïî, Çë¿´ÏÂÃæµÄÁбí, »òÕßµã»÷¡°´òÓ¡Ñ¡ÏîÁÐ±í¡±°´Å¥¡£%s%"
+"s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2300
+#: ../../printerdrake.pm_.c:2345
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
@@ -8682,35 +8718,37 @@ msgstr ""
 "ÒÔÏÂÊÇ¿ÉÓÃÓÚµ±Ç°´òÓ¡»úµÄһЩ´òÓ¡Ñ¡Ïî: \n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:2315
+#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2360
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\".\n"
-msgstr "ÃüÁîÐдòÓ¡ÎļþʹÓÃÃüÁî\"%s <Îļþ>\".\n"
+msgstr "ÃüÁîÐдòÓ¡ÎļþʹÓÃÃüÁî¡°%s <Îļþ>¡±¡£\n"
 
-#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:2317
-#: ../../printerdrake.pm_.c:2327
+#: ../../printerdrake.pm_.c:2352 ../../printerdrake.pm_.c:2362
+#: ../../printerdrake.pm_.c:2372
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
 "printing dialogs of many applications. But here do not supply the file name "
 "because the file to print is provided by the application.\n"
-msgstr "¸ÃÃüÁîÄã¿ÉÓÃÔÚÐí¶àÓ¦ÓõĴòÓ¡¶Ô»°¿òµÄ\"´òÓ¡ÃüÁî\"Ïî.\n"
+msgstr ""
+"¸ÃÃüÁîÄã¿ÉÓÃÔÚÐí¶àÓ¦ÓõĴòÓ¡¶Ô»°¿òµÄ¡°´òÓ¡ÃüÁÏî¡£µ«ÊÇ´Ë´¦²¢²»ÌṩÎļþÃû, Òò"
+"ΪҪ´òÓ¡µÄÎļþÓÉÓ¦ÓóÌÐòÌṩ¡£\n"
 
-#: ../../printerdrake.pm_.c:2312 ../../printerdrake.pm_.c:2322
+#: ../../printerdrake.pm_.c:2357 ../../printerdrake.pm_.c:2367
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
-msgstr "µã»÷\"´òÓ¡Ñ¡Ïî\"°´Å¥¿ÉÒÔÁоٵ±Ç°´òÓ¡»úµÄ¿ÉÓÃÑ¡Ïî."
+msgstr "µã»÷¡°´òÓ¡Ñ¡Ï°´Å¥¿ÉÒÔÁоٵ±Ç°´òÓ¡»úµÄ¿ÉÓÃÑ¡Ïî¡£"
 
-#: ../../printerdrake.pm_.c:2325
+#: ../../printerdrake.pm_.c:2370
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
-msgstr "ÓÃÃüÁî\"%s <Îļþ>\"»ò\"%s <Îļþ>\"´òÓ¡Îļþ.\n"
+msgstr "ÓÃÃüÁî¡°%s <Îļþ>¡±»ò¡°%s <Îļþ>¡±´òÓ¡Îļþ¡£\n"
 
-#: ../../printerdrake.pm_.c:2329
+#: ../../printerdrake.pm_.c:2374
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
 "handling printing jobs.\n"
@@ -8719,10 +8757,10 @@ msgid ""
 "jobs immediately when you click it. This is for example useful for paper "
 "jams.\n"
 msgstr ""
-"Äã¿ÉÒÔÓÃͼÐνӿÚ\"xpdq\"ÉèÖôòÓ¡Ñ¡ÏîºÍ´¦Àí´òÓ¡×÷Òµ.\n"
-"Èç¹ûÄãʹÓÃKDE, ×ÀÃæÉÏÓÐ\"Í£Ö¹´òÓ¡»ú!\"°´Å¥ÓÃÓÚÈ¡Ïû´òÓ¡×÷Òµ.\n"
+"Äã¿ÉÒÔÓÃͼÐνӿڡ°xpdq¡±ÉèÖôòÓ¡Ñ¡ÏîºÍ´¦Àí´òÓ¡×÷Òµ¡£\n"
+"Èç¹ûÄãʹÓÃKDE, ×ÀÃæÉÏÓС°Í£Ö¹´òÓ¡»ú!¡±°´Å¥ÓÃÓÚÈ¡Ïû´òÓ¡×÷Òµ¡£\n"
 
-#: ../../printerdrake.pm_.c:2333
+#: ../../printerdrake.pm_.c:2378
 #, c-format
 msgid ""
 "\n"
@@ -8731,42 +8769,42 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 "\n"
-"\"%s\"ºÍ\"%s\"ÃüÁîÔÊÐíÐ޸ĴòÓ¡×÷ÒµµÄÑ¡Ïî, ÀýÈç: \"%s <file>\".\n"
+"¡°%s¡±ºÍ¡°%s¡±ÃüÁîÔÊÐíÐ޸ĴòÓ¡×÷ÒµµÄÑ¡Ïî, ÀýÈç:¡°%s <file>¡±¡£\n"
 
-#: ../../printerdrake.pm_.c:2343
+#: ../../printerdrake.pm_.c:2388
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
-msgstr "ÔÚ\"%s\"´òÓ¡»úÉϵĴòÓ¡/ɨÃè/ÕÕƬ¿¨"
+msgstr "ÔÚ¡°%s¡±´òÓ¡»úÉϵĴòÓ¡/ɨÃè/ÕÕƬ¿¨"
 
-#: ../../printerdrake.pm_.c:2344
+#: ../../printerdrake.pm_.c:2389
 #, c-format
 msgid "Printing/Scanning on \"%s\""
-msgstr "ÔÚ\"%s\"´òÓ¡»úÉϵĴòÓ¡/ɨÃè"
+msgstr "ÔÚ¡°%s¡±´òÓ¡»úÉϵĴòÓ¡/ɨÃè"
 
-#: ../../printerdrake.pm_.c:2346
+#: ../../printerdrake.pm_.c:2391
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
-msgstr "\"%s\"´òÓ¡»úÉϵĴòÓ¡/ÕÕƬ¿¨·ÃÎÊ"
+msgstr "¡°%s¡±´òÓ¡»úÉϵĴòÓ¡/ÕÕƬ¿¨·ÃÎÊ"
 
-#: ../../printerdrake.pm_.c:2347
+#: ../../printerdrake.pm_.c:2392
 #, c-format
 msgid "Printing on the printer \"%s\""
-msgstr "ÕýÔÚ\"%s\"´òÓ¡»úÉÏ´òÓ¡"
+msgstr "ÕýÔÚ¡°%s¡±´òÓ¡»úÉÏ´òÓ¡"
 
-#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2353
-#: ../../printerdrake.pm_.c:2354 ../../printerdrake.pm_.c:2355
-#: ../../printerdrake.pm_.c:3400 ../../standalone/drakTermServ_.c:248
+#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
+#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
+#: ../../printerdrake.pm_.c:3448 ../../standalone/drakTermServ_.c:248
 #: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
 #: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
 #: ../../standalone/drakfont_.c:1014
 msgid "Close"
 msgstr "¹Ø±Õ"
 
-#: ../../printerdrake.pm_.c:2353
+#: ../../printerdrake.pm_.c:2398
 msgid "Print option list"
-msgstr "´òÓ¡»úÑ¡Ïî"
+msgstr "´òÓ¡»úÑ¡ÏîÁбí"
 
-#: ../../printerdrake.pm_.c:2373
+#: ../../printerdrake.pm_.c:2418
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -8779,14 +8817,14 @@ msgid ""
 "\n"
 "Do not use \"scannerdrake\" for this device!"
 msgstr ""
-"ÄúµÄ¶à¹¦ÄÜÉ豸ÒѾ­×Ô¶¯ÅäÖóÉÄܹ»É¨Ãè. ҪɨÃè, ¿ÉÒÔʹÓÃÃüÁî \"scanimage"
-"\" (\"scanimage -d hp:%s\" Ö¸¶¨¶à¸ö ɨÃèÒÇÖ®Ò») »òÕßÓÃͼÐνçÃæ \"xscanimage"
-"\" »ò \"xsane\". Èç¹ûÄúʹÓà GIMP, ¿ÉÒÔ´Ó \"Îļþ\"/\"»ñÈ¡\" ²Ëµ¥µÄÓйØÏîĿɨ"
-"Ãè. Ò²¿ÉÒÔʹÓà \"man scanimage\" ÃüÁî²é¿´¸ü¶àÐÅÏ¢.\n"
+"ÄúµÄ¶à¹¦ÄÜÉ豸ÒѾ­×Ô¶¯ÅäÖóÉÄܹ»É¨Ã衣ҪɨÃè, ¿ÉÒÔʹÓÃÃü"
+"Áî¡°scanimage¡±(¡°scanimage -d hp:%s¡±Ö¸¶¨¶à¸ö ɨÃèÒÇÖ®Ò») »òÕßÓÃͼÐνç"
+"Ãæ¡°xscanimage¡±»ò¡°xsane¡±. Èç¹ûÄúʹÓà GIMP, ¿ÉÒÔ´Ó¡°Îļþ¡±/¡°»ñÈ¡¡±²Ëµ¥µÄÓйØÏîĿɨ"
+"Ãè. Ò²¿ÉÒÔʹÓá°man scanimage¡±ÃüÁî²é¿´¸ü¶àÐÅÏ¢¡£\n"
 "\n"
-"²»Òª¶ÔÕâ¸öÉ豸ʹÓà \"scannerdrakeɨÃèÒÇÅäÖù¤¾ß\"!"
+"²»Òª¶ÔÕâ¸öÉ豸ʹÓá°scannerdrakeɨÃèÒÇÅäÖù¤¾ß¡±!"
 
-#: ../../printerdrake.pm_.c:2394
+#: ../../printerdrake.pm_.c:2439
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
 "card drives from your PC. Now you can access your photo cards using the "
@@ -8798,24 +8836,23 @@ msgid ""
 "can switch between drive letters with the field at the upper-right corners "
 "of the file lists."
 msgstr ""
-"ÒѾ­×Ô¶¯ÅäÖÃÔÊÐíµçÄÔ·ÃÎÊÄúµÄ´òÓ¡»úÀïÃæµÄÕÕƬ¿¨ Çý¶¯Æ÷. Òª·ÃÎÊÄúµÄ´òÓ¡»úÀïÃæµÄ"
-"ÕÕƬ¿¨, ¿ÉÒÔʹÓÃͼÐνçÃæ³ÌÐò \"MtoolsFM\" (²Ëµ¥: \"Ó¦ÓóÌÐò\" -> \"Îļþ¹¤¾ß"
-"\" -> \"MTools Îļþ¹ÜÀíÆ÷\") »òÕßÃüÁîÐй¤¾ß \"mtools\" (ÊäÈë \"man mtools\" "
-"ÃüÁî²é¿´¸ü¶àÐÅÏ¢). Äú»òÔÚÅÌ·û\"p:\" Öз¢ÏÖ¿¨ÉϵÄÎļþϵͳ, Èç¹ûÄúÓжàÓÚÒ»¸öÖ§"
-"³ÖÕÕƬ¿¨µÄ HP ´òÓ¡»ú¿ÉÒԲ鿴ºóÐøµÄÅÌ·û. ÔÚ \"MtoolsFM\" ÖÐ Äú¿ÉÒÔÔÚÎļþÁбíµÄ"
-"ÓÒÉϽÇÇл»ÅÌ·û."
+"ÒѾ­×Ô¶¯ÅäÖÃÔÊÐíµçÄÔ·ÃÎÊÄúµÄ´òÓ¡»úÀïÃæµÄÕÕƬ¿¨Çý¶¯Æ÷¡£Òª·ÃÎÊÄúµÄ´òÓ¡»úÀïÃæµÄ"
+"ÕÕƬ¿¨, ¿ÉÒÔʹÓÃͼÐνçÃæ³ÌÐò¡°MtoolsFM¡±(²Ëµ¥:¡°Ó¦ÓóÌÐò¡±->¡°Îļþ¹¤¾ß¡±->¡°MTools "
+"Îļþ¹ÜÀíÆ÷¡±) »òÕßÃüÁîÐй¤¾ß¡°mtools¡±(ÊäÈë¡°man mtools¡±ÃüÁî²é¿´¸ü¶àÐÅÏ¢)¡£Äú»òÔÚ"
+"ÅÌ·û¡°p:¡±Öз¢ÏÖ¿¨ÉϵÄÎļþϵͳ, Èç¹ûÄúÓжàÓÚÒ»¸öÖ§³ÖÕÕƬ¿¨µÄ HP ´òÓ¡»ú¿ÉÒԲ鿴"
+"ºóÐøµÄÅÌ·û¡£ÔÚ¡°MtoolsFM¡±ÖÐ Äú¿ÉÒÔÔÚÎļþÁбíµÄÓÒÉϽÇÇл»ÅÌ·û¡£"
 
-#: ../../printerdrake.pm_.c:2416 ../../printerdrake.pm_.c:2875
-#: ../../printerdrake.pm_.c:3170
+#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2923
+#: ../../printerdrake.pm_.c:3218
 msgid "Reading printer data..."
 msgstr "¶ÁÈ¡´òÓ¡»úÊý¾Ý..."
 
-#: ../../printerdrake.pm_.c:2436 ../../printerdrake.pm_.c:2464
-#: ../../printerdrake.pm_.c:2499
+#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2509
+#: ../../printerdrake.pm_.c:2544
 msgid "Transfer printer configuration"
 msgstr "ǨÒÆ´òÓ¡»úÅäÖÃ"
 
-#: ../../printerdrake.pm_.c:2437
+#: ../../printerdrake.pm_.c:2482
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -8824,34 +8861,34 @@ msgid ""
 "overtaken, but jobs will not be transferred.\n"
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
-"Äã¿ÉÒÔ°Ñ×öºÃµÄ´òÓ¡»úÅäÖôӶÓÁÐ %s ¸´ÖƵ½ %s, Äúµ±Ç°µÄ¶ÓÁÐ.\n"
-"ËùÓÐÅäÖÃÊý¾Ý½«±»¸²¸Ç£¬µ«ÊÇ´òÓ¡×÷Òµ²»»áǨÒÆ.\n"
+"Äã¿ÉÒÔ°Ñ×öºÃµÄ´òÓ¡»úÅäÖôӶÓÁÐ %s ¸´ÖƵ½ %s, Äúµ±Ç°µÄ¶ÓÁС£\n"
+"ËùÓÐÅäÖÃÊý¾Ý½«±»¸²¸Ç, µ«ÊÇ´òÓ¡×÷Òµ²»»áǨÒÆ¡£\n"
 "ÓÉÓÚÒÔÏÂÔ­Òò, ijЩ´òÓ¡¶ÓÁÐÎÞ·¨Ç¨ÒÆ:\n"
 
-#: ../../printerdrake.pm_.c:2440
+#: ../../printerdrake.pm_.c:2485
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
-msgstr "CUPS²»Ö§³ÖNovell·þÎñÆ÷ÉϵĴòÓ¡»ú¼°·¢ËÍÊý¾Ýµ½ÎÞ¸ñʽÃüÁîµÄ´òÓ¡»ú.\n"
+msgstr "CUPS²»Ö§³ÖNovell·þÎñÆ÷ÉϵĴòÓ¡»ú¼°·¢ËÍÊý¾Ýµ½ÎÞ¸ñʽÃüÁîµÄ´òÓ¡»ú¡£\n"
 
-#: ../../printerdrake.pm_.c:2442
+#: ../../printerdrake.pm_.c:2487
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
-msgstr "PDQÖ»Ö§³Ö±¾µØ´òÓ¡»ú, Ô¶³ÌLPD´òÓ¡»ú, ºÍ Socket/TCP ´òÓ¡»ú.\n"
+msgstr "PDQÖ»Ö§³Ö±¾µØ´òÓ¡»ú, Ô¶³ÌLPD´òÓ¡»ú, ºÍ Socket/TCP ´òÓ¡»ú¡£\n"
 
-#: ../../printerdrake.pm_.c:2444
+#: ../../printerdrake.pm_.c:2489
 msgid "LPD and LPRng do not support IPP printers.\n"
-msgstr "LPD ºÍ LPRng²»Ö§³ÖIPP´òÓ¡»ú.\n"
+msgstr "LPD ºÍ LPRng²»Ö§³ÖIPP´òÓ¡»ú¡£\n"
 
-#: ../../printerdrake.pm_.c:2446
+#: ../../printerdrake.pm_.c:2491
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
-"ÁíÍâ, Èç¹û¶ÓÁв»ÊÇÓÉÕâ¸ö³ÌÐò»òÕß \"foomatic-configure\" Ëù´´½¨, ¾ÍÎÞ·¨Ç¨ÒÆ."
+"ÁíÍâ, Èç¹û¶ÓÁв»ÊÇÓÉÕâ¸ö³ÌÐò»òÕß¡°foomatic-configure¡±Ëù´´½¨, ¾ÍÎÞ·¨Ç¨ÒÆ¡£"
 
-#: ../../printerdrake.pm_.c:2447
+#: ../../printerdrake.pm_.c:2492
 msgid ""
 "\n"
 "Also printers configured with the PPD files provided by their manufacturers "
@@ -8859,104 +8896,104 @@ msgid ""
 msgstr ""
 "\n"
 "¶øÇÒ, Èç¹û´òÓ¡»úÐèҪʹÓó§ÉÌÌṩµÄ PPDÎļþÅäÖÃ, »ò´òÓ¡»ú´øÓÐÄÚÖÃµÄ CUPS Çý¶¯"
-"³ÌÐò, Ëü½«ÎÞ·¨Ç¨ÒÆ."
+"³ÌÐò, Ëü½«ÎÞ·¨Ç¨ÒÆ¡£"
 
-#: ../../printerdrake.pm_.c:2448
+#: ../../printerdrake.pm_.c:2493
 msgid ""
 "\n"
 "Mark the printers which you want to transfer and click \n"
 "\"Transfer\"."
 msgstr ""
 "\n"
-"±ê¼ÇÄãҪǨÒƵĴòÓ¡»ú²¢µã»÷\"ǨÒÆ\"."
+"±ê¼ÇÄãҪǨÒƵĴòÓ¡»ú²¢µã»÷¡°Ç¨ÒÆ¡±¡£"
 
-#: ../../printerdrake.pm_.c:2451
+#: ../../printerdrake.pm_.c:2496
 msgid "Do not transfer printers"
 msgstr "²»Ç¨ÒÆ´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:2452 ../../printerdrake.pm_.c:2469
+#: ../../printerdrake.pm_.c:2497 ../../printerdrake.pm_.c:2514
 msgid "Transfer"
 msgstr "ǨÒÆ"
 
-#: ../../printerdrake.pm_.c:2465
+#: ../../printerdrake.pm_.c:2510
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
 "Click \"Transfer\" to overwrite it.\n"
 "You can also type a new name or skip this printer."
 msgstr ""
-"´òÓ¡»ú\"%s\"ÒѾ­ÔÚ%s´æÔÚ.\n"
-"µã»÷ \"ǨÒÆ\" ¸²¸ÇÅäÖÃ.\n"
-"ÄãÒ²¿ÉÒÔÑ¡ÔñеÄÃû³Æ»òÂÔ¹ý¸Ã´òÓ¡»ú."
+"´òÓ¡»ú¡°%s¡±ÒѾ­ÔÚ%s´æÔÚ¡£\n"
+"µã»÷¡°Ç¨ÒÆ¡±¸²¸ÇÅäÖá£\n"
+"ÄãÒ²¿ÉÒÔÑ¡ÔñеÄÃû³Æ»òÂÔ¹ý¸Ã´òÓ¡»ú¡£"
 
-#: ../../printerdrake.pm_.c:2473
+#: ../../printerdrake.pm_.c:2518
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "´òÓ¡»úÃû³Æ¿ÉÒÔ°üº¬×Öĸ, Êý×Ö ºÍ Ï»®Ïß"
 
-#: ../../printerdrake.pm_.c:2478
+#: ../../printerdrake.pm_.c:2523
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
-"´òÓ¡»ú \"%s\"ÒѾ­´æÔÚ,\n"
+"´òÓ¡»ú¡°%s¡±ÒѾ­´æÔÚ,\n"
 "ÕæµÄ¸²¸ÇÅäÖÃ?"
 
-#: ../../printerdrake.pm_.c:2486
+#: ../../printerdrake.pm_.c:2531
 msgid "New printer name"
 msgstr "дòÓ¡»úÃû³Æ"
 
-#: ../../printerdrake.pm_.c:2489
+#: ../../printerdrake.pm_.c:2534
 #, c-format
 msgid "Transferring %s..."
 msgstr "ǨÒÆ %s ..."
 
-#: ../../printerdrake.pm_.c:2500
+#: ../../printerdrake.pm_.c:2545
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
-"ÄãÒѾ­Ç¨ÒÆÒÔǰϵͳÖеÄȱʡ´òÓ¡»ú(\"%s\"),\n"
-"ÊÇ·ñÉèÖÃΪдòӡϵͳµÄȱʡ´òÓ¡»ú %s?"
+"ÄãÒѾ­Ç¨ÒÆÒÔǰϵͳÖеÄĬÈÏ´òÓ¡»ú(¡°%s¡±),\n"
+"ÊÇ·ñÉèÖÃΪдòӡϵͳµÄĬÈÏ´òÓ¡»ú %s?"
 
-#: ../../printerdrake.pm_.c:2510
+#: ../../printerdrake.pm_.c:2555
 msgid "Refreshing printer data..."
 msgstr "ˢдòÓ¡»úÊý¾Ý..."
 
-#: ../../printerdrake.pm_.c:2518 ../../printerdrake.pm_.c:2590
-#: ../../printerdrake.pm_.c:2602
+#: ../../printerdrake.pm_.c:2563 ../../printerdrake.pm_.c:2638
+#: ../../printerdrake.pm_.c:2650
 msgid "Configuration of a remote printer"
 msgstr "ÅäÖÃÔ¶³Ì´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:2519
+#: ../../printerdrake.pm_.c:2564
 msgid "Starting network..."
 msgstr "ÕýÔÚÆô¶¯ÍøÂç..."
 
-#: ../../printerdrake.pm_.c:2554 ../../printerdrake.pm_.c:2558
-#: ../../printerdrake.pm_.c:2560
+#: ../../printerdrake.pm_.c:2599 ../../printerdrake.pm_.c:2603
+#: ../../printerdrake.pm_.c:2605
 msgid "Configure the network now"
 msgstr "ÕýÔÚÅäÖÃÍøÂç"
 
-#: ../../printerdrake.pm_.c:2555
+#: ../../printerdrake.pm_.c:2600
 msgid "Network functionality not configured"
 msgstr "ÉÐδÍê³ÉÍøÂçÅäÖÃ"
 
-#: ../../printerdrake.pm_.c:2556
+#: ../../printerdrake.pm_.c:2601
 msgid ""
 "You are going to configure a remote printer. This needs working network "
 "access, but your network is not configured yet. If you go on without network "
 "configuration, you will not be able to use the printer which you are "
 "configuring now. How do you want to proceed?"
 msgstr ""
-"ÄãÔÚÅäÖÃÔ¶³Ì´òÓ¡»ú. ÅäÖÃÔ¶³Ì´òÓ¡ÐèÒªÍøÂç·ÃÎÊ,\n"
-"µ«Ä㻹ûÓÐÅäÖÃÍøÂç. ¼ÌÐøÂð?"
+"ÄãÔÚÅäÖÃÔ¶³Ì´òÓ¡»ú¡£ÅäÖÃÔ¶³Ì´òÓ¡ÐèÒªÍøÂç·ÃÎÊ,\n"
+"µ«Ä㻹ûÓÐÅäÖÃÍøÂç¡£¼ÌÐøÂð?"
 
-#: ../../printerdrake.pm_.c:2559
+#: ../../printerdrake.pm_.c:2604
 msgid "Go on without configuring the network"
 msgstr "Ìø¹ýÍøÂçÅäÖüÌÐø"
 
-#: ../../printerdrake.pm_.c:2592
+#: ../../printerdrake.pm_.c:2640
 msgid ""
 "The network configuration done during the installation cannot be started "
 "now. Please check whether the network gets accessable after booting your "
@@ -8965,37 +9002,37 @@ msgid ""
 "printer, also using the Mandrake Control Center, section \"Hardware\"/"
 "\"Printer\""
 msgstr ""
-"°²×°Ê±µÄÍøÂçÅäÖÃÎÞ·¨Æô¶¯.\n"
-"¿ª»úºó¼ì²éÍøÂç»òÓà Mandrake ÅäÖÃÖÐÐÄÐÞ¸Ä,½Ú \"ÍøÂçºÍÒòÌØÍø\"/\"Á¬½Ó\", È»ºóÓÃ"
-"\"Ó²¼þ\"/\"´òÓ¡»ú\"ÅäÖôòÓ¡»ú"
+"°²×°Ê±µÄÍøÂçÅäÖÃÎÞ·¨Æô¶¯¡£\n"
+"¿ª»úºó¼ì²éÍøÂç»òÓà Mandrake ÅäÖÃÖÐÐÄÐÞ¸Ä,½Ú¡°ÍøÂçºÍÒòÌØÍø¡±/¡°Á¬½Ó¡±, È»ºóÓá°Ó²"
+"¼þ¡±/¡°´òÓ¡»ú¡±ÅäÖôòÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:2593
+#: ../../printerdrake.pm_.c:2641
 msgid ""
 "The network access was not running and could not be started. Please check "
 "your configuration and your hardware. Then try to configure your remote "
 "printer again."
 msgstr ""
-"ÍøÂç·ÃÎʳöÏÖ´íÎó.\n"
-"Çë¼ì²éÓ²¼þ»÷ÅäÖÃ. È»ºóÔÙÅäÖÃÔ¶³Ì´òÓ¡."
+"ÍøÂç·ÃÎʳöÏÖ´íÎó¡£\n"
+"Çë¼ì²éÓ²¼þ»÷ÅäÖá£È»ºóÔÙÅäÖÃÔ¶³Ì´òÓ¡¡£"
 
-#: ../../printerdrake.pm_.c:2603
+#: ../../printerdrake.pm_.c:2651
 msgid "Restarting printing system..."
 msgstr "ÖØÐÂÆô¶¯´òÓ¡»úϵͳ ..."
 
-#: ../../printerdrake.pm_.c:2641
+#: ../../printerdrake.pm_.c:2689
 msgid "high"
 msgstr "¸ß"
 
-#: ../../printerdrake.pm_.c:2641
+#: ../../printerdrake.pm_.c:2689
 msgid "paranoid"
 msgstr "Ñϸñ"
 
-#: ../../printerdrake.pm_.c:2642
+#: ../../printerdrake.pm_.c:2690
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "ÔÚ %s °²È«¼¶±ðÉÏ°²×°´òӡϵͳ"
 
-#: ../../printerdrake.pm_.c:2643
+#: ../../printerdrake.pm_.c:2691
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -9009,19 +9046,19 @@ msgid ""
 "\n"
 "Do you really want to configure printing on this machine?"
 msgstr ""
-"ÄãÕýÔÚ°²×° %s ´òӡϵͳµ½ %s °²È«¼¶±ðµÄϵͳÉÏ.\n"
+"ÄãÕýÔÚ°²×° %s ´òӡϵͳµ½ %s °²È«¼¶±ðµÄϵͳÉÏ¡£\n"
 "\n"
 "¸Ã´òӡϵͳÔÚºǫ́ÔËÐÐÁôÊسÌÐò, ÁôÊسÌÐòÄÜͨ¹ýÍøÂç\n"
-"½øÐÐÔ¶³Ì·ÃÎÊ,¶ø¿ÉÄÜÔâÊܹ¥»÷. ¸Ã°²È«¼¶±ðÈ´Ê¡\n"
-"Æô¶¯ÉÙÊýÑ¡ÔñµÄÁôÊسÌÐò.\n"
+"½øÐÐÔ¶³Ì·ÃÎÊ,¶ø¿ÉÄÜÔâÊܹ¥»÷¡£¸Ã°²È«¼¶±ðÈ´Ê¡\n"
+"Æô¶¯ÉÙÊýÑ¡ÔñµÄÁôÊسÌÐò¡£\n"
 "\n"
 "ÄãÒªÅäÖôòÓ¡Âð?"
 
-#: ../../printerdrake.pm_.c:2675
+#: ../../printerdrake.pm_.c:2723
 msgid "Starting the printing system at boot time"
 msgstr "¿ª»úʱÆô¶¯´òӡϵͳ"
 
-#: ../../printerdrake.pm_.c:2676
+#: ../../printerdrake.pm_.c:2724
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -9034,106 +9071,106 @@ msgid ""
 "Do you want to have the automatic starting of the printing system turned on "
 "again?"
 msgstr ""
-"´òӡϵͳ(%s) ¿ª»úʱ²»»á×Ô¶¯Æô¶¯.\n"
+"´òӡϵͳ(%s) ¿ª»úʱ²»»á×Ô¶¯Æô¶¯¡£\n"
 "\n"
 "ÄãÏ£ÍûÈôòӡϵͳ×Ô¶¯Æô¶¯Âð?"
 
-#: ../../printerdrake.pm_.c:2700 ../../printerdrake.pm_.c:2741
-#: ../../printerdrake.pm_.c:2780 ../../printerdrake.pm_.c:2822
-#: ../../printerdrake.pm_.c:2943
+#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2789
+#: ../../printerdrake.pm_.c:2828 ../../printerdrake.pm_.c:2870
+#: ../../printerdrake.pm_.c:2991
 msgid "Checking installed software..."
 msgstr "¼ì²éÒѾ­°²×°µÄÈí¼þ..."
 
-#: ../../printerdrake.pm_.c:2746
+#: ../../printerdrake.pm_.c:2794
 msgid "Removing LPRng..."
 msgstr "ɾ³ý LPRng..."
 
-#: ../../printerdrake.pm_.c:2785
+#: ../../printerdrake.pm_.c:2833
 msgid "Removing LPD..."
 msgstr "ɾ³ý LPD ..."
 
-#: ../../printerdrake.pm_.c:2858
+#: ../../printerdrake.pm_.c:2906
 msgid "Select Printer Spooler"
 msgstr "Ñ¡Ôñ´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:2859
+#: ../../printerdrake.pm_.c:2907
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "ÄúÐèҪʹÓÃÄÄÖÖ´òӡϵͳ?"
 
-#: ../../printerdrake.pm_.c:2895
+#: ../../printerdrake.pm_.c:2943
 #, c-format
 msgid "Configuring printer \"%s\"..."
-msgstr "ÕýÔÚÉ趨´òÓ¡»ú\"%s\" ..."
+msgstr "ÕýÔÚÉ趨´òÓ¡»ú¡°%s¡±..."
 
-#: ../../printerdrake.pm_.c:2909
+#: ../../printerdrake.pm_.c:2957
 msgid "Installing Foomatic..."
 msgstr "ÕýÔÚ°²×° Foomatic ³ÌÐò..."
 
-#: ../../printerdrake.pm_.c:2979 ../../printerdrake.pm_.c:3020
-#: ../../printerdrake.pm_.c:3417 ../../printerdrake.pm_.c:3490
+#: ../../printerdrake.pm_.c:3027 ../../printerdrake.pm_.c:3068
+#: ../../printerdrake.pm_.c:3465 ../../printerdrake.pm_.c:3538
 msgid "Printer options"
 msgstr "´òÓ¡»úÑ¡Ïî"
 
-#: ../../printerdrake.pm_.c:2989
+#: ../../printerdrake.pm_.c:3037
 msgid "Preparing Printerdrake..."
-msgstr "×¼±¸´òÓ¡»úÅäÖÃÏòµ¼Printerdrake..."
+msgstr "×¼±¸ Printerdrake..."
 
-#: ../../printerdrake.pm_.c:3007 ../../printerdrake.pm_.c:3580
+#: ../../printerdrake.pm_.c:3055 ../../printerdrake.pm_.c:3628
 msgid "Configuring applications..."
 msgstr "ÅäÖÃÓ¦ÓóÌÐò ..."
 
-#: ../../printerdrake.pm_.c:3027
+#: ../../printerdrake.pm_.c:3075
 msgid "Would you like to configure printing?"
-msgstr "ÄúÏëÒªÅäÖôòÓ¡»úÂð ?"
+msgstr "ÄúÏëÒªÅäÖôòÓ¡»úÂð?"
 
-#: ../../printerdrake.pm_.c:3039
+#: ../../printerdrake.pm_.c:3087
 msgid "Printing system: "
 msgstr "´òӡϵͳ:"
 
-#: ../../printerdrake.pm_.c:3099
+#: ../../printerdrake.pm_.c:3147
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; to view information about it; "
 "or to make a printer on a remote CUPS server available for Star Office/"
 "OpenOffice.org/GIMP."
 msgstr ""
-"ÏÂÁдòÓ¡»úÒÑÅäÖÃ.\n"
-"ÔÚ´òÓ¡»úÃû³ÆÉÏË«»÷¿ÉÒÔÐÞ¸ÄËüµÄÉèÖÃ; °ÑËüÉèÖóÉȱʡ´òÓ¡»ú; ²é¿´ËüµÄÐÅÏ¢;\n"
+"ÏÂÁдòÓ¡»úÒÑÅäÖá£\n"
+"ÔÚ´òÓ¡»úÃû³ÆÉÏË«»÷¿ÉÒÔÐÞ¸ÄËüµÄÉèÖÃ; °ÑËüÉèÖóÉĬÈÏ´òÓ¡»ú; ²é¿´ËüµÄÐÅÏ¢;\n"
 "»òÕßÈà Star Office/OpenOffice.org/GIMP ÄÜÔÚÔ¶³Ì CUPS ·þÎñÆ÷µÄ´òÓ¡»úÉÏ´òÓ¡ÎÄ"
-"µµ."
+"µµ¡£"
 
-#: ../../printerdrake.pm_.c:3100
+#: ../../printerdrake.pm_.c:3148
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
 "it."
 msgstr ""
-"ÏÂÁдòÓ¡»úÒÑÅäÖÃ.\n"
+"ÏÂÁдòÓ¡»úÒÑÅäÖá£\n"
 "µã»÷È¥Ð޸Ļò¶ÁÈ¡ÐÅÏ¢,\n"
-"µã»÷\"Ôö¼Ó´òÓ¡»ú\"Ôö¼ÓеĴòÓ¡»ú."
+"µã»÷¡°Ôö¼Ó´òÓ¡»ú¡±Ôö¼ÓеĴòÓ¡»ú¡£"
 
-#: ../../printerdrake.pm_.c:3127
+#: ../../printerdrake.pm_.c:3175
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr "¸üÐÂÁбí (ÏÔʾԶ³Ì CUPS ´òÓ¡·þÎñÆ÷)"
 
-#: ../../printerdrake.pm_.c:3145
+#: ../../printerdrake.pm_.c:3193
 msgid "Change the printing system"
 msgstr "Ð޸Ĵòӡϵͳ"
 
-#: ../../printerdrake.pm_.c:3150 ../../standalone/drakconnect_.c:277
+#: ../../printerdrake.pm_.c:3198 ../../standalone/drakconnect_.c:277
 msgid "Normal Mode"
 msgstr "ÆÕͨģʽ"
 
-#: ../../printerdrake.pm_.c:3310 ../../printerdrake.pm_.c:3360
-#: ../../printerdrake.pm_.c:3573
+#: ../../printerdrake.pm_.c:3358 ../../printerdrake.pm_.c:3408
+#: ../../printerdrake.pm_.c:3621
 msgid "Do you want to configure another printer?"
-msgstr "ÄúÏëÒªÅäÖÃÆäËû´òÓ¡»úÂð ?"
+msgstr "ÄúÏëÒªÅäÖÃÆäËü´òÓ¡»úÂð?"
 
-#: ../../printerdrake.pm_.c:3395
+#: ../../printerdrake.pm_.c:3443
 msgid "Modify printer configuration"
 msgstr "Ð޸ĴòÓ¡»úÅäÖÃ"
 
-#: ../../printerdrake.pm_.c:3397
+#: ../../printerdrake.pm_.c:3445
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -9142,105 +9179,105 @@ msgstr ""
 "´òÓ¡»ú %s\n"
 "ÒªÐÞ¸ÄÂð?"
 
-#: ../../printerdrake.pm_.c:3401
+#: ../../printerdrake.pm_.c:3449
 msgid "Do it!"
 msgstr "Ö´ÐÐ!"
 
-#: ../../printerdrake.pm_.c:3406 ../../printerdrake.pm_.c:3461
+#: ../../printerdrake.pm_.c:3454 ../../printerdrake.pm_.c:3509
 msgid "Printer connection type"
 msgstr "´òÓ¡»úÁ¬½ÓÀàÐÍ"
 
-#: ../../printerdrake.pm_.c:3407 ../../printerdrake.pm_.c:3465
+#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3513
 msgid "Printer name, description, location"
 msgstr "´òÓ¡»úÃû³Æ, ÃèÊö, λÖÃ"
 
-#: ../../printerdrake.pm_.c:3409 ../../printerdrake.pm_.c:3483
+#: ../../printerdrake.pm_.c:3457 ../../printerdrake.pm_.c:3531
 msgid "Printer manufacturer, model, driver"
 msgstr "´òÓ¡»ú³§¼Ò, ÐͺÅ, Çý¶¯"
 
-#: ../../printerdrake.pm_.c:3410 ../../printerdrake.pm_.c:3484
+#: ../../printerdrake.pm_.c:3458 ../../printerdrake.pm_.c:3532
 msgid "Printer manufacturer, model"
 msgstr "´òÓ¡»ú³§¼Ò, ÐͺÅ"
 
-#: ../../printerdrake.pm_.c:3419 ../../printerdrake.pm_.c:3494
+#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3542
 msgid "Set this printer as the default"
-msgstr "ÉèÖøôòÓ¡»úΪȴʡ"
+msgstr "ÉèÖøôòÓ¡»úΪĬÈÏ"
 
-#: ../../printerdrake.pm_.c:3421 ../../printerdrake.pm_.c:3499
+#: ../../printerdrake.pm_.c:3469 ../../printerdrake.pm_.c:3547
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
 msgstr "°ÑÕâ¸ö´òÓ¡»úÌí¼Óµ½Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3422 ../../printerdrake.pm_.c:3508
+#: ../../printerdrake.pm_.c:3470 ../../printerdrake.pm_.c:3556
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
 msgstr "´ÓStar Office/OpenOffice.org/GIMPɾ³ýÕâ¸ö´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:3423 ../../printerdrake.pm_.c:3517
+#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3565
 msgid "Print test pages"
 msgstr "´òÓ¡²âÊÔÒ³"
 
-#: ../../printerdrake.pm_.c:3424 ../../printerdrake.pm_.c:3519
+#: ../../printerdrake.pm_.c:3472 ../../printerdrake.pm_.c:3567
 msgid "Know how to use this printer"
 msgstr "ÖªµÀÔõÑùʹÓô˴òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:3426 ../../printerdrake.pm_.c:3521
+#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3569
 msgid "Remove printer"
 msgstr "ɾ³ý´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:3472
+#: ../../printerdrake.pm_.c:3520
 #, c-format
 msgid "Removing old printer \"%s\"..."
-msgstr "ɾ³ý¾É´òÓ¡»ú\"%s\" ..."
+msgstr "ɾ³ý¾É´òÓ¡»ú¡°%s¡±..."
 
-#: ../../printerdrake.pm_.c:3497
+#: ../../printerdrake.pm_.c:3545
 msgid "Default printer"
-msgstr "ȱʡ´òÓ¡»ú"
+msgstr "ĬÈÏ´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:3498
+#: ../../printerdrake.pm_.c:3546
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
-msgstr "´òÓ¡»ú \"%s\" ÉèΪȴʡ´òÓ¡»ú."
+msgstr "´òÓ¡»ú¡°%s¡±ÉèΪȴʡ´òÓ¡»ú¡£"
 
-#: ../../printerdrake.pm_.c:3502 ../../printerdrake.pm_.c:3505
+#: ../../printerdrake.pm_.c:3550 ../../printerdrake.pm_.c:3553
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Ìí¼Ó´òÓ¡»úµ½Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3503
+#: ../../printerdrake.pm_.c:3551
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr "´òÓ¡»ú\"%s\"³É¹¦Ìí¼Óµ½Star Office/OpenOffice.org/GIMP"
+msgstr "´òÓ¡»ú¡°%s¡±³É¹¦Ìí¼Óµ½Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3506
+#: ../../printerdrake.pm_.c:3554
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr "δÄÜÌí¼Ó´òÓ¡»ú \"%s\" µ½Star Office/OpenOffice.org/GIMP"
+msgstr "δÄÜÌí¼Ó´òÓ¡»ú¡°%s¡±µ½Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3511 ../../printerdrake.pm_.c:3514
+#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "´Ó Star Office/OpenOffice.org/GIMP ɾ³ý´òÓ¡»ú"
 
-#: ../../printerdrake.pm_.c:3512
+#: ../../printerdrake.pm_.c:3560
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
-msgstr "³É¹¦µÄ´Ó Star Office/OpenOffice.org/GIMP ɾ³ý´òÓ¡»ú \"%s\"."
+msgstr "³É¹¦µÄ´Ó Star Office/OpenOffice.org/GIMP ɾ³ý´òÓ¡»ú¡°%s¡±¡£"
 
-#: ../../printerdrake.pm_.c:3515
+#: ../../printerdrake.pm_.c:3563
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "δÄÜ´Ó Star Office/OpenOffice.org/GIMP ɾ³ý´òÓ¡»ú \"%s\"."
+msgstr "δÄÜ´Ó Star Office/OpenOffice.org/GIMP ɾ³ý´òÓ¡»ú¡°%s¡±¡£"
 
-#: ../../printerdrake.pm_.c:3523
+#: ../../printerdrake.pm_.c:3571
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
-msgstr "ÕæµÄҪɾ³ý´òÓ¡»ú\"%s\"?"
+msgstr "ÕæµÄҪɾ³ý´òÓ¡»ú¡°%s¡±?"
 
-#: ../../printerdrake.pm_.c:3527
+#: ../../printerdrake.pm_.c:3575
 #, c-format
 msgid "Removing printer \"%s\"..."
-msgstr "ÕýÔÚɾ³ý´òÓ¡»ú\"%s\" ..."
+msgstr "ÕýÔÚɾ³ý´òÓ¡»ú¡°%s¡±..."
 
 #: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
 #: ../../proxy.pm_.c:78
@@ -9254,7 +9291,7 @@ msgid ""
 "Here, you'll be able to set up your http and ftp proxies\n"
 "with or without login and password\n"
 msgstr ""
-"»¶Ó­Ê¹ÓôúÀíÅäÖù¤¾ß.\n"
+"»¶Ó­Ê¹ÓôúÀíÅäÖù¤¾ß¡£\n"
 "\n"
 "Äã¿ÉÒÔÉèÖÃÐèÒªÓû§ÃûºÍ¿ÚÁîÒÔ¼°\n"
 "²»ÐèÒªÓû§ÃûºÍ¿ÚÁîµÄhttpºÍftp´úÀí\n"
@@ -9263,7 +9300,9 @@ msgstr ""
 msgid ""
 "Please fill in the http proxy informations\n"
 "Leave it blank if you don't want an http proxy"
-msgstr "ÇëÊäÈë HTTP ´úÀíÐÅÏ¢"
+msgstr ""
+"ÇëÊäÈë HTTP ´úÀíÐÅÏ¢\n"
+"Èç¹ûÄãûÓÐ http ´úÀíÇëÁô¿Õ"
 
 #: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
 msgid "URL"
@@ -9275,7 +9314,7 @@ msgstr "¶Ë¿Ú"
 
 #: ../../proxy.pm_.c:44
 msgid "Url should begin with 'http:'"
-msgstr "´úÀí·þÎñÆ÷Ó¦¸ÃÊÇÒÔ 'http:'¿ªÍ·"
+msgstr "´úÀí·þÎñÆ÷Ó¦¸ÃÊÇÒÔ¡°http:¡±¿ªÍ·"
 
 #: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
 msgid "The port part should be numeric"
@@ -9307,7 +9346,7 @@ msgstr "ÖØÊä¿ÚÁî"
 
 #: ../../proxy.pm_.c:88
 msgid "The passwords don't match. Try again!"
-msgstr "Á½´Î¿ÚÁî²»·û.ÖØÊÔ!"
+msgstr "Á½´Î¿ÚÁî²»·û¡£ÖØÊÔ!"
 
 #: ../../raid.pm_.c:35
 #, c-format
@@ -9325,30 +9364,54 @@ msgstr "mkraid ʧ°Ü"
 
 #: ../../raid.pm_.c:137
 msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid ʧ°Ü (¿ÉÄÜȱÉÙ raidtools ?)"
+msgstr "mkraid ʧ°Ü (¿ÉÄÜȱÉÙ raidtools?)"
 
 #: ../../raid.pm_.c:153
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "ûÓÐ×ã¹»µÄ·ÖÇø½¨Á¢ %d ¼¶µÄÓ²ÅÌÕóÁÐ\n"
 
+#: ../../security/main.pm_.c:35
+msgid ""
+"Standard: This is the standard security recommended for a computer that will "
+"be used to connect\n"
+"               to the Internet as a client.\n"
+"\n"
+"High:       There are already some restrictions, and more automatic checks "
+"are run every night.\n"
+"\n"
+"Higher:    The security is now high enough to use the system as a server "
+"which can accept\n"
+"              connections from many clients. If your machine is only a "
+"client on the Internet, you\n"
+"\t      should choose a lower level.\n"
+"\n"
+"Paranoid:  This is similar to the previous level, but the system is entirely "
+"closed and security\n"
+"                features are at their maximum\n"
+"\n"
+"Security Administrator:\n"
+"               If the 'Security Alerts' option is set, security alerts will "
+"be sent to this user (username or\n"
+"\t       email)"
+msgstr ""
+
 #: ../../security/main.pm_.c:66
 msgid "Security Level:"
 msgstr "°²È«¼¶±ð:"
 
 #: ../../security/main.pm_.c:74
-#, fuzzy
 msgid "Security Alerts:"
-msgstr "°²È«¼¶±ð"
+msgstr "°²È«¾¯¸æ:"
 
 #: ../../security/main.pm_.c:83
 msgid "Security Administrator:"
 msgstr "°²È«¹ÜÀíÔ±:"
 
 #: ../../security/main.pm_.c:114 ../../security/main.pm_.c:150
-#, fuzzy, c-format
+#, c-format
 msgid " (default: %s)"
-msgstr " (ȱʡ)"
+msgstr " (ĬÈÏ: %s)"
 
 #: ../../security/main.pm_.c:118 ../../security/main.pm_.c:154
 #: ../../security/main.pm_.c:179
@@ -9356,16 +9419,27 @@ msgid ""
 "The following options can be set to customize your\n"
 "system security. If you need explanations, click on Help.\n"
 msgstr ""
+"¿ÉÒÔÉèÖÃÏÂÁÐÑ¡ÏîÒÔ×Ô¶¨ÒåÄãµÄϵͳ°²È«¼¶±ð¡£Èç¹ûÄãÐèÒª½âÊ͵Ļ°, Çëµ¥»÷°ïÖú¡£\n"
+
+#: ../../security/main.pm_.c:226
+msgid "Network Options"
+msgstr "ÍøÂçÑ¡Ïî"
+
+#: ../../security/main.pm_.c:235
+msgid "System Options"
+msgstr "ϵͳѡÏî"
+
+#: ../../security/main.pm_.c:242
+msgid "Periodic Checks"
+msgstr ""
 
 #: ../../security/main.pm_.c:256
-#, fuzzy
 msgid "Please wait, setting security level..."
-msgstr "ÇëÑ¡ÔñÆÚÍûµÄ°²È«¼¶±ð"
+msgstr "ÇëÉÔºò, ÕýÔÚÉèÖð²È«¼¶±ð"
 
 #: ../../security/main.pm_.c:262
-#, fuzzy
 msgid "Please wait, setting security options..."
-msgstr "ÕýÔÚ×¼±¸°²×°"
+msgstr "ÇëÉÔºò, ÕýÔÚÉèÖð²È«Ñ¡Ïî..."
 
 #: ../../services.pm_.c:14
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
@@ -9380,16 +9454,16 @@ msgid ""
 "apmd is used for monitoring batery status and logging it via syslog.\n"
 "It can also be used for shutting down the machine when the battery is low."
 msgstr ""
-"apmd ¼àÊÓµç³Ø״̬, ²¢Í¨¹ý syslog ×÷¼Ç¼.\n"
-"Ëü»¹ÄÜÓÃÀ´ÔÚµç³Ø²»×ãʱ¹Ø±Õ»úÆ÷."
+"apmd ¼àÊÓµç³Ø״̬, ²¢Í¨¹ý syslog ×÷¼Ç¼¡£\n"
+"Ëü»¹ÄÜÓÃÀ´ÔÚµç³Ø²»×ãʱ¹Ø±Õ»úÆ÷¡£"
 
 #: ../../services.pm_.c:18
 msgid ""
 "Runs commands scheduled by the at command at the time specified when\n"
 "at was run, and runs batch commands when the load average is low enough."
 msgstr ""
-"ʹÓà at ÃüÁî¿ÉÒÔÔÚÖ¸¶¨Ê±¼äÔËÐÐÄúµÄÃüÁî. \n"
-"»¹¿ÉÒÔÔÚƽ¾ù¸ºÔØ×ã¹»µÍµÄʱºòÔËÐÐÅú´¦ÀíÃüÁî."
+"ʹÓà at ÃüÁî¿ÉÒÔÔÚÖ¸¶¨Ê±¼äÔËÐÐÄúµÄÃüÁî¡£\n"
+"»¹¿ÉÒÔÔÚƽ¾ù¸ºÔØ×ã¹»µÍµÄʱºòÔËÐÐÅú´¦ÀíÃüÁî¡£"
 
 #: ../../services.pm_.c:20
 msgid ""
@@ -9398,9 +9472,9 @@ msgid ""
 "basic\n"
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
-"cron ÊÇÒ»¸ö±ê×¼µÄ UNIX ³ÌÐò, Ëü¿ÉÒÔ¶¨ÆÚµÄÖ´ÐÐÓû§Ö¸¶¨µÄ³ÌÐò.\n"
+"cron ÊÇÒ»¸ö±ê×¼µÄ UNIX ³ÌÐò, Ëü¿ÉÒÔ¶¨ÆÚµÄÖ´ÐÐÓû§Ö¸¶¨µÄ³ÌÐò¡£\n"
 "vixie cron ÔÚ»ù±¾µÄ UNIX cron ÉÏÔö¼ÓÁËһЩÌØÐÔ, °üÀ¨¸Ä½øµÄ°²È«ÐÔ, \n"
-"ºÍ¸üÇ¿´óµÄÅäÖÃÑ¡Ïî."
+"ºÍ¸üÇ¿´óµÄÅäÖÃÑ¡Ïî¡£"
 
 #: ../../services.pm_.c:23
 msgid ""
@@ -9409,22 +9483,22 @@ msgid ""
 "operations,\n"
 "and includes support for pop-up menus on the console."
 msgstr ""
-"GPM Ϊ»ùÓÚÎı¾µÄ Linux Ó¦ÓóÌÐòÌṩ¶ÔÊó±êµÄÖ§³Ö, Èç MC ÃüÁî½âÊÍÆ÷.\n"
-"ËüͬʱÌṩÁËÀûÓÃÊó±êµÄ¿ØÖÆ̨ '¸´ÖÆ-Õ³Ìù' ²Ù×÷, »¹Ö§³Ö¿ØÖÆ̨ÉϵÄ\n"
-"µ¯³öʽ²Ëµ¥."
+"GPM Ϊ»ùÓÚÎı¾µÄ Linux Ó¦ÓóÌÐòÌṩ¶ÔÊó±êµÄÖ§³Ö, Èç MC ÃüÁî½âÊÍÆ÷¡£\n"
+"ËüͬʱÌṩÁËÀûÓÃÊó±êµÄ¿ØÖÆ̨¸´ÖƲ¢Õ³Ìù²Ù×÷, »¹Ö§³Ö¿ØÖÆ̨ÉϵÄ\n"
+"µ¯³öʽ²Ëµ¥¡£"
 
 #: ../../services.pm_.c:26
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
 msgstr ""
-"ħÁ¦Ó²ÅÌHardDrake½øÐÐÓ²¼þ¼ì²â£¬ÒÔ¼°Ñ¡ÏîÅäÖÃ\n"
+"HardDrake½øÐÐÓ²¼þ¼ì²â, ÒÔ¼°Ñ¡ÏîÅäÖÃ\n"
 "ÐÂÔö/ÐÞ¸ÄÓ²¼þ"
 
 #: ../../services.pm_.c:28
 msgid ""
 "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
-msgstr "Apache ÊÇÒ»¸ö WWW ÍòάÍø·þÎñÆ÷. ËüÌṩ HTML ÎļþºÍ CGI µÈ·þÎñ."
+msgstr "Apache ÊÇÒ»¸ö WWW ÍòάÍø·þÎñÆ÷¡£ËüÌṩ HTML ÎļþºÍ CGI µÈ·þÎñ¡£"
 
 #: ../../services.pm_.c:29
 msgid ""
@@ -9435,9 +9509,9 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"³¬¼¶»¥ÁªÍøºǫ́·þÎñÆ÷ (³£³Æ×÷ inetd) ÔÚÐèҪʱÆô¶¯¸÷ÖÖÆäËûµÄ»¥ÁªÍø·þÎñ.\n"
-"Ëü¸ºÔðÏìÓ¦¶àÖÖ·þÎñ, °üÀ¨ telnet, ftp, rsh, ºÍ rlogin.\n"
-"½ûÖ¹ inetd ¾Íͬʱ½ûÖ¹ÁËËü¸ºÔðµÄËùÓзþÎñ."
+"³¬¼¶»¥ÁªÍøºǫ́·þÎñÆ÷ (³£³Æ×÷ inetd) ÔÚÐèҪʱÆô¶¯¸÷ÖÖÆäËüµÄ»¥ÁªÍø·þÎñ¡£\n"
+"Ëü¸ºÔðÏìÓ¦¶àÖÖ·þÎñ, °üÀ¨ telnet, ftp, rsh ºÍ rlogin¡£\n"
+"½ûÖ¹ inetd ¾Íͬʱ½ûÖ¹ÁËËü¸ºÔðµÄËùÓзþÎñ¡£"
 
 #: ../../services.pm_.c:33
 msgid ""
@@ -9453,8 +9527,8 @@ msgid ""
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
 "You should leave this enabled for most machines."
 msgstr ""
-"Õâ¸ö³ÌÐò°´ÕÕ /etc/sysconfig/keyboard µÄÉ趨¼ÓÔØÑ¡ÔñµÄ¼üÅÌÓ³Éä.\n"
-"Äú¿ÉÒÔʹÓà kbdconfig ¹¤¾ßÐÞ¸ÄÕâ¸öÉ趨.¶Ô´ó¶àÊý»úÆ÷, Ó¦¸Ã¿ªÆôÕâ¸ö·þÎñ."
+"Õâ¸ö³ÌÐò°´ÕÕ /etc/sysconfig/keyboard µÄÉ趨¼ÓÔØÑ¡ÔñµÄ¼üÅÌÓ³Éä¡£\n"
+"Äú¿ÉÒÔʹÓà kbdconfig ¹¤¾ßÐÞ¸ÄÕâ¸öÉ趨¡£¶Ô´ó¶àÊý»úÆ÷, Ó¦¸Ã¿ªÆôÕâ¸ö·þÎñ¡£"
 
 #: ../../services.pm_.c:38
 msgid ""
@@ -9466,33 +9540,33 @@ msgstr ""
 
 #: ../../services.pm_.c:40
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr "¿ª»úʱ×Ô¶¯¼à²âºÍÅäÖÃÓ²¼þ"
+msgstr "¿ª»úʱ×Ô¶¯¼à²âºÍÅäÖÃÓ²¼þ¡£"
 
 #: ../../services.pm_.c:41
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
-msgstr "LinuxconfÔÚ¿ª»úʱ»áÖ´ÐÐһЩÈÎÎñÀ´Î¬»¤ÏµÍ³ÅäÖÃ"
+msgstr "LinuxconfÔÚ¿ª»úʱ»áÖ´ÐÐһЩÈÎÎñÀ´Î¬»¤ÏµÍ³ÅäÖá£"
 
 #: ../../services.pm_.c:43
 msgid ""
 "lpd is the print daemon required for lpr to work properly. It is\n"
 "basically a server that arbitrates print jobs to printer(s)."
 msgstr ""
-"lpd ÊDZ£Ö¤ lpr Õý³£¹¤×÷µÄºǫ́´òÓ¡·þÎñ. Õâ¸ö·þÎñÆ÷µÄ»ù±¾¹¦ÄÜÊÇ\n"
-"°Ñ´òÓ¡·þÎñÖ¸Òýµ½ÏàÓ¦µÄ´òÓ¡»ú."
+"lpd ÊDZ£Ö¤ lpr Õý³£¹¤×÷µÄºǫ́´òÓ¡·þÎñ¡£Õâ¸ö·þÎñÆ÷µÄ»ù±¾¹¦ÄÜÊÇ\n"
+"°Ñ´òÓ¡·þÎñÖ¸Òýµ½ÏàÓ¦µÄ´òÓ¡»ú¡£"
 
 #: ../../services.pm_.c:45
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
-msgstr "LinuxÐéÄâ·þÎñÆ÷£¬ ÓÃÀ´¹¹¼Ü¸ßЧºÍ¸ß¿ÉÓÃϵͳ"
+msgstr "LinuxÐéÄâ·þÎñÆ÷,  ÓÃÀ´¹¹¼Ü¸ßЧºÍ¸ß¿ÉÓÃϵͳ"
 
 #: ../../services.pm_.c:47
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
 "names to IP addresses."
-msgstr "named (BIND) ÊÇÒ»¸öÓòÃû·þÎñÆ÷ (DNS), ÓÃÀ´°ÑÖ÷»úÃû×Ö ½âÎö³É IP µØÖ·."
+msgstr "named (BIND) ÊÇÒ»¸öÓòÃû·þÎñÆ÷ (DNS), ÓÃÀ´°ÑÖ÷»úÃû×Ö ½âÎö³É IP µØÖ·¡£"
 
 #: ../../services.pm_.c:48
 msgid ""
@@ -9500,15 +9574,15 @@ msgid ""
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
 "¼ÓÔغÍжÔØËùÓÐÍøÂçÎļþϵͳ(NFS), SMB (Lan\n"
-"Manager/Windows), ºÍ NCP (NetWare) ¼ÓÔصã."
+"Manager/Windows), ºÍ NCP (NetWare) ¼ÓÔص㡣"
 
 #: ../../services.pm_.c:50
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
 msgstr ""
-"¼¤»î/½ûÖ¹ËùÓÐÅäÖÃΪ¿ª»ú¾ÍÆ𶯵Ä\n"
-"ÍøÂç½Ó¿Ú."
+"¼¤»î/½ûÖ¹ËùÓÐÅäÖÃΪ¿ª»ú¾ÍÆô¶¯µÄ\n"
+"ÍøÂç½Ó¿Ú¡£"
 
 #: ../../services.pm_.c:52
 msgid ""
@@ -9516,23 +9590,23 @@ msgid ""
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
-"NFS Êdz£ÓõÄͨ¹ý TCP/IP ÍøÂç¹²ÏíÎļþµÄЭÒé.\n"
+"NFS Êdz£ÓõÄͨ¹ý TCP/IP ÍøÂç¹²ÏíÎļþµÄЭÒé¡£\n"
 "Õâ¸ö·þÎñÌṩÁË NFS ·þÎñÆ÷¹¦ÄÜ, ¿ÉÒÔͨ¹ý\n"
-"/etc/exports ÎļþÅäÖÃ."
+"/etc/exports ÎļþÅäÖá£"
 
 #: ../../services.pm_.c:55
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
-"NFS Êdz£ÓõÄͨ¹ý TCP/IP ÍøÂç¹²ÏíÎļþµÄЭÒé.\n"
-"Õâ¸ö·þÎñÌṩÁË NFS ÎļþËø¶¨¹¦ÄÜ."
+"NFS Êdz£ÓõÄͨ¹ý TCP/IP ÍøÂç¹²ÏíÎļþµÄЭÒé¡£\n"
+"Õâ¸ö·þÎñÌṩÁË NFS ÎļþËø¶¨¹¦ÄÜ¡£"
 
 #: ../../services.pm_.c:57
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
-msgstr "¿ª»úʱΪ¿ØÖÆ̨ºÍ XFree ×Ô¶¯ÉèÖÃÊý×Ö¼üÅÌËø."
+msgstr "¿ª»úʱΪ¿ØÖÆ̨ºÍ XFree ×Ô¶¯ÉèÖÃÊý×Ö¼üÅÌËø¡£"
 
 #: ../../services.pm_.c:59
 msgid "Support the OKI 4w and compatible winprinters."
@@ -9546,8 +9620,8 @@ msgid ""
 "it installed on machines that don't need it."
 msgstr ""
 "PCMCIA Ö§³Öͨ³£ÓÃÓÚÔڱʼDZ¾µçÄÔÖÐÌí¼Ó\n"
-"ÒÔÌ«Íø¿¨»òÕßµ÷Öƽâµ÷Æ÷.  Èç¹ûûÓÐÅäÖÃËü²»»áÆð¶¯,\n"
-"ËùÒÔ²»±Øµ£ÐÄËü."
+"ÒÔÌ«Íø¿¨»òÕßµ÷Öƽâµ÷Æ÷¡£Èç¹ûûÓÐÅäÖÃËü²»»áÆô¶¯,\n"
+"ËùÒÔ²»±Øµ£ÐÄËü¡£"
 
 #: ../../services.pm_.c:63
 msgid ""
@@ -9558,7 +9632,7 @@ msgid ""
 msgstr ""
 "portmapper ¹ÜÀí¸÷ÖÖ RPC Á¬½Ó, Ïó NFS ºÍ NIS\n"
 "ÕâЩЭÒé»áÓõ½Ëü. Èç¹ûÄúµÄµçÄÔ½«ÒªÌṩÀûÓÃÓà RPC »úÖÆЭÒéµÄ·þÎñ\n"
-"¾Í±ØÐëÔËÐÐ portmap ·þÎñÆ÷."
+"¾Í±ØÐëÔËÐÐ portmap ·þÎñÆ÷¡£"
 
 #: ../../services.pm_.c:66
 msgid ""
@@ -9566,7 +9640,7 @@ msgid ""
 "one machine to another."
 msgstr ""
 "Postfix ÊÇÒ»¸öÓʼþ´«µÝ´úÀí, Õâ¸ö³ÌÐò°ïÖúÄú°Ñµç×ÓÓʼþ´Ó\n"
-"һ̨»úÆ÷Ë͵½Áíһ̨."
+"һ̨»úÆ÷Ë͵½Áíһ̨¡£"
 
 #: ../../services.pm_.c:67
 msgid ""
@@ -9588,28 +9662,28 @@ msgid ""
 "the RIP protocol. While RIP is widely used on small networks, more complex\n"
 "routing protocols are needed for complex networks."
 msgstr ""
-"ºǫ́·þÎñ routed ÔÊÐíͨ¹ý RIP ЭÒé×Ô¶¯¸üÐ嵀 IP ·Óɱí.\n"
-"ÔÚСÐÍÍøÂçÉϹ㷺µÄ²ÉÓà RIP, È»¶øÔÚ¸ü¸´ÔÓµÄÍøÂçÉÏÐèÒª¸ü¸´ÔӵķÓÉЭÒé."
+"ºǫ́·þÎñ routed ÔÊÐíͨ¹ý RIP ЭÒé×Ô¶¯¸üÐ嵀 IP ·ÓÉ±í¡£\n"
+"ÔÚСÐÍÍøÂçÉϹ㷺µÄ²ÉÓà RIP, È»¶øÔÚ¸ü¸´ÔÓµÄÍøÂçÉÏÐèÒª¸ü¸´ÔӵķÓÉЭÒé¡£"
 
 #: ../../services.pm_.c:74
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
-msgstr "rstat ЭÒéÔÊÐíÍøÂçÉϵÄÓû§»ñÈ¡ÍøÂçÉÏÈκλúÆ÷µÄÐÔÄÜÖ¸±ê."
+msgstr "rstat ЭÒéÔÊÐíÍøÂçÉϵÄÓû§»ñÈ¡ÍøÂçÉÏÈκλúÆ÷µÄÐÔÄÜÖ¸±ê¡£"
 
 #: ../../services.pm_.c:76
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
-msgstr "rusers ЭÒéÔÊÐíÍøÂçÉϵÄÓû§È·ÈÏÔÚÆäËû×÷³öÓ¦´ðµÄ»úÆ÷ÉÏÓÐÄÄЩÓû§µÇ¼."
+msgstr "rusers ЭÒéÔÊÐíÍøÂçÉϵÄÓû§È·ÈÏÔÚÆäËü×÷³öÓ¦´ðµÄ»úÆ÷ÉÏÓÐÄÄЩÓû§µÇ¼¡£"
 
 #: ../../services.pm_.c:78
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
 "logged into a machine running the rwho daemon (similiar to finger)."
 msgstr ""
-"rwho ЭÒéʹԶ¶ËµÄÓû§¿ÉÒԵõ½ÔËÐÐÁË rwho ºǫ́·þÎñµÄ\n"
-"»úÆ÷ÉÏËùÓеǼÓû§µÄÇåµ¥ (ÀàËÆ finger)."
+"rwho ЭÒéʹԶ³ÌµÄÓû§¿ÉÒԵõ½ÔËÐÐÁË rwho ºǫ́·þÎñµÄ\n"
+"»úÆ÷ÉÏËùÓеǼÓû§µÄÇåµ¥ (ÀàËÆ finger)¡£"
 
 #: ../../services.pm_.c:80
 msgid "Launch the sound system on your machine"
@@ -9620,8 +9694,8 @@ msgid ""
 "Syslog is the facility by which many daemons use to log messages\n"
 "to various system log files.  It is a good idea to always run syslog."
 msgstr ""
-"Syslog ÊÇÕâÑùÒ»¸öÉèÊ©, ºÜ¶àÆäËûµÄºǫ́·þÎñÀûÓÃËüÔÚ\n"
-"¸÷ÖÖϵͳÈÕÖ¾ÎļþÖмǼÈÕÖ¾ÏûÏ¢. Ò»Ö±ÔËÐÐ syslog ÊǸöºÃÖ÷Òâ."
+"Syslog ÊÇÕâÑùÒ»¸öÉèÊ©, ºÜ¶àÆäËüµÄºǫ́·þÎñÀûÓÃËüÔÚ\n"
+"¸÷ÖÖϵͳÈÕÖ¾ÎļþÖмǼÈÕÖ¾ÏûÏ¢. Ò»Ö±ÔËÐÐ syslog ÊǸöºÃÖ÷Òâ¡£"
 
 #: ../../services.pm_.c:83
 msgid "Load the drivers for your usb devices."
@@ -9629,7 +9703,7 @@ msgstr "ÔØÈëUSBÉ豸µÄÇý¶¯"
 
 #: ../../services.pm_.c:84
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Æ𶯠X ×ÖÌå·þÎñ(X´°¿Úϵͳ±ØÐë)."
+msgstr "Æô¶¯ X ×ÖÌå·þÎñ(X´°¿Úϵͳ±ØÐë)¡£"
 
 #: ../../services.pm_.c:110 ../../services.pm_.c:152
 msgid "Choose which services should be automatically started at boot time"
@@ -9653,7 +9727,7 @@ msgstr "ϵͳ"
 
 #: ../../services.pm_.c:133
 msgid "Remote Administration"
-msgstr "Ô¶¶Ë¹ÜÀí"
+msgstr "Ô¶³Ì¹ÜÀí"
 
 #: ../../services.pm_.c:141
 msgid "Database Server"
@@ -9684,7 +9758,7 @@ msgstr "·þÎñ¼°ÁôÊسÌÐò"
 msgid ""
 "No additional information\n"
 "about this service, sorry."
-msgstr "ûÓи÷þÎñµÄ¸½¼ÓÐÅÏ¢."
+msgstr "ûÓи÷þÎñµÄ¸½¼ÓÐÅÏ¢¡£"
 
 #: ../../services.pm_.c:224
 msgid "On boot"
@@ -9712,7 +9786,7 @@ msgid ""
 "Your new operating system is the result of collaborative work on the part of "
 "the worldwide Linux Community"
 msgstr ""
-"MandrakeSoft µÄ³É¹¦Ö²¸ùÓÚ×ÔÓÉÈí¼þµÄÔ­Ôò. ÄúµÄвÙ×÷ϵͳÊÇÈ«ÊÀ½ç Linux ÉçÍźÏ"
+"MandrakeSoft µÄ³É¹¦Ö²¸ùÓÚ×ÔÓÉÈí¼þµÄÔ­Ôò¡£ÄúµÄвÙ×÷ϵͳÊÇÈ«ÊÀ½ç Linux ÉçÍźÏ"
 "×÷µÄ³É¹û"
 
 #: ../../share/advertising/02-community.pl_.c:9
@@ -9728,8 +9802,8 @@ msgid ""
 "To share your own knowledge and help build Linux tools, join the discussion "
 "forums you'll find on our \"Community\" webpages"
 msgstr ""
-"ÏëÓë±ðÈË·ÖÏíÄúµÄ֪ʶ, ²¢°ïÖú´´Ôì¸üºÃµÄ Linux ¹¤¾ßÂð? Çë¼ÓÈëÎÒÃǵÄÂÛ̳.ÔÚ\"Éç"
-"ÍÅ\"ÍøÒ³¿ÉÒÔÕÒµ½Ëü"
+"ÏëÓë±ðÈË·ÖÏíÄúµÄ֪ʶ, ²¢°ïÖú´´Ôì¸üºÃµÄ Linux ¹¤¾ßÂð? Çë¼ÓÈëÎÒÃǵÄÂÛ̳¡£ÔÚ¡°Éç"
+"Çø¡±ÍøÒ³¿ÉÒÔÕÒµ½Ëü"
 
 #: ../../share/advertising/03-internet.pl_.c:9
 msgid "Get the most from the Internet"
@@ -9741,7 +9815,7 @@ msgid ""
 "view animations with Mozilla and Konqueror, or read your mail and handle "
 "your personal information with Evolution and Kmail"
 msgstr ""
-"Mandrake Linux 9.0 ΪÄúÌôÑ¡ÁË×îºÃµÄÈí¼þ.  Mozilla ºÍ Konquerro °ïÄúÍøÉϳåÀ˺Í"
+"Mandrake Linux 9.0 ΪÄúÌôÑ¡ÁË×îºÃµÄÈí¼þ¡£Mozilla ºÍ Konquerro °ïÄúÍøÉϳåÀ˺Í"
 "ÐÀÉͶ¯»­, Evolution ºÍ Kmail °ïÄúÊÕ·¢µç×ÓÓʼþ²¢¹ÜÀíÄúµÄ¸öÈËÐÅÏ¢"
 
 #: ../../share/advertising/04-multimedia.pl_.c:9
@@ -9779,7 +9853,8 @@ msgstr "Mandrake ¿ØÖÆÖÐÐÄ"
 msgid ""
 "Mandrake Linux 9.0 provides a powerful tool to fully customize and configure "
 "your machine"
-msgstr "Mandrake Linux 9.0 ÌṩÁËÇ¿´óµÄ¹¤¾ß, ¿ÉÒÔÈ«Ãæ°´ÕÕÄúµÄÒªÇóÅäÖÃÄúµÄϵͳ."
+msgstr ""
+"Mandrake Linux 9.0 ÌṩÁËÇ¿´óµÄ¹¤¾ß, ¿ÉÒÔÈ«Ãæ°´ÕÕÄúµÄÒªÇóÅäÖÃÄúµÄϵͳ¡£"
 
 #: ../../share/advertising/07-desktop.pl_.c:9
 msgid "User interfaces"
@@ -9813,8 +9888,8 @@ msgstr "°ÑÄúµÄ»úÆ÷±ä³É¿É¿¿ÔËÐеķþÎñÆ÷"
 
 #: ../../share/advertising/09-server.pl_.c:10
 msgid ""
-"Transform your machine into a powerful Linux server with a few clicks of your "
-"mouse: Web server, mail, firewall, router, file and print server, ..."
+"Transform your machine into a powerful Linux server with a few clicks of "
+"your mouse: Web server, mail, firewall, router, file and print server, ..."
 msgstr ""
 "Êó±êµã¼¸µã, ÄúµÄ»úÆ÷¾ÍÄܱä³Éһ̨ǿ´óµÄ Linux ·þÎñÆ÷: ÌṩÍøÕ¾·þÎñ, µç×ÓÓʼþ, "
 "·À»ðǽ, ·ÓÉÆ÷, Îļþ¼°´òÓ¡·þÎñ, ..."
@@ -9938,7 +10013,7 @@ msgstr ""
 "Ôñ.Èç¹ûÄúϲ»¶ÎÒÃǵIJúÆ·, Èç¹ûÄúµÄ¹«Ë¾ÒòΪʹÓÃÎÒÃǵIJúÆ·¶ø»ñµÃÁ˾ºÕùÓÅÊÆ, Èç¹û"
 "ÄúÔ¸ÒâÖ§³Ö Mandrake Linux µÄ¿ª·¢, Çë¼ÓÈëMandrakeClub!"
 
-#: ../../standalone.pm_.c:41
+#: ../../standalone.pm_.c:42
 msgid "Installing packages..."
 msgstr "ÕýÔÚ°²×°³ÌÐò ..."
 
@@ -9965,7 +10040,7 @@ msgstr "½ûÖ¹·þÎñÆ÷"
 
 #: ../../standalone/drakTermServ_.c:218
 msgid "Start Server"
-msgstr "Æ𶯷þÎñÆ÷"
+msgstr "Æô¶¯·þÎñÆ÷"
 
 #: ../../standalone/drakTermServ_.c:225
 msgid "Stop Server"
@@ -9977,7 +10052,7 @@ msgstr "Etherboot Floppy/ISO"
 
 #: ../../standalone/drakTermServ_.c:235
 msgid "Net Boot Images"
-msgstr "ÍøÂçÆ𶯴ÅÅ̾µÏñ"
+msgstr "ÍøÂçÆô¶¯´ÅÅ̾µÏñ"
 
 #: ../../standalone/drakTermServ_.c:239
 msgid "Add/Del Users"
@@ -9989,11 +10064,11 @@ msgstr "Ôö¼Ó/ɾ³ýÓû§"
 
 #: ../../standalone/drakTermServ_.c:436
 msgid "Boot Floppy"
-msgstr "¿ª»úÈíÅÌ"
+msgstr "Æô¶¯ÈíÅÌ"
 
 #: ../../standalone/drakTermServ_.c:438
 msgid "Boot ISO"
-msgstr "¿ª»ú ISO"
+msgstr "Æô¶¯ ISO"
 
 #: ../../standalone/drakTermServ_.c:507
 msgid "Build Whole Kernel -->"
@@ -10001,7 +10076,7 @@ msgstr "½¨ÔìÕû¸öÄÚºË -->"
 
 #: ../../standalone/drakTermServ_.c:509 ../../standalone/drakTermServ_.c:539
 msgid "This will take a few minutes."
-msgstr "Õ⽫»¨·Ñ¼¸·ÖÖÓ."
+msgstr "Õ⽫»¨·Ñ¼¸·ÖÖÓ¡£"
 
 #: ../../standalone/drakTermServ_.c:521
 msgid "No kernel selected!"
@@ -10036,9 +10111,8 @@ msgid "<-- Del User"
 msgstr "<-- ɾ³ýÓû§"
 
 #: ../../standalone/drakTermServ_.c:694
-#, fuzzy
 msgid "No net boot images created!"
-msgstr "ÍøÂçÆ𶯴ÅÅ̾µÏñ"
+msgstr "ûÓд´½¨ÍøÂçÆô¶¯¾µÏñ!"
 
 #: ../../standalone/drakTermServ_.c:710
 msgid "Add Client -->"
@@ -10050,18 +10124,19 @@ msgstr "<-- ɾ³ý¿Í»§"
 
 #: ../../standalone/drakTermServ_.c:748
 msgid "dhcpd Config..."
-msgstr "dhcpd ÅäÖÃ..."
+msgstr "DHCPD ÅäÖÃ..."
 
 #: ../../standalone/drakTermServ_.c:873
-#, fuzzy
 msgid "dhcpd Server Configuration"
-msgstr "¸ß¼¶ÅäÖÃ"
+msgstr "DHCPD ·þÎñÆ÷ÅäÖÃ"
 
 #: ../../standalone/drakTermServ_.c:874
 msgid ""
 "Most of these values were extracted\n"
 "from your running system. You can modify as needed."
 msgstr ""
+"ÕâЩֵÖоø´ó¶àÊý»á´ÓÄãÕýÔÚÔËÐеÄϵͳ\n"
+"ÖÐÌáÈ¡¡£ÈôÐèÒªÄã¿ÉÒÔ½øÐÐÐ޸ġ£"
 
 #: ../../standalone/drakTermServ_.c:875
 msgid "Write Config"
@@ -10103,7 +10178,7 @@ msgstr "´íÎó!"
 #: ../../standalone/drakautoinst_.c:44
 #, c-format
 msgid "I can't find needed image file `%s'."
-msgstr "ÎÞ·¨ÕÒµ½Ó³ÏóÎļþ '%s'."
+msgstr "ÎÞ·¨ÕÒµ½Ó³ÏñÎļþ¡°%s¡±¡£"
 
 #: ../../standalone/drakautoinst_.c:46
 msgid "Auto Install Configurator"
@@ -10123,11 +10198,11 @@ msgid ""
 "\n"
 "Do you want to continue?"
 msgstr ""
-"ÏÖÔÚÅäÖÃ×Ô¶¯°²×°ÈíÅÌ. СÐĵã.\n"
+"ÏÖÔÚÅäÖÃ×Ô¶¯°²×°ÈíÅÌ¡£Ð¡Ðĵ㡣\n"
 "\n"
-"Äã¿ÉÒÔÖظ´¸Ã»úÆ÷µÄ°²×°, ½»»¥Ìáʾ²½Öè, ÐÞ¸ÄÊýÖµ.\n"
+"Äã¿ÉÒÔÖظ´¸Ã»úÆ÷µÄ°²×°, ½»»¥Ìáʾ²½Öè, ÐÞ¸ÄÊýÖµ¡£\n"
 "\n"
-"Ϊ°²È«Æð¼û, ·ÖÇø¼°¸ñʽ»¯²»»á×Ô¶¯Ö´ÐÐ.\n"
+"Ϊ°²È«Æð¼û, ·ÖÇø¼°¸ñʽ»¯²»»á×Ô¶¯Ö´ÐС£\n"
 "\n"
 "¼ÌÐøÂð?"
 
@@ -10157,7 +10232,7 @@ msgstr ""
 "\n"
 "×ó±ßÁгöÁË×Ô¶¯°²×°¿ÉÓõÄÑ¡Ïî"
 
-#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:484
+#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:480
 #: ../../standalone/scannerdrake_.c:119
 msgid "Congratulations!"
 msgstr "¹§Ï²!"
@@ -10167,8 +10242,8 @@ msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
 msgstr ""
-"ÄúµÄÈíÅÌÒѾ­³É¹¦Éú³É.\n"
-"Äã¿ÉÒÔÓÃËüÖØÏÖÕâ´Î°²×°."
+"ÄúµÄÈíÅÌÒѾ­³É¹¦Éú³É¡£\n"
+"Äã¿ÉÒÔÓÃËüÖØÏÖÕâ´Î°²×°¡£"
 
 #: ../../standalone/drakautoinst_.c:278
 msgid "Auto Install"
@@ -10205,8 +10280,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"                      DrakBackup Report \n"
-"                      ħÁ¦±¸·ÝÏòµ¼±¨¸æ \n"
+"                      DrakBackup ±¨¸æ \n"
 "\n"
 
 #: ../../standalone/drakbackup_.c:738
@@ -10217,8 +10291,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"                      DrakBackup Daemon Report\n"
-"                      ħÁ¦±¸·ÝÏòµ¼ ÊØ»¤½ø³Ì±¨¸æ\n"
+"                      DrakBackup Daemon ±¨¸æ\n"
 "\n"
 
 #: ../../standalone/drakbackup_.c:742
@@ -10229,8 +10302,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"                    DrakBackup Report Details\n"
-"                    DrakBackup Ïêϸ±¨¸æ\n"
+"                    DrakBackup ±¨¸æϸ½Ú\n"
 "\n"
 
 #: ../../standalone/drakbackup_.c:763 ../../standalone/drakbackup_.c:836
@@ -10249,16 +10321,16 @@ msgstr ""
 "%s ´æÔÚ, Ҫɾ³ýÂð?\n"
 "\n"
 "¾¯¸æ: Èç¹ûÄúÔø¾­×ö¹ýÕâ¸ö²½Öè, Äú¿ÉÄÜÐèÒª\n"
-"´Ó·þÎñÆ÷µÄµÄ authorized_keys ɾ³ý¸ÃÏîÄ¿."
+"´Ó·þÎñÆ÷µÄµÄ authorized_keys ɾ³ý¸ÃÏîÄ¿¡£"
 
 #: ../../standalone/drakbackup_.c:827
 msgid "This may take a moment to generate the keys."
-msgstr "Éú³ÉÒ»¸öÔ¿³×ÐèҪһЩʱ¼ä."
+msgstr "Éú³ÉÒ»¸öÔ¿³×ÐèҪһЩʱ¼ä¡£"
 
 #: ../../standalone/drakbackup_.c:834
 #, c-format
 msgid "ERROR: Cannot spawn %s."
-msgstr "´íÎó: ÎÞ·¨½øÐÐ %s."
+msgstr "´íÎó: ÎÞ·¨½øÐÐ %s¡£"
 
 #: ../../standalone/drakbackup_.c:851
 #, c-format
@@ -10324,11 +10396,11 @@ msgstr "½éÖʲ»ÄÜÇå³ý!"
 
 #: ../../standalone/drakbackup_.c:977
 msgid "This may take a moment to erase the media."
-msgstr "Çå¿Õ½éÖÊÐèҪһЩʱ¼ä."
+msgstr "Çå¿Õ½éÖÊÐèҪһЩʱ¼ä¡£"
 
 #: ../../standalone/drakbackup_.c:1062
 msgid "Permission problem accessing CD."
-msgstr "ûÓÐÊʵ±µÄȨÏÞ¶Áд CD."
+msgstr "ûÓÐÊʵ±µÄȨÏÞ¶Áд CD¡£"
 
 #: ../../standalone/drakbackup_.c:1089
 #, c-format
@@ -10386,7 +10458,7 @@ msgid ""
 "FTP.\n"
 msgstr ""
 "\n"
-"FTP Á¬½Ó´íÎó: ÎÞ·¨Í¨¹ý FTP ´«ËÍÄúµÄ±¸·ÝÎļþ.\n"
+"FTP Á¬½Ó´íÎó: ÎÞ·¨Í¨¹ý FTP ´«ËÍÄúµÄ±¸·ÝÎļþ¡£\n"
 
 #: ../../standalone/drakbackup_.c:1367
 msgid ""
@@ -10410,7 +10482,7 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:1381
 msgid " Error during mail sending. \n"
-msgstr "·¢Ë͵ç×ÓÓʼþ³ö´í. \n"
+msgstr "·¢Ë͵ç×ÓÓʼþ³ö´í¡£\n"
 
 #: ../../standalone/drakbackup_.c:1406
 msgid "Can't create catalog!"
@@ -10423,7 +10495,7 @@ msgstr "Ñ¡ÔñÎļþ"
 
 #: ../../standalone/drakbackup_.c:1558
 msgid "Select the files or directories and click on 'Add'"
-msgstr "Ñ¡ÔñÎļþ»òĿ¼, È»ºóµã»÷ 'Ôö¼Ó'"
+msgstr "Ñ¡ÔñÎļþ»òĿ¼, È»ºóµã»÷¡°Ôö¼Ó¡±"
 
 #: ../../standalone/drakbackup_.c:1602
 msgid ""
@@ -10431,7 +10503,7 @@ msgid ""
 "Please check all options that you need.\n"
 msgstr ""
 "\n"
-"ÇëÑ¡ÖÐÄúÐèÒªµÄËùÓÐÑ¡Ïî.\n"
+"ÇëÑ¡ÖÐÄúÐèÒªµÄËùÓÐÑ¡Ïî¡£\n"
 
 #: ../../standalone/drakbackup_.c:1603
 msgid ""
@@ -10454,7 +10526,7 @@ msgstr "²»°üÀ¨¹Ø¼üÎļþ (passwd, group, fstab) "
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
-msgstr "Õû¸öÑ¡ÏîÈÃÄú°Ñ/etc Ŀ¼¿ÉÒÔ»Ö¸´µ½ÈκÎÒÔÇ°µÄ°æ±¾."
+msgstr "Õû¸öÑ¡ÏîÈÃÄú°Ñ/etc Ŀ¼¿ÉÒÔ»Ö¸´µ½ÈκÎÒÔÇ°µÄ°æ±¾¡£"
 
 #: ../../standalone/drakbackup_.c:1624
 msgid "Please check all users that you want to include in your backup."
@@ -10509,11 +10581,12 @@ msgstr ""
 "´«ËÍ"
 
 #: ../../standalone/drakbackup_.c:1786
-#, fuzzy
 msgid ""
 "Other (not drakbackup)\n"
 "keys in place already"
-msgstr "ÒѾ­ÓÐÃÜÔ¿ÁË"
+msgstr ""
+"ÆäËü(²»ÊÇ drakbackup)\n"
+"ÃÜÔ¿ÒѾ­ÓÐÁË"
 
 #: ../../standalone/drakbackup_.c:1790
 msgid "Please enter the host name or IP."
@@ -10604,15 +10677,15 @@ msgstr "ÇëÊäÈëÓÃÓÚ±¸·ÝµÄÉ豸Ãû"
 
 #: ../../standalone/drakbackup_.c:2059
 msgid "Please check if you want to use the non-rewinding device."
-msgstr "Èç¹ûÄúʹÓò»»Ø¾íµÄÉ豸, ÇëÑ¡ÔñÕâÀï."
+msgstr "Èç¹ûÄúʹÓò»»Ø¾íµÄÉ豸, ÇëÑ¡ÔñÕâÀï¡£"
 
 #: ../../standalone/drakbackup_.c:2065
 msgid "Please check if you want to erase your tape before the backup."
-msgstr "Èç¹ûÐèÒªÔÚ±¸·ÝÇ°Çå³ý´Å´ø, ÇëÑ¡ÔñÕâÀï."
+msgstr "Èç¹ûÐèÒªÔÚ±¸·ÝÇ°Çå³ý´Å´ø, ÇëÑ¡ÔñÕâÀï¡£"
 
 #: ../../standalone/drakbackup_.c:2071
 msgid "Please check if you want to eject your tape after the backup."
-msgstr "Èç¹ûÐèÒªÔÚ±¸·Ýºó, , ÇëÑ¡ÔñÕâÀï."
+msgstr "Èç¹ûÐèÒªÔÚ±¸·Ýºó,ÇëÑ¡ÔñÕâÀï¡£"
 
 #: ../../standalone/drakbackup_.c:2077 ../../standalone/drakbackup_.c:2151
 #: ../../standalone/drakbackup_.c:3118
@@ -10689,17 +10762,17 @@ msgid ""
 "\n"
 "Note that currently all 'net' medias also use the hard drive."
 msgstr ""
-"ÇëÈ·ÈÏ cron ºǫ́³ÌÐò°üº¬ÔÚ services ÎļþÖÐ. \n"
+"ÇëÈ·ÈÏ cron ºǫ́³ÌÐò°üº¬ÔÚ services ÎļþÖС£\n"
 "\n"
-"Çë×¢ÒâÏÖÔÚËùÓÐµÄ 'ÍøÂç' ½éÖʶ¼ÒªÀûÓÃÓ²ÅÌ."
+"Çë×¢ÒâÏÖÔÚËùÓеġ°ÍøÂ硱½éÖʶ¼ÒªÀûÓÃÓ²ÅÌ¡£"
 
 #: ../../standalone/drakbackup_.c:2328
 msgid "Send mail report after each backup to:"
-msgstr "ÔÚÿ´Î±¸·Ýºó·¢ËÍÓʼþ±¨¸æ¸ø :"
+msgstr "ÔÚÿ´Î±¸·Ýºó·¢ËÍÓʼþ±¨¸æ¸ø:"
 
 #: ../../standalone/drakbackup_.c:2334
 msgid "Delete Hard Drive tar files after backup to other media."
-msgstr "±¸·Ýµ½ÆäËü½éÖÊÖ®ºóɾ³ýÓ²ÅÌÉ쵀 tar Îļþ."
+msgstr "±¸·Ýµ½ÆäËü½éÖÊÖ®ºóɾ³ýÓ²ÅÌÉ쵀 tar Îļþ¡£"
 
 #: ../../standalone/drakbackup_.c:2373
 msgid "What"
@@ -10763,7 +10836,7 @@ msgid ""
 "Backup Sources: \n"
 msgstr ""
 "\n"
-"±¸·ÝÀ´Ô´ : \n"
+"±¸·ÝÀ´Ô´: \n"
 
 #: ../../standalone/drakbackup_.c:2587
 msgid ""
@@ -10787,7 +10860,7 @@ msgid ""
 "- Other Files:\n"
 msgstr ""
 "\n"
-"- ÆäËûÎļþ:\n"
+"- ÆäËüÎļþ:\n"
 
 #: ../../standalone/drakbackup_.c:2593
 #, c-format
@@ -10804,7 +10877,7 @@ msgid ""
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 "\n"
-"- ±¸·Ýºóɾ³ýÓ²ÅÌµÄ tar Îļþ.\n"
+"- ±¸·Ýºóɾ³ýÓ²ÅÌµÄ tar Îļþ¡£\n"
 
 #: ../../standalone/drakbackup_.c:2602
 msgid ""
@@ -10890,35 +10963,35 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:2622
 msgid "\t-Hard drive.\n"
-msgstr "\t-Ó²ÅÌ.\n"
+msgstr "\t-Ó²ÅÌ¡£\n"
 
 #: ../../standalone/drakbackup_.c:2623
 msgid "\t-CDROM.\n"
-msgstr "\t-¹âÅÌ.\n"
+msgstr "\t-¹âÅÌ¡£\n"
 
 #: ../../standalone/drakbackup_.c:2624
 msgid "\t-Tape \n"
-msgstr "\t-´Å´ø \n"
+msgstr "\t-´Å´ø\n"
 
 #: ../../standalone/drakbackup_.c:2625
 msgid "\t-Network by FTP.\n"
-msgstr "\t-ÍøÂçͨ¹ýFTP.\n"
+msgstr "\t-ÍøÂçͨ¹ýFTP¡£\n"
 
 #: ../../standalone/drakbackup_.c:2626
 msgid "\t-Network by SSH.\n"
-msgstr "\t-ÍøÂç ͨ¹ýSSH\n"
+msgstr "\t-ÍøÂçͨ¹ýSSH¡£\n"
 
 #: ../../standalone/drakbackup_.c:2627
 msgid "\t-Network by rsync.\n"
-msgstr "\t-ÍøÂç ͨ¹ý rsync.\n"
+msgstr "\t-ÍøÂç ͨ¹ý rsync¡£\n"
 
 #: ../../standalone/drakbackup_.c:2628
 msgid "\t-Network by webdav.\n"
-msgstr "\t-ÍøÂç ͨ¹ýwebdav.\n"
+msgstr "\t-ÍøÂç ͨ¹ýwebdav¡£\n"
 
 #: ../../standalone/drakbackup_.c:2630
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "ûÓÐÅäÖÃ, ÇëÑ¡Ôñµ¼Ê¦»ò¸ß¼¶.\n"
+msgstr "ûÓÐÅäÖÃ, ÇëÑ¡ÔñÏòµ¼»ò¸ß¼¶¡£\n"
 
 #: ../../standalone/drakbackup_.c:2636
 msgid ""
@@ -10938,7 +11011,7 @@ msgstr ""
 
 #: ../../standalone/drakbackup_.c:2805
 msgid "Please uncheck or remove it on next time."
-msgstr "ÇëÈ¡ÏûÑ¡Ôñ²¢É¾³ýËü."
+msgstr "ÇëÈ¡ÏûÑ¡Ôñ²¢É¾³ýËü¡£"
 
 #: ../../standalone/drakbackup_.c:2815
 msgid "Backup files are corrupted"
@@ -10959,7 +11032,7 @@ msgstr "        »Ö¸´µÄÅäÖà       "
 
 #: ../../standalone/drakbackup_.c:2973
 msgid "OK to restore the other files."
-msgstr "OK ½«»Ö¸´ÆäËûÎļþ"
+msgstr "OK ½«»Ö¸´ÆäËüÎļþ"
 
 #: ../../standalone/drakbackup_.c:2990
 msgid "User list to restore (only the most recent date per user is important)"
@@ -11023,11 +11096,11 @@ msgstr "Ñ¡Ôñ½«Òª»Ö¸´µ½µÄ·¾¶ (/ ³ýÍâ)"
 
 #: ../../standalone/drakbackup_.c:3271
 msgid "Do new backup before restore (only for incremental backups.)"
-msgstr "»Ö¸´Ç°×öеı¸·Ý (Ö»ÊÊÓÃÓÚÔöÁ¿±¸·Ý.)"
+msgstr "»Ö¸´Ç°×öеı¸·Ý (Ö»ÊÊÓÃÓÚÔöÁ¿±¸·Ý¡£)"
 
 #: ../../standalone/drakbackup_.c:3273
 msgid "Remove user directories before restore."
-msgstr "»Ö¸´Ç°É¾³ýÓû§Ä¿Â¼."
+msgstr "»Ö¸´Ç°É¾³ýÓû§Ä¿Â¼¡£"
 
 #: ../../standalone/drakbackup_.c:3386
 msgid ""
@@ -11056,7 +11129,7 @@ msgstr ""
 #: ../../standalone/drakbackup_.c:3479
 #, c-format
 msgid "Backup files not found at %s."
-msgstr "ÔÚ %s ûÓз¢ÏÖ±¸·ÝÎļþ."
+msgstr "ÔÚ %s ûÓз¢ÏÖ±¸·ÝÎļþ¡£"
 
 #: ../../standalone/drakbackup_.c:3492
 #, c-format
@@ -11074,7 +11147,7 @@ msgstr "´Ó¹âÅָ̻´"
 #: ../../standalone/drakbackup_.c:3494
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
-msgstr "¹âÅÌÅ̱겻¶Ô. ÕâÕÅÅ̵ľí±êÊÇ %s."
+msgstr "¹âÅÌÅ̱겻¶Ô. ÕâÕÅÅ̵ľí±êÊÇ %s¡£"
 
 #: ../../standalone/drakbackup_.c:3504
 #, c-format
@@ -11092,7 +11165,7 @@ msgstr "´Ó´Å´ø»Ö¸´"
 #: ../../standalone/drakbackup_.c:3506
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
-msgstr "´Å´ø±ê¼Ç²»¶Ô. ÕâÅÌ´Å´øÊÇ %s"
+msgstr "´Å´ø±ê¼Ç²»¶Ô¡£ÕâÅÌ´Å´øÊÇ %s¡£"
 
 #: ../../standalone/drakbackup_.c:3526
 msgid "Restore Via Network"
@@ -11145,11 +11218,11 @@ msgstr "¶¨Öƻָ´"
 
 #: ../../standalone/drakbackup_.c:3858
 msgid "CD in place - continue."
-msgstr "¹âÅ̾ÍÐ÷ - ¼ÌÐø."
+msgstr "¹âÅ̾ÍÐ÷ - ¼ÌÐø¡£"
 
 #: ../../standalone/drakbackup_.c:3864
 msgid "Browse to new restore repository."
-msgstr "ä¯ÀÀеĻָ´²Ö¿â."
+msgstr "ä¯ÀÀеĻָ´²Ö¿â¡£"
 
 #: ../../standalone/drakbackup_.c:3867
 msgid "Restore From Catalog"
@@ -11168,7 +11241,7 @@ msgid "Previous"
 msgstr "Ç°Ò»²½"
 
 #: ../../standalone/drakbackup_.c:3941 ../../standalone/drakbackup_.c:4027
-#: ../../standalone/logdrake_.c:223
+#: ../../standalone/logdrake_.c:224
 msgid "Save"
 msgstr "±£´æ"
 
@@ -11187,7 +11260,7 @@ msgid ""
 "  Please configure sendmail"
 msgstr ""
 "ʹÓà sendmail ³ö´í\n"
-"  ÄúµÄ±¨¸æÓʼþûÓз¢³ö.\n"
+"  ÄúµÄ±¨¸æÓʼþûÓз¢³ö¡£\n"
 "  ÇëÅäÖà sendmail"
 
 #: ../../standalone/drakbackup_.c:4257
@@ -11203,8 +11276,8 @@ msgid ""
 "Error during sending file via FTP.\n"
 " Please correct your FTP configuration."
 msgstr ""
-"ͨ¹ý FTP ·¢ËÍÎļþ³ö´í.\n"
-" Çë¸ÄÕýÄúµÄ FTP ÅäÖÃ."
+"ͨ¹ý FTP ·¢ËÍÎļþ³ö´í¡£\n"
+" Çë¸ÄÕýÄúµÄ FTP ÅäÖá£"
 
 #: ../../standalone/drakbackup_.c:4303
 msgid "Please select data to restore..."
@@ -11224,11 +11297,11 @@ msgid ""
 "please click Wizard or Advanced."
 msgstr ""
 "ûÓÐÕÒµ½ÅäÖÃÎļþ\n"
-"Çëµã»÷Ïòµ¼»ò¸ß¼¶."
+"Çëµã»÷Ïòµ¼»ò¸ß¼¶¡£"
 
 #: ../../standalone/drakbackup_.c:4389
 msgid "Under Devel ... please wait."
-msgstr "¿ª·¢ÖÐ...ÇëµÈ´ýа汾."
+msgstr "¿ª·¢ÖÐ...ÇëµÈ´ýа汾¡£"
 
 #: ../../standalone/drakbackup_.c:4470
 msgid "Backup system files"
@@ -11240,7 +11313,7 @@ msgstr "±¸·ÝÓû§Îļþ"
 
 #: ../../standalone/drakbackup_.c:4474
 msgid "Backup other files"
-msgstr "±¸·ÝÆäËûÎļþ"
+msgstr "±¸·ÝÆäËüÎļþ"
 
 #: ../../standalone/drakbackup_.c:4476 ../../standalone/drakbackup_.c:4509
 msgid "Total Progress"
@@ -11256,11 +11329,11 @@ msgstr "ÕýÔÚ·¢ËÍÎļþ..."
 
 #: ../../standalone/drakbackup_.c:4590
 msgid "Backup Now from configuration file"
-msgstr "ÏÖÔÚ±¸·Ý,´ÓÅäÖÃÎļþ"
+msgstr "ÏÖÔÚ´ÓÅäÖÃÎļþ±¸·Ý"
 
 #: ../../standalone/drakbackup_.c:4595
 msgid "View Backup Configuration."
-msgstr "²é¿´±¸·ÝÅäÖÃ"
+msgstr "²é¿´±¸·ÝÅäÖá£"
 
 #: ../../standalone/drakbackup_.c:4616
 msgid "Wizard Configuration"
@@ -11276,7 +11349,7 @@ msgstr "ÏÖÔÚ±¸·Ý"
 
 #: ../../standalone/drakbackup_.c:4660
 msgid "Drakbackup"
-msgstr "ħÁ¦±¸·Ý"
+msgstr "Drakbackup"
 
 #: ../../standalone/drakbackup_.c:4711
 msgid ""
@@ -11315,21 +11388,21 @@ msgstr ""
 "\n"
 " - ѹËõµÄģʽ:\n"
 "    \n"
-"      If you check bzip2 compression, you will compress\n"
-"      your data better than gzip (about 2-10 %).\n"
-"      This option is not checked by default because\n"
-"      this compression mode needs more time (about 1000% more).\n"
+"      Èç¹ûÄãÑ¡Ôñ bzip2 ѹËõ, Ä㽫»ñµÃ±È gzip ¸üºÃµÄ\n"
+"      ѹËõÂÊ(´óÔ¼ 2-10 %)¡£\n"
+"      Ö®ËùÒÔ´ËÑ¡Ïî²»ÊÇĬÈÏÑ¡ÖеÄ, ÊÇÒòΪÕâÖÖѹËõģʽ\n"
+"      Ëù»¨Ê±¼äÌ«¶à(´óÓÚ¶à³ö10±¶)¡£\n"
 " \n"
 " - ¸üеÄģʽ:\n"
 "\n"
 "      Õâ¸öÑ¡Ï¸üÐÂÄúµÄ±¸·Ý, µ«ÊÇ\n"
 "      ËüûÓÐʲôʵ¼ÊÓÃ;\n"
-"      ÒòΪ¸üÐÂ֮ǰÐèÒª½âѹËõÄúµÄÊý¾Ý.\n"
+"      ÒòΪ¸üÐÂ֮ǰÐèÒª½âѹËõÄúµÄÊý¾Ý¡£\n"
 "      \n"
 " - .backupignore ģʽ:\n"
 "\n"
 "      Ïó cvs ÄÇÑù, Drakbackup »á¼ì²éÿ¸öĿ¼µÄ .backupignore Îļþ\n"
-"      ºöÂÔÆäÖÐÁгöµÄÎļþ.\n"
+"      ºöÂÔÆäÖÐÁгöµÄÎļþ¡£\n"
 "      ÀýÈç: \n"
 "         /*> cat .backupignore*/\n"
 "         *.o\n"
@@ -11396,7 +11469,7 @@ msgstr ""
 " - ±¸·ÝϵͳÎļþ:\n"
 "       \n"
 "\tÕâ¸öÑ¡ÏîÔÊÐíÄú±¸·ÝÄúµÄ /etc Ŀ¼,\n"
-"\tËü°üº¬ÁËËùÓеÄÅäÖÃÎļþ. ÔÚ»Ö¸´¹ý³ÌÖÐ\n"
+"\tËü°üº¬ÁËËùÓеÄÅäÖÃÎļþ¡£ÔÚ»Ö¸´¹ý³ÌÖÐ\n"
 "\tҪСÐÄ, ²»Òª¸²¸Ç:\n"
 "\t\t/etc/passwd \n"
 "\t\t/etc/group \n"
@@ -11404,26 +11477,26 @@ msgstr ""
 "\n"
 " - ±¸·ÝÓû§Îļþ: \n"
 "\n"
-"\tÕâ¸öÑ¡ÏîÔÊÐíÄú±¸·ÝÄúÑ¡ÔñµÄËùÓÐÓû§ \n"
-"\tΪÁ˽ÚÊ¡´ÅÅÌ¿Õ¼ä, ½¨ÒéÄú²»Òª°üÀ¨ \n"
-"\tÍøÂçä¯ÀÀÆ÷µÄ»º´æÎļþ.\n"
+"\tÕâ¸öÑ¡ÏîÔÊÐíÄú±¸·ÝÄúÑ¡ÔñµÄËùÓÐÓû§\n"
+"\tΪÁ˽ÚÊ¡´ÅÅÌ¿Õ¼ä, ½¨ÒéÄú²»Òª°üÀ¨\n"
+"\tÍøÂçä¯ÀÀÆ÷µÄ»º´æÎļþ¡£\n"
 "\n"
 " - ±¸·ÝÆäËüÎļþ: \n"
 "\n"
-"\tÕâ¸öÑ¡ÏîÔÊÐíÄú±¸·ÝÄúÌí¼ÓµÄÆäËûÎļþ.\n"
+"\tÕâ¸öÑ¡ÏîÔÊÐíÄú±¸·ÝÄúÌí¼ÓµÄÆäËüÎļþ¡£\n"
 "\tÈç¹ûÄúÑ¡Ôñ±¸·ÝÆäËüÎļþ \n"
 "\t¾Í²»ÄÜÑ¡ÔñÔöÁ¿±¸·Ý.\t\t\n"
 " \n"
 " - ÔöÁ¿±¸·Ý:\n"
-"\tÔöÁ¿±¸·ÝÊǹ¦ÄÜ×îÇ¿´óµÄÑ¡Ïî.\n"
+"\tÔöÁ¿±¸·ÝÊǹ¦ÄÜ×îÇ¿´óµÄÑ¡Ïî¡£\n"
 "\tÄú¿ÉÒÔʹÓÃÕâ¸ö¹¦ÄÜ \n"
 "\tµÚÒ»´Î±¸·ÝÄúËùÓеÄÊý¾Ý,\n"
-"\tÒÔºóÖ»±¸·Ý¸Ä±äµÄ²¿·Ö.\n"
+"\tÒÔºóÖ»±¸·Ý¸Ä±äµÄ²¿·Ö¡£\n"
 "\tÕâÑùÔÚ»Ö¸´Ê±ºò,\n"
 "\tÄú¿ÉÒÔ°ÑÊý¾Ý»Ö¸´µ½Ö¸¶¨\n"
-"\tÈÕÆÚµÄ״̬.\n"
+"\tÈÕÆÚµÄ״̬¡£\n"
 "\tÈç¹û²»Ñ¡ÔñÔöÁ¿±¸·Ý\n"
-"\tÿ´Î±¸·Ý֮ǰ»áɾ³ý¾ÉµÄ±¸·Ý.\n"
+"\tÿ´Î±¸·Ý֮ǰ»áɾ³ý¾ÉµÄ±¸·Ý¡£\n"
 
 #: ../../standalone/drakbackup_.c:4788
 msgid ""
@@ -11455,24 +11528,24 @@ msgstr ""
 "»Ö¸´ÃèÊö:\n"
 " \n"
 "Ö»ÄÜʹÓÃ×î½üµÄÈÕÆÚ , ÒòΪʹÓÃÔöÁ¿±¸·ÝÒªÇó \n"
-"Ò»¸ö½Ó×ÅÒ»¸ö»Ö¸´½ÏÔçµÄ±¸·Ý.\n"
+"Ò»¸ö½Ó×ÅÒ»¸ö»Ö¸´½ÏÔçµÄ±¸·Ý¡£\n"
 "\n"
 "Èç¹û²»Òª»Ö¸´Ä³¸öÓû§, ÇëÇå¿Õ\n"
-"ËûµÄËùÓÐÑ¡Ôñ¿ò.\n"
+"ËûµÄËùÓÐÑ¡Ôñ¿ò¡£\n"
 "\n"
 "·ñÔò, Äú¿ÉÒÔÑ¡ÔñÏÂÁÐÖ®Ò»\n"
 "\n"
 " - ÔöÁ¿±¸·Ý:\n"
 "\n"
-"\tÔöÁ¿±¸·ÝÊǹ¦ÄÜ×îÇ¿´óµÄÑ¡Ïî.\n"
+"\tÔöÁ¿±¸·ÝÊǹ¦ÄÜ×îÇ¿´óµÄÑ¡Ïî¡£\n"
 "\tÄú¿ÉÒÔʹÓÃÕâ¸ö¹¦ÄÜ \n"
 "\tµÚÒ»´Î±¸·ÝÄúËùÓеÄÊý¾Ý,\n"
-"\tÒÔºóÖ»±¸·Ý¸Ä±äµÄ²¿·Ö.\n"
+"\tÒÔºóÖ»±¸·Ý¸Ä±äµÄ²¿·Ö¡£\n"
 "\tÕâÑùÔÚ»Ö¸´Ê±ºò,\n"
 "\tÄú¿ÉÒÔ°ÑÊý¾Ý»Ö¸´µ½Ö¸¶¨\n"
-"\tÈÕÆÚµÄ״̬.\n"
+"\tÈÕÆÚµÄ״̬¡£\n"
 "\tÈç¹û²»Ñ¡ÔñÔöÁ¿±¸·Ý\n"
-"\tÿ´Î±¸·Ý֮ǰ»áɾ³ý¾ÉµÄ±¸·Ý.\n"
+"\tÿ´Î±¸·Ý֮ǰ»áɾ³ý¾ÉµÄ±¸·Ý¡£\n"
 "\n"
 "\n"
 "\n"
@@ -11508,12 +11581,12 @@ msgstr ""
 " Õâ¸ö³ÌÐòÊÇ×ÔÓÉÈí¼þ; Äú¿ÉÒÔÖØз¢²¼, »òÐÞ¸ÄËü\n"
 " Ö»ÒªÄú×ñÊØÀ´×Ô Free Software Foundation ×ÔÓÉÈí¼þ»ù½ð»áµÄ\n"
 "  GNU General Public License ͨÓù«¹²Ðí¿ÉÖ¤µÚ2°æ, »òÕß\n"
-" ¸üеİ汾.\n"
+" ¸üеİ汾¡£\n"
 "\n"
 " ÎÒÃÇ·¢ÐÐÕâ¸öÈí¼þÊÇÏ£ÍûËüÓÐÓÃ,\n"
 " µ«ÊDz»ÌṩÈκε£±£; ²»±£Ö¤Ëü\n"
-" ÊʺÏÈκÎÆÕͨ»òÌض¨µÄÓÃ;.  ϸ½Ú\n"
-" ¼û GNU General Public License ͨÓù«¹²Ðí¿ÉÖ¤.\n"
+" ÊʺÏÈκÎÆÕͨ»òÌض¨µÄÓÃ;¡£Ï¸½Ú\n"
+" ¼û GNU General Public License ͨÓù«¹²Ðí¿ÉÖ¤¡£\n"
 "\n"
 " ÄúÓ¦¸ÃËæͬ±¾Èí¼þµÃµ½Ò»·Ý GNU General Public License ͨÓù«¹²Ðí¿ÉÖ¤\n"
 " ÄúÒ²¿ÉÒÔдПø×ÔÓÉÈí¼þ»ù½ð»á, ÒªÇóËûÃÇÌṩ,\n"
@@ -11561,26 +11634,26 @@ msgid ""
 msgstr ""
 "ÃèÊö:\n"
 "\n"
-"  Drakbackup °ïÖúÄú±¸·ÝÄúµÄϵͳ.\n"
+"  Drakbackup °ïÖúÄú±¸·ÝÄúµÄϵͳ¡£\n"
 "  ÔÚÅäÖÃʱÄú¿ÉÒÔÑ¡Ôñ \n"
 "\t- ϵͳÎļþ, \n"
 "\t- Óû§Îļþ, \n"
-"\t- ÆäËûÎļþ.\n"
+"\t- ÆäËüÎļþ.\n"
 "\t»òÕßÕû¸öϵͳ ...  ºÍÆäËü (Èç Windows ·ÖÇø)\n"
 "\n"
 "  Drakbackup ¿ÉÒÔ±¸·Ýµ½:\n"
 "\t- Ó²ÅÌ.\n"
 "\t- NFS.\n"
-"\t- CDROM (CDRW), DVDROM (Óà autoboot, rescue ºÍ autoinstall.).\n"
+"\t- CDROM (CDRW), DVDROM (Óà autoboot, rescue ºÍ autoinstall.)¡£\n"
 "\t- FTP.\n"
 "\t- Rsync.\n"
 "\t- Webdav.\n"
 "\t- Tape.\n"
 "\n"
 "  Drakbackup ¿ÉÒÔ»Ö¸´ÄúµÄϵͳ\n"
-"  µ½Óû§Ö¸¶¨µÄĿ¼.\n"
+"  µ½Óû§Ö¸¶¨µÄĿ¼¡£\n"
 "\n"
-"  ȱʡÉ趨ËùÓб¸·Ý±£´æÔÚ\n"
+"  ĬÈÏÉ趨ËùÓб¸·Ý±£´æÔÚ\n"
 "  /var/lib/drakbackup directory\n"
 "\n"
 "  ÅäÖÃÎļþ:\n"
@@ -11610,7 +11683,7 @@ msgstr ""
 "ÇëСÐÄʹÓà ftp ±¸·Ý, ÒòΪ·¢Ë͵½·þÎñÆ÷µÄÖ»ÄÜÊÇ \n"
 "ÒѾ­Íê³ÉµÄ±¸·Ý.\n"
 "ËùÒÔÄ¿Ç°, ÄúÐèÒªÏÈÔÚÓ²ÅÌÉϽøÐб¸·Ý, \n"
-"È»ºó°ÑËü´«µ½·þÎñÆ÷.\n"
+"È»ºó°ÑËü´«µ½·þÎñÆ÷¡£\n"
 "\n"
 
 #: ../../standalone/drakbackup_.c:4879
@@ -11631,7 +11704,7 @@ msgstr ""
 "ÔÚ»Ö¸´²½ÖèÖÐ, Drakbackup »á\n"
 "ɾ³ýÄúÔ­À´µÄµÄĿ¼, ÄúËùÓеÄÊý¾Ý\n"
 "»á¶ªÊ§. Çë¸ñÍâСÐÄ, \n"
-"Ò»¶¨²»ÒªÊÖ¹¤Ð޸ı¸·ÝÊý¾ÝÎļþ.\n"
+"Ò»¶¨²»ÒªÊÖ¹¤Ð޸ı¸·ÝÊý¾ÝÎļþ¡£\n"
 ".\n"
 
 #: ../../standalone/drakbackup_.c:4909
@@ -11674,26 +11747,26 @@ msgid ""
 msgstr ""
 "ÃèÊö:\n"
 "\n"
-"  Drakbackup ¿ÉÒÔ±¸·ÝÄúµÄϵͳ.\n"
+"  Drakbackup ¿ÉÒÔ±¸·ÝÄúµÄϵͳ¡£\n"
 "  ÔÚÅäÖÃʱÄú¿ÉÒÔÑ¡Ôñ \n"
 "\t- ϵͳÎļþ, \n"
 "\t- Óû§Îļþ, \n"
-"\t- ÆäËûÎļþ.\n"
+"\t- ÆäËüÎļþ.\n"
 "\t»òÕßÕû¸öϵͳ ...  ºÍÆäËü (Èç Windows ·ÖÇø)\n"
 "\n"
 "  Drakbackup ¿ÉÒÔ±¸·Ýµ½:\n"
-"\t- Ó²ÅÌ.\n"
-"\t- NFS.\n"
-"\t- CDROM (CDRW), DVDROM (Óà autoboot, rescue ºÍ autoinstall.).\n"
-"\t- FTP.\n"
-"\t- Rsync.\n"
-"\t- Webdav.\n"
-"\t- Tape.\n"
+"\t- Ó²ÅÌ¡£\n"
+"\t- NFS¡£\n"
+"\t- CDROM (CDRW), DVDROM (Óà autoboot, rescue ºÍ autoinstall.)¡£\n"
+"\t- FTP¡£\n"
+"\t- Rsync¡£\n"
+"\t- Webdav¡£\n"
+"\t- Tape¡£\n"
 "\n"
 "  Drakbackup ¿ÉÒÔ»Ö¸´ÄúµÄϵͳ\n"
-"  µ½Óû§Ö¸¶¨µÄĿ¼.\n"
+"  µ½Óû§Ö¸¶¨µÄĿ¼¡£\n"
 "\n"
-"  ȱʡÉ趨ËùÓб¸·Ý±£´æÔÚ\n"
+"  ĬÈÏÉ趨ËùÓб¸·Ý±£´æÔÚ\n"
 "  /var/lib/drakbackup directory\n"
 "\n"
 "  ÅäÖÃÎļþ:\n"
@@ -11704,14 +11777,14 @@ msgstr ""
 "  ÔÚ»Ö¸´²½ÖèÖÐ, Drakbackup »á\n"
 "  ɾ³ýÄúÔ­À´µÄµÄĿ¼, ²¢ÇÒÑéÖ¤\n"
 "  ±¸·ÝÎļþûÓÐÆÆ»µ. ½¨ÒéÄú\n"
-"  ÔÚ»Ö¸´Ö®Ç°ÔÙ×öÒ»´Î±¸·Ý.\n"
+"  ÔÚ»Ö¸´Ö®Ç°ÔÙ×öÒ»´Î±¸·Ý¡£\n"
 " \n"
 "\n"
 
 #: ../../standalone/drakboot_.c:57
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
-msgstr "°²×° %s ʧ°Ü£¬³öÏÖÏÂÁдíÎó:"
+msgstr "°²×° %s ʧ°Ü, ³öÏÖÏÂÁдíÎó:"
 
 #: ../../standalone/drakbug_.c:40
 #, c-format
@@ -11727,7 +11800,7 @@ msgid ""
 msgstr ""
 "drakbug °æ±¾ %s\n"
 "Copyright (C) 2002 MandrakeSoft.\n"
-"ÕâÊÇÒ»¸ö×ÔÓÉÈí¼þ, ¿ÉÒÔ°´ÕÕ GNU GPL Ðí¿ÉÖ¤µÄ¹æ¶¨Ôٴη¢²¼.\n"
+"ÕâÊÇÒ»¸ö×ÔÓÉÈí¼þ, ¿ÉÒÔ°´ÕÕ GNU GPL Ðí¿ÉÖ¤µÄ¹æ¶¨Ôٴη¢²¼¡£\n"
 "\n"
 "Ó÷¨: drakbug [Ñ¡Ïî] [³ÌÐòÃû]\n"
 "\n"
@@ -11735,7 +11808,7 @@ msgstr ""
 
 #: ../../standalone/drakbug_.c:47
 msgid "  --help            - print this help message.\n"
-msgstr "  --help            - ÁгöÕâ¸ö°ïÖúÐÅÏ¢.\n"
+msgstr "  --help            - ÁгöÕâ¸ö°ïÖúÐÅÏ¢¡£\n"
 
 #: ../../standalone/drakbug_.c:48
 msgid "  --report          - program should be one of mandrake tools\n"
@@ -11765,7 +11838,7 @@ msgstr "¶ÀÁ¢¹¤¾ß"
 
 #: ../../standalone/drakbug_.c:73
 msgid "HardDrake"
-msgstr "HardDrakeħÁ¦Ó²¼þ"
+msgstr "HardDrake"
 
 #: ../../standalone/drakbug_.c:74
 msgid "Mandrake Online"
@@ -11773,7 +11846,7 @@ msgstr "MandrakeÔÚÏß"
 
 #: ../../standalone/drakbug_.c:75
 msgid "Menudrake"
-msgstr "MenudrakeħÁ¦²Ëµ¥ÅäÖÃ"
+msgstr "Menudrake"
 
 #: ../../standalone/drakbug_.c:76
 msgid "Msec"
@@ -11848,7 +11921,7 @@ msgstr "ûÓа²×°"
 
 #: ../../standalone/drakbug_.c:189
 msgid "connecting to Bugzilla wizard ..."
-msgstr "Á¬½Ó Bugzilla ¹ÊÕϱ¨¸æ¾«Áé ..."
+msgstr "Á¬½Ó Bugzilla ¹ÊÕϱ¨¸æÏòµ¼ ..."
 
 #: ../../standalone/drakbug_.c:196
 msgid "No browser available! Please install one"
@@ -11861,19 +11934,19 @@ msgstr "ÍøÂçÅäÖÃ(%d Íø¿¨)"
 
 #: ../../standalone/drakconnect_.c:86 ../../standalone/drakconnect_.c:594
 msgid "Profile: "
-msgstr "Profile: "
+msgstr "ÅäÖÃÎļþ: "
 
 #: ../../standalone/drakconnect_.c:94
 msgid "Del profile..."
-msgstr "ɾ³ýprofile..."
+msgstr "ɾ³ýÅäÖÃÎļþ..."
 
 #: ../../standalone/drakconnect_.c:100
 msgid "Profile to delete:"
-msgstr "Ҫɾ³ýµÄprofile:"
+msgstr "Ҫɾ³ýµÄÅäÖÃÎļþ:"
 
 #: ../../standalone/drakconnect_.c:128
 msgid "New profile..."
-msgstr "н¨profile..."
+msgstr "н¨ÅäÖÃÎļþ..."
 
 #: ../../standalone/drakconnect_.c:134
 msgid ""
@@ -11883,7 +11956,7 @@ msgstr "н¨profileÃû:"
 
 #: ../../standalone/drakconnect_.c:160
 msgid "Hostname: "
-msgstr "Ö÷»úÃû×Ö:"
+msgstr "Ö÷»úÃû:"
 
 #: ../../standalone/drakconnect_.c:167
 msgid "Internet access"
@@ -11911,7 +11984,7 @@ msgstr "ÇëÉÔºò"
 
 #: ../../standalone/drakconnect_.c:219
 msgid "Configure Internet Access..."
-msgstr "É趨ÒòÌØÍø·ÃÎÊ·þÎñ"
+msgstr "É趨ÒòÌØÍø·ÃÎÊ·þÎñ..."
 
 #: ../../standalone/drakconnect_.c:226 ../../standalone/drakconnect_.c:448
 msgid "LAN configuration"
@@ -11939,7 +12012,7 @@ msgstr "ÅäÖþÖÓòÍøÂç..."
 
 #: ../../standalone/drakconnect_.c:255
 msgid "Click here to launch the wizard ->"
-msgstr "µã»÷¸Ã´¦Æô¶¯¾«Áé ->"
+msgstr "µã»÷¸Ã´¦Æô¶¯Ïòµ¼ ->"
 
 #: ../../standalone/drakconnect_.c:256
 msgid "Wizard..."
@@ -11951,7 +12024,7 @@ msgstr "Ó¦ÓÃ"
 
 #: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
 msgid "Connected"
-msgstr "Á¬½Ó"
+msgstr "ÒÑÁ¬½Ó"
 
 #: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
 msgid "Not connected"
@@ -11976,8 +12049,8 @@ msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
-"ÄãûÓÐÅäÖúõĽӿÚ.\n"
-"µã»÷ 'ÅäÖÃ' ÏÈÅäÖýӿÚ"
+"ÄãûÓÐÅäÖúõĽӿڡ£\n"
+"µã»÷¡°ÅäÖá±ÏÈÅäÖýӿÚ"
 
 #: ../../standalone/drakconnect_.c:452
 msgid "LAN Configuration"
@@ -12013,16 +12086,16 @@ msgid ""
 "This interface has not been configured yet.\n"
 "Launch the configuration wizard in the main window"
 msgstr ""
-"Õâ¸ö½Ó¿Ú»¹Ã»ÓÐÅäÖùý.\n"
-"´ÓÖ÷´°¿ÚÆð¶¯ÅäÖþ«Áé"
+"Õâ¸ö½Ó¿Ú»¹Ã»ÓÐÅäÖùý¡£\n"
+"´ÓÖ÷´°¿ÚÆô¶¯ÅäÖÃÏòµ¼"
 
 #: ../../standalone/drakconnect_.c:559
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
-"ÄãûÓÐÒòÌØÍøÁª½Ó.\n"
-"µã»÷ 'ÅäÖÃ' ÏȽ¨Á¢Áª½Ó"
+"ÄãûÓÐÒòÌØÍøÁª½Ó¡£\n"
+"µã»÷¡°ÅäÖá±ÏȽ¨Á¢Áª½Ó"
 
 #: ../../standalone/drakconnect_.c:583
 msgid "Internet connection configuration"
@@ -12052,93 +12125,93 @@ msgstr "Íø¿¨"
 msgid "DHCP Client"
 msgstr "DHCP¿Í»§¶Ë"
 
-#: ../../standalone/drakfloppy_.c:63
+#: ../../standalone/drakfloppy_.c:64
 msgid "usage: drakfloppy\n"
 msgstr "Ó÷¨: drakfloppy\n"
 
-#: ../../standalone/drakfloppy_.c:67
+#: ../../standalone/drakfloppy_.c:68
 msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Module name"
 msgstr "Ä£¿é"
 
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:69
 msgid "Size"
 msgstr "´óС"
 
-#: ../../standalone/drakfloppy_.c:73
+#: ../../standalone/drakfloppy_.c:74
 msgid "drakfloppy"
-msgstr "ħÁ¦ÈíÅÌ"
+msgstr "drakfloppy"
 
-#: ../../standalone/drakfloppy_.c:90
+#: ../../standalone/drakfloppy_.c:91
 msgid "boot disk creation"
-msgstr "´´½¨¿ª»ú´ÅÅ̵Ť¾ß"
+msgstr "´´½¨Æô¶¯´ÅÅ̵Ť¾ß"
 
-#: ../../standalone/drakfloppy_.c:98 ../../standalone/drakfloppy_.c:111
+#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
 msgid "default"
-msgstr "ȱʡ"
+msgstr "ĬÈÏ"
 
-#: ../../standalone/drakfloppy_.c:114
+#: ../../standalone/drakfloppy_.c:115
 #, c-format
 msgid "DrakFloppy Error: %s"
 msgstr "DrakFloppy ´íÎó: %s"
 
-#: ../../standalone/drakfloppy_.c:125
+#: ../../standalone/drakfloppy_.c:126
 msgid "kernel version"
 msgstr "Äں˰汾"
 
-#: ../../standalone/drakfloppy_.c:131
+#: ../../standalone/drakfloppy_.c:132
 msgid "General"
 msgstr "³£¹æ"
 
-#: ../../standalone/drakfloppy_.c:136
+#: ../../standalone/drakfloppy_.c:137
 msgid "Expert Area"
 msgstr "ר¼Ò"
 
-#: ../../standalone/drakfloppy_.c:139
+#: ../../standalone/drakfloppy_.c:140
 msgid "mkinitrd optional arguments"
 msgstr "mkinitrdÑ¡Ïî"
 
-#: ../../standalone/drakfloppy_.c:140
+#: ../../standalone/drakfloppy_.c:141
 msgid "Add a module"
 msgstr "Ôö¼ÓÄ£¿é"
 
-#: ../../standalone/drakfloppy_.c:160
+#: ../../standalone/drakfloppy_.c:161
 msgid "force"
 msgstr "Ç¿ÆÈ"
 
-#: ../../standalone/drakfloppy_.c:161
+#: ../../standalone/drakfloppy_.c:162
 msgid "if needed"
 msgstr "µ±ÐèҪʱ"
 
-#: ../../standalone/drakfloppy_.c:162
+#: ../../standalone/drakfloppy_.c:163
 msgid "omit scsi modules"
 msgstr "Ê¡ÂÔ scsi Ä£¿é"
 
-#: ../../standalone/drakfloppy_.c:163
+#: ../../standalone/drakfloppy_.c:164
 msgid "omit raid modules"
 msgstr "Ê¡ÂÔ RAID Ä£¿é"
 
-#: ../../standalone/drakfloppy_.c:199
+#: ../../standalone/drakfloppy_.c:200
 msgid "Remove a module"
 msgstr "жÔØÄ£¿é"
 
-#: ../../standalone/drakfloppy_.c:221
+#: ../../standalone/drakfloppy_.c:222
 msgid "Output"
 msgstr "Êä³ö"
 
-#: ../../standalone/drakfloppy_.c:233
+#: ../../standalone/drakfloppy_.c:234
 msgid "Build the disk"
 msgstr "ÖÆ×÷¿ª»úÆô¶¯ÅÌ"
 
-#: ../../standalone/drakfloppy_.c:376
+#: ../../standalone/drakfloppy_.c:377
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "È·¶¨É豸 %s µÄ½éÖÊ´æÔÚ"
 
-#: ../../standalone/drakfloppy_.c:381
+#: ../../standalone/drakfloppy_.c:382
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -12147,12 +12220,12 @@ msgstr ""
 "É豸 %s ½éÖʲ»´æÔÚ»ò±»Ð´±£»¤.\n"
 "Çë²åÈë½éÖÊ."
 
-#: ../../standalone/drakfloppy_.c:383
+#: ../../standalone/drakfloppy_.c:384
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "ÎÞ·¨´´½¨½ø³Ì: %s"
 
-#: ../../standalone/drakfloppy_.c:387
+#: ../../standalone/drakfloppy_.c:388
 #, c-format
 msgid ""
 "Unable to close properly mkbootdisk: \n"
@@ -12204,11 +12277,11 @@ msgstr "ÔÚ°²×°¼Ç¼ÖвéÕÒ×Ö¿â"
 
 #: ../../standalone/drakfont_.c:377
 msgid "Fonts copy"
-msgstr "¿½±´×Ö¿â"
+msgstr "¸´ÖÆ×Ö¿â"
 
 #: ../../standalone/drakfont_.c:381
 msgid "True Type fonts installation"
-msgstr "°²×° TTF ×Ö¿â"
+msgstr "TrueType ×ÖÌå°²×°"
 
 #: ../../standalone/drakfont_.c:389
 msgid "please wait during ttmkfdir..."
@@ -12216,7 +12289,7 @@ msgstr "ÕýÔÚÔËÐÐ ttmkfdir..."
 
 #: ../../standalone/drakfont_.c:394
 msgid "True Type install done"
-msgstr "TTF ×Ö¿â°²×°Íê³É"
+msgstr "TrueType ×ÖÌå°²×°Íê³É"
 
 #: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:429
 msgid "Fonts conversion"
@@ -12263,9 +12336,9 @@ msgid ""
 "-You can install the fonts using the normal way. In rare cases, bogus fonts "
 "may hang up your X Server."
 msgstr ""
-"°²×°ÈκÎ×ÖÌå֮ǰÇëÈ·ÈÏÄúÓÐȨÀûÔÚ×Ô¼ºµÄϵͳ°²×°ºÍʹÓÃËü.\n"
+"°²×°ÈκÎ×ÖÌå֮ǰÇëÈ·ÈÏÄúÓÐȨÀûÔÚ×Ô¼ºµÄϵͳ°²×°ºÍʹÓÃËü¡£\n"
 "\n"
-"-ͨ³£×ÖÌå°²×°¿ÉÒÔÕý³£½øÐÐ. µ«Óк±¼ûµÄÀýÍâ, ÓÐÎÊÌâµÄ×ÖÌå»áʹ X ¹Òס."
+"-ͨ³£×ÖÌå°²×°¿ÉÒÔÕý³£½øÐС£µ«Óк±¼ûµÄÀýÍâ, ÓÐÎÊÌâµÄ×ÖÌå»áʹ X ¹Òס¡£"
 
 #: ../../standalone/drakfont_.c:630
 msgid "Fonts Importation"
@@ -12289,7 +12362,7 @@ msgstr "ËùÓÐ×Ö¿â"
 
 #: ../../standalone/drakfont_.c:909
 msgid "Choose the applications that will support the fonts:"
-msgstr "ÇëÑ¡ÔñʹÓÃÐÂ×ÖÌåµÄÓ¦ÓóÌÐò :"
+msgstr "ÇëÑ¡ÔñʹÓÃÐÂ×ÖÌåµÄÓ¦ÓóÌÐò:"
 
 #: ../../standalone/drakfont_.c:918
 msgid "Ghostscript"
@@ -12309,7 +12382,7 @@ msgstr "»ù±¾´òÓ¡"
 
 #: ../../standalone/drakfont_.c:1016
 msgid "Select the font file or directory and click on 'Add'"
-msgstr "Ñ¡Ôñ×ÖÌåÎļþ»òĿ¼, È»ºóµã»÷ 'Ìí¼Ó'"
+msgstr "Ñ¡Ôñ×ÖÌåÎļþ»òĿ¼, È»ºóµã»÷¡°Ìí¼Ó¡±"
 
 #: ../../standalone/drakfont_.c:1063
 msgid "Install List"
@@ -12359,79 +12432,79 @@ msgstr "ɾ³ý×Ö¿â"
 msgid "Post Uninstall"
 msgstr "ɾ³ýºóµÄÉ趨"
 
-#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:188
+#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:184
 msgid "Internet Connection Sharing"
 msgstr "¹²Ïí»¥ÁªÍøÁ¬½Ó"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:115
 msgid "Sorry, we support only 2.4 kernels."
-msgstr "¶Ô²»Æð, ÎÒÃÇÖ»Ö§³Ö 2.4 ÄÚºË"
+msgstr "¶Ô²»Æð, ÎÒÃÇÖ»Ö§³Ö 2.4 Äںˡ£"
 
-#: ../../standalone/drakgw_.c:130
+#: ../../standalone/drakgw_.c:126
 msgid "Internet Connection Sharing currently enabled"
 msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíÏÖÔÚÒѾ­¼¤»î"
 
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:127
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"»¥ÁªÍøÁ¬½Ó¹²ÏíµÄÉ趨ÒѾ­Íê³É.\n"
-"Ëüµ±Ç°ÒѾ­±»Æô¶¯.\n"
+"»¥ÁªÍøÁ¬½Ó¹²ÏíµÄÉ趨ÒѾ­Íê³É¡£\n"
+"Ëüµ±Ç°ÒѾ­±»Æô¶¯¡£\n"
 "\n"
 "ÄúÒª×öʲô?"
 
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:131
 msgid "disable"
 msgstr "½ûÖ¹"
 
-#: ../../standalone/drakgw_.c:135 ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
 msgid "dismiss"
 msgstr "À뿪"
 
-#: ../../standalone/drakgw_.c:135 ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
 msgid "reconfigure"
 msgstr "ÖØÐÂÅäÖÃ"
 
-#: ../../standalone/drakgw_.c:138
+#: ../../standalone/drakgw_.c:134
 msgid "Disabling servers..."
 msgstr "Í£Ö¹·þÎñ..."
 
-#: ../../standalone/drakgw_.c:146
+#: ../../standalone/drakgw_.c:142
 msgid "Internet connection sharing is now disabled."
-msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíÏÖÔÚ±»½ûÖ¹ÁË"
+msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíÏÖÔÚ±»½ûÖ¹ÁË¡£"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:151
 msgid "Internet Connection Sharing currently disabled"
 msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíÏÖÔÚ±»½ûÖ¹"
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:152
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"»¥ÁªÍøÁ¬½Ó¹²ÏíµÄÉ趨ÒѾ­Íê³É.\n"
+"»¥ÁªÍøÁ¬½Ó¹²ÏíµÄÉ趨ÒѾ­Íê³É¡£\n"
 "Ëüµ±Ç°ÒѾ­±»½ûÖ¹.\n"
 "\n"
 "ÄúÒª×öʲô?"
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:156
 msgid "enable"
 msgstr "Æô¶¯"
 
-#: ../../standalone/drakgw_.c:167
+#: ../../standalone/drakgw_.c:163
 msgid "Enabling servers..."
 msgstr "Æô¶¯·þÎñ..."
 
-#: ../../standalone/drakgw_.c:172
+#: ../../standalone/drakgw_.c:168
 msgid "Internet connection sharing is now enabled."
-msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíÏÖÔÚÒѾ­¼¤»î"
+msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíÏÖÔÚÒѾ­¼¤»î¡£"
 
-#: ../../standalone/drakgw_.c:189
+#: ../../standalone/drakgw_.c:185
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -12440,35 +12513,35 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
-"Äú»¹¿ÉÒÔÅäÖÃÄúµÄµçÄÔ, ÈÃÆäËüµçÄÔ¹²ÏíËüµÄ»¥ÁªÍøÁ¬½Ó.\n"
+"Äú»¹¿ÉÒÔÅäÖÃÄúµÄµçÄÔ, ÈÃÆäËüµçÄÔ¹²ÏíËüµÄ»¥ÁªÍøÁ¬½Ó¡£\n"
 "\n"
-"×¢Òâ: ÄúÐèÒªÓоÖÓòÍø(LAN)ʹÓõÄÍø¿¨."
+"×¢Òâ: ÄúÐèÒªÓоÖÓòÍø(LAN)ʹÓõÄÍø¿¨¡£"
 
-#: ../../standalone/drakgw_.c:215
+#: ../../standalone/drakgw_.c:211
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Íø¿¨ %s (ʹÓà %s Ä£¿é)"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:212
 #, c-format
 msgid "Interface %s"
 msgstr "Íø¿¨ %s"
 
-#: ../../standalone/drakgw_.c:224
+#: ../../standalone/drakgw_.c:220
 msgid "No network adapter on your system!"
 msgstr "ÄúϵͳÖÐûÓÐÍøÂ翨!"
 
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:221
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
-msgstr "ÄúµÄϵͳÀïûÓÐÅäÖÃÒÔÌ«Íø¿¨. ÇëÔËÐÐÓ²¼þÅäÖù¤¾ß."
+msgstr "ÄúµÄϵͳÀïûÓÐÅäÖÃÒÔÌ«Íø¿¨¡£ÇëÔËÐÐÓ²¼þÅäÖù¤¾ß¡£"
 
-#: ../../standalone/drakgw_.c:231
+#: ../../standalone/drakgw_.c:227
 msgid "Network interface"
 msgstr "ÍøÂç½Ó¿Ú¿¨"
 
-#: ../../standalone/drakgw_.c:232
+#: ../../standalone/drakgw_.c:228
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -12481,19 +12554,19 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"¶ÔÕâ¿éÍø¿¨ÅäÖÃÄúµÄ¾ÖÓòÍø."
+"¶ÔÕâ¿éÍø¿¨ÅäÖÃÄúµÄ¾ÖÓòÍø¡£"
 
-#: ../../standalone/drakgw_.c:241
+#: ../../standalone/drakgw_.c:237
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
-msgstr "ÇëÑ¡ÔñÄĸöÍø¿¨½«Á¬½ÓÄúµÄ¾ÖÓòÍø."
+msgstr "ÇëÑ¡ÔñÄĸöÍø¿¨½«Á¬½ÓÄúµÄ¾ÖÓòÍø¡£"
 
-#: ../../standalone/drakgw_.c:259
+#: ../../standalone/drakgw_.c:255
 msgid "Network interface already configured"
 msgstr "ÒÑÍê³ÉÍøÂçÅäÖÃ"
 
-#: ../../standalone/drakgw_.c:260
+#: ../../standalone/drakgw_.c:256
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -12502,21 +12575,21 @@ msgid ""
 "\n"
 "You can do it manually but you need to know what you're doing."
 msgstr ""
-"¾¯¸æ,Íø¿¨ (%s) ÒѾ­ÅäÖùý.\n"
+"¾¯¸æ,Íø¿¨ (%s) ÒѾ­ÅäÖùý¡£\n"
 "\n"
 "ÄúÏ£Íû×Ô¶¯ÖØÐÂÅäÖÃÂð?\n"
 "\n"
-"Èç¹ûÄúÖªµÀÔõÑù×ö, Ò²¿ÉÒÔÊÖ¹¤ÅäÖÃ."
+"Èç¹ûÄúÖªµÀÔõÑù×ö, Ò²¿ÉÒÔÊÖ¹¤ÅäÖá£"
 
-#: ../../standalone/drakgw_.c:265
+#: ../../standalone/drakgw_.c:261
 msgid "Automatic reconfiguration"
 msgstr "×Ô¶¯ÖØÐÂÅäÖÃ"
 
-#: ../../standalone/drakgw_.c:266
+#: ../../standalone/drakgw_.c:262
 msgid "Show current interface configuration"
 msgstr "Ð޸ĵ±Ç°ÍøÂç½çÃæµÄÅäÖÃ"
 
-#: ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:264
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -12533,7 +12606,7 @@ msgstr ""
 "IP ÊôÐÔ: %s\n"
 "ÆäËü: %s"
 
-#: ../../standalone/drakgw_.c:280
+#: ../../standalone/drakgw_.c:276
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
 "server; in that case please verify I correctly read the C-Class Network that "
@@ -12545,72 +12618,72 @@ msgid ""
 "\n"
 msgstr ""
 "Èç¹ûÒªÎÒ±£ÁôÄúÏÖÓÐµÄ DHCP ·þÎñÆ÷ÅäÖÃ; ÇëÈ·ÈÏÎÒ·¢ÏÖÄúÕýÔÚ±¾µØÍøÂçʹÓÃµÄ C-ÀàÍø"
-"Âç.\n"
+"Âç¡£\n"
 "\n"
-"·ñÔò,ÎÒ»áÖØÐÂÅäÖÃÍø¿¨, ²¢ÖØÐÂÅäÖÃÄúµÄ DHCP ·þÎñ.\n"
+"·ñÔò,ÎÒ»áÖØÐÂÅäÖÃÍø¿¨, ²¢ÖØÐÂÅäÖÃÄúµÄ DHCP ·þÎñ¡£\n"
 "\n"
 
-#: ../../standalone/drakgw_.c:285
+#: ../../standalone/drakgw_.c:281
 msgid "C-Class Local Network"
 msgstr "CÀà±¾µØÍøÂç"
 
-#: ../../standalone/drakgw_.c:286
+#: ../../standalone/drakgw_.c:282
 msgid "(This) DHCP Server IP"
 msgstr "DHCP ·þÎñÆ÷ IP"
 
-#: ../../standalone/drakgw_.c:287
+#: ../../standalone/drakgw_.c:283
 msgid "Re-configure interface and DHCP server"
 msgstr "ÖØÐÂÅäÖÃÍøÂç½çÃæºÍ DHCP "
 
-#: ../../standalone/drakgw_.c:294
+#: ../../standalone/drakgw_.c:290
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "±¾µØÍøÂçûÓÐÒÔ`.0'½áÊø, ÒѾ­ÐÞ¸Ä"
 
-#: ../../standalone/drakgw_.c:305
+#: ../../standalone/drakgw_.c:301
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "ÔÚµ±Ç°µÄ %s ÅäÖÃÖз¢ÏÖ¿ÉÄÜµÄ LAN µØÖ·³åÍ»! \n"
 
-#: ../../standalone/drakgw_.c:315
+#: ../../standalone/drakgw_.c:311
 msgid "Configuring..."
 msgstr "ÕýÔÚÅäÖÃ..."
 
-#: ../../standalone/drakgw_.c:316
+#: ../../standalone/drakgw_.c:312
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "ÕýÔÚÅäÖýű¾, °²×°Èí¼þ, Æô¶¯·þÎñ³ÌÐò ..."
 
-#: ../../standalone/drakgw_.c:352
+#: ../../standalone/drakgw_.c:348
 #, c-format
 msgid "Problems installing package %s"
 msgstr "°²×° %s Èí¼þ°ü³öÏÖÎÊÌâ"
 
-#: ../../standalone/drakgw_.c:485
+#: ../../standalone/drakgw_.c:481
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
 "Area Network, using automatic network configuration (DHCP)."
 msgstr ""
-"ËùÓÐÅäÖö¼Íê³ÉÁË.\n"
+"ËùÓÐÅäÖö¼Íê³ÉÁË¡£\n"
 "ÄúÏÖÔÚ¿ÉÒÔÀûÓÃ×Ô¶¯ÍøÂçÉèÖà (DHCP).ÈÃÄúµÄ¾ÖÓòÍøÉÏÆäËüµÄµçÄÔ¹²ÏíÄúµÄ»¥ÁªÍøÁ¬½Ó"
 "ÁË."
 
-#: ../../standalone/drakgw_.c:504
+#: ../../standalone/drakgw_.c:500
 msgid "The setup has already been done, but it's currently disabled."
-msgstr "ÅäÖÃÒѾ­Íê³É.Ëüµ±Ç°ÒѾ­±»½ûÖ¹."
+msgstr "ÅäÖÃÒѾ­Íê³É¡£Ëüµ±Ç°ÒѾ­±»½ûÖ¹¡£"
 
-#: ../../standalone/drakgw_.c:505
+#: ../../standalone/drakgw_.c:501
 msgid "The setup has already been done, and it's currently enabled."
-msgstr "ÅäÖÃÒѾ­Íê³É.Ëüµ±Ç°ÒѾ­±»Æô¶¯."
+msgstr "ÅäÖÃÒѾ­Íê³É¡£Ëüµ±Ç°ÒѾ­±»Æô¶¯¡£"
 
-#: ../../standalone/drakgw_.c:506
+#: ../../standalone/drakgw_.c:502
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíûÓÐÅäÖÃ"
 
-#: ../../standalone/drakgw_.c:511
+#: ../../standalone/drakgw_.c:507
 msgid "Internet connection sharing configuration"
 msgstr "»¥ÁªÍøÁ¬½Ó¹²ÏíÅäÖÃ"
 
-#: ../../standalone/drakgw_.c:518
+#: ../../standalone/drakgw_.c:514
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -12623,7 +12696,7 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"µã»÷''ÅäÖÃ''ÔËÐÐÅäÖþ«Áé."
+"µã»÷¡°ÅäÖá±ÔËÐÐÅäÖÃÏòµ¼¡£"
 
 #: ../../standalone/drakperm_.c:42
 msgid "group"
@@ -12672,8 +12745,8 @@ msgid ""
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
 "¿ÉÒÔʹÓà Drakperm ²é¿´È¨ÏÞ¶¨ÒåÎļþ, msec ʹÓÃËüÃÇÀ´µ÷Õû¸÷ÖÖÎļþȨÏÞ, ËùÓÐÕß, "
-"×éµÈ.\n"
-"Äú¿ÉÒÔ±àд×Ô¼ºµÄ¹æÔòÒÔ´úÌæ¸÷ÖÖȱʡµÄ¹æÔò."
+"×éµÈ¡£\n"
+"Äú¿ÉÒÔ±àд×Ô¼ºµÄ¹æÔòÒÔ´úÌæ¸÷ÖÖĬÈϵĹæÔò¡£"
 
 #: ../../standalone/drakperm_.c:62
 msgid "Add a new rule at the end"
@@ -12774,8 +12847,8 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"ÔÚÄúµÄ»úÆ÷ÉÏûÓмì²âµ½Éù¿¨. Çë¼ì²éÄúÊÇ·ñÕýÈ·µÄ°²×°ÁËÄúµÄÉù¿¨, ËüÊÇ·ñ±» Linux "
-"Ö§³Ö.\n"
+"ÔÚÄúµÄ»úÆ÷ÉÏûÓмì²âµ½Éù¿¨¡£Çë¼ì²éÄúÊÇ·ñÕýÈ·µÄ°²×°ÁËÄúµÄÉù¿¨, ËüÊÇ·ñ±» Linux "
+"Ö§³Ö¡£\n"
 "\n"
 "\n"
 "Äú¿ÉÒÔ·ÃÎÊÓ²¼þÊý¾Ý¿â:\n"
@@ -12791,13 +12864,19 @@ msgid ""
 "Note: if you've an ISA PnP sound card, you'll have to use the sndconfig "
 "program.  Just type \"sndconfig\" in a console."
 msgstr ""
+"\n"
+"\n"
+"\n"
+"×¢Òâ: Èç¹ûÄãµÄÉù¿¨ÊÇ ISA ¼´²å¼´ÓõÄ, ÄãÐèҪʹÓà sndconfig ³ÌÐò¡£Ö»ÐèÔÚ¿ØÖÆ̨"
+"ÖÐÊäÈë¡°sndconfig¡±¡£"
 
 #: ../../standalone/draksplash_.c:34
-#, fuzzy
 msgid ""
 "package 'ImageMagick' is required for correct working.\n"
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
-msgstr "ÒªÕý³£¹¤×÷ÐèÒªÈí¼þ°ü ImageMagick"
+msgstr ""
+"ÒªÕý³£¹¤×÷ÐèÒªÈí¼þ°ü ImageMagick¡£\n"
+"Çëµ¥»÷¡°È·¶¨¡±°²×° ImageMagick »ò¡°È¡Ïû¡±Í˳ö"
 
 #: ../../standalone/draksplash_.c:78
 msgid "first step creation"
@@ -12885,7 +12964,7 @@ msgstr "ÔÚ¿ØÖÆ̨ÏÔʾ LOGO"
 
 #: ../../standalone/draksplash_.c:128
 msgid "Make kernel message quiet by default"
-msgstr "ȱʡÉ趨ÄÚºËÏûÏ¢²»ÏÔʾ"
+msgstr "ĬÈÏÉ趨ÄÚºËÏûÏ¢²»ÏÔʾ"
 
 #: ../../standalone/draksplash_.c:165 ../../standalone/draksplash_.c:329
 #, c-format
@@ -12910,9 +12989,9 @@ msgstr "ÕýÔÚÉú³ÉÔ¤ÀÀ ..."
 
 #. -PO  First %s is theme name, second %s (in parenthesis) is resolution
 #: ../../standalone/draksplash_.c:511
-#, fuzzy, c-format
+#, c-format
 msgid "%s BootSplash (%s) preview"
-msgstr "ÎÞ·¨´´½¨¿ª»ú»­ÃæÔ¤ÀÀ"
+msgstr "%s Æô¶¯»­Ãæ(%s) Ô¤ÀÀ"
 
 #: ../../standalone/drakxtv_.c:49
 msgid ""
@@ -12932,12 +13011,12 @@ msgstr ""
 "\n"
 "\n"
 "Èç¹ûÄúÓеçÊÓ¿¨µ«ÊÇ DrakX ¼´Ã»Óмì²âµ½Ëü ( bttv »ò saa7134 \n"
-"Ä£¿é¶¼²»ÔÚ \"/etc/modules\"ÖÐ) ҲûÓа²×° xawtv, ÇëÔËÐÐ\n"
-" \"lspcidrake -v -f\" ²¢°Ñ½á¹û·¢Ë͸ø \"install\\@mandrakesoft.com\"\n"
-"±êÌâд \"undetected TV card\".\n"
+"Ä£¿é¶¼²»ÔÚ¡°/etc/modules¡±ÖÐ) ҲûÓа²×° xawtv, ÇëÔËÐÐ\n"
+"¡°lspcidrake -v -f¡±²¢°Ñ½á¹û·¢Ë͸ø \"install\\@mandrakesoft.com\"\n"
+"±êÌâд¡°undetected TV card¡±£¬\n"
 "\n"
 "\n"
-"Äú¿ÉÒÔ×÷Ϊ root ´Ó¿ØÖÆ̨ÔËÐÐ \"urpmi xawtv\" À´°²×°Ëü."
+"Äú¿ÉÒÔ×÷Ϊ root ´Ó¿ØÖÆ̨ÔËÐС°urpmi xawtv¡±À´°²×°Ëü."
 
 #: ../../standalone/drakxtv_.c:66
 msgid "Canada (cable)"
@@ -13001,7 +13080,7 @@ msgstr "°¢¸ùÍ¢"
 
 #: ../../standalone/drakxtv_.c:72
 msgid "Australian Optus cable TV"
-msgstr "Australian Optus cable TV"
+msgstr "°Ä´óÀûÑÇ Optus ¹âÀ TV"
 
 #: ../../standalone/drakxtv_.c:107
 msgid ""
@@ -13013,11 +13092,11 @@ msgstr ""
 
 #: ../../standalone/drakxtv_.c:109
 msgid "TV norm:"
-msgstr "µçÊÓÖÆʽ :"
+msgstr "µçÊÓÖÆʽ:"
 
 #: ../../standalone/drakxtv_.c:110
 msgid "Area:"
-msgstr "µØÇø :"
+msgstr "µØÇø:"
 
 #: ../../standalone/drakxtv_.c:114
 msgid "Scanning for TV channels in progress ..."
@@ -13058,7 +13137,7 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"ûÓз¢ÏÖÄú»úÆ÷ÉÏÓеçÊÓ¿¨. Çë¼ì²éÊÇ·ñÕýÈ·°²×°ÁË Linux-Ö§³ÖµÄ ÊÓƵ/µçÊÓ¿¨.\n"
+"ûÓз¢ÏÖÄú»úÆ÷ÉÏÓеçÊÓ¿¨¡£Çë¼ì²éÊÇ·ñÕýÈ·°²×°ÁË Linux-Ö§³ÖµÄ ÊÓƵ/µçÊÓ¿¨¡£\n"
 "\n"
 "\n"
 "ÇëÄú·ÃÎÊÎÒÃǵÄÓ²¼þÊý¾Ý¿â:\n"
@@ -13080,11 +13159,11 @@ msgstr "Ó÷¨: keyboarddrake [--expert] [keyboard]\n"
 
 #: ../../standalone/keyboarddrake_.c:32
 msgid "Please, choose your keyboard layout."
-msgstr "ÇëÑ¡ÔñÄúʹÓõļüÅ̲¼¾Ö."
+msgstr "ÇëÑ¡ÔñÄúʹÓõļüÅ̲¼¾Ö¡£"
 
 #: ../../standalone/keyboarddrake_.c:41
 msgid "Do you want the BackSpace to return Delete in console?"
-msgstr "ÔÚ¿ØÖÆ̨ÓÃBackSpace×÷ɾ³ý¼ü"
+msgstr "ÄãÊÇ·ñÏëÒªBackSpaceÔÚ¿ØÖÆ̨Æð Delete µÄ×÷ÓÃ?"
 
 #: ../../standalone/livedrake_.c:24
 msgid "Change Cd-Rom"
@@ -13095,206 +13174,206 @@ msgid ""
 "Please insert the Installation Cd-Rom in your drive and press Ok when done.\n"
 "If you don't have it, press Cancel to avoid live upgrade."
 msgstr ""
-"ÇëÔÚÇý¶¯Æ÷ÖвåÈë°²×°¹âÅÌ, È»ºóµã»÷ 'È·¶¨'.\n"
-"Èç¹ûÄúûÓÐÕâÕŹâÅÌ, Çëµã»÷ 'È¡Ïû', ·ÅÆúlive upgrade."
+"ÇëÔÚÇý¶¯Æ÷ÖвåÈë°²×°¹âÅÌ, È»ºóµã»÷¡°È·¶¨¡±¡£\n"
+"Èç¹ûÄúûÓÐÕâÕŹâÅÌ, Çëµã»÷¡°È¡Ïû¡±, ·ÅÆúÔÚÏßÉý¼¶¡£"
 
 #: ../../standalone/livedrake_.c:35
 msgid "Unable to start live upgrade !!!\n"
-msgstr "ÎÞ·¨¿ªÊ¼ live upgrade !!!\n"
+msgstr "ÎÞ·¨¿ªÊ¼ÔÚÏßÉý¼¶ !!!\n"
 
 #: ../../standalone/localedrake_.c:33
 msgid "The change is done, but to be effective you must logout"
 msgstr "ÐÞ¸ÄÒѾ­Íê³É, ²»¹ýÄú±ØÐëÍ˳öµÇ¼Ð޸IJŻáÉúЧ"
 
-#: ../../standalone/logdrake_.c:85 ../../ugtk.pm_.c:285
+#: ../../standalone/logdrake_.c:86 ../../ugtk.pm_.c:285
 msgid "logdrake"
 msgstr "logdrake"
 
-#: ../../standalone/logdrake_.c:95
+#: ../../standalone/logdrake_.c:96
 msgid "Show only for the selected day"
 msgstr "½öÏÔʾ±»Ñ¡ÔñµÄÈÕÆÚ"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "/File/_New"
-msgstr "/F Îļþ/_N еÄ"
+msgstr "/¼þ/н¨(_N)"
 
-#: ../../standalone/logdrake_.c:102
+#: ../../standalone/logdrake_.c:103
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "/File/_Open"
-msgstr "/F Îļþ/_O´ò¿ª"
+msgstr "//´ò¿ª(_O)"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:104
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "/File/_Save"
-msgstr "/F Îļþ/_S±£´æ"
+msgstr "/Îļþ/±£´æ(_S)"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:105
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:106
 msgid "/File/Save _As"
-msgstr "/F Îļþ/_A Áí´æΪ"
+msgstr "/Îļþ/Áí´æΪ(_A)"
 
-#: ../../standalone/logdrake_.c:106
+#: ../../standalone/logdrake_.c:107
 msgid "/File/-"
-msgstr "/F Îļþ/-"
+msgstr "/Îļþ/-"
 
-#: ../../standalone/logdrake_.c:108
+#: ../../standalone/logdrake_.c:109
 msgid "/_Options"
-msgstr "/_OÑ¡Ïî"
+msgstr "/Ñ¡Ïî(_O)"
 
-#: ../../standalone/logdrake_.c:109
+#: ../../standalone/logdrake_.c:110
 msgid "/Options/Test"
-msgstr "/OÑ¡Ïî/T²âÊÔ"
+msgstr "/Ñ¡Ïî/²âÊÔ"
 
-#: ../../standalone/logdrake_.c:111
+#: ../../standalone/logdrake_.c:112
 msgid "/Help/_About..."
-msgstr "/H °ïÖú/_A ¹ØÓÚ..."
+msgstr "/°ïÖú/¹ØÓÚ(_A)..."
 
-#: ../../standalone/logdrake_.c:118
+#: ../../standalone/logdrake_.c:119
 msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:119
+#: ../../standalone/logdrake_.c:120
 msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: ../../standalone/logdrake_.c:173
+#: ../../standalone/logdrake_.c:174
 msgid "User"
 msgstr "Óû§"
 
-#: ../../standalone/logdrake_.c:174
+#: ../../standalone/logdrake_.c:175
 msgid "Messages"
 msgstr "ÐÅÏ¢"
 
-#: ../../standalone/logdrake_.c:175
+#: ../../standalone/logdrake_.c:176
 msgid "Syslog"
 msgstr "Syslog"
 
-#: ../../standalone/logdrake_.c:176
+#: ../../standalone/logdrake_.c:177
 msgid "Mandrake Tools Explanations"
 msgstr "Mandrake ¹¤¾ßµÄ½âÊÍ"
 
-#: ../../standalone/logdrake_.c:179
+#: ../../standalone/logdrake_.c:180
 msgid "search"
 msgstr "ËÑË÷"
 
-#: ../../standalone/logdrake_.c:185
+#: ../../standalone/logdrake_.c:186
 msgid "A tool to monitor your logs"
-msgstr "ÈÕÖ¾²ì¿´¹¤¾ß"
+msgstr "ÈÕÖ¾²é¿´¹¤¾ß"
 
-#: ../../standalone/logdrake_.c:186
+#: ../../standalone/logdrake_.c:187
 msgid "Settings"
 msgstr "ÉèÖÃ"
 
-#: ../../standalone/logdrake_.c:191
+#: ../../standalone/logdrake_.c:192
 msgid "matching"
 msgstr "Æ¥Åä"
 
-#: ../../standalone/logdrake_.c:192
+#: ../../standalone/logdrake_.c:193
 msgid "but not matching"
 msgstr "²»Æ¥Åä"
 
-#: ../../standalone/logdrake_.c:196
+#: ../../standalone/logdrake_.c:197
 msgid "Choose file"
 msgstr "Ñ¡ÔñÎļþ"
 
-#: ../../standalone/logdrake_.c:201
+#: ../../standalone/logdrake_.c:202
 msgid "Calendar"
 msgstr "ÈÕÀú"
 
-#: ../../standalone/logdrake_.c:211
+#: ../../standalone/logdrake_.c:212
 msgid "Content of the file"
 msgstr "ÎļþÄÚÈÝ"
 
-#: ../../standalone/logdrake_.c:215 ../../standalone/logdrake_.c:391
+#: ../../standalone/logdrake_.c:216 ../../standalone/logdrake_.c:392
 msgid "Mail alert"
 msgstr "Óʼþ±¨¾¯"
 
-#: ../../standalone/logdrake_.c:267
+#: ../../standalone/logdrake_.c:268
 #, c-format
 msgid "please wait, parsing file: %s"
-msgstr "ÇëµÈ´ý, ·ÖÎöÎļþ: %s"
+msgstr "ÇëµÈ´ý, ÕýÔÚ·ÖÎöÎļþ: %s"
 
-#: ../../standalone/logdrake_.c:408
+#: ../../standalone/logdrake_.c:409
 msgid "Mail alert configuration"
 msgstr "Óʼþ¾¯¸æÉ趨"
 
-#: ../../standalone/logdrake_.c:409
+#: ../../standalone/logdrake_.c:410
 msgid ""
 "Welcome to the mail configuration utility.\n"
 "\n"
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
-"»¶Ó­Ê¹ÓÃÓʼþÅäÖù¤¾ß.\n"
+"»¶Ó­Ê¹ÓÃÓʼþÅäÖù¤¾ß¡£\n"
 "\n"
-"ÔÚÕâÀïÄú¿ÉÒÔÄãÅäÖþ¯¸æ.\n"
+"ÔÚÕâÀïÄú¿ÉÒÔÄãÅäÖþ¯¸æ¡£\n"
 
-#: ../../standalone/logdrake_.c:416
+#: ../../standalone/logdrake_.c:417
 msgid "Apache World Wide Web Server"
-msgstr "Apache WWW »·ÇòÍø·þÎñÆ÷"
+msgstr "Apache WWW ÍòάÍø·þÎñÆ÷"
 
-#: ../../standalone/logdrake_.c:417
+#: ../../standalone/logdrake_.c:418
 msgid "Domain Name Resolver"
-msgstr "ÓòÃû½âÎö"
+msgstr "ÓòÃû½âÎöÆ÷"
 
-#: ../../standalone/logdrake_.c:418
+#: ../../standalone/logdrake_.c:419
 msgid "Ftp Server"
 msgstr "FTP ·þÎñÆ÷"
 
-#: ../../standalone/logdrake_.c:419
+#: ../../standalone/logdrake_.c:420
 msgid "Postfix Mail Server"
 msgstr "Postfix Óʼþ·þÎñ"
 
-#: ../../standalone/logdrake_.c:420
+#: ../../standalone/logdrake_.c:421
 msgid "Samba Server"
-msgstr "NIS ·þÎñÆ÷"
+msgstr "Samba ·þÎñÆ÷"
 
-#: ../../standalone/logdrake_.c:421
+#: ../../standalone/logdrake_.c:422
 msgid "SSH Server"
 msgstr "SSH ·þÎñÆ÷"
 
-#: ../../standalone/logdrake_.c:422
+#: ../../standalone/logdrake_.c:423
 msgid "Webmin Service"
 msgstr "Webmin ·þÎñ"
 
-#: ../../standalone/logdrake_.c:423
+#: ../../standalone/logdrake_.c:424
 msgid "Xinetd Service"
 msgstr "Xinetd ·þÎñÆ÷"
 
-#: ../../standalone/logdrake_.c:430
+#: ../../standalone/logdrake_.c:431
 msgid "service setting"
 msgstr "·þÎñÅäÖÃ"
 
-#: ../../standalone/logdrake_.c:431
+#: ../../standalone/logdrake_.c:432
 msgid ""
 "You will receive an alert if one of the selected services is no more running"
 msgstr "Èç¹ûÑ¡ÖеķþÎñÖÐÓÐÈκÎÒ»¸öÍ£Ö¹ÔËÐÐÄú½«ÊÕµ½¾¯±¨"
 
-#: ../../standalone/logdrake_.c:443
+#: ../../standalone/logdrake_.c:444
 msgid "load setting"
 msgstr "µ÷ÈëÅäÖÃ"
 
-#: ../../standalone/logdrake_.c:444
+#: ../../standalone/logdrake_.c:445
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "µ±¸ºÔس¬¹ýÕâ¸öֵʱÄú»áÊÕµ½Ò»¸ö¾¯±¨"
 
-#: ../../standalone/logdrake_.c:457
+#: ../../standalone/logdrake_.c:458
 msgid "alert configuration"
 msgstr "±¨¾¯É趨"
 
-#: ../../standalone/logdrake_.c:458
+#: ../../standalone/logdrake_.c:459
 msgid "Please enter your email address below "
 msgstr "ÇëÊäÈëÄúµÄÓʼþµØÖ· "
 
-#: ../../standalone/logdrake_.c:497
+#: ../../standalone/logdrake_.c:498
 msgid "Save as.."
 msgstr "Áí´æΪ.."
 
@@ -13308,11 +13387,11 @@ msgstr "Ä£ÄâÈý¼ü"
 
 #: ../../standalone/printerdrake_.c:57
 msgid "Reading printer data ..."
-msgstr "¶ÁÈ¡´òÓ¡»úÊý¾Ý..."
+msgstr "ÕýÔÚ¶ÁÈ¡´òÓ¡»úÊý¾Ý..."
 
 #: ../../standalone/scannerdrake_.c:41
 msgid "Detecting devices ..."
-msgstr "ÕýÔÚ̽²âÉ豸..."
+msgstr "ÕýÔÚ¼ì²âÉ豸..."
 
 #: ../../standalone/scannerdrake_.c:41
 msgid "Test ports"
@@ -13322,7 +13401,7 @@ msgstr "²âÊԶ˿Ú"
 #: ../../standalone/scannerdrake_.c:81
 #, c-format
 msgid "The %s is not supported by this version of Mandrake Linux."
-msgstr "Õâ¸ö°æ±¾µÄ Mandrake Linux ²»Ö§³Ö %s "
+msgstr "Õâ¸ö°æ±¾µÄ Mandrake Linux ²»Ö§³Ö %s¡£"
 
 #: ../../standalone/scannerdrake_.c:56
 #, c-format
@@ -13349,8 +13428,8 @@ msgid ""
 "Scannerdrake was not able to detect your %s scanner.\n"
 "Please select the device where your scanner is plugged"
 msgstr ""
-"Scannerdrake ûÄܼì²âµ½ÄúµÄ %s ɨÃèÒÇ.\n"
-"ÇëÑ¡ÔñÄúµÄɨÃèÒÇÁ¬½ÓµÄÉ豸."
+"Scannerdrake ûÄܼì²âµ½ÄúµÄ %s ɨÃèÒÇ¡£\n"
+"ÇëÑ¡ÔñÄúµÄɨÃèÒÇÁ¬½ÓµÄÉ豸¡£"
 
 #: ../../standalone/scannerdrake_.c:109
 msgid "choose device"
@@ -13363,8 +13442,8 @@ msgid ""
 "You can launch printerdrake from the Mandrake Control Center in Hardware "
 "section."
 msgstr ""
-"Õâ¸ö %s ɨÃèÒDZØÐëʹÓà printerdrake À´ÅäÖÃ.\n"
-"Äú¿ÉÒÔÔÚMandrake ¿ØÖÆÖÐÐĵÄÓ²¼þ²¿·Ö´ò¿ª printerdrake."
+"Õâ¸ö %s ɨÃèÒDZØÐëʹÓà printerdrake À´ÅäÖá£\n"
+"Äú¿ÉÒÔÔÚMandrake ¿ØÖÆÖÐÐĵÄÓ²¼þ²¿·Ö´ò¿ª printerdrake¡£"
 
 #: ../../standalone/scannerdrake_.c:120
 #, c-format
@@ -13382,11 +13461,8 @@ msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "ɾ³ýÁËһЩ \"%s\" Àà±ðµÄÉ豸:\n"
 
 #: ../../standalone/service_harddrake_.c:48
-#, fuzzy
 msgid "Some devices were added:\n"
-msgstr ""
-"\n"
-"Ìí¼ÓÁËһЩ %s Àà±ðµÄÉ豸:\n"
+msgstr "Ìí¼ÓÁËһЩÉ豸:\n"
 
 #: ../../steps.pm_.c:14
 msgid "Choose your language"
@@ -13418,11 +13494,11 @@ msgstr "É趨Îļþϵͳ"
 
 #: ../../steps.pm_.c:21
 msgid "Format partitions"
-msgstr "¸ñʽ»¯Ó²ÅÌ·ÖÇø"
+msgstr "¸ñʽ»¯·ÖÇø"
 
 #: ../../steps.pm_.c:22
 msgid "Choose packages to install"
-msgstr "Ñ¡ÔñÈí¼þ°ü"
+msgstr "Ñ¡ÔñÒª°²×°µÄÈí¼þ°ü"
 
 #: ../../steps.pm_.c:23
 msgid "Install system"
@@ -13466,7 +13542,7 @@ msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
-msgstr "WebÍøÕ¾/FTP"
+msgstr "Web/FTP"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer (client)"
@@ -13486,7 +13562,7 @@ msgstr "Gnome¹¤×÷Õ¾"
 
 #: ../../share/compssUsers:999
 msgid "Tools for your Palm Pilot or your Visor"
-msgstr "ÅäºÏ Palm Pilot, Visor µÈÊÖ³ÖÉ豸µÄ¹¤¾ß "
+msgstr "ÅäºÏ Palm Pilot, Visor µÈÊÖ³ÖÉ豸µÄ¹¤¾ß"
 
 #: ../../share/compssUsers:999
 msgid "Workstation"
@@ -13562,7 +13638,7 @@ msgstr "¿ØÖÆ̨¹¤¾ß"
 
 #: ../../share/compssUsers:999
 msgid "Postfix mail server, Inn news server"
-msgstr "PostfixÓʼþ·þÎñ£¬ Inn ÐÂÎÅ×é·þÎñ"
+msgstr "PostfixÓʼþ·þÎñ,  Inn ÐÂÎÅ×é·þÎñ"
 
 #: ../../share/compssUsers:999
 msgid "Internet station"
@@ -13620,7 +13696,7 @@ msgstr "DNS/NIS"
 
 #: ../../share/compssUsers:999
 msgid "C and C++ development libraries, programs and include files"
-msgstr "CºÍC++¿ª·¢¿â£¬³ÌÐò¼°Í·Îļþ"
+msgstr "CºÍC++¿ª·¢¿â, ³ÌÐò¼°Í·Îļþ"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
@@ -13650,7 +13726,7 @@ msgstr "ÓÎÏ·³ÌÐò: ½Ö»ú, ÆåÅÌ, Õ½ÂÔ µÈµÈ"
 msgid ""
 "Set of tools to read and send mail and news (pine, mutt, tin..) and to "
 "browse the Web"
-msgstr "ÉÏÍø¹¤¾ß, ÈçÊÕ·¢µç×ÓÓʼþ¼°ÐÂÎÅ×é (pine, mutt, tin..) , ä¯ÀÀÍøÕ¾."
+msgstr "ÉÏÍø¹¤¾ß, ÈçÊÕ·¢µç×ÓÓʼþ¼°ÐÂÎÅ×é (pine, mutt, tin..) , ä¯ÀÀÍøÕ¾"
 
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
@@ -13701,175 +13777,3 @@ msgstr "¶àýÌå - ÉÕ¼¹âÅÌ"
 #: ../../share/compssUsers:999
 msgid "Scientific Workstation"
 msgstr "¿Æѧ¼ÆË㹤×÷Õ¾"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "To submit a bug report, click on the button report.\n"
-#~ "This will open  a web browser window  on https://www.bugzilla.com\n"
-#~ " where you'll find a form to fill in.The information displayed above will "
-#~ "be \n"
-#~ "transferred to that server\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "ÒªÌá½»¹ÊÕϱ¨¸æ, µã»÷±¨¸æ°´Å¥.\n"
-#~ "Ëü»á´ò¿ªÒ»¸öä¯ÀÀÆ÷´°¿Ú, ½øÈë https://www.bugzilla.com\n"
-#~ " ÄÇÀïÓÐÒ»¸ö±í¸ñÐèÒªÄúÌîд. ÉÏÃæÏÔʾµÄÐÅÏ¢½«±» \n"
-#~ "´«Ë͵½·þÎñÆ÷.\n"
-#~ "\n"
-
-#~ msgid "Make bootsplash step 2"
-#~ msgstr "´´½¨¿ª»úÆÁÄ»µÚ¶þ²½"
-
-#~ msgid "Go to lilosplash configuration"
-#~ msgstr "¼ÌÐø lilosplash µÄÅäÖÃ"
-
-#~ msgid "Go back"
-#~ msgstr "ºóÍË"
-
-#~ msgid ""
-#~ "There's no known OSS/ALSA alternative driver for your sound card (%s)"
-#~ msgstr "ûÓÐÒÑÖªµÄ OSS/ALSA Ìæ´úÇý¶¯³ÌÐò¿ÉÒÔÓÃÔÚÄúµÄÉù¿¨ (%s) ÉÏ"
-
-#~ msgid "ECI Hi-Focus"
-#~ msgstr "ECI Hi-Focus"
-
-#~ msgid "Proxy should be ftp://..."
-#~ msgstr "´úÀí·þÎñÆ÷Ó¦¸ÃÊÇÏó ftp://..."
-
-#~ msgid "quit"
-#~ msgstr "Í˳ö"
-
-#~ msgid ""
-#~ "Sorry, perl-Expect is not installed/enabled. To use\n"
-#~ "this feature, install perl-Expect and comment lines 772-774,\n"
-#~ " as well as 788,789. Then uncomment line 787."
-#~ msgstr ""
-#~ "¶Ô²»Æð, perl-Expect ûÓа²×°»òûÓ줻î. ҪʹÓÃ\n"
-#~ "Õâ¸ö¹¦ÄÜ, Çë°²×° perl-Expect ²¢×¢Ê͵Ú\n"
-#~ " 772-774 ÐÐ, µÚ 788,789 ÐÐ.  ²¢È¡Ïû 787 ÐеÄ×¢ÊÍ."
-
-#~ msgid ""
-#~ "The first time you try the X configuration, you may not be very "
-#~ "satisfied\n"
-#~ "with its display (screen is too small, shifted left or right...). Hence,\n"
-#~ "even if X starts up correctly, DrakX then asks you if the configuration\n"
-#~ "suits you. It will also propose to change it by displaying a list of "
-#~ "valid\n"
-#~ "modes it could find, asking you to select one.\n"
-#~ "\n"
-#~ "As a last resort, if you still cannot get X to work, choose \"Change\n"
-#~ "graphics card\", select \"Unlisted card\", and when prompted on which\n"
-#~ "server, choose \"FBDev\". This is a failsafe option which works with any\n"
-#~ "modern graphics card. Then choose \"Test again\" to be sure."
-#~ msgstr ""
-#~ "×Ô¶¯¼ì²âµÄ½á¹ûδ±Ø×ÜÁîÄúÂúÒâ(ÆÁĻ̫С, Æ«×ó»òÆ«ÓÒ...), ËùÒÔ\n"
-#~ "DrakX »áÎÊÄúÅäÖÃÊÇ·ñºÏÊÊ. Ëü»¹¿ÉÒÔÁгöËùÓпÉÓõÄÏÔʾģʽÇëÄúÑ¡Ôñ.\n"
-#~ "\n"
-#~ "×îºó,Èç¹û DrakX ÈÔÈ»ÎÞ·¨ÕýÈ·ÅäÖÃ, Äã¿ÉÔÚ\n"
-#~ "\"¸Ä±äͼÐο¨\",Ñ¡Ôñ\"ÆäËü¿¨\", ÔÙÑ¡Ôñ\"FBDev\", \n"
-#~ "Õâ¸ö¿ÉÒÔ±£Ö¤ÔÚËùÓÐÏÖ´úͼÐο¨ÉϹ¤×÷. Ñ¡Ôñ\"ÖØвâÊÔ\"À´È·ÈÏ."
-
-#~ msgid "Thank you for choosing Mandrake Linux 8.2"
-#~ msgstr "¸ÐлÄúÑ¡Ôñ Mandrake Linux"
-
-#~ msgid "Join the Free Software world"
-#~ msgstr "¼ÓÈë×ÔÓÉÈí¼þµÄÊÀ½ç"
-
-#~ msgid ""
-#~ "Get to know the Open Source community and become a member. Learn, teach, "
-#~ "and help others by joining the many discussion forums that you will find "
-#~ "in our \"Community\" webpages"
-#~ msgstr ""
-#~ "À´Á˽⿪·ÅÔ´Âë, ²¢³ÉΪÉçÇøµÄÒ»Ô±. ´ÓÎÒÃǵÄ\"ÉçÇø\"ÍøÒ³¿ªÊ¼, ¼ÓÈëÖÚ¶àµÄÌÖÂÛ"
-#~ "ÇøºÍÆäËûÈËÒ»Æð, »¥Ïàѧϰ, »¥Ïà°ïÖú"
-
-#~ msgid "Internet and Messaging"
-#~ msgstr "»¥ÁªÍøºÍͨÐÅ"
-
-#~ msgid "Multimedia and Graphics"
-#~ msgstr "¶àýÌåºÍͼÐÎ"
-
-#~ msgid ""
-#~ "Mandrake Linux 8.2 lets you push your multimedia computer to its limits! "
-#~ "Use the latest software to play music and audio files, edit and organize "
-#~ "your images and photos, watch TV and videos, and much more"
-#~ msgstr ""
-#~ "Mandrake Linux ½«ÄúµÄ¶àýÌåµçÄÔÍÆÏò¼«ÏÞ! ʹÓÃ×îеÄÈí¼þÀ´²¥·ÅÒôÀÖºÍÒôƵÎÄ"
-#~ "¼þ,±à¼­ºÍ×éÖ¯ÄúµÄͼÏñºÍÕÕƬ, ¿´µçÊÓºÍӰƬ, »¹Óиü¶àµÈÄúÀ´³¢ÊÔ"
-
-#~ msgid ""
-#~ "Mandrake Linux 8.2 is the ultimate development platform. Discover the "
-#~ "power of the GNU gcc compiler as well as the best Open Source development "
-#~ "environments"
-#~ msgstr ""
-#~ "Mandrake Linux ÊÇ×îÖյĿª·¢Æ½Ì¨.  À´·¢ÏÖ GNU gcc ±àÒëÆ÷µÄÇ¿´óÁ¦Á¿»¹ÓÐ×î°ô"
-#~ "µÄ¿ª·ÅÔ´Â뿪·¢»·¾³"
-
-#~ msgid ""
-#~ "The Mandrake Linux 8.2 Control Center is a one-stop location for fully "
-#~ "customizing and configuring your Mandrake system"
-#~ msgstr "Mandrake Linux ¿ØÖÆÖÐÐÄÈÃÄú´ÓÒ»¸ö½çÃæÅäÖà Mandrake ϵͳµÄ·½·½ÃæÃæ."
-
-#~ msgid ""
-#~ "Mandrake Linux 8.2 provides 11 different graphical desktop environments "
-#~ "and window managers to choose from including GNOME 1.4, KDE 2.2.2, Window "
-#~ "Maker 0.8, and the rest"
-#~ msgstr ""
-#~ "Mandrake Linux ÌṩÁË 11 ÖÖ²»Í¬µÄͼÐÎ×ÀÃæ»·¾³ºÍ´°¿Ú¹ÜÀí³ÌÐò, ÈÎÄúÑ¡ÔñÆäÖÐ"
-#~ "°üÀ¨ GNOME, KDE, Window Maker, µÈµÈ"
-
-#~ msgid "Server Software"
-#~ msgstr "·þÎñÆ÷Èí¼þ"
-
-#~ msgid ""
-#~ "Mandrake Linux 8.2 provides the best Open Source games - arcade, action, "
-#~ "cards, sports, strategy, ..."
-#~ msgstr ""
-#~ "Mandrake Linux °üÀ¨ÁË×îºÃµÄ¿ª·ÅÔ´ÂëÓÎÏ· -´³¹Ø, ¶¯×÷, Ö½ÅÆ, ²ßÂÔ, ..."
-
-#~ msgid "MandrakeCampus"
-#~ msgstr "MandrakeУ԰"
-
-#~ msgid ""
-#~ "Would you like to learn Linux simply, quickly, and for free? MandrakeSoft "
-#~ "provides free Linux training, as well as a way to test your progress, at "
-#~ "MandrakeCampus -- our online training center"
-#~ msgstr ""
-#~ "ÔõÑù¼òµ¥, ¿ì½Ý, ÓÖÊ¡Ç®µÄѧϰ Linxu? MandrakeSoft ÌṩÃâ·ÑµÄ Linux Åàѵ, ÒÔ"
-#~ "¼°²âÊÔÄú×Ô¼º½ø²½µÄ°ì·¨, ¾ÍÔÚ MandrakeУ԰ -- ÎÒÃǵÄÔÚÏßÅàѵÖÐÐÄ"
-
-#~ msgid ""
-#~ "Quality support from the Linux Community, and from MandrakeSoft, is just "
-#~ "around the corner. And if you're already a Linux veteran, become an "
-#~ "\"Expert\" and share your knowledge at our support website"
-#~ msgstr ""
-#~ "À´×Ô Linux ÉçÇøµÄÓÅÖÊÖ§³Ö·þÎñ, ½üÔÚåë³ßµÄ Mandrakeר¼Ò -- ÎÒÃǵÄÔÚÏßÖ§³ÖÖÐ"
-#~ "ÐÄ.Èç¹ûÄú¾«Í¨ Linux, Äú¾ÍÊÇÎÒÃǵÄ\"ר¼Ò\", ÇëÀ´ÕâÀï·ÖÏíÄúµÄ¾­Ñé."
-
-#~ msgid "MandrakeConsulting"
-#~ msgstr "Mandrake¹ËÎÊ"
-
-#~ msgid ""
-#~ "For all of your IT projects, our consultants are ready to analyze your "
-#~ "requirements and offer a customized solution. Benefit from MandrakeSoft's "
-#~ "vast experience as a Linux producer to provide a true IT alternative for "
-#~ "your business organization"
-#~ msgstr ""
-#~ "ÎÒÃǵĹËÎʶÓÎéËæʱ׼±¸°ïÖúÄú, ·ÖÎöÐèÇó²¢ÊµÏÖÄúµÄ IT ÏîÄ¿.MandrakeSoft ×÷"
-#~ "Ϊ Linux ÌṩÉÌËù»ýÀ۵ijɹ¦¾­Ñé, ±Ø½«ÎªÄúµÄÆóÒµÌṩ¸üºÃµÄ IT ½â¾ö·½°¸"
-
-#~ msgid "MandrakeStore"
-#~ msgstr "MandrakeÉ̳¡"
-
-#~ msgid ""
-#~ "A full range of Linux solutions, as well as special offers on products "
-#~ "and 'goodies', are available online at our e-store"
-#~ msgstr "È«Ì×µÄ Linux ²úÆ·ºÍ·þÎñ, ¸÷ÖÖÌع©²úÆ·ºÍÍæÒâ¶ù, ¾ÍÔÚÎÒÃǵÄÔÚÏßÉ̳¡"
-
-#~ msgid ""
-#~ "For more information on MandrakeSoft's Professional Services and "
-#~ "commercial offerings, please see the following web page:"
-#~ msgstr "Òª¸ü¶àÁ˽â MandrakeSoft µÄרҵ·þÎñºÍºÏ×÷»ú»á, Çëµ½ÏÂÁÐÍøÒ³:"