update-po

3 files changed, 1468 insertions, 1105 deletions

diff --git a/perl-install/share/po/Changelog b/perl-install/share/po/Changelog
index 1b740cfde..1214b43c7 100644
--- a/perl-install/share/po/Changelog
+++ b/perl-install/share/po/Changelog
@@ -1,3 +1,6 @@
+1999-11-16  Pablo Saratxaga <pablo@mandrakesoft.com>
+	* update-po, lots of new strings :)
+
 1999-11-10  Pablo Saratxaga <pablo@mandrakesoft.com>
 	* es.po: completed
 	* pl.po: updated from Pavel Jablonski
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 15f92dcde..9eec3451f 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-09 16:28+0100\n"
+"POT-Creation-Date: 1999-11-16 12:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -87,8 +87,8 @@ msgstr ""
 msgid "(leaving in %d seconds)"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:324 ../install_steps_interactive.pm_.c:571
-#: ../my_gtk.pm_.c:437
+#: ../Xconfigurator.pm_.c:324 ../install_steps_interactive.pm_.c:599
+#: ../my_gtk.pm_.c:438
 msgid "Is this correct?"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgid ""
 "You can switch if off if you want, you'll hear a beep when it's over"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:536
+#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:564
 msgid "Resolution"
 msgstr ""
 
@@ -177,66 +177,70 @@ msgstr ""
 msgid "XFree86 server: %s\n"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:732
+#: ../Xconfigurator.pm_.c:721
+msgid "Preparing X-Window configuration"
+msgstr ""
+
+#: ../Xconfigurator.pm_.c:735
 msgid "Change Monitor"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:733
+#: ../Xconfigurator.pm_.c:736
 msgid "Change Graphic card"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:734
+#: ../Xconfigurator.pm_.c:737
 msgid "Change Resolution"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:735
+#: ../Xconfigurator.pm_.c:738
 msgid "Automatical resolutions search"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:739
+#: ../Xconfigurator.pm_.c:742
 msgid "Show information"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:740
+#: ../Xconfigurator.pm_.c:743
 msgid "Test again"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:741
+#: ../Xconfigurator.pm_.c:744
 msgid "Quit"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:744
+#: ../Xconfigurator.pm_.c:747
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:749
+#: ../Xconfigurator.pm_.c:754
 msgid "X at startup"
 msgstr ""
 
-#: ../Xconfigurator.pm_.c:750
+#: ../Xconfigurator.pm_.c:755
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
 msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:4
-msgid "256 colors"
+msgid "256 colors (8 bits)"
 msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:5
-msgid "32 thousand colors"
+msgid "32 thousand colors (15 bits)"
 msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:6
-msgid "65 thousand colors"
+msgid "65 thousand colors (16 bits)"
 msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:7
-msgid "16 million colors"
+msgid "16 million colors (24 bits)"
 msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:8
-msgid "4 billion colors"
+msgid "4 billion colors (32 bits)"
 msgstr ""
 
 #: ../Xconfigurator_consts.pm_.c:101
@@ -331,19 +335,19 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:418
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:425
 msgid "Move"
 msgstr ""
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:476
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:484
 msgid "Resize"
 msgstr ""
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:365
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:367
 msgid "Type"
 msgstr ""
 
-#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:381
+#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:387
 msgid "Mount point"
 msgstr ""
 
@@ -375,8 +379,8 @@ msgstr ""
 msgid "Save on floppy"
 msgstr ""
 
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:628
-#: ../install_steps_interactive.pm_.c:746
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:656
+#: ../install_steps_interactive.pm_.c:774
 msgid "Done"
 msgstr ""
 
@@ -422,167 +426,167 @@ msgstr ""
 msgid "Reload"
 msgstr ""
 
-#: ../diskdrake.pm_.c:98
+#: ../diskdrake.pm_.c:100
 msgid "Filesystem types:"
 msgstr ""
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Empty"
 msgstr ""
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Ext2"
 msgstr ""
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "FAT"
 msgstr ""
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Other"
 msgstr ""
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Swap"
 msgstr ""
 
-#: ../diskdrake.pm_.c:105
+#: ../diskdrake.pm_.c:107
 msgid "Choose action"
 msgstr ""
 
-#: ../diskdrake.pm_.c:107
+#: ../diskdrake.pm_.c:109
 msgid "Details"
 msgstr ""
 
-#: ../diskdrake.pm_.c:132
+#: ../diskdrake.pm_.c:134
 #, c-format
 msgid "After %s partition %s,"
 msgstr ""
 
-#: ../diskdrake.pm_.c:132 ../diskdrake.pm_.c:408 ../diskdrake.pm_.c:436
+#: ../diskdrake.pm_.c:134 ../diskdrake.pm_.c:415 ../diskdrake.pm_.c:444
 msgid "Read carefully!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:132
+#: ../diskdrake.pm_.c:134
 msgid "all data on this partition will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:172 ../install_steps.pm_.c:71
-#: ../install_steps_interactive.pm_.c:41
+#: ../diskdrake.pm_.c:153 ../install_any.pm_.c:173 ../install_steps.pm_.c:73
+#: ../install_steps_interactive.pm_.c:43
 msgid "Error"
 msgstr ""
 
-#: ../diskdrake.pm_.c:175 ../diskdrake.pm_.c:553
+#: ../diskdrake.pm_.c:177 ../diskdrake.pm_.c:562
 msgid "Mount point: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:176 ../diskdrake.pm_.c:208
+#: ../diskdrake.pm_.c:178 ../diskdrake.pm_.c:210
 msgid "Device: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:177
+#: ../diskdrake.pm_.c:179
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:178 ../diskdrake.pm_.c:211
+#: ../diskdrake.pm_.c:180 ../diskdrake.pm_.c:213
 msgid "Type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:179
+#: ../diskdrake.pm_.c:181
 #, c-format
 msgid "Start: sector %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:180
+#: ../diskdrake.pm_.c:182
 #, c-format
 msgid "Size: %s MB"
 msgstr ""
 
-#: ../diskdrake.pm_.c:182
+#: ../diskdrake.pm_.c:184
 #, c-format
 msgid ", %s sectors"
 msgstr ""
 
-#: ../diskdrake.pm_.c:184
+#: ../diskdrake.pm_.c:186
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:185
+#: ../diskdrake.pm_.c:187
 msgid "Formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:186
+#: ../diskdrake.pm_.c:188
 msgid "Not formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:187
+#: ../diskdrake.pm_.c:189
 msgid "Mounted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:188
+#: ../diskdrake.pm_.c:190
 #, c-format
 msgid "RAID md%s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:189
+#: ../diskdrake.pm_.c:191
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:191
+#: ../diskdrake.pm_.c:193
 #, c-format
 msgid "Level %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:192
+#: ../diskdrake.pm_.c:194
 #, c-format
 msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:193
+#: ../diskdrake.pm_.c:195
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:209
+#: ../diskdrake.pm_.c:211
 #, c-format
 msgid "Size: %d MB\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:210
+#: ../diskdrake.pm_.c:212
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:212
+#: ../diskdrake.pm_.c:214
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:224
+#: ../diskdrake.pm_.c:226
 msgid "Mount"
 msgstr ""
 
-#: ../diskdrake.pm_.c:226
+#: ../diskdrake.pm_.c:228
 msgid "Active"
 msgstr ""
 
-#: ../diskdrake.pm_.c:227
+#: ../diskdrake.pm_.c:229
 msgid "Add to RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:228
+#: ../diskdrake.pm_.c:230
 msgid "Remove from RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:229
+#: ../diskdrake.pm_.c:231
 msgid "Modify RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:325
+#: ../diskdrake.pm_.c:327
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -590,7 +594,7 @@ msgid ""
 "need /boot"
 msgstr ""
 
-#: ../diskdrake.pm_.c:329
+#: ../diskdrake.pm_.c:331
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -598,155 +602,164 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:344
+#: ../diskdrake.pm_.c:346
 msgid "Quit without saving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:344
+#: ../diskdrake.pm_.c:346
 msgid "Quit without writing the partition table?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:360
+#: ../diskdrake.pm_.c:362
 msgid "changing type of"
 msgstr ""
 
-#: ../diskdrake.pm_.c:363
+#: ../diskdrake.pm_.c:365
 msgid "Change partition type"
 msgstr ""
 
-#: ../diskdrake.pm_.c:364
+#: ../diskdrake.pm_.c:366
 msgid "Which partition type do you want?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:380
+#: ../diskdrake.pm_.c:386
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:402
+#: ../diskdrake.pm_.c:408
 msgid "formatting"
 msgstr ""
 
-#: ../diskdrake.pm_.c:408
+#: ../diskdrake.pm_.c:410
+msgid "Formatting"
+msgstr ""
+
+#: ../diskdrake.pm_.c:410 ../install_steps_interactive.pm_.c:216
+#, c-format
+msgid "Formatting partition %s"
+msgstr ""
+
+#: ../diskdrake.pm_.c:415
 msgid "After formatting all partitions,"
 msgstr ""
 
-#: ../diskdrake.pm_.c:408
+#: ../diskdrake.pm_.c:415
 msgid "all data on these partitions will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:419
+#: ../diskdrake.pm_.c:426
 msgid "Which disk do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:423
+#: ../diskdrake.pm_.c:430
 msgid "Sector"
 msgstr ""
 
-#: ../diskdrake.pm_.c:424
+#: ../diskdrake.pm_.c:431
 msgid "Which sector do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:434
 msgid "Moving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:434
 msgid "Moving partition..."
 msgstr ""
 
-#: ../diskdrake.pm_.c:436
+#: ../diskdrake.pm_.c:444
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:438
+#: ../diskdrake.pm_.c:446
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../diskdrake.pm_.c:459
+#: ../diskdrake.pm_.c:467
 msgid "Computing fat filesystem bounds"
 msgstr ""
 
-#: ../diskdrake.pm_.c:459 ../diskdrake.pm_.c:504
+#: ../diskdrake.pm_.c:467 ../diskdrake.pm_.c:512
 msgid "Resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:473
+#: ../diskdrake.pm_.c:481
 msgid "resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:483
+#: ../diskdrake.pm_.c:491
 msgid "Choose the new size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:483 ../install_steps_graphical.pm_.c:290
-#: ../install_steps_graphical.pm_.c:337
-#: ../unused/install_steps_graphical.pm_.c:314
+#: ../diskdrake.pm_.c:491 ../install_steps_graphical.pm_.c:287
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:334
 msgid "MB"
 msgstr ""
 
-#: ../diskdrake.pm_.c:530
+#: ../diskdrake.pm_.c:539
 msgid "Create a new partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:546
+#: ../diskdrake.pm_.c:555
 msgid "Start sector: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:549
+#: ../diskdrake.pm_.c:558
 msgid "Size in MB: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:552
+#: ../diskdrake.pm_.c:561
 msgid "Filesystem type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:554
+#: ../diskdrake.pm_.c:563
 msgid "Preference: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:596 ../diskdrake.pm_.c:612
+#: ../diskdrake.pm_.c:607 ../diskdrake.pm_.c:623
 msgid "Select file"
 msgstr ""
 
-#: ../diskdrake.pm_.c:605
+#: ../diskdrake.pm_.c:616
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:613
+#: ../diskdrake.pm_.c:624
 msgid "Warning"
 msgstr ""
 
-#: ../diskdrake.pm_.c:614
+#: ../diskdrake.pm_.c:625
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:628
+#: ../diskdrake.pm_.c:639
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: ../diskdrake.pm_.c:639
+#: ../diskdrake.pm_.c:650
 msgid "device"
 msgstr ""
 
-#: ../diskdrake.pm_.c:640
+#: ../diskdrake.pm_.c:651
 msgid "level"
 msgstr ""
 
-#: ../diskdrake.pm_.c:641
+#: ../diskdrake.pm_.c:652
 msgid "chunk size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:653
-msgid "Choose an existent RAID to add to"
+#: ../diskdrake.pm_.c:664
+msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../diskdrake.pm_.c:654
+#: ../diskdrake.pm_.c:665
 msgid "new"
 msgstr ""
 
@@ -773,69 +786,69 @@ msgstr ""
 msgid "error unmounting %s: %s"
 msgstr ""
 
-#: ../fsedit.pm_.c:168
+#: ../fsedit.pm_.c:186
 msgid "Mount points must begin with a leading /"
 msgstr ""
 
-#: ../fsedit.pm_.c:171
+#: ../fsedit.pm_.c:189
 #, c-format
 msgid "There is already a partition with mount point %s"
 msgstr ""
 
-#: ../fsedit.pm_.c:301
+#: ../fsedit.pm_.c:273
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr ""
 
-#: ../fsedit.pm_.c:373
+#: ../fsedit.pm_.c:345
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
 
-#: ../fsedit.pm_.c:388
+#: ../fsedit.pm_.c:360
 msgid "You don't have any partitions!"
 msgstr ""
 
-#: ../help.pm_.c:21 ../help.pm_.c:259
+#: ../help.pm_.c:17 ../help.pm_.c:287
 msgid "Choose preferred language for install and system usage."
 msgstr ""
 
-#: ../help.pm_.c:24 ../help.pm_.c:262
+#: ../help.pm_.c:20 ../help.pm_.c:290
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr ""
 
-#: ../help.pm_.c:27 ../help.pm_.c:265
+#: ../help.pm_.c:23
 msgid ""
-"Choose \"Installation\" if there are no previous versions of Linux\n"
-"installed, or if you wish use to multiple distributions or versions.\n"
+"Choose \"Install\" if there are no previous versions of Linux\n"
+"nstalled, or if you wish use to multiple distributions or versions.\n"
 "\n"
 "\n"
-"Choose \"Update\" if you wish to update a previous version of Mandrake\n"
+"Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
 "Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
 msgstr ""
 
-#: ../help.pm_.c:35
+#: ../help.pm_.c:31
 msgid ""
 "Select:\n"
 "\n"
-"  - Beginner: If you have never installed Linux before.\n"
+"  - Recommended: If you have never installed Linux before.\n"
 "\n"
 "\n"
-"  - Developer: If you are familiar with Linux and will be using the\n"
-"computer primarily for software development, you will find happiness\n"
-"here.\n"
-"\n"
-"\n"
-"  - Server: If you wish to install a general purpose server (for mail,\n"
-"printing...), select this.\n"
+"  - Customized: If you are familiar with Linux, you will be able to \n"
+"select the usage for the installed system between normal, development or\n"
+"server. Choose \"Normal\" for a general purpose installation of your\n"
+"computer. You may choose \"Development\" if you will be using the computer\n"
+"primarily for software development, or choose \"Server\" if you wish to\n"
+"install a general purpose server (for mail, printing...).\n"
 "\n"
 "\n"
 "  - Expert: If you are fluent with GNU/Linux and want to perform\n"
-"a highly customized installation, this Install Class is for you."
+"a highly customized installation, this Install Class is for you. You will\n"
+"be able to select the usage of your installed system as for \"Customized\"."
 msgstr ""
 
-#: ../help.pm_.c:53
+#: ../help.pm_.c:49
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -861,13 +874,36 @@ msgid ""
 "are the options you will need to provide to the driver."
 msgstr ""
 
-#: ../help.pm_.c:77 ../help.pm_.c:312
+#: ../help.pm_.c:76
 msgid ""
-"In this stage, you may choose what partition(s) use to install your\n"
-"Linux-Mandrake system."
+"At this point, you may choose what partition(s) to use to install\n"
+"your Linux-Mandrake system if they have been already defined (from a\n"
+"previous install of Linux or from another partitionning tool). In other\n"
+"cases, hard drive partitions must be defined. This operation consists of\n"
+"logically dividing the computer's hard drive capacity into separate\n"
+"areas for use.\n"
+"\n"
+"\n"
+"If you have to create new partitions, use \"Auto allocate\" to "
+"automatically\n"
+"create partitions for Linux. You can select the disk for partitionning by\n"
+"clicking on \"hda\" for the first IDE drive,\n"
+"\"hdb\" for the second or \"sda\" for the first SCSI drive and so on.\n"
+"\n"
+"\n"
+"Two common partition are: the root partition (/), which is the starting\n"
+"point of the filesystem's directory hierarchy, and /boot, which contains\n"
+"all files necessary to start the operating system when the\n"
+"computer is first turned on.\n"
+"\n"
+"\n"
+"Because the effects of this process are usually irreversible, partitioning\n"
+"can be intimidating and stressful to the unexperienced user. DiskDrake\n"
+"simplifies the process so that it need not be. Consult the documentation\n"
+"and take your time before proceeding."
 msgstr ""
 
-#: ../help.pm_.c:99 ../help.pm_.c:334
+#: ../help.pm_.c:102 ../help.pm_.c:362
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -877,11 +913,18 @@ msgid ""
 "Typically retained are /home and /usr/local."
 msgstr ""
 
-#: ../help.pm_.c:107 ../help.pm_.c:342
+#: ../help.pm_.c:110
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
 "\n"
+"First you can select the size of your installed system and an automated\n"
+"selection of packages will be done according to your system usage. After\n"
+"that you can select more packages by group or click on Ok to keep the\n"
+"previous selection.\n"
+"\n"
+"\n"
+"If you are in expert mode, you can select packages individually.\n"
 "Please note that some packages require the installation of others.\n"
 "These are referred to as package dependencies. The packages you select,\n"
 "and the packages they require will be automatically selected for\n"
@@ -890,17 +933,19 @@ msgid ""
 "\n"
 "\n"
 "Information on each category and specific package is available in the\n"
-"area titled \"Info\",  located between list of packages and the five\n"
-"buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
+"area titled \"Info\",  located between list of packages and the\n"
+"button \"Install\" to start the installation."
 msgstr ""
 
-#: ../help.pm_.c:122
+#: ../help.pm_.c:132
 msgid ""
 "The packages selected are now being installed. This operation\n"
-"should only take a few minutes."
+"should take a few minutes unless you have chosen to upgrade an\n"
+"existing system, in that case it can take more time even before\n"
+"upgrade starts."
 msgstr ""
 
-#: ../help.pm_.c:126 ../help.pm_.c:363
+#: ../help.pm_.c:138 ../help.pm_.c:391
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -916,14 +961,16 @@ msgid ""
 "which serial port it is connected to."
 msgstr ""
 
-#: ../help.pm_.c:140 ../help.pm_.c:377
+#: ../help.pm_.c:152
 msgid ""
-"This section is dedicated to configuring a local area network,\n"
-"or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
-"Ethernet adapter on your machine. PCI adapters should be found and\n"
-"initialized automatically. However, if your peripheral is ISA,\n"
-"autodetection will not work, and you will have to choose a driver\n"
-"from the list that will appear then.\n"
+"This section is dedicated to configuring a local area\n"
+"network (LAN) or a modem.\n"
+"\n"
+"Choose \"Local LAN\" and DrakX will\n"
+"try to find an Ethernet adapter on your machine. PCI adapters\n"
+"should be found and initialized automatically.\n"
+"However, if your peripheral is ISA, autodetection will not work,\n"
+"and you will have to choose a driver from the list that will appear then.\n"
 "\n"
 "\n"
 "As for SCSI adapters, you can let the driver probe for the adapter\n"
@@ -937,15 +984,30 @@ msgid ""
 "have given you all necessary information (IP address, network\n"
 "submask or netmask for short, and hostname). If you're setting\n"
 "up a private network at home for example, you should choose\n"
-"addresses "
+"addresses.\n"
+"\n"
+"\n"
+"Choose \"Dialup with modem\" and the Internet connection with\n"
+"a modem will be configured. DrakX will try to find your modem,\n"
+"if it fails you will have to select the right serial port where\n"
+"your modem is connected to."
+msgstr ""
+
+#: ../help.pm_.c:182
+msgid ""
+"You can now select your timezone according to where you live.\n"
+"\n"
+"\n"
+"Linux manages time in GMT or \"Greenwich Meridian Time\" and translates it\n"
+"in local time according to the time zone you have selected."
 msgstr ""
 
-#: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:399
-#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:68
+#: ../help.pm_.c:189 ../help.pm_.c:427 ../help.pm_.c:430 ../help.pm_.c:518
+#: ../install2.pm_.c:68
 msgid "Help"
 msgstr ""
 
-#: ../help.pm_.c:168
+#: ../help.pm_.c:192
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -957,7 +1019,7 @@ msgid ""
 "\n"
 "\n"
 "If you want to access a printer located on a remote Unix machine,\n"
-"you will have to select \"Remote lpd queue\". In order to make\n"
+"you will have to select \"Remote lpd\". In order to make\n"
 "it work, no username or password is required, but you will need\n"
 "to know the name of the printing queue on this server.\n"
 "\n"
@@ -970,9 +1032,9 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../help.pm_.c:191 ../help.pm_.c:428
+#: ../help.pm_.c:215
 msgid ""
-"You must now enter the root password for your Linux-Mandrake\n"
+"You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
 "password entries are identical.\n"
 "\n"
@@ -988,7 +1050,7 @@ msgid ""
 "effort."
 msgstr ""
 
-#: ../help.pm_.c:207 ../help.pm_.c:444
+#: ../help.pm_.c:231 ../help.pm_.c:472
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"priviledged\" user account, root. You can create\n"
@@ -1012,7 +1074,7 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../help.pm_.c:226 ../help.pm_.c:463
+#: ../help.pm_.c:250 ../help.pm_.c:491
 msgid ""
 "Please, please, answer \"Yes\" here! Just for example, when you\n"
 "reinstall Windows, it will overwrite the boot sector. Unless you have\n"
@@ -1020,7 +1082,7 @@ msgid ""
 "any more!"
 msgstr ""
 
-#: ../help.pm_.c:232 ../help.pm_.c:469
+#: ../help.pm_.c:256 ../help.pm_.c:497
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1030,7 +1092,7 @@ msgid ""
 "drive (MBR)\"."
 msgstr ""
 
-#: ../help.pm_.c:240 ../help.pm_.c:477
+#: ../help.pm_.c:264 ../help.pm_.c:505
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1045,7 +1107,25 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../help.pm_.c:273
+#: ../help.pm_.c:277
+msgid "You can now select some miscellaneous options for your system."
+msgstr ""
+
+#: ../help.pm_.c:280
+msgid "Exit Linux-Mandrake installation to reboot your system."
+msgstr ""
+
+#: ../help.pm_.c:293
+msgid ""
+"Choose \"Installation\" if there are no previous versions of Linux\n"
+"installed, or if you wish use to multiple distributions or versions.\n"
+"\n"
+"\n"
+"Choose \"Update\" if you wish to update a previous version of Mandrake\n"
+"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
+msgstr ""
+
+#: ../help.pm_.c:301
 msgid ""
 "Select:\n"
 "\n"
@@ -1065,7 +1145,7 @@ msgid ""
 "a highly customized installation, this Install Class is for you."
 msgstr ""
 
-#: ../help.pm_.c:291
+#: ../help.pm_.c:319
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -1088,7 +1168,30 @@ msgid ""
 "These are the options you will need to provide to the driver."
 msgstr ""
 
-#: ../help.pm_.c:357
+#: ../help.pm_.c:340
+msgid ""
+"In this stage, you may choose what partition(s) use to install your\n"
+"Linux-Mandrake system."
+msgstr ""
+
+#: ../help.pm_.c:370
+msgid ""
+"You may now select the packages you wish to install.\n"
+"\n"
+"\n"
+"Please note that some packages require the installation of others.\n"
+"These are referred to as package dependencies. The packages you select,\n"
+"and the packages they require will be automatically selected for\n"
+"install. It is impossible to install a package without installing all\n"
+"of its dependencies.\n"
+"\n"
+"\n"
+"Information on each category and specific package is available in the\n"
+"area titled \"Info\",  located between list of packages and the five\n"
+"buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
+msgstr ""
+
+#: ../help.pm_.c:385
 msgid ""
 "The packages selected are now being installed.\n"
 "\n"
@@ -1098,6 +1201,30 @@ msgstr ""
 
 #: ../help.pm_.c:405
 msgid ""
+"This section is dedicated to configuring a local area network,\n"
+"or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
+"Ethernet adapter on your machine. PCI adapters should be found and\n"
+"initialized automatically. However, if your peripheral is ISA,\n"
+"autodetection will not work, and you will have to choose a driver\n"
+"from the list that will appear then.\n"
+"\n"
+"\n"
+"As for SCSI adapters, you can let the driver probe for the adapter\n"
+"in the first time, otherwise you will have to specify the options\n"
+"to the driver that you will have fetched from Windows' control\n"
+"panel.\n"
+"\n"
+"\n"
+"If you install a Linux-Mandrake system on a machine which is part\n"
+"of an already existing network, the network administrator will\n"
+"have given you all necessary information (IP address, network\n"
+"submask or netmask for short, and hostname). If you're setting\n"
+"up a private network at home for example, you should choose\n"
+"addresses "
+msgstr ""
+
+#: ../help.pm_.c:433
+msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
 "\n"
@@ -1121,6 +1248,24 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
+#: ../help.pm_.c:456
+msgid ""
+"You must now enter the root password for your Linux-Mandrake\n"
+"system. The password must be entered twice to verify that both\n"
+"password entries are identical.\n"
+"\n"
+"\n"
+"Root is the administrator of the system, and is the only user\n"
+"allowed to modify the system configuration. Therefore, choose\n"
+"this password carefully! Unauthorized use of the root account can\n"
+"be extremely dangerous to the integrity of the system and its data,\n"
+"and other systems connected to it. The password should be a\n"
+"mixture of alphanumeric characters and a least 8 characters long. It\n"
+"should *never* be written down. Do not make the password too long or\n"
+"complicated, though: you must be able to remember without too much\n"
+"effort."
+msgstr ""
+
 #: ../install2.pm_.c:41
 msgid "Choose your language"
 msgstr ""
@@ -1177,8 +1322,8 @@ msgstr ""
 msgid "Configure printer"
 msgstr ""
 
-#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:586
-#: ../install_steps_interactive.pm_.c:587
+#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:614
+#: ../install_steps_interactive.pm_.c:615
 msgid "Set root password"
 msgstr ""
 
@@ -1218,370 +1363,357 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: ../install2.pm_.c:307
+#: ../install2.pm_.c:310
 msgid "Partitioning failed: no root filesystem"
 msgstr ""
 
-#: ../install2.pm_.c:317
+#: ../install2.pm_.c:320
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../install_any.pm_.c:173
+#: ../install_any.pm_.c:174
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
 msgstr ""
 
-#: ../install_any.pm_.c:189
+#: ../install_any.pm_.c:190
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
 msgstr ""
 
-#: ../install_any.pm_.c:228
+#: ../install_any.pm_.c:229
 msgid "Information"
 msgstr ""
 
-#: ../install_any.pm_.c:229
+#: ../install_any.pm_.c:230
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr ""
 
-#: ../install_any.pm_.c:231
+#: ../install_any.pm_.c:232
 msgid "No root partition found"
 msgstr ""
 
-#: ../install_any.pm_.c:267
+#: ../install_any.pm_.c:268
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../install_any.pm_.c:415
+#: ../install_any.pm_.c:417
 msgid "Error reading file $f"
 msgstr ""
 
-#: ../install_any.pm_.c:420
+#: ../install_any.pm_.c:423
 #, c-format
 msgid "Bad kickstart file %s (failed %s)"
 msgstr ""
 
-#: ../install_steps.pm_.c:72
+#: ../install_steps.pm_.c:74
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 
-#: ../install_steps.pm_.c:136
+#: ../install_steps.pm_.c:138
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr ""
 
-#: ../install_steps.pm_.c:417
+#: ../install_steps.pm_.c:425
 msgid "No floppy drive available"
 msgstr ""
 
-#: ../install_steps_auto_install.pm_.c:18 ../install_steps_stdio.pm_.c:21
+#: ../install_steps_auto_install.pm_.c:18 ../install_steps_stdio.pm_.c:26
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:259
-#: ../unused/install_steps_graphical.pm_.c:255
+#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:259
 msgid "You must have a swap partition"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:261
-#: ../unused/install_steps_graphical.pm_.c:258
+#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
 "Continue anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:290
+#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:287
 msgid "Choose the size you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:337
-#: ../unused/install_steps_graphical.pm_.c:314
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:334
 msgid "Total size: "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:349
-#: ../unused/install_steps_graphical.pm_.c:284
+#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:346
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:350
-#: ../unused/install_steps_graphical.pm_.c:285
+#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:347
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:465
-#: ../unused/install_steps_graphical.pm_.c:421
+#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:462
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:468
-#: ../unused/install_steps_graphical.pm_.c:424
+#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:465
 msgid "Info"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:476 ../install_steps_interactive.pm_.c:85
-#: ../unused/install_steps_graphical.pm_.c:432
+#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:473
+#: ../install_steps_interactive.pm_.c:87
 msgid "Install"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:495
-#: ../unused/install_steps_graphical.pm_.c:451
+#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:492
+#: ../install_steps_interactive.pm_.c:251
 msgid "Installing"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:502
-#: ../unused/install_steps_graphical.pm_.c:457
+#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:499
 msgid "Please wait, "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:504
-#: ../unused/install_steps_graphical.pm_.c:459
+#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:501
 msgid "Time remaining "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:505
-#: ../unused/install_steps_graphical.pm_.c:460
+#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:502
 msgid "Total time "
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:510
-#: ../unused/install_steps_graphical.pm_.c:465
+#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:507
+#: ../install_steps_interactive.pm_.c:251
 msgid "Preparing installation"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:533
-#: ../unused/install_steps_graphical.pm_.c:486
+#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:522
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:558
-#: ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
 msgid "Go on anyway?"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:558
-#: ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
 msgid "There was an error ordering packages:"
 msgstr ""
 
-#: ../install_steps_graphical.pm_.c:582
-#: ../unused/install_steps_graphical.pm_.c:535
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:916
 msgid "Use existing configuration for X11?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:41
+#: ../install_steps_interactive.pm_.c:43
 msgid "An error occurred"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:58
+#: ../install_steps_interactive.pm_.c:60
 msgid "Which language do you want?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:73
+#: ../install_steps_interactive.pm_.c:75
 msgid "What is your keyboard layout?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:83
+#: ../install_steps_interactive.pm_.c:85
 msgid "Install/Upgrade"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:84
+#: ../install_steps_interactive.pm_.c:86
 msgid "Is this an install or an upgrade?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:85
+#: ../install_steps_interactive.pm_.c:87
 msgid "Upgrade"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:93
+#: ../install_steps_interactive.pm_.c:95
 msgid "Root Partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:94
+#: ../install_steps_interactive.pm_.c:96
 msgid "What is the root partition (/) of your system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:104
+#: ../install_steps_interactive.pm_.c:106
 msgid "Recommended"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:105
+#: ../install_steps_interactive.pm_.c:107
 msgid "Customized"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:106
+#: ../install_steps_interactive.pm_.c:108
 msgid "Expert"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:108
-#: ../install_steps_interactive.pm_.c:122
+#: ../install_steps_interactive.pm_.c:110
+#: ../install_steps_interactive.pm_.c:124
 msgid "Install Class"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:109
+#: ../install_steps_interactive.pm_.c:111
 msgid "What installation class do you want?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:118
+#: ../install_steps_interactive.pm_.c:120
 msgid "Normal"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:119
+#: ../install_steps_interactive.pm_.c:121
 msgid "Developement"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:120
+#: ../install_steps_interactive.pm_.c:122
 msgid "Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:123
+#: ../install_steps_interactive.pm_.c:125
 msgid "What usage do you want?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:136
+#: ../install_steps_interactive.pm_.c:138
 msgid "What is the type of your mouse?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:140
+#: ../install_steps_interactive.pm_.c:142
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:143
+#: ../install_steps_interactive.pm_.c:145
 msgid "Mouse Port"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:144
+#: ../install_steps_interactive.pm_.c:146
 msgid "Which serial port is your mouse connected to?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:157
+#: ../install_steps_interactive.pm_.c:159
 msgid "no available partitions"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:159
+#: ../install_steps_interactive.pm_.c:161
 #, c-format
 msgid "(%dMb)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:166
+#: ../install_steps_interactive.pm_.c:168
 msgid "Which partition do you want to use as your root partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:173
+#: ../install_steps_interactive.pm_.c:175
 msgid "Choose the mount points"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:185
+#: ../install_steps_interactive.pm_.c:187
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:204
+#: ../install_steps_interactive.pm_.c:206
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:214
-#, c-format
-msgid "Formatting partition %s"
-msgstr ""
-
-#: ../install_steps_interactive.pm_.c:223
+#: ../install_steps_interactive.pm_.c:225
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:229
+#: ../install_steps_interactive.pm_.c:231
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:238
+#: ../install_steps_interactive.pm_.c:240
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:250
+#: ../install_steps_interactive.pm_.c:260
+msgid ""
+"Installing package %s\n"
+"%d%%"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:274
 msgid "Keep the current IP configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_interactive.pm_.c:275
 msgid "Reconfigure network now"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:252
-#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:276
+#: ../install_steps_interactive.pm_.c:288
 msgid "Do not set up networking"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:254
-#: ../install_steps_interactive.pm_.c:262
+#: ../install_steps_interactive.pm_.c:278
+#: ../install_steps_interactive.pm_.c:286
 msgid "Network Configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:255
+#: ../install_steps_interactive.pm_.c:279
 msgid "Local networking has already been configured. Do you want to:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:263
+#: ../install_steps_interactive.pm_.c:287
 msgid "Do you want to configure networking for yout system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:288
 msgid "Dialup with modem"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:288
 msgid "Local LAN"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:273
+#: ../install_steps_interactive.pm_.c:297
 msgid "no network card found"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:302
+#: ../install_steps_interactive.pm_.c:326
 #, c-format
 msgid "Configuring network device %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:303
+#: ../install_steps_interactive.pm_.c:327
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:306
+#: ../install_steps_interactive.pm_.c:330
 msgid "Automatic IP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:306
+#: ../install_steps_interactive.pm_.c:330
 msgid "IP address:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:306
+#: ../install_steps_interactive.pm_.c:330
 msgid "Netmask:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:307
+#: ../install_steps_interactive.pm_.c:331
 msgid "(bootp/dhcp)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:313
-#: ../install_steps_interactive.pm_.c:476
+#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:504
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:332
+#: ../install_steps_interactive.pm_.c:356
 msgid "Configuring network"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:333
+#: ../install_steps_interactive.pm_.c:357
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -1589,179 +1721,179 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "DNS server:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "Gateway device:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "Gateway:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "Host name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:348
+#: ../install_steps_interactive.pm_.c:374
 msgid "Try to find a modem?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:357
+#: ../install_steps_interactive.pm_.c:383
 msgid "Which serial port is your modem connected to?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:361
+#: ../install_steps_interactive.pm_.c:387
 msgid "Dialup options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:362
+#: ../install_steps_interactive.pm_.c:388
 msgid "Connection name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:363
+#: ../install_steps_interactive.pm_.c:389
 msgid "Phone number"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:390
 msgid "Login ID"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:365
-#: ../install_steps_interactive.pm_.c:588
-#: ../install_steps_interactive.pm_.c:634
-#: ../install_steps_interactive.pm_.c:725
+#: ../install_steps_interactive.pm_.c:391
+#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:662
+#: ../install_steps_interactive.pm_.c:753
 msgid "Password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "Authentication"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "CHAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "PAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "Script-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "Terminal-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:367
+#: ../install_steps_interactive.pm_.c:393
 msgid "Domain name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:368
+#: ../install_steps_interactive.pm_.c:394
 msgid "First DNS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:369
+#: ../install_steps_interactive.pm_.c:395
 msgid "Second DNS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:378
+#: ../install_steps_interactive.pm_.c:406
 msgid "Which is your timezone?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:379
+#: ../install_steps_interactive.pm_.c:407
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:389
+#: ../install_steps_interactive.pm_.c:417
 msgid "Printer"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:390
+#: ../install_steps_interactive.pm_.c:418
 msgid "Would you like to configure a printer?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:402
+#: ../install_steps_interactive.pm_.c:430
 msgid "Local Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:403
+#: ../install_steps_interactive.pm_.c:431
 msgid ""
 "Every print queue (which print jobs are directed to) needs a\n"
 "name (often lp) and a spool directory associated with it. What\n"
 "name and directory should be used for this queue?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:406
+#: ../install_steps_interactive.pm_.c:434
 msgid "Name of queue:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:406
+#: ../install_steps_interactive.pm_.c:434
 msgid "Spool directory:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:445
 msgid "Select Printer Connection"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:446
 msgid "How is the printer connected?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:426
+#: ../install_steps_interactive.pm_.c:454
 msgid "Detecting devices..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:426
+#: ../install_steps_interactive.pm_.c:454
 msgid "Test ports"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:439
+#: ../install_steps_interactive.pm_.c:467
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:446
+#: ../install_steps_interactive.pm_.c:474
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:447
+#: ../install_steps_interactive.pm_.c:475
 msgid ""
 "What device is your printer connected to  \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:448
+#: ../install_steps_interactive.pm_.c:476
 msgid "Printer Device:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:452
+#: ../install_steps_interactive.pm_.c:480
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:453
+#: ../install_steps_interactive.pm_.c:481
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
 "on that server which jobs should be placed in."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:456
+#: ../install_steps_interactive.pm_.c:484
 msgid "Remote hostname:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:456
+#: ../install_steps_interactive.pm_.c:484
 msgid "Remote queue"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:461
+#: ../install_steps_interactive.pm_.c:489
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:462
+#: ../install_steps_interactive.pm_.c:490
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -1770,37 +1902,37 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:467
+#: ../install_steps_interactive.pm_.c:495
 msgid "SMB server IP:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:467
+#: ../install_steps_interactive.pm_.c:495
 msgid "SMB server host:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:468
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:496
+#: ../install_steps_interactive.pm_.c:518
 msgid "Password:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:468
+#: ../install_steps_interactive.pm_.c:496
 msgid "Share name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:468
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:496
+#: ../install_steps_interactive.pm_.c:518
 msgid "User name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:469
+#: ../install_steps_interactive.pm_.c:497
 msgid "Workgroup:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:484
+#: ../install_steps_interactive.pm_.c:512
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:485
+#: ../install_steps_interactive.pm_.c:513
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -1808,182 +1940,183 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:517
 msgid "Print Queue Name:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:517
 msgid "Printer Server:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:500
-msgid "Yes, print ascii test page"
+#: ../install_steps_interactive.pm_.c:528
+msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:501
-msgid "Yes, print postscript test page"
+#: ../install_steps_interactive.pm_.c:529
+msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:502
+#: ../install_steps_interactive.pm_.c:530
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:503
-#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52
-#: ../my_gtk.pm_.c:436
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../my_gtk.pm_.c:437
 msgid "No"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:509
+#: ../install_steps_interactive.pm_.c:537
 msgid "Configure Printer"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:538
 msgid "What type of printer do you have?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:560
 msgid "Printer options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:561
 msgid "Paper Size"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:562
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:565
 msgid "Fix stair-stepping text?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:568
 msgid "Uniprint driver options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:541
+#: ../install_steps_interactive.pm_.c:569
 msgid "Color depth options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:550
+#: ../install_steps_interactive.pm_.c:578
 msgid "Do you want to test printing?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:586
+#: ../install_steps_interactive.pm_.c:614
 msgid "No password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:586
-#: ../install_steps_interactive.pm_.c:796 ../interactive.pm_.c:47
-#: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22
-#: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:437
-#: ../my_gtk.pm_.c:534 ../unused/install_steps_graphical.pm_.c:608
+#: ../install_steps_interactive.pm_.c:614
+#: ../install_steps_interactive.pm_.c:824 ../interactive.pm_.c:47
+#: ../interactive.pm_.c:57 ../interactive.pm_.c:136
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:438
+#: ../my_gtk.pm_.c:535
 msgid "Ok"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:589
-#: ../install_steps_interactive.pm_.c:635
+#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:663
 msgid "Password (again)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:591
+#: ../install_steps_interactive.pm_.c:619
 msgid "Use shadow file"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:591
+#: ../install_steps_interactive.pm_.c:619
 msgid "shadow"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:592
+#: ../install_steps_interactive.pm_.c:620
 msgid "MD5"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:592
+#: ../install_steps_interactive.pm_.c:620
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:594
+#: ../install_steps_interactive.pm_.c:622
 msgid "Use NIS"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:594
+#: ../install_steps_interactive.pm_.c:622
 msgid "yellow pages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:598
-#: ../install_steps_interactive.pm_.c:646
+#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:674
 msgid "Please try again"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:598
-#: ../install_steps_interactive.pm_.c:646
+#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:674
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:600
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:675
 msgid "This password is too simple"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:607
-msgid "TODO"
+#: ../install_steps_interactive.pm_.c:635
+msgid "Authentification NIS"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:636
 msgid "NIS Domain"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:636
 msgid "NIS Server"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:656
 msgid "Accept user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:656
 msgid "Add user"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:629
+#: ../install_steps_interactive.pm_.c:657
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:629
+#: ../install_steps_interactive.pm_.c:657
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:659
 msgid "Real name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:632
+#: ../install_steps_interactive.pm_.c:660
 msgid "User name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:637
+#: ../install_steps_interactive.pm_.c:665
 msgid "Shell"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:648
+#: ../install_steps_interactive.pm_.c:676
 msgid "Please give a user name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:649
+#: ../install_steps_interactive.pm_.c:677
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:650
+#: ../install_steps_interactive.pm_.c:678
 msgid "This user name is already added"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:671
+#: ../install_steps_interactive.pm_.c:699
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -1997,246 +2130,257 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:680
+#: ../install_steps_interactive.pm_.c:708
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:683
+#: ../install_steps_interactive.pm_.c:711
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:684
+#: ../install_steps_interactive.pm_.c:712
 msgid "Skip"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:716
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:689
+#: ../install_steps_interactive.pm_.c:717
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:696
+#: ../install_steps_interactive.pm_.c:724
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:736
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:736
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:712
+#: ../install_steps_interactive.pm_.c:740
 msgid "LILO Installation"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:741
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:716
+#: ../install_steps_interactive.pm_.c:744
 msgid "Do you want to use LILO?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:719
+#: ../install_steps_interactive.pm_.c:747
 msgid "Boot device"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:720
+#: ../install_steps_interactive.pm_.c:748
 msgid "Linear (needed for some SCSI drives)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:720
+#: ../install_steps_interactive.pm_.c:748
 msgid "linear"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:721
+#: ../install_steps_interactive.pm_.c:749
 msgid "Compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:721
+#: ../install_steps_interactive.pm_.c:749
 msgid "compact"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:722
+#: ../install_steps_interactive.pm_.c:750
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:723
+#: ../install_steps_interactive.pm_.c:751
 msgid "Video mode"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:726
+#: ../install_steps_interactive.pm_.c:754
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:726
+#: ../install_steps_interactive.pm_.c:754
 msgid "restrict"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:732
+#: ../install_steps_interactive.pm_.c:760
 msgid "LILO main options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:734
-msgid ""
-"At this level of security, a password (and a good one) in lilo is requested"
-msgstr ""
-
-#: ../install_steps_interactive.pm_.c:735
+#: ../install_steps_interactive.pm_.c:763
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:744
+#: ../install_steps_interactive.pm_.c:772
 msgid ""
 "Here are the following entries in LILO.\n"
 "You can add some more or change the existent ones."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:746
+#: ../install_steps_interactive.pm_.c:774
 msgid "Add"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:783
 msgid "Linux"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:783
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:783
 msgid "Which type of entry do you want to add"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:803
 msgid "Image"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:776
-#: ../install_steps_interactive.pm_.c:784
+#: ../install_steps_interactive.pm_.c:804
+#: ../install_steps_interactive.pm_.c:812
 msgid "Root"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:777
+#: ../install_steps_interactive.pm_.c:805
 msgid "Append"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:778
+#: ../install_steps_interactive.pm_.c:806
 msgid "Initrd"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:779
+#: ../install_steps_interactive.pm_.c:807
 msgid "Read-write"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:785
+#: ../install_steps_interactive.pm_.c:813
 msgid "Table"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:786
+#: ../install_steps_interactive.pm_.c:814
 msgid "Unsafe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:791
+#: ../install_steps_interactive.pm_.c:819
 msgid "Label"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:793
+#: ../install_steps_interactive.pm_.c:821
 msgid "Default"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:796
+#: ../install_steps_interactive.pm_.c:824
 msgid "Remove entry"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:799
+#: ../install_steps_interactive.pm_.c:827
 msgid "Empty label not allowed"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:800
+#: ../install_steps_interactive.pm_.c:828
 msgid "This label is already in use"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:801
+#: ../install_steps_interactive.pm_.c:829
 #, c-format
 msgid "A entry %s already exists"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:815
+#: ../install_steps_interactive.pm_.c:843
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:827
-msgid "Low"
+#: ../install_steps_interactive.pm_.c:855
+msgid "Proxies configuration"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:828
-msgid "Medium"
+#: ../install_steps_interactive.pm_.c:856
+msgid "HTTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:829
-msgid "High"
+#: ../install_steps_interactive.pm_.c:857
+msgid "FTP proxy"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:838
-msgid "Miscellaneous questions"
+#: ../install_steps_interactive.pm_.c:863
+msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:839
-msgid "Do you have a laptop?"
+#: ../install_steps_interactive.pm_.c:864
+msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:840
-msgid "Use hard drive optimizations"
+#: ../install_steps_interactive.pm_.c:874
+msgid "Windows(TM)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:841
-msgid "Security level"
+#: ../install_steps_interactive.pm_.c:875
+msgid "Poor"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:842
-msgid "HTTP proxy"
+#: ../install_steps_interactive.pm_.c:876
+msgid "Low"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:843
-msgid "FTP proxy"
+#: ../install_steps_interactive.pm_.c:877
+msgid "Medium"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:845
-#, c-format
-msgid "Precise ram size (found %d MB)"
+#: ../install_steps_interactive.pm_.c:878
+msgid "High"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:848
-msgid "(may cause disk problems)"
+#: ../install_steps_interactive.pm_.c:879
+msgid "Paranoid"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:856
-msgid "Proxy should be http://..."
+#: ../install_steps_interactive.pm_.c:889
+msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:857
-msgid "Proxy should be ftp://..."
+#: ../install_steps_interactive.pm_.c:890
+msgid "Is this machine a laptop?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:891
+msgid "Use hard drive optimisations?"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:892
+msgid "Choose security level"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:893
+#, c-format
+msgid "Precise RAM size if needed (found %d MB)"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:896
+msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:858
+#: ../install_steps_interactive.pm_.c:901
 msgid "Give the ram size in Mb"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:871
+#: ../install_steps_interactive.pm_.c:940
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:878
+#: ../install_steps_interactive.pm_.c:945
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2249,22 +2393,22 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:897
+#: ../install_steps_interactive.pm_.c:966
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:898
+#: ../install_steps_interactive.pm_.c:967
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:908
+#: ../install_steps_interactive.pm_.c:977
 #, c-format
-msgid "What %s card do you have?"
+msgid "Which %s driver should I try?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:915
+#: ../install_steps_interactive.pm_.c:984
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2276,20 +2420,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:920
+#: ../install_steps_interactive.pm_.c:989
 msgid "Autoprobe"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:920
+#: ../install_steps_interactive.pm_.c:989
 msgid "Specify options"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:924
+#: ../install_steps_interactive.pm_.c:993
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:999
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2297,87 +2441,98 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:933
+#: ../install_steps_interactive.pm_.c:1002
 msgid "Module options:"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:943
+#: ../install_steps_interactive.pm_.c:1012
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:956
+#: ../install_steps_interactive.pm_.c:1025
 #, c-format
 msgid "Skip %s PCMCIA probing"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:957
+#: ../install_steps_interactive.pm_.c:1026
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:957
+#: ../install_steps_interactive.pm_.c:1026
 msgid "PCMCIA"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:964
+#: ../install_steps_interactive.pm_.c:1033
 msgid "Try to find PCI devices?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:968
+#: ../install_steps_interactive.pm_.c:1037
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:969
+#: ../install_steps_interactive.pm_.c:1038
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:970
+#: ../install_steps_interactive.pm_.c:1039
 #, c-format
-msgid "Do you have an %s interface?"
+msgid "Do you have any %s interface?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52
-#: ../my_gtk.pm_.c:436
+#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../my_gtk.pm_.c:437
 msgid "Yes"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:973
+#: ../install_steps_interactive.pm_.c:1042
 msgid "See hardware info"
 msgstr ""
 
-#: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22
-#: ../interactive_newt.pm_.c:55 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:437
+#: ../install_steps_newt.pm_.c:19
+#, c-format
+msgid "Linux-Mandrake Installation %s"
+msgstr ""
+
+#: ../install_steps_newt.pm_.c:30
+msgid ""
+"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+msgstr ""
+
+#: ../interactive.pm_.c:57 ../interactive.pm_.c:135
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:201 ../my_gtk.pm_.c:438
 msgid "Cancel"
 msgstr ""
 
-#: ../interactive.pm_.c:159
+#: ../interactive.pm_.c:153
 msgid "Please wait"
 msgstr ""
 
-#: ../interactive_stdio.pm_.c:34
+#: ../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
 msgstr ""
 
-#: ../interactive_stdio.pm_.c:35 ../interactive_stdio.pm_.c:50
-#: ../interactive_stdio.pm_.c:69
+#: ../interactive_stdio.pm_.c:36 ../interactive_stdio.pm_.c:51
+#: ../interactive_stdio.pm_.c:70
 msgid "Bad choice, try again\n"
 msgstr ""
 
-#: ../interactive_stdio.pm_.c:38
+#: ../interactive_stdio.pm_.c:39
 #, c-format
 msgid " ? (default %s) "
 msgstr ""
 
-#: ../interactive_stdio.pm_.c:51
+#: ../interactive_stdio.pm_.c:52
 #, c-format
 msgid "Your choice? (default %s) "
 msgstr ""
 
-#: ../interactive_stdio.pm_.c:70
+#: ../interactive_stdio.pm_.c:71
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr ""
@@ -2502,152 +2657,152 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../mouse.pm_.c:19
+#: ../mouse.pm_.c:20
 msgid "No Mouse"
 msgstr ""
 
-#: ../mouse.pm_.c:20
+#: ../mouse.pm_.c:21
 msgid "Microsoft Rev 2.1A or higher (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:21
+#: ../mouse.pm_.c:22
 msgid "Logitech CC Series (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:22
+#: ../mouse.pm_.c:23
 msgid "Logitech MouseMan+/FirstMouse+ (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:23
+#: ../mouse.pm_.c:24
 msgid "ASCII MieMouse (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:24
+#: ../mouse.pm_.c:25
 msgid "Genius NetMouse (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:25
+#: ../mouse.pm_.c:26
 msgid "Microsoft IntelliMouse (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:26
+#: ../mouse.pm_.c:27
 msgid "MM Series (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:27
+#: ../mouse.pm_.c:28
 msgid "MM HitTablet (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:28
+#: ../mouse.pm_.c:29
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr ""
 
-#: ../mouse.pm_.c:29
+#: ../mouse.pm_.c:30
 msgid "Logitech MouseMan/FirstMouse (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:30
+#: ../mouse.pm_.c:31
 msgid "Generic Mouse (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:31
+#: ../mouse.pm_.c:32
 msgid "Microsoft compatible (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:32
+#: ../mouse.pm_.c:33
 msgid "Generic 3 Button Mouse (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:33
+#: ../mouse.pm_.c:34
 msgid "Mouse Systems (serial)"
 msgstr ""
 
-#: ../mouse.pm_.c:34
+#: ../mouse.pm_.c:35
 msgid "Generic Mouse (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:35
+#: ../mouse.pm_.c:36
 msgid "Logitech MouseMan/FirstMouse (ps/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:36
+#: ../mouse.pm_.c:37
 msgid "Generic 3 Button Mouse (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:37
+#: ../mouse.pm_.c:38
 msgid "ALPS GlidePoint (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:38
+#: ../mouse.pm_.c:39
 msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:39
+#: ../mouse.pm_.c:40
 msgid "Kensington Thinking Mouse (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:40
+#: ../mouse.pm_.c:41
 msgid "ASCII MieMouse (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:41
+#: ../mouse.pm_.c:42
 msgid "Genius NetMouse (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:42
+#: ../mouse.pm_.c:43
 msgid "Genius NetMouse Pro (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:43
+#: ../mouse.pm_.c:44
 msgid "Genius NetScroll (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:44
+#: ../mouse.pm_.c:45
 msgid "Microsoft IntelliMouse (PS/2)"
 msgstr ""
 
-#: ../mouse.pm_.c:45
+#: ../mouse.pm_.c:46
 msgid "ATI Bus Mouse"
 msgstr ""
 
-#: ../mouse.pm_.c:46
+#: ../mouse.pm_.c:47
 msgid "Microsoft Bus Mouse"
 msgstr ""
 
-#: ../mouse.pm_.c:47
+#: ../mouse.pm_.c:48
 msgid "Logitech Bus Mouse"
 msgstr ""
 
-#: ../mouse.pm_.c:48
+#: ../mouse.pm_.c:49
 msgid "USB Mouse"
 msgstr ""
 
-#: ../mouse.pm_.c:49
+#: ../mouse.pm_.c:50
 msgid "USB Mouse (3 buttons or more)"
 msgstr ""
 
-#: ../partition_table.pm_.c:452
+#: ../partition_table.pm_.c:463
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions"
 msgstr ""
 
-#: ../partition_table.pm_.c:538
+#: ../partition_table.pm_.c:549
 #, c-format
 msgid "Error reading file %s"
 msgstr ""
 
-#: ../partition_table.pm_.c:545
+#: ../partition_table.pm_.c:556
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: ../partition_table.pm_.c:547
+#: ../partition_table.pm_.c:558
 msgid "Bad backup file"
 msgstr ""
 
-#: ../partition_table.pm_.c:567
+#: ../partition_table.pm_.c:578
 #, c-format
 msgid "Error writing to file %s"
 msgstr ""
@@ -2668,24 +2823,16 @@ msgstr ""
 msgid "NetWare"
 msgstr ""
 
-#: ../raid.pm_.c:34
+#: ../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../raid.pm_.c:104
+#: ../raid.pm_.c:108
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../raid.pm_.c:139
+#: ../raid.pm_.c:145
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
-
-#: ../unused/install_steps_graphical.pm_.c:433
-msgid "Show less"
-msgstr ""
-
-#: ../unused/install_steps_graphical.pm_.c:434
-msgid "Show more"
-msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 2cdfdd9f6..7c763ca4e 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 1999-11-09 16:28+0100\n"
+"POT-Creation-Date: 1999-11-16 12:04+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -98,8 +98,8 @@ msgstr ""
 msgid "(leaving in %d seconds)"
 msgstr "(slutter om %d sekunder)"
 
-#: ../Xconfigurator.pm_.c:324 ../install_steps_interactive.pm_.c:571
-#: ../my_gtk.pm_.c:437
+#: ../Xconfigurator.pm_.c:324 ../install_steps_interactive.pm_.c:599
+#: ../my_gtk.pm_.c:438
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
@@ -121,7 +121,7 @@ msgstr ""
 "Skjermen din vil blinke...\n"
 "Du kan slå av hvis du vil, du vil høre et bipp når det er ferdig"
 
-#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:536
+#: ../Xconfigurator.pm_.c:392 ../install_steps_interactive.pm_.c:564
 msgid "Resolution"
 msgstr "Oppløsning"
 
@@ -196,43 +196,48 @@ msgstr "Minne grafikk: %s kB\n"
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-tjener: %s\n"
 
-#: ../Xconfigurator.pm_.c:732
+#: ../Xconfigurator.pm_.c:721
+#, fuzzy
+msgid "Preparing X-Window configuration"
+msgstr "Forbereder installasjon"
+
+#: ../Xconfigurator.pm_.c:735
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../Xconfigurator.pm_.c:733
+#: ../Xconfigurator.pm_.c:736
 msgid "Change Graphic card"
 msgstr "Endre grafikk-kort"
 
-#: ../Xconfigurator.pm_.c:734
+#: ../Xconfigurator.pm_.c:737
 msgid "Change Resolution"
 msgstr "Endre oppløsning"
 
-#: ../Xconfigurator.pm_.c:735
+#: ../Xconfigurator.pm_.c:738
 msgid "Automatical resolutions search"
 msgstr "Automatisk oppløsningssøk"
 
-#: ../Xconfigurator.pm_.c:739
+#: ../Xconfigurator.pm_.c:742
 msgid "Show information"
 msgstr "Vis informasjon"
 
-#: ../Xconfigurator.pm_.c:740
+#: ../Xconfigurator.pm_.c:743
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../Xconfigurator.pm_.c:741
+#: ../Xconfigurator.pm_.c:744
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../Xconfigurator.pm_.c:744
+#: ../Xconfigurator.pm_.c:747
 msgid "What do you want to do?"
 msgstr "Hva vil du gjøre?"
 
-#: ../Xconfigurator.pm_.c:749
+#: ../Xconfigurator.pm_.c:754
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../Xconfigurator.pm_.c:750
+#: ../Xconfigurator.pm_.c:755
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -241,23 +246,28 @@ msgstr ""
 "Vil du at X skal starte når du starter maskinen på nytt?"
 
 #: ../Xconfigurator_consts.pm_.c:4
-msgid "256 colors"
+#, fuzzy
+msgid "256 colors (8 bits)"
 msgstr "256 farger"
 
 #: ../Xconfigurator_consts.pm_.c:5
-msgid "32 thousand colors"
+#, fuzzy
+msgid "32 thousand colors (15 bits)"
 msgstr "32 tusen farger"
 
 #: ../Xconfigurator_consts.pm_.c:6
-msgid "65 thousand colors"
+#, fuzzy
+msgid "65 thousand colors (16 bits)"
 msgstr "65 tusen farger"
 
 #: ../Xconfigurator_consts.pm_.c:7
-msgid "16 million colors"
+#, fuzzy
+msgid "16 million colors (24 bits)"
 msgstr "16 millioner farger"
 
 #: ../Xconfigurator_consts.pm_.c:8
-msgid "4 billion colors"
+#, fuzzy
+msgid "4 billion colors (32 bits)"
 msgstr "4 milliarder farger"
 
 #: ../Xconfigurator_consts.pm_.c:101
@@ -352,19 +362,19 @@ msgstr "Slett"
 msgid "Format"
 msgstr "Formater"
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:418
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:425
 msgid "Move"
 msgstr "Flytt"
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:476
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:484
 msgid "Resize"
 msgstr "Endre størrelse"
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:365
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:367
 msgid "Type"
 msgstr "Type"
 
-#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:381
+#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:387
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
@@ -396,8 +406,8 @@ msgstr "Gjenopprett fra diskett"
 msgid "Save on floppy"
 msgstr "Lagre på diskett"
 
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:628
-#: ../install_steps_interactive.pm_.c:746
+#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:656
+#: ../install_steps_interactive.pm_.c:774
 msgid "Done"
 msgstr "Ferdig"
 
@@ -445,112 +455,112 @@ msgstr "Skriv partisjonstabell"
 msgid "Reload"
 msgstr "Last igjen"
 
-#: ../diskdrake.pm_.c:98
+#: ../diskdrake.pm_.c:100
 msgid "Filesystem types:"
 msgstr "Filsystemtype:"
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Empty"
 msgstr "Tom"
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "FAT"
 msgstr "FAT"
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Other"
 msgstr "Andre"
 
-#: ../diskdrake.pm_.c:102
+#: ../diskdrake.pm_.c:104
 msgid "Swap"
 msgstr "Veksle"
 
-#: ../diskdrake.pm_.c:105
+#: ../diskdrake.pm_.c:107
 msgid "Choose action"
 msgstr "Velg handling"
 
-#: ../diskdrake.pm_.c:107
+#: ../diskdrake.pm_.c:109
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../diskdrake.pm_.c:132
+#: ../diskdrake.pm_.c:134
 #, c-format
 msgid "After %s partition %s,"
 msgstr "Etter %s partisjon %s,"
 
-#: ../diskdrake.pm_.c:132 ../diskdrake.pm_.c:408 ../diskdrake.pm_.c:436
+#: ../diskdrake.pm_.c:134 ../diskdrake.pm_.c:415 ../diskdrake.pm_.c:444
 msgid "Read carefully!"
 msgstr "Les nøye!"
 
-#: ../diskdrake.pm_.c:132
+#: ../diskdrake.pm_.c:134
 msgid "all data on this partition will be lost"
 msgstr "alle data på denne partisjonen vil gå tapt"
 
 # #: ../install_steps_interactive.pm_.c:37
-#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:172 ../install_steps.pm_.c:71
-#: ../install_steps_interactive.pm_.c:41
+#: ../diskdrake.pm_.c:153 ../install_any.pm_.c:173 ../install_steps.pm_.c:73
+#: ../install_steps_interactive.pm_.c:43
 msgid "Error"
 msgstr "Feil"
 
-#: ../diskdrake.pm_.c:175 ../diskdrake.pm_.c:553
+#: ../diskdrake.pm_.c:177 ../diskdrake.pm_.c:562
 msgid "Mount point: "
 msgstr "Monteringspunkt: "
 
-#: ../diskdrake.pm_.c:176 ../diskdrake.pm_.c:208
+#: ../diskdrake.pm_.c:178 ../diskdrake.pm_.c:210
 msgid "Device: "
 msgstr "Enhet: "
 
-#: ../diskdrake.pm_.c:177
+#: ../diskdrake.pm_.c:179
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS diskbokstav: %s (bare en gjetning)\n"
 
-#: ../diskdrake.pm_.c:178 ../diskdrake.pm_.c:211
+#: ../diskdrake.pm_.c:180 ../diskdrake.pm_.c:213
 msgid "Type: "
 msgstr "Type: "
 
-#: ../diskdrake.pm_.c:179
+#: ../diskdrake.pm_.c:181
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Start: sektor %s\n"
 
-#: ../diskdrake.pm_.c:180
+#: ../diskdrake.pm_.c:182
 #, c-format
 msgid "Size: %s MB"
 msgstr "Størrelse: %d MB"
 
-#: ../diskdrake.pm_.c:182
+#: ../diskdrake.pm_.c:184
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorer"
 
-#: ../diskdrake.pm_.c:184
+#: ../diskdrake.pm_.c:186
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Sylinder %d til sylinder %d\n"
 
-#: ../diskdrake.pm_.c:185
+#: ../diskdrake.pm_.c:187
 msgid "Formatted\n"
 msgstr "Formatert\n"
 
-#: ../diskdrake.pm_.c:186
+#: ../diskdrake.pm_.c:188
 msgid "Not formatted\n"
 msgstr "Ikke formatert\n"
 
-#: ../diskdrake.pm_.c:187
+#: ../diskdrake.pm_.c:189
 msgid "Mounted\n"
 msgstr "Montert\n"
 
-#: ../diskdrake.pm_.c:188
+#: ../diskdrake.pm_.c:190
 #, c-format
 msgid "RAID md%s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:189
+#: ../diskdrake.pm_.c:191
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -558,58 +568,58 @@ msgstr ""
 "Partisjon startet opp som standard\n"
 "    (for MS-DOS oppstart, ikke for lilo)\n"
 
-#: ../diskdrake.pm_.c:191
+#: ../diskdrake.pm_.c:193
 #, c-format
 msgid "Level %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:192
+#: ../diskdrake.pm_.c:194
 #, c-format
 msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:193
+#: ../diskdrake.pm_.c:195
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:209
+#: ../diskdrake.pm_.c:211
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Størrelse: %d MB\n"
 
-#: ../diskdrake.pm_.c:210
+#: ../diskdrake.pm_.c:212
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
 
-#: ../diskdrake.pm_.c:212
+#: ../diskdrake.pm_.c:214
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "på buss %d id %d\n"
 
-#: ../diskdrake.pm_.c:224
+#: ../diskdrake.pm_.c:226
 msgid "Mount"
 msgstr "Monter"
 
-#: ../diskdrake.pm_.c:226
+#: ../diskdrake.pm_.c:228
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../diskdrake.pm_.c:227
+#: ../diskdrake.pm_.c:229
 msgid "Add to RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:228
+#: ../diskdrake.pm_.c:230
 #, fuzzy
 msgid "Remove from RAID"
 msgstr "Gjenopprett fra fil"
 
-#: ../diskdrake.pm_.c:229
+#: ../diskdrake.pm_.c:231
 msgid "Modify RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:325
+#: ../diskdrake.pm_.c:327
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -621,7 +631,7 @@ msgstr ""
 "Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du "
 "trenger ikke /boot"
 
-#: ../diskdrake.pm_.c:329
+#: ../diskdrake.pm_.c:331
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -634,119 +644,129 @@ msgstr ""
 "Hvis du skal bruke oppstartshåndtereren LILO, vær nøye med å legge til en\n"
 "/boot partisjon"
 
-#: ../diskdrake.pm_.c:344
+#: ../diskdrake.pm_.c:346
 msgid "Quit without saving"
 msgstr "Avslutt uten å lagre"
 
-#: ../diskdrake.pm_.c:344
+#: ../diskdrake.pm_.c:346
 msgid "Quit without writing the partition table?"
 msgstr "Avslutt uten å skrive partisjonstabellen?"
 
-#: ../diskdrake.pm_.c:360
+#: ../diskdrake.pm_.c:362
 msgid "changing type of"
 msgstr "endrer type av"
 
-#: ../diskdrake.pm_.c:363
+#: ../diskdrake.pm_.c:365
 msgid "Change partition type"
 msgstr "Endre partisjonstype"
 
-#: ../diskdrake.pm_.c:364
+#: ../diskdrake.pm_.c:366
 msgid "Which partition type do you want?"
 msgstr "Hvilken partisjonstype ønsker du?"
 
-#: ../diskdrake.pm_.c:380
+#: ../diskdrake.pm_.c:386
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hvor vil du montere %s enheten?"
 
-#: ../diskdrake.pm_.c:402
+#: ../diskdrake.pm_.c:408
 msgid "formatting"
 msgstr "formatering"
 
-#: ../diskdrake.pm_.c:408
+#: ../diskdrake.pm_.c:410
+#, fuzzy
+msgid "Formatting"
+msgstr "formatering"
+
+#: ../diskdrake.pm_.c:410 ../install_steps_interactive.pm_.c:216
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partisjon %s"
+
+#: ../diskdrake.pm_.c:415
 msgid "After formatting all partitions,"
 msgstr "Etter formatering av alle partisjonene,"
 
-#: ../diskdrake.pm_.c:408
+#: ../diskdrake.pm_.c:415
 msgid "all data on these partitions will be lost"
 msgstr "alle data på disse partisjonene vil gå tapt"
 
-#: ../diskdrake.pm_.c:419
+#: ../diskdrake.pm_.c:426
 msgid "Which disk do you want to move to?"
 msgstr "Hvilken disk vil du flytte til?"
 
-#: ../diskdrake.pm_.c:423
+#: ../diskdrake.pm_.c:430
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../diskdrake.pm_.c:424
+#: ../diskdrake.pm_.c:431
 msgid "Which sector do you want to move to?"
 msgstr "Hvilken sektor vil du flytte til?"
 
-#: ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:434
 msgid "Moving"
 msgstr "Flytter"
 
-#: ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:434
 msgid "Moving partition..."
 msgstr "Flytter partisjon..."
 
-#: ../diskdrake.pm_.c:436
+#: ../diskdrake.pm_.c:444
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partisjonstabellen på disk %s blir nå skrevet til disk!"
 
-#: ../diskdrake.pm_.c:438
+#: ../diskdrake.pm_.c:446
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Du må starte maskinen på nytt for at modifiseringene skal tre i kraft"
 
-#: ../diskdrake.pm_.c:459
+#: ../diskdrake.pm_.c:467
 msgid "Computing fat filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
-#: ../diskdrake.pm_.c:459 ../diskdrake.pm_.c:504
+#: ../diskdrake.pm_.c:467 ../diskdrake.pm_.c:512
 msgid "Resizing"
 msgstr "Endrer størrelse"
 
-#: ../diskdrake.pm_.c:473
+#: ../diskdrake.pm_.c:481
 msgid "resizing"
 msgstr "endrer størrelse"
 
-#: ../diskdrake.pm_.c:483
+#: ../diskdrake.pm_.c:491
 msgid "Choose the new size"
 msgstr "Velg den nye størrelsen"
 
-#: ../diskdrake.pm_.c:483 ../install_steps_graphical.pm_.c:290
-#: ../install_steps_graphical.pm_.c:337
-#: ../unused/install_steps_graphical.pm_.c:314
+#: ../diskdrake.pm_.c:491 ../install_steps_graphical.pm_.c:287
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:287
+#: ../install_steps_gtk.pm_.c:334
 msgid "MB"
 msgstr "MB"
 
-#: ../diskdrake.pm_.c:530
+#: ../diskdrake.pm_.c:539
 msgid "Create a new partition"
 msgstr "Opprette en ny partisjon"
 
-#: ../diskdrake.pm_.c:546
+#: ../diskdrake.pm_.c:555
 msgid "Start sector: "
 msgstr "Start sektor: "
 
-#: ../diskdrake.pm_.c:549
+#: ../diskdrake.pm_.c:558
 msgid "Size in MB: "
 msgstr "Størrelse i MB: "
 
-#: ../diskdrake.pm_.c:552
+#: ../diskdrake.pm_.c:561
 msgid "Filesystem type: "
 msgstr "Filsystemtype: "
 
-#: ../diskdrake.pm_.c:554
+#: ../diskdrake.pm_.c:563
 msgid "Preference: "
 msgstr "Valg: "
 
-#: ../diskdrake.pm_.c:596 ../diskdrake.pm_.c:612
+#: ../diskdrake.pm_.c:607 ../diskdrake.pm_.c:623
 msgid "Select file"
 msgstr "Velg fil"
 
-#: ../diskdrake.pm_.c:605
+#: ../diskdrake.pm_.c:616
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -754,11 +774,11 @@ msgstr ""
 "Sikkerhetskopien av partisjonstabellen har ikke samme størrelse\n"
 "Fortsette for det?"
 
-#: ../diskdrake.pm_.c:613
+#: ../diskdrake.pm_.c:624
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../diskdrake.pm_.c:614
+#: ../diskdrake.pm_.c:625
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -766,28 +786,28 @@ msgstr ""
 "Sett inn en diskett i stasjonen\n"
 "Alle data på denne disketten vil gå tapt"
 
-#: ../diskdrake.pm_.c:628
+#: ../diskdrake.pm_.c:639
 msgid "Trying to rescue partition table"
 msgstr "Prøver å redde partisjonstabell"
 
-#: ../diskdrake.pm_.c:639
+#: ../diskdrake.pm_.c:650
 #, fuzzy
 msgid "device"
 msgstr "Enhet: "
 
-#: ../diskdrake.pm_.c:640
+#: ../diskdrake.pm_.c:651
 msgid "level"
 msgstr ""
 
-#: ../diskdrake.pm_.c:641
+#: ../diskdrake.pm_.c:652
 msgid "chunk size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:653
-msgid "Choose an existent RAID to add to"
+#: ../diskdrake.pm_.c:664
+msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../diskdrake.pm_.c:654
+#: ../diskdrake.pm_.c:665
 msgid "new"
 msgstr ""
 
@@ -814,21 +834,21 @@ msgstr "montering mislykket: "
 msgid "error unmounting %s: %s"
 msgstr "feil ved demontering av %s: %s"
 
-#: ../fsedit.pm_.c:168
+#: ../fsedit.pm_.c:186
 msgid "Mount points must begin with a leading /"
 msgstr "Monteringspunkter må begynne med /"
 
-#: ../fsedit.pm_.c:171
+#: ../fsedit.pm_.c:189
 #, c-format
 msgid "There is already a partition with mount point %s"
 msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
 
-#: ../fsedit.pm_.c:301
+#: ../fsedit.pm_.c:273
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Feil ved åpning av %s for skriving: %s"
 
-#: ../fsedit.pm_.c:373
+#: ../fsedit.pm_.c:345
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -836,25 +856,26 @@ msgstr ""
 "En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
 "filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
 
-#: ../fsedit.pm_.c:388
+#: ../fsedit.pm_.c:360
 msgid "You don't have any partitions!"
 msgstr "Du har ingen partisjoner!"
 
-#: ../help.pm_.c:21 ../help.pm_.c:259
+#: ../help.pm_.c:17 ../help.pm_.c:287
 msgid "Choose preferred language for install and system usage."
 msgstr "Velg ønsket språk for installering og systembruk."
 
-#: ../help.pm_.c:24 ../help.pm_.c:262
+#: ../help.pm_.c:20 ../help.pm_.c:290
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr "Velg oppsettet som stemmer med tastaturet ditt fra listen ovenfor"
 
-#: ../help.pm_.c:27 ../help.pm_.c:265
+#: ../help.pm_.c:23
+#, fuzzy
 msgid ""
-"Choose \"Installation\" if there are no previous versions of Linux\n"
-"installed, or if you wish use to multiple distributions or versions.\n"
+"Choose \"Install\" if there are no previous versions of Linux\n"
+"nstalled, or if you wish use to multiple distributions or versions.\n"
 "\n"
 "\n"
-"Choose \"Update\" if you wish to update a previous version of Mandrake\n"
+"Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
 "Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
 msgstr ""
 "Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
@@ -865,24 +886,25 @@ msgstr ""
 "Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
 "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)."
 
-#: ../help.pm_.c:35
+#: ../help.pm_.c:31
+#, fuzzy
 msgid ""
 "Select:\n"
 "\n"
-"  - Beginner: If you have never installed Linux before.\n"
+"  - Recommended: If you have never installed Linux before.\n"
 "\n"
 "\n"
-"  - Developer: If you are familiar with Linux and will be using the\n"
-"computer primarily for software development, you will find happiness\n"
-"here.\n"
-"\n"
-"\n"
-"  - Server: If you wish to install a general purpose server (for mail,\n"
-"printing...), select this.\n"
+"  - Customized: If you are familiar with Linux, you will be able to \n"
+"select the usage for the installed system between normal, development or\n"
+"server. Choose \"Normal\" for a general purpose installation of your\n"
+"computer. You may choose \"Development\" if you will be using the computer\n"
+"primarily for software development, or choose \"Server\" if you wish to\n"
+"install a general purpose server (for mail, printing...).\n"
 "\n"
 "\n"
 "  - Expert: If you are fluent with GNU/Linux and want to perform\n"
-"a highly customized installation, this Install Class is for you."
+"a highly customized installation, this Install Class is for you. You will\n"
+"be able to select the usage of your installed system as for \"Customized\"."
 msgstr ""
 "Velg:\n"
 "\n"
@@ -900,7 +922,7 @@ msgstr ""
 "  - Ekspert: Hvis du allerede kjenner GNU/Linux og ønsker å gjøre en\n"
 "egendefinert installasjon så er dette installasjonsvalget for deg."
 
-#: ../help.pm_.c:53
+#: ../help.pm_.c:49
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -948,15 +970,53 @@ msgstr ""
 "som foreslått i installasjonsguiden. Dette er opsjonene du vil trenge å\n"
 "gi til driveren."
 
-#: ../help.pm_.c:77 ../help.pm_.c:312
+#: ../help.pm_.c:76
+#, fuzzy
 msgid ""
-"In this stage, you may choose what partition(s) use to install your\n"
-"Linux-Mandrake system."
+"At this point, you may choose what partition(s) to use to install\n"
+"your Linux-Mandrake system if they have been already defined (from a\n"
+"previous install of Linux or from another partitionning tool). In other\n"
+"cases, hard drive partitions must be defined. This operation consists of\n"
+"logically dividing the computer's hard drive capacity into separate\n"
+"areas for use.\n"
+"\n"
+"\n"
+"If you have to create new partitions, use \"Auto allocate\" to "
+"automatically\n"
+"create partitions for Linux. You can select the disk for partitionning by\n"
+"clicking on \"hda\" for the first IDE drive,\n"
+"\"hdb\" for the second or \"sda\" for the first SCSI drive and so on.\n"
+"\n"
+"\n"
+"Two common partition are: the root partition (/), which is the starting\n"
+"point of the filesystem's directory hierarchy, and /boot, which contains\n"
+"all files necessary to start the operating system when the\n"
+"computer is first turned on.\n"
+"\n"
+"\n"
+"Because the effects of this process are usually irreversible, partitioning\n"
+"can be intimidating and stressful to the unexperienced user. DiskDrake\n"
+"simplifies the process so that it need not be. Consult the documentation\n"
+"and take your time before proceeding."
 msgstr ""
-"På dette punktet kan du velge hvilken partisjon(er) som skal brukes til\n"
-"å installere Linux-Mandrake systemet ditt."
+"På dette punktet må hard-disk partisjoner defineres. (Hvis du ikke\n"
+"overskriver en tidligere installasjon av Linux og allerede har definert\n"
+"hard-disk partisjonene dine som ønsket.) Denne operasjonen innebærer å\n"
+"logisk dele maskinens hard-disk kapasitet i separate områder for bruk.\n"
+"\n"
+"\n"
+"To vanlige partisjoner er: root-partisjonen (/) som er punktet hvor\n"
+"filsystemets katalogstruktur starter, og /boot, som inneholder alle\n"
+"filene som er nødvendige for å starte operativsystemet når datamaskinen\n"
+"blir slått på.\n"
+"\n"
+"\n"
+"Fordi effekten av denne prosessen vanligvis er ugjenkallelig kan\n"
+"partisjonering være både stressende og skremmende for uerfarne brukere.\n"
+"DiskDrake forenkler prosessen så den ikke trenger å være det. Les\n"
+"dokumentasjonen og ta deg god tid før du begynner."
 
-#: ../help.pm_.c:99 ../help.pm_.c:334
+#: ../help.pm_.c:102 ../help.pm_.c:362
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -972,11 +1032,19 @@ msgstr ""
 "eksisterende partisjoner, især hvis de inneholder filer eller data som du\n"
 "ønsker å beholde. Typiske å beholde er: /home og /usr/local."
 
-#: ../help.pm_.c:107 ../help.pm_.c:342
+#: ../help.pm_.c:110
+#, fuzzy
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
 "\n"
+"First you can select the size of your installed system and an automated\n"
+"selection of packages will be done according to your system usage. After\n"
+"that you can select more packages by group or click on Ok to keep the\n"
+"previous selection.\n"
+"\n"
+"\n"
+"If you are in expert mode, you can select packages individually.\n"
 "Please note that some packages require the installation of others.\n"
 "These are referred to as package dependencies. The packages you select,\n"
 "and the packages they require will be automatically selected for\n"
@@ -985,8 +1053,8 @@ msgid ""
 "\n"
 "\n"
 "Information on each category and specific package is available in the\n"
-"area titled \"Info\",  located between list of packages and the five\n"
-"buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
+"area titled \"Info\",  located between list of packages and the\n"
+"button \"Install\" to start the installation."
 msgstr ""
 "Du kan nå velge de pakkene du ønsker å installere.\n"
 "\n"
@@ -1002,15 +1070,15 @@ msgstr ""
 "kalt \"Info\", som du finner mellom listen over pakker og de fem knappene\n"
 "\"Installer\", \"Velg flere/færre\" og \"Vis flere/færre\"."
 
-#: ../help.pm_.c:122
+#: ../help.pm_.c:132
 msgid ""
 "The packages selected are now being installed. This operation\n"
-"should only take a few minutes."
+"should take a few minutes unless you have chosen to upgrade an\n"
+"existing system, in that case it can take more time even before\n"
+"upgrade starts."
 msgstr ""
-"Pakkene som er valgt blir nå installert. Denne operasjonen burde\n"
-"bare ta noen få minutter."
 
-#: ../help.pm_.c:126 ../help.pm_.c:363
+#: ../help.pm_.c:138 ../help.pm_.c:391
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1037,14 +1105,17 @@ msgstr ""
 "Hvis du har en seriell mus, må du også fortelle DrakX hvilken\n"
 "serie-port den er koblet til."
 
-#: ../help.pm_.c:140 ../help.pm_.c:377
+#: ../help.pm_.c:152
+#, fuzzy
 msgid ""
-"This section is dedicated to configuring a local area network,\n"
-"or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
-"Ethernet adapter on your machine. PCI adapters should be found and\n"
-"initialized automatically. However, if your peripheral is ISA,\n"
-"autodetection will not work, and you will have to choose a driver\n"
-"from the list that will appear then.\n"
+"This section is dedicated to configuring a local area\n"
+"network (LAN) or a modem.\n"
+"\n"
+"Choose \"Local LAN\" and DrakX will\n"
+"try to find an Ethernet adapter on your machine. PCI adapters\n"
+"should be found and initialized automatically.\n"
+"However, if your peripheral is ISA, autodetection will not work,\n"
+"and you will have to choose a driver from the list that will appear then.\n"
 "\n"
 "\n"
 "As for SCSI adapters, you can let the driver probe for the adapter\n"
@@ -1058,7 +1129,13 @@ msgid ""
 "have given you all necessary information (IP address, network\n"
 "submask or netmask for short, and hostname). If you're setting\n"
 "up a private network at home for example, you should choose\n"
-"addresses "
+"addresses.\n"
+"\n"
+"\n"
+"Choose \"Dialup with modem\" and the Internet connection with\n"
+"a modem will be configured. DrakX will try to find your modem,\n"
+"if it fails you will have to select the right serial port where\n"
+"your modem is connected to."
 msgstr ""
 "Denne seksjonen er dedikert til konfigurering av et lokalt nettverk,\n"
 "eller LAN. Hvis du svarer \"Ja\" her, vil DrakX forsøke å finne\n"
@@ -1079,13 +1156,23 @@ msgstr ""
 "opp et privat nettverk hjemme, burde du velge\n"
 "adresser "
 
+#: ../help.pm_.c:182
+msgid ""
+"You can now select your timezone according to where you live.\n"
+"\n"
+"\n"
+"Linux manages time in GMT or \"Greenwich Meridian Time\" and translates it\n"
+"in local time according to the time zone you have selected."
+msgstr ""
+
 # #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
-#: ../help.pm_.c:162 ../help.pm_.c:165 ../help.pm_.c:253 ../help.pm_.c:399
-#: ../help.pm_.c:402 ../help.pm_.c:490 ../install2.pm_.c:68
+#: ../help.pm_.c:189 ../help.pm_.c:427 ../help.pm_.c:430 ../help.pm_.c:518
+#: ../install2.pm_.c:68
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../help.pm_.c:168
+#: ../help.pm_.c:192
+#, fuzzy
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -1097,7 +1184,7 @@ msgid ""
 "\n"
 "\n"
 "If you want to access a printer located on a remote Unix machine,\n"
-"you will have to select \"Remote lpd queue\". In order to make\n"
+"you will have to select \"Remote lpd\". In order to make\n"
 "it work, no username or password is required, but you will need\n"
 "to know the name of the printing queue on this server.\n"
 "\n"
@@ -1132,9 +1219,10 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
-#: ../help.pm_.c:191 ../help.pm_.c:428
+#: ../help.pm_.c:215
+#, fuzzy
 msgid ""
-"You must now enter the root password for your Linux-Mandrake\n"
+"You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
 "password entries are identical.\n"
 "\n"
@@ -1163,7 +1251,7 @@ msgstr ""
 "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
 "du må kunne klare å huske det."
 
-#: ../help.pm_.c:207 ../help.pm_.c:444
+#: ../help.pm_.c:231 ../help.pm_.c:472
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"priviledged\" user account, root. You can create\n"
@@ -1206,7 +1294,7 @@ msgstr ""
 "du vil ha opprettet her, og logge inn som root bare for administrasjon-\n"
 "og vedlikeholdsformål."
 
-#: ../help.pm_.c:226 ../help.pm_.c:463
+#: ../help.pm_.c:250 ../help.pm_.c:491
 msgid ""
 "Please, please, answer \"Yes\" here! Just for example, when you\n"
 "reinstall Windows, it will overwrite the boot sector. Unless you have\n"
@@ -1218,7 +1306,7 @@ msgstr ""
 "ikke har opprettet oppstartsdisketten som foreslått, vil du ikke kunne\n"
 "starte Linux mer!"
 
-#: ../help.pm_.c:232 ../help.pm_.c:469
+#: ../help.pm_.c:256 ../help.pm_.c:497
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1234,7 +1322,7 @@ msgstr ""
 "Med mindre du vet akkurat hva du gjør, velg \"Første sektor av\n"
 "disken (MBR)\"."
 
-#: ../help.pm_.c:240 ../help.pm_.c:477
+#: ../help.pm_.c:264 ../help.pm_.c:505
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1260,7 +1348,32 @@ msgstr ""
 "passer deg. Hvis de ikke gjør det, kan du komme tilbake og endre\n"
 "disse så mange ganger som det måtte behøves."
 
-#: ../help.pm_.c:273
+#: ../help.pm_.c:277
+msgid "You can now select some miscellaneous options for your system."
+msgstr ""
+
+#: ../help.pm_.c:280
+msgid "Exit Linux-Mandrake installation to reboot your system."
+msgstr ""
+
+#: ../help.pm_.c:293
+msgid ""
+"Choose \"Installation\" if there are no previous versions of Linux\n"
+"installed, or if you wish use to multiple distributions or versions.\n"
+"\n"
+"\n"
+"Choose \"Update\" if you wish to update a previous version of Mandrake\n"
+"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
+msgstr ""
+"Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
+"av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
+"versjoner.\n"
+"\n"
+"\n"
+"Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
+"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)."
+
+#: ../help.pm_.c:301
 msgid ""
 "Select:\n"
 "\n"
@@ -1294,7 +1407,7 @@ msgstr ""
 "  - Ekspert: Hvis du allerede kjenner GNU/Linux og ønsker å gjøre en\n"
 "egendefinert installasjon, så er dette installasjonsvalget for deg."
 
-#: ../help.pm_.c:291
+#: ../help.pm_.c:319
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -1337,7 +1450,45 @@ msgstr ""
 "som foreslått i installasjonsguiden. Dette er opsjonene du vil trenge å\n"
 "gi til driveren."
 
-#: ../help.pm_.c:357
+#: ../help.pm_.c:340
+msgid ""
+"In this stage, you may choose what partition(s) use to install your\n"
+"Linux-Mandrake system."
+msgstr ""
+"På dette punktet kan du velge hvilken partisjon(er) som skal brukes til\n"
+"å installere Linux-Mandrake systemet ditt."
+
+#: ../help.pm_.c:370
+msgid ""
+"You may now select the packages you wish to install.\n"
+"\n"
+"\n"
+"Please note that some packages require the installation of others.\n"
+"These are referred to as package dependencies. The packages you select,\n"
+"and the packages they require will be automatically selected for\n"
+"install. It is impossible to install a package without installing all\n"
+"of its dependencies.\n"
+"\n"
+"\n"
+"Information on each category and specific package is available in the\n"
+"area titled \"Info\",  located between list of packages and the five\n"
+"buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
+msgstr ""
+"Du kan nå velge de pakkene du ønsker å installere.\n"
+"\n"
+"\n"
+"Vennligst merk at noen pakker er avhengige av installasjon av andre pakker.\n"
+"Disse blir referert til som pakkeavhengigheter. Pakkene du velger, og\n"
+"pakkene disse trenger vil automatisk bli valgt for installering.\n"
+"Det er ikke mulig å installere en pakke uten å installere alle dens\n"
+"avhengigheter.\n"
+"\n"
+"\n"
+"Informasjon om hver kategori og spesifikke pakker er tilgjengelig i området\n"
+"kalt \"Info\", som du finner mellom listen over pakker og de fem knappene\n"
+"\"Installer\", \"Velg flere/færre\" og \"Vis flere/færre\"."
+
+#: ../help.pm_.c:385
 #, fuzzy
 msgid ""
 "The packages selected are now being installed.\n"
@@ -1350,6 +1501,48 @@ msgstr ""
 
 #: ../help.pm_.c:405
 msgid ""
+"This section is dedicated to configuring a local area network,\n"
+"or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
+"Ethernet adapter on your machine. PCI adapters should be found and\n"
+"initialized automatically. However, if your peripheral is ISA,\n"
+"autodetection will not work, and you will have to choose a driver\n"
+"from the list that will appear then.\n"
+"\n"
+"\n"
+"As for SCSI adapters, you can let the driver probe for the adapter\n"
+"in the first time, otherwise you will have to specify the options\n"
+"to the driver that you will have fetched from Windows' control\n"
+"panel.\n"
+"\n"
+"\n"
+"If you install a Linux-Mandrake system on a machine which is part\n"
+"of an already existing network, the network administrator will\n"
+"have given you all necessary information (IP address, network\n"
+"submask or netmask for short, and hostname). If you're setting\n"
+"up a private network at home for example, you should choose\n"
+"addresses "
+msgstr ""
+"Denne seksjonen er dedikert til konfigurering av et lokalt nettverk,\n"
+"eller LAN. Hvis du svarer \"Ja\" her, vil DrakX forsøke å finne\n"
+"et Ethernet-adapter i maskinen din. PCI-adaptere burde bli funnet og\n"
+"initialisert automatisk. Men, hvis det er et ISA, vil ikke automatisk\n"
+"oppdaging virke, og du må velge en driver fra listen som så vil vises.\n"
+"\n"
+"\n"
+"For SCSI-adaptere kan du la driveren søke etter adapteret første\n"
+"gangen, ellers må du spesifisere opsjonene for driveren som du\n"
+"har innhentet fra Windows sitt kontrollpanel.\n"
+"\n"
+"\n"
+"Hvis du installerer et Linux-Mandrake system på en maskin som er en del\n"
+"av et allerede eksisterende nettverk, vil nettverks-administratoren\n"
+"ha gitt deg all nødvendig informasjon (IP-adresse, nettverks-\n"
+"submask eller netmask, og vertsnavn). Hvis du f.eks. setter\n"
+"opp et privat nettverk hjemme, burde du velge\n"
+"adresser "
+
+#: ../help.pm_.c:433
+msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
 "\n"
@@ -1395,6 +1588,37 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
+#: ../help.pm_.c:456
+msgid ""
+"You must now enter the root password for your Linux-Mandrake\n"
+"system. The password must be entered twice to verify that both\n"
+"password entries are identical.\n"
+"\n"
+"\n"
+"Root is the administrator of the system, and is the only user\n"
+"allowed to modify the system configuration. Therefore, choose\n"
+"this password carefully! Unauthorized use of the root account can\n"
+"be extremely dangerous to the integrity of the system and its data,\n"
+"and other systems connected to it. The password should be a\n"
+"mixture of alphanumeric characters and a least 8 characters long. It\n"
+"should *never* be written down. Do not make the password too long or\n"
+"complicated, though: you must be able to remember without too much\n"
+"effort."
+msgstr ""
+"Du må nå entre root-passordet for Linux-Mandrake systemet ditt.\n"
+"Passordet må entres to ganger for å verifisere at begge passord-\n"
+"inntastingene er identiske.\n"
+"\n"
+"\n"
+"Root er administratoren av systemet, og er den eneste brukeren som\n"
+"har adgang til å modifisere systemkonfigurasjonen. Velg derfor dette\n"
+"passordet med forsiktighet! Ikke-autorisert bruk av root-kontoen kan\n"
+"være ekstremt farlig for integriteten til systemet, dataene det inneholder,\n"
+"og andre systemer tilkoblet dette. Passordet bør være en miks av\n"
+"alfanumeriske tegn og være minst åtte tegn langt. Passordet bør *aldri*\n"
+"bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
+"du må kunne klare å huske det."
+
 #: ../install2.pm_.c:41
 msgid "Choose your language"
 msgstr "Velg språk"
@@ -1451,8 +1675,8 @@ msgstr "Konfigurer tidssone"
 msgid "Configure printer"
 msgstr "Konfigurer skriver"
 
-#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:586
-#: ../install_steps_interactive.pm_.c:587
+#: ../install2.pm_.c:56 ../install_steps_interactive.pm_.c:614
+#: ../install_steps_interactive.pm_.c:615
 msgid "Set root password"
 msgstr "Sett root-passord"
 
@@ -1492,16 +1716,16 @@ msgstr "ekspert"
 msgid "server"
 msgstr "tjener"
 
-#: ../install2.pm_.c:307
+#: ../install2.pm_.c:310
 msgid "Partitioning failed: no root filesystem"
 msgstr "Partisjonering feilet: intet root-filsystem"
 
-#: ../install2.pm_.c:317
+#: ../install2.pm_.c:320
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Ikke nok vekslingsplass til å fullføre installasjonen, du må legge til mer"
 
-#: ../install_any.pm_.c:173
+#: ../install_any.pm_.c:174
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -1509,7 +1733,7 @@ msgstr ""
 "Jeg kan ikke lese partisjonstabellen din, den er for ødelagt for meg :(\n"
 "Jeg vil førsøke å blanke ut dårlige partisjoner"
 
-#: ../install_any.pm_.c:189
+#: ../install_any.pm_.c:190
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -1517,33 +1741,33 @@ msgstr ""
 "DiskDrake klarte ikke å lese partisjonstabellen korrekt.\n"
 "Fortsett på egen risiko!"
 
-#: ../install_any.pm_.c:228
+#: ../install_any.pm_.c:229
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../install_any.pm_.c:229
+#: ../install_any.pm_.c:230
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr "%s: Dette er ikke en root-partisjon, vennligst velg en annen."
 
-#: ../install_any.pm_.c:231
+#: ../install_any.pm_.c:232
 msgid "No root partition found"
 msgstr "Ingen root-partisjon funnet"
 
-#: ../install_any.pm_.c:267
+#: ../install_any.pm_.c:268
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan ikke bruke broadcast uten NIS domene"
 
-#: ../install_any.pm_.c:415
+#: ../install_any.pm_.c:417
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
-#: ../install_any.pm_.c:420
+#: ../install_any.pm_.c:423
 #, c-format
 msgid "Bad kickstart file %s (failed %s)"
 msgstr "Dårlig kickstart-fil %s (mislykket %s)"
 
-#: ../install_steps.pm_.c:72
+#: ../install_steps.pm_.c:74
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
 "Continue at your own risk."
@@ -1552,27 +1776,25 @@ msgstr ""
 "pen måte.\n"
 "Fortsett på eget ansvar."
 
-#: ../install_steps.pm_.c:136
+#: ../install_steps.pm_.c:138
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dupliser monteringspunkt %s"
 
-#: ../install_steps.pm_.c:417
+#: ../install_steps.pm_.c:425
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
 
-#: ../install_steps_auto_install.pm_.c:18 ../install_steps_stdio.pm_.c:21
+#: ../install_steps_auto_install.pm_.c:18 ../install_steps_stdio.pm_.c:26
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr "Entrer trinn `%s'\n"
 
-#: ../install_steps_graphical.pm_.c:259
-#: ../unused/install_steps_graphical.pm_.c:255
+#: ../install_steps_graphical.pm_.c:259 ../install_steps_gtk.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "Du må ha en vekslingspartisjon"
 
-#: ../install_steps_graphical.pm_.c:261
-#: ../unused/install_steps_graphical.pm_.c:258
+#: ../install_steps_graphical.pm_.c:261 ../install_steps_gtk.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -1582,267 +1804,257 @@ msgstr ""
 "\n"
 "Fortsette alikevel?"
 
-#: ../install_steps_graphical.pm_.c:290
+#: ../install_steps_graphical.pm_.c:287 ../install_steps_gtk.pm_.c:287
 msgid "Choose the size you want to install"
 msgstr "Velg størrelsen du ønsker å installere"
 
-#: ../install_steps_graphical.pm_.c:337
-#: ../unused/install_steps_graphical.pm_.c:314
+#: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:334
 msgid "Total size: "
 msgstr "Total størrelse: "
 
-#: ../install_steps_graphical.pm_.c:349
-#: ../unused/install_steps_graphical.pm_.c:284
+#: ../install_steps_graphical.pm_.c:346 ../install_steps_gtk.pm_.c:346
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versjon: %s\n"
 
-#: ../install_steps_graphical.pm_.c:350
-#: ../unused/install_steps_graphical.pm_.c:285
+#: ../install_steps_graphical.pm_.c:347 ../install_steps_gtk.pm_.c:347
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Størrelse: %d KB\n"
 
-#: ../install_steps_graphical.pm_.c:465
-#: ../unused/install_steps_graphical.pm_.c:421
+#: ../install_steps_graphical.pm_.c:462 ../install_steps_gtk.pm_.c:462
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: ../install_steps_graphical.pm_.c:468
-#: ../unused/install_steps_graphical.pm_.c:424
+#: ../install_steps_graphical.pm_.c:465 ../install_steps_gtk.pm_.c:465
 msgid "Info"
 msgstr "Info"
 
-#: ../install_steps_graphical.pm_.c:476 ../install_steps_interactive.pm_.c:85
-#: ../unused/install_steps_graphical.pm_.c:432
+#: ../install_steps_graphical.pm_.c:473 ../install_steps_gtk.pm_.c:473
+#: ../install_steps_interactive.pm_.c:87
 msgid "Install"
 msgstr "Installer"
 
-#: ../install_steps_graphical.pm_.c:495
-#: ../unused/install_steps_graphical.pm_.c:451
+#: ../install_steps_graphical.pm_.c:492 ../install_steps_gtk.pm_.c:492
+#: ../install_steps_interactive.pm_.c:251
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../install_steps_graphical.pm_.c:502
-#: ../unused/install_steps_graphical.pm_.c:457
+#: ../install_steps_graphical.pm_.c:499 ../install_steps_gtk.pm_.c:499
 msgid "Please wait, "
 msgstr "Vennligst vent, "
 
-#: ../install_steps_graphical.pm_.c:504
-#: ../unused/install_steps_graphical.pm_.c:459
+#: ../install_steps_graphical.pm_.c:501 ../install_steps_gtk.pm_.c:501
 msgid "Time remaining "
 msgstr "Tid som gjenstår "
 
-#: ../install_steps_graphical.pm_.c:505
-#: ../unused/install_steps_graphical.pm_.c:460
+#: ../install_steps_graphical.pm_.c:502 ../install_steps_gtk.pm_.c:502
 msgid "Total time "
 msgstr "Total tid "
 
-#: ../install_steps_graphical.pm_.c:510
-#: ../unused/install_steps_graphical.pm_.c:465
+#: ../install_steps_graphical.pm_.c:507 ../install_steps_gtk.pm_.c:507
+#: ../install_steps_interactive.pm_.c:251
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: ../install_steps_graphical.pm_.c:533
-#: ../unused/install_steps_graphical.pm_.c:486
+#: ../install_steps_graphical.pm_.c:528 ../install_steps_gtk.pm_.c:522
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: ../install_steps_graphical.pm_.c:558
-#: ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
 msgid "Go on anyway?"
 msgstr "Fortsette uansett?"
 
-#: ../install_steps_graphical.pm_.c:558
-#: ../unused/install_steps_graphical.pm_.c:511
+#: ../install_steps_graphical.pm_.c:553 ../install_steps_gtk.pm_.c:547
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
 
-#: ../install_steps_graphical.pm_.c:582
-#: ../unused/install_steps_graphical.pm_.c:535
+#: ../install_steps_graphical.pm_.c:577 ../install_steps_interactive.pm_.c:916
 msgid "Use existing configuration for X11?"
 msgstr "Bruke eksisterende konfigurasjon for X11?"
 
-#: ../install_steps_interactive.pm_.c:41
+#: ../install_steps_interactive.pm_.c:43
 msgid "An error occurred"
 msgstr "En feil oppsto"
 
-#: ../install_steps_interactive.pm_.c:58
+#: ../install_steps_interactive.pm_.c:60
 msgid "Which language do you want?"
 msgstr "Hvilket språk ønsker du?"
 
-#: ../install_steps_interactive.pm_.c:73
+#: ../install_steps_interactive.pm_.c:75
 msgid "What is your keyboard layout?"
 msgstr "Hva er tastatur-oppsettet ditt?"
 
-#: ../install_steps_interactive.pm_.c:83
+#: ../install_steps_interactive.pm_.c:85
 msgid "Install/Upgrade"
 msgstr "Installer/Oppgrader"
 
-#: ../install_steps_interactive.pm_.c:84
+#: ../install_steps_interactive.pm_.c:86
 msgid "Is this an install or an upgrade?"
 msgstr "Er dette en installasjon eller en oppgradering?"
 
-#: ../install_steps_interactive.pm_.c:85
+#: ../install_steps_interactive.pm_.c:87
 msgid "Upgrade"
 msgstr "Oppgrader"
 
-#: ../install_steps_interactive.pm_.c:93
+#: ../install_steps_interactive.pm_.c:95
 msgid "Root Partition"
 msgstr "Root-partisjon"
 
-#: ../install_steps_interactive.pm_.c:94
+#: ../install_steps_interactive.pm_.c:96
 msgid "What is the root partition (/) of your system?"
 msgstr "Hva er root-partisjonen (/) på systemet ditt?"
 
-#: ../install_steps_interactive.pm_.c:104
+#: ../install_steps_interactive.pm_.c:106
 msgid "Recommended"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:105
+#: ../install_steps_interactive.pm_.c:107
 msgid "Customized"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:106
+#: ../install_steps_interactive.pm_.c:108
 #, fuzzy
 msgid "Expert"
 msgstr "ekspert"
 
-#: ../install_steps_interactive.pm_.c:108
-#: ../install_steps_interactive.pm_.c:122
+#: ../install_steps_interactive.pm_.c:110
+#: ../install_steps_interactive.pm_.c:124
 msgid "Install Class"
 msgstr "Installeringsklasse"
 
-#: ../install_steps_interactive.pm_.c:109
+#: ../install_steps_interactive.pm_.c:111
 msgid "What installation class do you want?"
 msgstr "Hvilken installasjonsklasse ønsker du?"
 
-#: ../install_steps_interactive.pm_.c:118
+#: ../install_steps_interactive.pm_.c:120
 #, fuzzy
 msgid "Normal"
 msgstr "Normal DAC"
 
-#: ../install_steps_interactive.pm_.c:119
+#: ../install_steps_interactive.pm_.c:121
 #, fuzzy
 msgid "Developement"
 msgstr "utvikler"
 
-#: ../install_steps_interactive.pm_.c:120
+#: ../install_steps_interactive.pm_.c:122
 #, fuzzy
 msgid "Server"
 msgstr "tjener"
 
-#: ../install_steps_interactive.pm_.c:123
+#: ../install_steps_interactive.pm_.c:125
 #, fuzzy
 msgid "What usage do you want?"
 msgstr "Hvilket språk ønsker du?"
 
-#: ../install_steps_interactive.pm_.c:136
+#: ../install_steps_interactive.pm_.c:138
 msgid "What is the type of your mouse?"
 msgstr "Hva slags type er musen din?"
 
-#: ../install_steps_interactive.pm_.c:140
+#: ../install_steps_interactive.pm_.c:142
 msgid "Emulate third button?"
 msgstr "Emulere tredje knapp?"
 
-#: ../install_steps_interactive.pm_.c:143
+#: ../install_steps_interactive.pm_.c:145
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../install_steps_interactive.pm_.c:144
+#: ../install_steps_interactive.pm_.c:146
 msgid "Which serial port is your mouse connected to?"
 msgstr "Hvilken serieport er musen din koblet til?"
 
-#: ../install_steps_interactive.pm_.c:157
+#: ../install_steps_interactive.pm_.c:159
 msgid "no available partitions"
 msgstr "ingen tilgjengelige partisjoner"
 
-#: ../install_steps_interactive.pm_.c:159
+#: ../install_steps_interactive.pm_.c:161
 #, c-format
 msgid "(%dMb)"
 msgstr "(%dMb)"
 
-#: ../install_steps_interactive.pm_.c:166
+#: ../install_steps_interactive.pm_.c:168
 msgid "Which partition do you want to use as your root partition"
 msgstr "Hvilken partisjon vil du bruke som din root-partisjon"
 
-#: ../install_steps_interactive.pm_.c:173
+#: ../install_steps_interactive.pm_.c:175
 msgid "Choose the mount points"
 msgstr "Velg monteringspunkter"
 
-#: ../install_steps_interactive.pm_.c:185
+#: ../install_steps_interactive.pm_.c:187
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Du må starte maskinen på nytt for at modifiseringene av partisjonstabellen\n"
 "skal tre i kraft"
 
-#: ../install_steps_interactive.pm_.c:204
+#: ../install_steps_interactive.pm_.c:206
 msgid "Choose the partitions you want to format"
 msgstr "Velg de partisjonene du ønsker å formatere"
 
-#: ../install_steps_interactive.pm_.c:214
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterer partisjon %s"
-
-#: ../install_steps_interactive.pm_.c:223
+#: ../install_steps_interactive.pm_.c:225
 msgid "Looking for available packages"
 msgstr "Ser etter tilgjengelige pakker"
 
-#: ../install_steps_interactive.pm_.c:229
+#: ../install_steps_interactive.pm_.c:231
 msgid "Finding packages to upgrade"
 msgstr "Finner pakker å oppgradere"
 
-#: ../install_steps_interactive.pm_.c:238
+#: ../install_steps_interactive.pm_.c:240
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: ../install_steps_interactive.pm_.c:250
+#: ../install_steps_interactive.pm_.c:260
+#, fuzzy
+msgid ""
+"Installing package %s\n"
+"%d%%"
+msgstr "Installerer pakke %s"
+
+#: ../install_steps_interactive.pm_.c:274
 msgid "Keep the current IP configuration"
 msgstr "Behold nåværende IP-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:251
+#: ../install_steps_interactive.pm_.c:275
 msgid "Reconfigure network now"
 msgstr "Rekonfigurer nettverket nå"
 
-#: ../install_steps_interactive.pm_.c:252
-#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:276
+#: ../install_steps_interactive.pm_.c:288
 msgid "Do not set up networking"
 msgstr "Ikke sett opp nettverk"
 
-#: ../install_steps_interactive.pm_.c:254
-#: ../install_steps_interactive.pm_.c:262
+#: ../install_steps_interactive.pm_.c:278
+#: ../install_steps_interactive.pm_.c:286
 msgid "Network Configuration"
 msgstr "Nettverks-konfigurasjon"
 
-#: ../install_steps_interactive.pm_.c:255
+#: ../install_steps_interactive.pm_.c:279
 msgid "Local networking has already been configured. Do you want to:"
 msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:"
 
-#: ../install_steps_interactive.pm_.c:263
+#: ../install_steps_interactive.pm_.c:287
 #, fuzzy
 msgid "Do you want to configure networking for yout system?"
 msgstr "Vil du konfigurere LAN (ikke oppringt) nettverk for systemet ditt?"
 
-#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:288
 msgid "Dialup with modem"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:264
+#: ../install_steps_interactive.pm_.c:288
 msgid "Local LAN"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:273
+#: ../install_steps_interactive.pm_.c:297
 msgid "no network card found"
 msgstr "ingen nettverkskort funnet"
 
-#: ../install_steps_interactive.pm_.c:302
+#: ../install_steps_interactive.pm_.c:326
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Konfigurerer nettverks-enhet %s"
 
-#: ../install_steps_interactive.pm_.c:303
+#: ../install_steps_interactive.pm_.c:327
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -1852,32 +2064,32 @@ msgstr ""
 "Hvert element bør entres som en IP-adresse i punkt-desimal\n"
 "notasjon (f.eks, 1.2.3.4)."
 
-#: ../install_steps_interactive.pm_.c:306
+#: ../install_steps_interactive.pm_.c:330
 msgid "Automatic IP"
 msgstr "Automatisk IP"
 
-#: ../install_steps_interactive.pm_.c:306
+#: ../install_steps_interactive.pm_.c:330
 msgid "IP address:"
 msgstr "IP-adresse:"
 
-#: ../install_steps_interactive.pm_.c:306
+#: ../install_steps_interactive.pm_.c:330
 msgid "Netmask:"
 msgstr "Nettmaske:"
 
-#: ../install_steps_interactive.pm_.c:307
+#: ../install_steps_interactive.pm_.c:331
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../install_steps_interactive.pm_.c:313
-#: ../install_steps_interactive.pm_.c:476
+#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:504
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bør være i format 1.2.3.4"
 
-#: ../install_steps_interactive.pm_.c:332
+#: ../install_steps_interactive.pm_.c:356
 msgid "Configuring network"
 msgstr "Konfigurerer nettverk"
 
-#: ../install_steps_interactive.pm_.c:333
+#: ../install_steps_interactive.pm_.c:357
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -1889,112 +2101,112 @@ msgstr ""
 "så som ``minboks.mittlab.mittfirma.no''.\n"
 "Du kan også entre IP-adressen til gateway'en hvis du har en"
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "DNS server:"
 msgstr "DNS-tjener:"
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "Gateway device:"
 msgstr "Gateway-enhet:"
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../install_steps_interactive.pm_.c:337
+#: ../install_steps_interactive.pm_.c:361
 msgid "Host name:"
 msgstr "Vertsnavn:"
 
-#: ../install_steps_interactive.pm_.c:348
+#: ../install_steps_interactive.pm_.c:374
 #, fuzzy
 msgid "Try to find a modem?"
 msgstr "Har du en bærbar maskin?"
 
-#: ../install_steps_interactive.pm_.c:357
+#: ../install_steps_interactive.pm_.c:383
 #, fuzzy
 msgid "Which serial port is your modem connected to?"
 msgstr "Hvilken serieport er musen din koblet til?"
 
-#: ../install_steps_interactive.pm_.c:361
+#: ../install_steps_interactive.pm_.c:387
 #, fuzzy
 msgid "Dialup options"
 msgstr "LILO hovedopsjoner"
 
-#: ../install_steps_interactive.pm_.c:362
+#: ../install_steps_interactive.pm_.c:388
 msgid "Connection name"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:363
+#: ../install_steps_interactive.pm_.c:389
 msgid "Phone number"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:364
+#: ../install_steps_interactive.pm_.c:390
 msgid "Login ID"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:365
-#: ../install_steps_interactive.pm_.c:588
-#: ../install_steps_interactive.pm_.c:634
-#: ../install_steps_interactive.pm_.c:725
+#: ../install_steps_interactive.pm_.c:391
+#: ../install_steps_interactive.pm_.c:616
+#: ../install_steps_interactive.pm_.c:662
+#: ../install_steps_interactive.pm_.c:753
 msgid "Password"
 msgstr "Passord"
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "Authentication"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "CHAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "PAP"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "Script-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:366
+#: ../install_steps_interactive.pm_.c:392
 msgid "Terminal-based"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:367
+#: ../install_steps_interactive.pm_.c:393
 #, fuzzy
 msgid "Domain name"
 msgstr "Virkelig navn"
 
-#: ../install_steps_interactive.pm_.c:368
+#: ../install_steps_interactive.pm_.c:394
 #, fuzzy
 msgid "First DNS Server"
 msgstr "NIS-tjener"
 
-#: ../install_steps_interactive.pm_.c:369
+#: ../install_steps_interactive.pm_.c:395
 #, fuzzy
 msgid "Second DNS Server"
 msgstr "NIS-tjener"
 
-#: ../install_steps_interactive.pm_.c:378
+#: ../install_steps_interactive.pm_.c:406
 msgid "Which is your timezone?"
 msgstr "Hvilken er tidsonen din?"
 
-#: ../install_steps_interactive.pm_.c:379
+#: ../install_steps_interactive.pm_.c:407
 msgid "Is your hardware clock set to GMT?"
 msgstr "Er maskinvareklokken din satt til GMT?"
 
-#: ../install_steps_interactive.pm_.c:389
+#: ../install_steps_interactive.pm_.c:417
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../install_steps_interactive.pm_.c:390
+#: ../install_steps_interactive.pm_.c:418
 msgid "Would you like to configure a printer?"
 msgstr "Ønsker du å konfigurere en skriver?"
 
-#: ../install_steps_interactive.pm_.c:402
+#: ../install_steps_interactive.pm_.c:430
 msgid "Local Printer Options"
 msgstr "Opsjoner for lokal skriver"
 
-#: ../install_steps_interactive.pm_.c:403
+#: ../install_steps_interactive.pm_.c:431
 msgid ""
 "Every print queue (which print jobs are directed to) needs a\n"
 "name (often lp) and a spool directory associated with it. What\n"
@@ -2004,40 +2216,40 @@ msgstr ""
 "(ofte lp) og en spolingskatalog assosiert til denne. Hvilket\n"
 "navn og katalog skal brukes for denne køen?"
 
-#: ../install_steps_interactive.pm_.c:406
+#: ../install_steps_interactive.pm_.c:434
 msgid "Name of queue:"
 msgstr "Køens navn:"
 
-#: ../install_steps_interactive.pm_.c:406
+#: ../install_steps_interactive.pm_.c:434
 msgid "Spool directory:"
 msgstr "Spolingskatalog:"
 
-#: ../install_steps_interactive.pm_.c:417
+#: ../install_steps_interactive.pm_.c:445
 msgid "Select Printer Connection"
 msgstr "Velg skrivertilkobling"
 
-#: ../install_steps_interactive.pm_.c:418
+#: ../install_steps_interactive.pm_.c:446
 msgid "How is the printer connected?"
 msgstr "Hvordan er skriveren tilkoblet?"
 
-#: ../install_steps_interactive.pm_.c:426
+#: ../install_steps_interactive.pm_.c:454
 msgid "Detecting devices..."
 msgstr "Finner enheter..."
 
-#: ../install_steps_interactive.pm_.c:426
+#: ../install_steps_interactive.pm_.c:454
 msgid "Test ports"
 msgstr "Test porter"
 
-#: ../install_steps_interactive.pm_.c:439
+#: ../install_steps_interactive.pm_.c:467
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "En skriver, modell \"%s\", ble funnet på "
 
-#: ../install_steps_interactive.pm_.c:446
+#: ../install_steps_interactive.pm_.c:474
 msgid "Local Printer Device"
 msgstr "Lokal skriverenhet"
 
-#: ../install_steps_interactive.pm_.c:447
+#: ../install_steps_interactive.pm_.c:475
 msgid ""
 "What device is your printer connected to  \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -2045,15 +2257,15 @@ msgstr ""
 "Hvilken enhet er skriveren din koblet til  \n"
 "(merk at /dev/lp0 er det samme som LPT1:)?\n"
 
-#: ../install_steps_interactive.pm_.c:448
+#: ../install_steps_interactive.pm_.c:476
 msgid "Printer Device:"
 msgstr "Skriverenhet:"
 
-#: ../install_steps_interactive.pm_.c:452
+#: ../install_steps_interactive.pm_.c:480
 msgid "Remote lpd Printer Options"
 msgstr "Opsjoner for fjern-lpd skriver"
 
-#: ../install_steps_interactive.pm_.c:453
+#: ../install_steps_interactive.pm_.c:481
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
@@ -2063,19 +2275,19 @@ msgstr ""
 "til skrivertjeneren og kønavnet til den tjeneren som\n"
 "jobbene skal plasseres i."
 
-#: ../install_steps_interactive.pm_.c:456
+#: ../install_steps_interactive.pm_.c:484
 msgid "Remote hostname:"
 msgstr "Fjern-vertnavn:"
 
-#: ../install_steps_interactive.pm_.c:456
+#: ../install_steps_interactive.pm_.c:484
 msgid "Remote queue"
 msgstr "Fjern-kø"
 
-#: ../install_steps_interactive.pm_.c:461
+#: ../install_steps_interactive.pm_.c:489
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opsjoner for SMB (Windows 9x/NT) skriver"
 
-#: ../install_steps_interactive.pm_.c:462
+#: ../install_steps_interactive.pm_.c:490
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -2089,37 +2301,37 @@ msgstr ""
 "navnet til skriveren du ønsker tilgang til og anvendelige brukernavn,\n"
 "passord og arbeidsgruppeinformasjon."
 
-#: ../install_steps_interactive.pm_.c:467
+#: ../install_steps_interactive.pm_.c:495
 msgid "SMB server IP:"
 msgstr "SMB-tjener IP:"
 
-#: ../install_steps_interactive.pm_.c:467
+#: ../install_steps_interactive.pm_.c:495
 msgid "SMB server host:"
 msgstr "SMB-tjener vert:"
 
-#: ../install_steps_interactive.pm_.c:468
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:496
+#: ../install_steps_interactive.pm_.c:518
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../install_steps_interactive.pm_.c:468
+#: ../install_steps_interactive.pm_.c:496
 msgid "Share name:"
 msgstr "Delt navn:"
 
-#: ../install_steps_interactive.pm_.c:468
-#: ../install_steps_interactive.pm_.c:490
+#: ../install_steps_interactive.pm_.c:496
+#: ../install_steps_interactive.pm_.c:518
 msgid "User name:"
 msgstr "Brukernavn:"
 
-#: ../install_steps_interactive.pm_.c:469
+#: ../install_steps_interactive.pm_.c:497
 msgid "Workgroup:"
 msgstr "Arbeidsgruppe:"
 
-#: ../install_steps_interactive.pm_.c:484
+#: ../install_steps_interactive.pm_.c:512
 msgid "NetWare Printer Options"
 msgstr "NetWare skriveropsjoner"
 
-#: ../install_steps_interactive.pm_.c:485
+#: ../install_steps_interactive.pm_.c:513
 msgid ""
 "To print to a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -2131,154 +2343,155 @@ msgstr ""
 "vertsnavn!) så vel som navnet på skriverkøen til skriveren du ønsker\n"
 "adgang til og anvendelige brukernavn og passord."
 
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:517
 msgid "Print Queue Name:"
 msgstr "Skriverkø-navn:"
 
-#: ../install_steps_interactive.pm_.c:489
+#: ../install_steps_interactive.pm_.c:517
 msgid "Printer Server:"
 msgstr "Skrivertjener:"
 
-#: ../install_steps_interactive.pm_.c:500
-msgid "Yes, print ascii test page"
+#: ../install_steps_interactive.pm_.c:528
+msgid "Yes, print ASCII test page"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:501
-msgid "Yes, print postscript test page"
+#: ../install_steps_interactive.pm_.c:529
+msgid "Yes, print PostScript test page"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:502
+#: ../install_steps_interactive.pm_.c:530
 msgid "Yes, print both test pages"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:503
-#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52
-#: ../my_gtk.pm_.c:436
+#: ../install_steps_interactive.pm_.c:531
+#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../my_gtk.pm_.c:437
 msgid "No"
 msgstr "Nei"
 
-#: ../install_steps_interactive.pm_.c:509
+#: ../install_steps_interactive.pm_.c:537
 msgid "Configure Printer"
 msgstr "Konfigurer skriver"
 
-#: ../install_steps_interactive.pm_.c:510
+#: ../install_steps_interactive.pm_.c:538
 msgid "What type of printer do you have?"
 msgstr "Hva slags type skriver har du?"
 
-#: ../install_steps_interactive.pm_.c:532
+#: ../install_steps_interactive.pm_.c:560
 #, fuzzy
 msgid "Printer options"
 msgstr "Opsjoner for lokal skriver"
 
-#: ../install_steps_interactive.pm_.c:533
+#: ../install_steps_interactive.pm_.c:561
 msgid "Paper Size"
 msgstr "Papirstørrelse"
 
-#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:562
 msgid "Eject page after job?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:537
+#: ../install_steps_interactive.pm_.c:565
 msgid "Fix stair-stepping text?"
 msgstr "Fikse trappestegs-tekst?"
 
-#: ../install_steps_interactive.pm_.c:540
+#: ../install_steps_interactive.pm_.c:568
 #, fuzzy
 msgid "Uniprint driver options"
 msgstr "Bruk harddisk-optimisering"
 
-#: ../install_steps_interactive.pm_.c:541
+#: ../install_steps_interactive.pm_.c:569
 #, fuzzy
 msgid "Color depth options"
 msgstr "Modulopsjoner:"
 
-#: ../install_steps_interactive.pm_.c:550
+#: ../install_steps_interactive.pm_.c:578
 #, fuzzy
 msgid "Do you want to test printing?"
 msgstr "Vil du teste konfigurasjonen?"
 
-#: ../install_steps_interactive.pm_.c:586
+#: ../install_steps_interactive.pm_.c:614
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../install_steps_interactive.pm_.c:586
-#: ../install_steps_interactive.pm_.c:796 ../interactive.pm_.c:47
-#: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22
-#: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:437
-#: ../my_gtk.pm_.c:534 ../unused/install_steps_graphical.pm_.c:608
+#: ../install_steps_interactive.pm_.c:614
+#: ../install_steps_interactive.pm_.c:824 ../interactive.pm_.c:47
+#: ../interactive.pm_.c:57 ../interactive.pm_.c:136
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:438
+#: ../my_gtk.pm_.c:535
 msgid "Ok"
 msgstr "Ok"
 
-#: ../install_steps_interactive.pm_.c:589
-#: ../install_steps_interactive.pm_.c:635
+#: ../install_steps_interactive.pm_.c:617
+#: ../install_steps_interactive.pm_.c:663
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: ../install_steps_interactive.pm_.c:591
+#: ../install_steps_interactive.pm_.c:619
 msgid "Use shadow file"
 msgstr "Bruk skyggefil"
 
-#: ../install_steps_interactive.pm_.c:591
+#: ../install_steps_interactive.pm_.c:619
 msgid "shadow"
 msgstr "skygge"
 
-#: ../install_steps_interactive.pm_.c:592
+#: ../install_steps_interactive.pm_.c:620
 msgid "MD5"
 msgstr "MD5"
 
-#: ../install_steps_interactive.pm_.c:592
+#: ../install_steps_interactive.pm_.c:620
 msgid "Use MD5 passwords"
 msgstr "Bruk MD5 passord"
 
-#: ../install_steps_interactive.pm_.c:594
+#: ../install_steps_interactive.pm_.c:622
 msgid "Use NIS"
 msgstr "Bruk NIS"
 
-#: ../install_steps_interactive.pm_.c:594
+#: ../install_steps_interactive.pm_.c:622
 msgid "yellow pages"
 msgstr "gule sider"
 
-#: ../install_steps_interactive.pm_.c:598
-#: ../install_steps_interactive.pm_.c:646
+#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:674
 msgid "Please try again"
 msgstr "Vennligst prøv igjen"
 
-#: ../install_steps_interactive.pm_.c:598
-#: ../install_steps_interactive.pm_.c:646
+#: ../install_steps_interactive.pm_.c:626
+#: ../install_steps_interactive.pm_.c:674
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
-#: ../install_steps_interactive.pm_.c:600
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:675
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../install_steps_interactive.pm_.c:607
-msgid "TODO"
-msgstr "TODO"
+#: ../install_steps_interactive.pm_.c:635
+msgid "Authentification NIS"
+msgstr ""
 
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:636
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../install_steps_interactive.pm_.c:608
+#: ../install_steps_interactive.pm_.c:636
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:656
 msgid "Accept user"
 msgstr "Godta bruker"
 
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:656
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../install_steps_interactive.pm_.c:629
+#: ../install_steps_interactive.pm_.c:657
 #, c-format
 msgid "(already added %s)"
 msgstr "(allerede lagt til %s)"
 
-#: ../install_steps_interactive.pm_.c:629
+#: ../install_steps_interactive.pm_.c:657
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -2287,32 +2500,32 @@ msgstr ""
 "Entre en bruker\n"
 "%s"
 
-#: ../install_steps_interactive.pm_.c:631
+#: ../install_steps_interactive.pm_.c:659
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../install_steps_interactive.pm_.c:632
+#: ../install_steps_interactive.pm_.c:660
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../install_steps_interactive.pm_.c:637
+#: ../install_steps_interactive.pm_.c:665
 msgid "Shell"
 msgstr "Skall"
 
-#: ../install_steps_interactive.pm_.c:648
+#: ../install_steps_interactive.pm_.c:676
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../install_steps_interactive.pm_.c:649
+#: ../install_steps_interactive.pm_.c:677
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde små bokstaver, tall, `-' og `_'"
 
-#: ../install_steps_interactive.pm_.c:650
+#: ../install_steps_interactive.pm_.c:678
 msgid "This user name is already added"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:671
+#: ../install_steps_interactive.pm_.c:699
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -2336,103 +2549,98 @@ msgstr ""
 "systemsvikt.\n"
 "Ønsker du å opprette en oppstartsdiskett for systemet ditt?"
 
-#: ../install_steps_interactive.pm_.c:680
+#: ../install_steps_interactive.pm_.c:708
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../install_steps_interactive.pm_.c:683
+#: ../install_steps_interactive.pm_.c:711
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Velg diskettstasjonen du ønsker å bruke for å lage oppstartsdisketten"
 
-#: ../install_steps_interactive.pm_.c:684
+#: ../install_steps_interactive.pm_.c:712
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:716
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../install_steps_interactive.pm_.c:689
+#: ../install_steps_interactive.pm_.c:717
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../install_steps_interactive.pm_.c:696
+#: ../install_steps_interactive.pm_.c:724
 msgid "Preparing bootloader"
 msgstr "Klargjør oppstartslaster"
 
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:736
 msgid "First sector of boot partition"
 msgstr "Første sektor av oppstartspartisjon"
 
-#: ../install_steps_interactive.pm_.c:708
+#: ../install_steps_interactive.pm_.c:736
 msgid "First sector of drive (MBR)"
 msgstr "Første sektor av disk (MBR)"
 
-#: ../install_steps_interactive.pm_.c:712
+#: ../install_steps_interactive.pm_.c:740
 msgid "LILO Installation"
 msgstr "LILO-installasjon"
 
-#: ../install_steps_interactive.pm_.c:713
+#: ../install_steps_interactive.pm_.c:741
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor vil du installere oppstartslasteren?"
 
-#: ../install_steps_interactive.pm_.c:716
+#: ../install_steps_interactive.pm_.c:744
 msgid "Do you want to use LILO?"
 msgstr "Ønsker du å bruke LILO?"
 
-#: ../install_steps_interactive.pm_.c:719
+#: ../install_steps_interactive.pm_.c:747
 msgid "Boot device"
 msgstr "Oppstartsenhet"
 
-#: ../install_steps_interactive.pm_.c:720
+#: ../install_steps_interactive.pm_.c:748
 msgid "Linear (needed for some SCSI drives)"
 msgstr "Lineær (behøves av noen SCSI-disker)"
 
-#: ../install_steps_interactive.pm_.c:720
+#: ../install_steps_interactive.pm_.c:748
 msgid "linear"
 msgstr "lineær"
 
-#: ../install_steps_interactive.pm_.c:721
+#: ../install_steps_interactive.pm_.c:749
 msgid "Compact"
 msgstr "Kompakt"
 
-#: ../install_steps_interactive.pm_.c:721
+#: ../install_steps_interactive.pm_.c:749
 msgid "compact"
 msgstr "kompakt"
 
-#: ../install_steps_interactive.pm_.c:722
+#: ../install_steps_interactive.pm_.c:750
 msgid "Delay before booting default image"
 msgstr "Forsinkelse før oppstart av standard bilde"
 
-#: ../install_steps_interactive.pm_.c:723
+#: ../install_steps_interactive.pm_.c:751
 msgid "Video mode"
 msgstr "Skjerm-modus"
 
-#: ../install_steps_interactive.pm_.c:726
+#: ../install_steps_interactive.pm_.c:754
 msgid "Restrict command line options"
 msgstr "Begrense kommandolinje-opsjoner"
 
-#: ../install_steps_interactive.pm_.c:726
+#: ../install_steps_interactive.pm_.c:754
 msgid "restrict"
 msgstr "begrense"
 
-#: ../install_steps_interactive.pm_.c:732
+#: ../install_steps_interactive.pm_.c:760
 msgid "LILO main options"
 msgstr "LILO hovedopsjoner"
 
-#: ../install_steps_interactive.pm_.c:734
-msgid ""
-"At this level of security, a password (and a good one) in lilo is requested"
-msgstr "På dette sikkerhetsnivået anmodes et passord (og et godt et) i lilo"
-
-#: ../install_steps_interactive.pm_.c:735
+#: ../install_steps_interactive.pm_.c:763
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../install_steps_interactive.pm_.c:744
+#: ../install_steps_interactive.pm_.c:772
 msgid ""
 "Here are the following entries in LILO.\n"
 "You can add some more or change the existent ones."
@@ -2440,139 +2648,160 @@ msgstr ""
 "Her er følgende oppføringer i LILO\n"
 "Du kan legge til noen flere eller endre de eksisterende."
 
-#: ../install_steps_interactive.pm_.c:746
+#: ../install_steps_interactive.pm_.c:774
 msgid "Add"
 msgstr "Legg til"
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:783
 msgid "Linux"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:783
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:755
+#: ../install_steps_interactive.pm_.c:783
 #, fuzzy
 msgid "Which type of entry do you want to add"
 msgstr "Hvilken sektor vil du flytte til?"
 
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:803
 msgid "Image"
 msgstr "Bilde"
 
-#: ../install_steps_interactive.pm_.c:776
-#: ../install_steps_interactive.pm_.c:784
+#: ../install_steps_interactive.pm_.c:804
+#: ../install_steps_interactive.pm_.c:812
 msgid "Root"
 msgstr "Root"
 
-#: ../install_steps_interactive.pm_.c:777
+#: ../install_steps_interactive.pm_.c:805
 msgid "Append"
 msgstr "Tilføye"
 
-#: ../install_steps_interactive.pm_.c:778
+#: ../install_steps_interactive.pm_.c:806
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../install_steps_interactive.pm_.c:779
+#: ../install_steps_interactive.pm_.c:807
 msgid "Read-write"
 msgstr "Les-skriv"
 
-#: ../install_steps_interactive.pm_.c:785
+#: ../install_steps_interactive.pm_.c:813
 msgid "Table"
 msgstr "Tabell"
 
-#: ../install_steps_interactive.pm_.c:786
+#: ../install_steps_interactive.pm_.c:814
 msgid "Unsafe"
 msgstr "Usikker"
 
-#: ../install_steps_interactive.pm_.c:791
+#: ../install_steps_interactive.pm_.c:819
 msgid "Label"
 msgstr "Etikett"
 
-#: ../install_steps_interactive.pm_.c:793
+#: ../install_steps_interactive.pm_.c:821
 msgid "Default"
 msgstr "Standard"
 
-#: ../install_steps_interactive.pm_.c:796
+#: ../install_steps_interactive.pm_.c:824
 msgid "Remove entry"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:799
+#: ../install_steps_interactive.pm_.c:827
 msgid "Empty label not allowed"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:800
+#: ../install_steps_interactive.pm_.c:828
 msgid "This label is already in use"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:801
+#: ../install_steps_interactive.pm_.c:829
 #, c-format
 msgid "A entry %s already exists"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:815
+#: ../install_steps_interactive.pm_.c:843
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Installasjon av LILO mislykket. Følgende feil oppsto:"
 
-#: ../install_steps_interactive.pm_.c:827
+#: ../install_steps_interactive.pm_.c:855
+#, fuzzy
+msgid "Proxies configuration"
+msgstr "Test konfigurasjon"
+
+#: ../install_steps_interactive.pm_.c:856
+msgid "HTTP proxy"
+msgstr "HTTP-proxy"
+
+#: ../install_steps_interactive.pm_.c:857
+msgid "FTP proxy"
+msgstr "FTP-proxy"
+
+#: ../install_steps_interactive.pm_.c:863
+msgid "Proxy should be http://..."
+msgstr "Proxy burde være http://..."
+
+#: ../install_steps_interactive.pm_.c:864
+msgid "Proxy should be ftp://..."
+msgstr "Proxy burde være ftp://..."
+
+#: ../install_steps_interactive.pm_.c:874
+msgid "Windows(TM)"
+msgstr "Windows(TM)"
+
+#: ../install_steps_interactive.pm_.c:875
+msgid "Poor"
+msgstr ""
+
+#: ../install_steps_interactive.pm_.c:876
 msgid "Low"
 msgstr "Lav"
 
-#: ../install_steps_interactive.pm_.c:828
+#: ../install_steps_interactive.pm_.c:877
 msgid "Medium"
 msgstr "Medium"
 
-#: ../install_steps_interactive.pm_.c:829
+#: ../install_steps_interactive.pm_.c:878
 msgid "High"
 msgstr "Høy"
 
-#: ../install_steps_interactive.pm_.c:838
+#: ../install_steps_interactive.pm_.c:879
+msgid "Paranoid"
+msgstr "Paranoid"
+
+#: ../install_steps_interactive.pm_.c:889
 msgid "Miscellaneous questions"
 msgstr "Forskjellige spørsmål"
 
-#: ../install_steps_interactive.pm_.c:839
-msgid "Do you have a laptop?"
+#: ../install_steps_interactive.pm_.c:890
+#, fuzzy
+msgid "Is this machine a laptop?"
 msgstr "Har du en bærbar maskin?"
 
-#: ../install_steps_interactive.pm_.c:840
-msgid "Use hard drive optimizations"
+#: ../install_steps_interactive.pm_.c:891
+#, fuzzy
+msgid "Use hard drive optimisations?"
 msgstr "Bruk harddisk-optimisering"
 
-#: ../install_steps_interactive.pm_.c:841
-msgid "Security level"
+#: ../install_steps_interactive.pm_.c:892
+#, fuzzy
+msgid "Choose security level"
 msgstr "Sikkerhetsnivå"
 
-#: ../install_steps_interactive.pm_.c:842
-msgid "HTTP proxy"
-msgstr "HTTP-proxy"
-
-#: ../install_steps_interactive.pm_.c:843
-msgid "FTP proxy"
-msgstr "FTP-proxy"
-
-#: ../install_steps_interactive.pm_.c:845
-#, c-format
-msgid "Precise ram size (found %d MB)"
+#: ../install_steps_interactive.pm_.c:893
+#, fuzzy, c-format
+msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Nøyaktig ram-størrelse (funnet %d MB)"
 
-#: ../install_steps_interactive.pm_.c:848
-msgid "(may cause disk problems)"
+#: ../install_steps_interactive.pm_.c:896
+#, fuzzy
+msgid "(may cause data corruption)"
 msgstr "(kan forårsake diskproblemer)"
 
-#: ../install_steps_interactive.pm_.c:856
-msgid "Proxy should be http://..."
-msgstr "Proxy burde være http://..."
-
-#: ../install_steps_interactive.pm_.c:857
-msgid "Proxy should be ftp://..."
-msgstr "Proxy burde være ftp://..."
-
-#: ../install_steps_interactive.pm_.c:858
+#: ../install_steps_interactive.pm_.c:901
 msgid "Give the ram size in Mb"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:871
+#: ../install_steps_interactive.pm_.c:940
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -2582,7 +2811,7 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å slutte nå?"
 
-#: ../install_steps_interactive.pm_.c:878
+#: ../install_steps_interactive.pm_.c:945
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -2604,22 +2833,22 @@ msgstr ""
 "Informasjon om konfigurering av systemet ditt finnes i post\n"
 "install-kapittelet i Official Linux Mandrake User's Guide."
 
-#: ../install_steps_interactive.pm_.c:897
+#: ../install_steps_interactive.pm_.c:966
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installerer driver for %s kort %s"
 
-#: ../install_steps_interactive.pm_.c:898
+#: ../install_steps_interactive.pm_.c:967
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
-#: ../install_steps_interactive.pm_.c:908
+#: ../install_steps_interactive.pm_.c:977
 #, c-format
-msgid "What %s card do you have?"
-msgstr "Hvilket %s kort har du?"
+msgid "Which %s driver should I try?"
+msgstr ""
 
-#: ../install_steps_interactive.pm_.c:915
+#: ../install_steps_interactive.pm_.c:984
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -2639,20 +2868,20 @@ msgstr ""
 "forårsake\n"
 "forårsake noen skade."
 
-#: ../install_steps_interactive.pm_.c:920
+#: ../install_steps_interactive.pm_.c:989
 msgid "Autoprobe"
 msgstr "Automatisk sondering"
 
-#: ../install_steps_interactive.pm_.c:920
+#: ../install_steps_interactive.pm_.c:989
 msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
-#: ../install_steps_interactive.pm_.c:924
+#: ../install_steps_interactive.pm_.c:993
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Du kan nå gi dens opsjoner til modul %s."
 
-#: ../install_steps_interactive.pm_.c:930
+#: ../install_steps_interactive.pm_.c:999
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -2663,11 +2892,11 @@ msgstr ""
 "Opsjonene er i format ``name=value name2=value2 ...''.\n"
 "F.eks., ``io=0x300 irq=7''"
 
-#: ../install_steps_interactive.pm_.c:933
+#: ../install_steps_interactive.pm_.c:1002
 msgid "Module options:"
 msgstr "Modulopsjoner:"
 
-#: ../install_steps_interactive.pm_.c:943
+#: ../install_steps_interactive.pm_.c:1012
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -2676,76 +2905,87 @@ msgstr ""
 "Lasting av modul %s feilet.\n"
 "Ønsker du å prøve igjen med andre parametere?"
 
-#: ../install_steps_interactive.pm_.c:956
+#: ../install_steps_interactive.pm_.c:1025
 #, c-format
 msgid "Skip %s PCMCIA probing"
 msgstr "Dropp %s PCMCIA-sondering"
 
-#: ../install_steps_interactive.pm_.c:957
+#: ../install_steps_interactive.pm_.c:1026
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfigurerer PCMCIA-kort..."
 
-#: ../install_steps_interactive.pm_.c:957
+#: ../install_steps_interactive.pm_.c:1026
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../install_steps_interactive.pm_.c:964
+#: ../install_steps_interactive.pm_.c:1033
 msgid "Try to find PCI devices?"
 msgstr ""
 
-#: ../install_steps_interactive.pm_.c:968
+#: ../install_steps_interactive.pm_.c:1037
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Fant %s %s grensesnitt"
 
-#: ../install_steps_interactive.pm_.c:969
+#: ../install_steps_interactive.pm_.c:1038
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../install_steps_interactive.pm_.c:970
-#, c-format
-msgid "Do you have an %s interface?"
+#: ../install_steps_interactive.pm_.c:1039
+#, fuzzy, c-format
+msgid "Do you have any %s interface?"
 msgstr "Har du et %s grensesnitt?"
 
-#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52
-#: ../my_gtk.pm_.c:436
+#: ../install_steps_interactive.pm_.c:1041 ../interactive.pm_.c:52
+#: ../my_gtk.pm_.c:437
 msgid "Yes"
 msgstr "Ja"
 
-#: ../install_steps_interactive.pm_.c:973
+#: ../install_steps_interactive.pm_.c:1042
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
-#: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22
-#: ../interactive_newt.pm_.c:55 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:437
+#: ../install_steps_newt.pm_.c:19
+#, c-format
+msgid "Linux-Mandrake Installation %s"
+msgstr ""
+
+#: ../install_steps_newt.pm_.c:30
+msgid ""
+"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+msgstr ""
+
+#: ../interactive.pm_.c:57 ../interactive.pm_.c:135
+#: ../interactive_newt.pm_.c:46 ../interactive_newt.pm_.c:91
+#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:201 ../my_gtk.pm_.c:438
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../interactive.pm_.c:159
+#: ../interactive.pm_.c:153
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: ../interactive_stdio.pm_.c:34
+#: ../interactive_stdio.pm_.c:35
 #, c-format
 msgid "Ambiguity (%s), be more precise\n"
 msgstr "Tvetydig (%s), vær mere presis\n"
 
-#: ../interactive_stdio.pm_.c:35 ../interactive_stdio.pm_.c:50
-#: ../interactive_stdio.pm_.c:69
+#: ../interactive_stdio.pm_.c:36 ../interactive_stdio.pm_.c:51
+#: ../interactive_stdio.pm_.c:70
 msgid "Bad choice, try again\n"
 msgstr "Dårlig valg, prøv igjen\n"
 
-#: ../interactive_stdio.pm_.c:38
+#: ../interactive_stdio.pm_.c:39
 #, c-format
 msgid " ? (default %s) "
 msgstr " ? (standard %s) "
 
-#: ../interactive_stdio.pm_.c:51
+#: ../interactive_stdio.pm_.c:52
 #, c-format
 msgid "Your choice? (default %s) "
 msgstr "Ditt valg? (standard %s) "
 
-#: ../interactive_stdio.pm_.c:70
+#: ../interactive_stdio.pm_.c:71
 #, c-format
 msgid "Your choice? (default %s  enter `none' for none) "
 msgstr "Ditt valg? (standard %s  entre `none' for ingen) "
@@ -2877,132 +3117,132 @@ msgstr ""
 "sekunder for standard oppstart.\n"
 "\n"
 
-#: ../mouse.pm_.c:19
+#: ../mouse.pm_.c:20
 msgid "No Mouse"
 msgstr "Ingen mus"
 
-#: ../mouse.pm_.c:20
+#: ../mouse.pm_.c:21
 msgid "Microsoft Rev 2.1A or higher (serial)"
 msgstr "Microsoft Rev 2.1A eller høyere (seriell)"
 
-#: ../mouse.pm_.c:21
+#: ../mouse.pm_.c:22
 msgid "Logitech CC Series (serial)"
 msgstr "Logitech CC-seriene (seriell)"
 
-#: ../mouse.pm_.c:22
+#: ../mouse.pm_.c:23
 msgid "Logitech MouseMan+/FirstMouse+ (serial)"
 msgstr "Logitech MouseMan+/FirstMouse+ (seriell)"
 
-#: ../mouse.pm_.c:23
+#: ../mouse.pm_.c:24
 msgid "ASCII MieMouse (serial)"
 msgstr "ASCII MieMouse (seriell)"
 
-#: ../mouse.pm_.c:24
+#: ../mouse.pm_.c:25
 msgid "Genius NetMouse (serial)"
 msgstr "Genius NetMouse (seriell)"
 
-#: ../mouse.pm_.c:25
+#: ../mouse.pm_.c:26
 msgid "Microsoft IntelliMouse (serial)"
 msgstr "Microsoft IntelliMouse (seriell)"
 
-#: ../mouse.pm_.c:26
+#: ../mouse.pm_.c:27
 msgid "MM Series (serial)"
 msgstr "MM-seriene (seriell)"
 
-#: ../mouse.pm_.c:27
+#: ../mouse.pm_.c:28
 msgid "MM HitTablet (serial)"
 msgstr "MM HitTablet (seriell)"
 
-#: ../mouse.pm_.c:28
+#: ../mouse.pm_.c:29
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (seriell, gammel C7 type)"
 
-#: ../mouse.pm_.c:29
+#: ../mouse.pm_.c:30
 msgid "Logitech MouseMan/FirstMouse (serial)"
 msgstr "Logitech MouseMan/FirstMouse (seriell)"
 
-#: ../mouse.pm_.c:30
+#: ../mouse.pm_.c:31
 msgid "Generic Mouse (serial)"
 msgstr "Generic Mouse (seriell)"
 
-#: ../mouse.pm_.c:31
+#: ../mouse.pm_.c:32
 msgid "Microsoft compatible (serial)"
 msgstr "Microsoft-kompatibel (seriell)"
 
-#: ../mouse.pm_.c:32
+#: ../mouse.pm_.c:33
 msgid "Generic 3 Button Mouse (serial)"
 msgstr "Generic 3-knappers mus (seriell)"
 
-#: ../mouse.pm_.c:33
+#: ../mouse.pm_.c:34
 msgid "Mouse Systems (serial)"
 msgstr "Mouse Systems (seriell)"
 
-#: ../mouse.pm_.c:34
+#: ../mouse.pm_.c:35
 msgid "Generic Mouse (PS/2)"
 msgstr "Generic mus (PS/2)"
 
-#: ../mouse.pm_.c:35
+#: ../mouse.pm_.c:36
 msgid "Logitech MouseMan/FirstMouse (ps/2)"
 msgstr "Logitech MouseMan/FirstMouse (ps/2)"
 
-#: ../mouse.pm_.c:36
+#: ../mouse.pm_.c:37
 msgid "Generic 3 Button Mouse (PS/2)"
 msgstr "Generic 3-knappers mus (PS/2)"
 
-#: ../mouse.pm_.c:37
+#: ../mouse.pm_.c:38
 msgid "ALPS GlidePoint (PS/2)"
 msgstr "ALPS GlidePoint (PS/2)"
 
-#: ../mouse.pm_.c:38
+#: ../mouse.pm_.c:39
 msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
 msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
 
-#: ../mouse.pm_.c:39
+#: ../mouse.pm_.c:40
 msgid "Kensington Thinking Mouse (PS/2)"
 msgstr "Kensington Thinking Mouse (PS/2)"
 
-#: ../mouse.pm_.c:40
+#: ../mouse.pm_.c:41
 msgid "ASCII MieMouse (PS/2)"
 msgstr "ASCII MieMouse (PS/2)"
 
-#: ../mouse.pm_.c:41
+#: ../mouse.pm_.c:42
 msgid "Genius NetMouse (PS/2)"
 msgstr "Genius NetMouse (PS/2)"
 
-#: ../mouse.pm_.c:42
+#: ../mouse.pm_.c:43
 msgid "Genius NetMouse Pro (PS/2)"
 msgstr "Genius NetMouse Pro (PS/2)"
 
-#: ../mouse.pm_.c:43
+#: ../mouse.pm_.c:44
 msgid "Genius NetScroll (PS/2)"
 msgstr "Genius NetScroll (PS/2)"
 
-#: ../mouse.pm_.c:44
+#: ../mouse.pm_.c:45
 msgid "Microsoft IntelliMouse (PS/2)"
 msgstr "Microsoft IntelliMouse (PS/2)"
 
-#: ../mouse.pm_.c:45
+#: ../mouse.pm_.c:46
 msgid "ATI Bus Mouse"
 msgstr "ATI Bus Mouse"
 
-#: ../mouse.pm_.c:46
+#: ../mouse.pm_.c:47
 msgid "Microsoft Bus Mouse"
 msgstr "Microsoft Bus Mouse"
 
-#: ../mouse.pm_.c:47
+#: ../mouse.pm_.c:48
 msgid "Logitech Bus Mouse"
 msgstr "Logitech Bus Mouse"
 
-#: ../mouse.pm_.c:48
+#: ../mouse.pm_.c:49
 #, fuzzy
 msgid "USB Mouse"
 msgstr "Ingen mus"
 
-#: ../mouse.pm_.c:49
+#: ../mouse.pm_.c:50
 msgid "USB Mouse (3 buttons or more)"
 msgstr ""
 
-#: ../partition_table.pm_.c:452
+#: ../partition_table.pm_.c:463
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
@@ -3012,21 +3252,21 @@ msgstr ""
 "Den eneste løsningen er å flytte primærpartisjonene dine for å ha hullet ved "
 "siden av de utvidede partisjonene"
 
-#: ../partition_table.pm_.c:538
+#: ../partition_table.pm_.c:549
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: ../partition_table.pm_.c:545
+#: ../partition_table.pm_.c:556
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Gjenoppretting fra fil %s mislykket: %s"
 
-#: ../partition_table.pm_.c:547
+#: ../partition_table.pm_.c:558
 msgid "Bad backup file"
 msgstr "Dårlig sikkerhetskopi-fil"
 
-#: ../partition_table.pm_.c:567
+#: ../partition_table.pm_.c:578
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Feil ved skriving til fil %s"
@@ -3047,27 +3287,42 @@ msgstr "SMB/Windows 95/98/NT"
 msgid "NetWare"
 msgstr "NetWare"
 
-#: ../raid.pm_.c:34
+#: ../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../raid.pm_.c:104
+#: ../raid.pm_.c:108
 msgid "Can't write file $file"
 msgstr ""
 
-#: ../raid.pm_.c:139
+#: ../raid.pm_.c:145
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
 
-#: ../unused/install_steps_graphical.pm_.c:433
-msgid "Show less"
-msgstr "Vis færre"
+#~ msgid ""
+#~ "The packages selected are now being installed. This operation\n"
+#~ "should only take a few minutes."
+#~ msgstr ""
+#~ "Pakkene som er valgt blir nå installert. Denne operasjonen burde\n"
+#~ "bare ta noen få minutter."
+
+#~ msgid "TODO"
+#~ msgstr "TODO"
+
+#~ msgid ""
+#~ "At this level of security, a password (and a good one) in lilo is requested"
+#~ msgstr "På dette sikkerhetsnivået anmodes et passord (og et godt et) i lilo"
+
+#~ msgid "What %s card do you have?"
+#~ msgstr "Hvilket %s kort har du?"
 
-#: ../unused/install_steps_graphical.pm_.c:434
-msgid "Show more"
-msgstr "Vis flere"
+#~ msgid "Show less"
+#~ msgstr "Vis færre"
+
+#~ msgid "Show more"
+#~ msgstr "Vis flere"
 
 #, fuzzy
 #~ msgid ""
@@ -3484,42 +3739,6 @@ msgstr "Vis flere"
 #~ msgstr "Wanring no wrranty, be carfull it's gonna explose ytou romcpature"
 
 #~ msgid ""
-#~ "At this point, hard drive partitions must be defined. (Unless you\n"
-#~ "are overwriting a previous install of Linux and have already defined\n"
-#~ "your hard drive partitions as desired.) This operation consists of\n"
-#~ "logically dividing the computer's hard drive capacity into separate\n"
-#~ "areas for use.\n"
-#~ "\n"
-#~ "\n"
-#~ "Two common partition are: the root partition (/), which is the starting\n"
-#~ "point of the filesystem's directory hierarchy, and /boot, which contains\n"
-#~ "all files necessary to start the operating system when the\n"
-#~ "computer is first turned on.\n"
-#~ "\n"
-#~ "\n"
-#~ "Because the effects of this process are usually irreversible, partitioning\n"
-#~ "can be intimidating and stressful to the unexperienced. DiskDrake\n"
-#~ "simplifies the process so that it need not be. Consult the documentation\n"
-#~ "and take your time before proceeding."
-#~ msgstr ""
-#~ "På dette punktet må hard-disk partisjoner defineres. (Hvis du ikke\n"
-#~ "overskriver en tidligere installasjon av Linux og allerede har definert\n"
-#~ "hard-disk partisjonene dine som ønsket.) Denne operasjonen innebærer å\n"
-#~ "logisk dele maskinens hard-disk kapasitet i separate områder for bruk.\n"
-#~ "\n"
-#~ "\n"
-#~ "To vanlige partisjoner er: root-partisjonen (/) som er punktet hvor\n"
-#~ "filsystemets katalogstruktur starter, og /boot, som inneholder alle\n"
-#~ "filene som er nødvendige for å starte operativsystemet når datamaskinen\n"
-#~ "blir slått på.\n"
-#~ "\n"
-#~ "\n"
-#~ "Fordi effekten av denne prosessen vanligvis er ugjenkallelig kan\n"
-#~ "partisjonering være både stressende og skremmende for uerfarne brukere.\n"
-#~ "DiskDrake forenkler prosessen så den ikke trenger å være det. Les\n"
-#~ "dokumentasjonen og ta deg god tid før du begynner."
-
-#~ msgid ""
 #~ "Summary: %s\n"
 #~ "\n"
 #~ msgstr ""
@@ -3596,12 +3815,6 @@ msgstr "Vis flere"
 #~ msgid "Legend:"
 #~ msgstr "Legende:"
 
-#~ msgid "Paranoid"
-#~ msgstr "Paranoid"
-
-#~ msgid "Windows(TM)"
-#~ msgstr "Windows(TM)"
-
 #~ msgid "Size: %s MB (%s%%)"
 #~ msgstr "Størrelse: %s MB (%s%%)"