update-po

3 files changed, 456 insertions, 423 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index efa389219..75d91ba5b 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: 2000-03-22 15:43+0100\n"
+"POT-Creation-Date: 2000-03-24 13:11+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"
@@ -565,8 +565,8 @@ msgstr ""
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:196 ../../install_any.pm_.c:249
-#: ../../install_steps.pm_.c:72 ../../install_steps_interactive.pm_.c:40
+#: ../../diskdrake.pm_.c:196 ../../install_any.pm_.c:242
+#: ../../install_steps.pm_.c:73 ../../install_steps_interactive.pm_.c:40
 #: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
 #: ../../standalone/rpmdrake_.c:304
 msgid "Error"
@@ -836,12 +836,12 @@ msgstr ""
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:560 ../../install_steps_gtk.pm_.c:271
+#: ../../diskdrake.pm_.c:560 ../../install_steps_gtk.pm_.c:286
 msgid "Computing fat filesystem bounds"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:560 ../../diskdrake.pm_.c:609
-#: ../../install_steps_gtk.pm_.c:271
+#: ../../install_steps_gtk.pm_.c:286
 msgid "Resizing"
 msgstr ""
 
@@ -859,7 +859,7 @@ msgid "Choose the new size"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:588 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334 ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_graphical.pm_.c:334 ../../install_steps_gtk.pm_.c:351
 msgid "MB"
 msgstr ""
 
@@ -896,50 +896,54 @@ msgid "Loopback file name: "
 msgstr ""
 
 #: ../../diskdrake.pm_.c:765
+msgid "File already used by another loopback, choose another one"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:766
 msgid "File already exists. Use it?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:786 ../../diskdrake.pm_.c:802
+#: ../../diskdrake.pm_.c:788 ../../diskdrake.pm_.c:804
 msgid "Select file"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:795
+#: ../../diskdrake.pm_.c:797
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:803
+#: ../../diskdrake.pm_.c:805
 msgid "Warning"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:804
+#: ../../diskdrake.pm_.c:806
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:820
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:829
+#: ../../diskdrake.pm_.c:831
 msgid "device"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:830
+#: ../../diskdrake.pm_.c:832
 msgid "level"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:831
+#: ../../diskdrake.pm_.c:833
 msgid "chunk size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:845
 msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:846
 msgid "new"
 msgstr ""
 
@@ -953,15 +957,15 @@ msgstr ""
 msgid "don't know how to format %s in type %s"
 msgstr ""
 
-#: ../../fs.pm_.c:173
+#: ../../fs.pm_.c:169
 msgid "nfs mount failed"
 msgstr ""
 
-#: ../../fs.pm_.c:190
+#: ../../fs.pm_.c:186
 msgid "mount failed: "
 msgstr ""
 
-#: ../../fs.pm_.c:201
+#: ../../fs.pm_.c:197
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
@@ -1557,99 +1561,99 @@ msgstr ""
 msgid "Exit install"
 msgstr ""
 
-#: ../../install2.pm_.c:317
+#: ../../install2.pm_.c:312
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
 "Then choose action ``Mount point'' and set it to `/'"
 msgstr ""
 
-#: ../../install_any.pm_.c:250 ../../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:243 ../../standalone/diskdrake_.c:61
 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:266
+#: ../../install_any.pm_.c:259
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
 msgstr ""
 
-#: ../../install_any.pm_.c:276
+#: ../../install_any.pm_.c:269
 msgid "Searching root partition."
 msgstr ""
 
-#: ../../install_any.pm_.c:305
+#: ../../install_any.pm_.c:298
 msgid "Information"
 msgstr ""
 
-#: ../../install_any.pm_.c:306
+#: ../../install_any.pm_.c:299
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr ""
 
-#: ../../install_any.pm_.c:308
+#: ../../install_any.pm_.c:301
 msgid "No root partition found"
 msgstr ""
 
-#: ../../install_any.pm_.c:345
+#: ../../install_any.pm_.c:338
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:528
+#: ../../install_any.pm_.c:521
 msgid "Error reading file $f"
 msgstr ""
 
-#: ../../install_any.pm_.c:770
+#: ../../install_any.pm_.c:763
 msgid ""
 "Linux does not yet fully support ultra dma 66.\n"
 "As a work-around i can make a custom floppy giving access the hard drive on "
 "ide2 and ide3"
 msgstr ""
 
-#: ../../install_any.pm_.c:795
+#: ../../install_any.pm_.c:788
 msgid ""
 "Enter a floppy to create an HTP enabled boot\n"
 "(all data on floppy will be lost)"
 msgstr ""
 
-#: ../../install_any.pm_.c:798 ../../install_steps_interactive.pm_.c:695
+#: ../../install_any.pm_.c:791 ../../install_steps_interactive.pm_.c:695
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_any.pm_.c:812
+#: ../../install_any.pm_.c:805
 msgid "It is necessary to restart installation booting on the floppy"
 msgstr ""
 
-#: ../../install_any.pm_.c:813
+#: ../../install_any.pm_.c:806
 msgid "It is necessary to restart installation with the new parameters"
 msgstr ""
 
-#: ../../install_any.pm_.c:817
+#: ../../install_any.pm_.c:810
 #, c-format
 msgid ""
 "Failed to create an HTP boot floppy.\n"
 "You may have to restart installation and give ``%s'' at the prompt"
 msgstr ""
 
-#: ../../install_steps.pm_.c:73
+#: ../../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:137
+#: ../../install_steps.pm_.c:138
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:296
+#: ../../install_steps.pm_.c:299
 #, c-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:570
+#: ../../install_steps.pm_.c:573
 msgid "No floppy drive available"
 msgstr ""
 
@@ -1659,18 +1663,18 @@ msgstr ""
 msgid "Entering step `%s'\n"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:312
+#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:327
 msgid "You must have a swap partition"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:314
+#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:329
 msgid ""
 "You don't have a swap partition\n"
 "\n"
 "Continue anyway?"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:287 ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_graphical.pm_.c:287 ../../install_steps_gtk.pm_.c:351
 msgid "Choose the size you want to install"
 msgstr ""
 
@@ -1678,63 +1682,63 @@ msgstr ""
 msgid "Total size: "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:418
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:433
 #: ../../standalone/rpmdrake_.c:136
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:419
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:434
 #: ../../standalone/rpmdrake_.c:137
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:360
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:375
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:363
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:378
 msgid "Info"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:368
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:383
 #: ../../install_steps_interactive.pm_.c:92 ../../standalone/rpmdrake_.c:161
 msgid "Install"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:483
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:498
 #: ../../install_steps_interactive.pm_.c:325
 msgid "Installing"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:490
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:505
 msgid "Please wait, "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:492
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:507
 msgid "Time remaining "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:493
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:508
 msgid "Total time "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:498
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:517
 #: ../../install_steps_interactive.pm_.c:325
 msgid "Preparing installation"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:513
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:532
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:561
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:580
 msgid "Go on anyway?"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:561
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:580
 msgid "There was an error ordering packages:"
 msgstr ""
 
@@ -1743,7 +1747,7 @@ msgstr ""
 msgid "Use existing configuration for X11?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:276
+#: ../../install_steps_gtk.pm_.c:291
 msgid ""
 "WARNING!\n"
 "\n"
@@ -1755,66 +1759,73 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:295
+#: ../../install_steps_gtk.pm_.c:310
 msgid "Automatic resizing failed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:331
+#: ../../install_steps_gtk.pm_.c:346
 msgid ""
 "Now that you've selected desired groups, please choose \n"
 "how many packages you want, ranging from minimal to full \n"
 "installation of each selected groups."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:334
+#: ../../install_steps_gtk.pm_.c:349
 msgid "You will be able to choose more precisely in next step"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:432
 msgid "Bad package"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:420
+#: ../../install_steps_gtk.pm_.c:435
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:441
+#: ../../install_steps_gtk.pm_.c:456
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:468
 msgid "The following packages are going to be install/removed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:462
+#: ../../install_steps_gtk.pm_.c:477
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:486
+#: ../../install_steps_gtk.pm_.c:501
 msgid "Estimating"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:508
+#: ../../install_steps_gtk.pm_.c:514 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:195 ../../interactive_newt.pm_.c:50
+#: ../../interactive_newt.pm_.c:97 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:195 ../../my_gtk.pm_.c:435
+msgid "Cancel"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:527
 #, c-format
 msgid "%d packages"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:508
+#: ../../install_steps_gtk.pm_.c:527
 msgid ", %U MB"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:538
+#: ../../install_steps_gtk.pm_.c:557
 msgid "Installation CD /*1"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid "Installation CD /*%s"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:543
+#: ../../install_steps_gtk.pm_.c:562
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1824,7 +1835,7 @@ msgid ""
 "If you don't have it press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:549
+#: ../../install_steps_gtk.pm_.c:568
 #, c-format
 msgid ""
 "Update installation image!\n"
@@ -1836,7 +1847,7 @@ msgid ""
 "to avoid installation from this Cd-Rom image."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:620 ../../install_steps_interactive.pm_.c:581
+#: ../../install_steps_gtk.pm_.c:643 ../../install_steps_interactive.pm_.c:581
 #: ../../install_steps_interactive.pm_.c:802
 #: ../../install_steps_interactive.pm_.c:911 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:196
@@ -1925,36 +1936,36 @@ msgstr ""
 msgid "What usage do you want?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:143 ../../standalone/mousedrake_.c:25
+#: ../../install_steps_interactive.pm_.c:141 ../../standalone/mousedrake_.c:25
 msgid "What is the type of your mouse?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:151 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:149 ../../standalone/mousedrake_.c:38
 msgid "Mouse Port"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:152 ../../standalone/mousedrake_.c:39
+#: ../../install_steps_interactive.pm_.c:150 ../../standalone/mousedrake_.c:39
 msgid "Which serial port is your mouse connected to?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:166
 msgid "no available partitions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:170
+#: ../../install_steps_interactive.pm_.c:168
 #, c-format
 msgid "(%dMb)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:177
+#: ../../install_steps_interactive.pm_.c:175
 msgid "Which partition do you want to use as your root partition"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:182
 msgid "Choose the mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:194
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
@@ -2812,21 +2823,21 @@ msgstr ""
 msgid "See hardware info"
 msgstr ""
 
-#: ../../install_steps_newt.pm_.c:19
+#: ../../install_steps_newt.pm_.c:21
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr ""
 
-#: ../../install_steps_newt.pm_.c:30
+#: ../../install_steps_newt.pm_.c:32
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:195
-#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:97
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:195
-#: ../../my_gtk.pm_.c:435
-msgid "Cancel"
+#: ../../install_steps_newt.pm_.c:43
+#, c-format
+msgid ""
+"You can now partition your %s hard drive\n"
+"When you are done, don't forget to save using `w'"
 msgstr ""
 
 #: ../../interactive.pm_.c:213
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index fdeb85f5b..f7f847788 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: 2000-03-22 15:43+0100\n"
+"POT-Creation-Date: 2000-03-24 13:11+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -596,8 +596,8 @@ msgid "Be careful: this operation is dangerous."
 msgstr "Vцr forsiktig: denne operasjonen er farlig."
 
 # #: ../install_steps_interactive.pm_.c:37
-#: ../../diskdrake.pm_.c:196 ../../install_any.pm_.c:249
-#: ../../install_steps.pm_.c:72 ../../install_steps_interactive.pm_.c:40
+#: ../../diskdrake.pm_.c:196 ../../install_any.pm_.c:242
+#: ../../install_steps.pm_.c:73 ../../install_steps_interactive.pm_.c:40
 #: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
 #: ../../standalone/rpmdrake_.c:304
 msgid "Error"
@@ -885,12 +885,12 @@ msgstr "Partisjonstabellen pх disk %s blir nх skrevet til disk!"
 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:560 ../../install_steps_gtk.pm_.c:271
+#: ../../diskdrake.pm_.c:560 ../../install_steps_gtk.pm_.c:286
 msgid "Computing fat filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
 #: ../../diskdrake.pm_.c:560 ../../diskdrake.pm_.c:609
-#: ../../install_steps_gtk.pm_.c:271
+#: ../../install_steps_gtk.pm_.c:286
 msgid "Resizing"
 msgstr "Endrer stјrrelse"
 
@@ -910,7 +910,7 @@ msgid "Choose the new size"
 msgstr "Velg den nye stјrrelsen"
 
 #: ../../diskdrake.pm_.c:588 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334 ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_graphical.pm_.c:334 ../../install_steps_gtk.pm_.c:351
 msgid "MB"
 msgstr "MB"
 
@@ -947,15 +947,19 @@ msgid "Loopback file name: "
 msgstr "Loopback filnavn: "
 
 #: ../../diskdrake.pm_.c:765
+msgid "File already used by another loopback, choose another one"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:766
 #, fuzzy
 msgid "File already exists. Use it?"
 msgstr "En inngang %s eksisterer ellerede"
 
-#: ../../diskdrake.pm_.c:786 ../../diskdrake.pm_.c:802
+#: ../../diskdrake.pm_.c:788 ../../diskdrake.pm_.c:804
 msgid "Select file"
 msgstr "Velg fil"
 
-#: ../../diskdrake.pm_.c:795
+#: ../../diskdrake.pm_.c:797
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -963,11 +967,11 @@ msgstr ""
 "Sikkerhetskopien av partisjonstabellen har ikke samme stјrrelse\n"
 "Fortsette for det?"
 
-#: ../../diskdrake.pm_.c:803
+#: ../../diskdrake.pm_.c:805
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../../diskdrake.pm_.c:804
+#: ../../diskdrake.pm_.c:806
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -975,27 +979,27 @@ msgstr ""
 "Sett inn en diskett i stasjonen\n"
 "Alle data pх denne disketten vil gх tapt"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:820
 msgid "Trying to rescue partition table"
 msgstr "Prјver х redde partisjonstabell"
 
-#: ../../diskdrake.pm_.c:829
+#: ../../diskdrake.pm_.c:831
 msgid "device"
 msgstr "enhet"
 
-#: ../../diskdrake.pm_.c:830
+#: ../../diskdrake.pm_.c:832
 msgid "level"
 msgstr "nivх"
 
-#: ../../diskdrake.pm_.c:831
+#: ../../diskdrake.pm_.c:833
 msgid "chunk size"
 msgstr "skivestјrrelse"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:845
 msgid "Choose an existing RAID to add to"
 msgstr "Velg en eksisterende RAID for х legge til"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:846
 msgid "new"
 msgstr "ny"
 
@@ -1009,15 +1013,15 @@ msgstr "%s formatering av %s mislykket"
 msgid "don't know how to format %s in type %s"
 msgstr "vet ikke hvordan formatere %s i type %s"
 
-#: ../../fs.pm_.c:173
+#: ../../fs.pm_.c:169
 msgid "nfs mount failed"
 msgstr "nfs montering mislykket"
 
-#: ../../fs.pm_.c:190
+#: ../../fs.pm_.c:186
 msgid "mount failed: "
 msgstr "montering mislykket: "
 
-#: ../../fs.pm_.c:201
+#: ../../fs.pm_.c:197
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "feil ved demontering av %s: %s"
@@ -1959,7 +1963,7 @@ msgstr "Konfigurer X"
 msgid "Exit install"
 msgstr "Avslutt installering"
 
-#: ../../install2.pm_.c:317
+#: ../../install2.pm_.c:312
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -1969,7 +1973,7 @@ msgstr ""
 "Opprett en partisjon for dette (eller klikk pх en eksisterende).\n"
 "Velg sх ``Monteringspunkt'' og  sett dette til `/'"
 
-#: ../../install_any.pm_.c:250 ../../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:243 ../../standalone/diskdrake_.c:61
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -1977,7 +1981,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:266
+#: ../../install_any.pm_.c:259
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -1985,32 +1989,32 @@ msgstr ""
 "DiskDrake klarte ikke х lese partisjonstabellen korrekt.\n"
 "Fortsett pх eget ansvar!"
 
-#: ../../install_any.pm_.c:276
+#: ../../install_any.pm_.c:269
 msgid "Searching root partition."
 msgstr "Sјker root-partisjon."
 
-#: ../../install_any.pm_.c:305
+#: ../../install_any.pm_.c:298
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../../install_any.pm_.c:306
+#: ../../install_any.pm_.c:299
 #, 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:308
+#: ../../install_any.pm_.c:301
 msgid "No root partition found"
 msgstr "Ingen root-partisjon funnet"
 
-#: ../../install_any.pm_.c:345
+#: ../../install_any.pm_.c:338
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan ikke bruke broadcast uten NIS-domene"
 
-#: ../../install_any.pm_.c:528
+#: ../../install_any.pm_.c:521
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
-#: ../../install_any.pm_.c:770
+#: ../../install_any.pm_.c:763
 msgid ""
 "Linux does not yet fully support ultra dma 66.\n"
 "As a work-around i can make a custom floppy giving access the hard drive on "
@@ -2020,7 +2024,7 @@ msgstr ""
 "Som en lјsning kan jeg lage en diskett som gir tilgang til harddisken pх "
 "ide2 og ide3"
 
-#: ../../install_any.pm_.c:795
+#: ../../install_any.pm_.c:788
 msgid ""
 "Enter a floppy to create an HTP enabled boot\n"
 "(all data on floppy will be lost)"
@@ -2028,20 +2032,20 @@ msgstr ""
 "Sett inn en diskett for х opprette en oppstart med HTP slхtt pх\n"
 "(Alle data pх disketten vil gх tapt)"
 
-#: ../../install_any.pm_.c:798 ../../install_steps_interactive.pm_.c:695
+#: ../../install_any.pm_.c:791 ../../install_steps_interactive.pm_.c:695
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_any.pm_.c:812
+#: ../../install_any.pm_.c:805
 msgid "It is necessary to restart installation booting on the floppy"
 msgstr "Det er nјdvendig х starte installasjonen igjen fra disketten"
 
-#: ../../install_any.pm_.c:813
+#: ../../install_any.pm_.c:806
 msgid "It is necessary to restart installation with the new parameters"
 msgstr ""
 "Det er nјdvendig х starte installasjonen igjen med de de nye parameterene"
 
-#: ../../install_any.pm_.c:817
+#: ../../install_any.pm_.c:810
 #, c-format
 msgid ""
 "Failed to create an HTP boot floppy.\n"
@@ -2050,7 +2054,7 @@ msgstr ""
 "Oppretting av HTP oppstartsdiskett mislykket.\n"
 "Du mх muligens starte installasjonen igjen og gi ``%s'' ved klartegnet"
 
-#: ../../install_steps.pm_.c:73
+#: ../../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."
@@ -2059,17 +2063,17 @@ msgstr ""
 "pen mхte.\n"
 "Fortsett pх eget ansvar."
 
-#: ../../install_steps.pm_.c:137
+#: ../../install_steps.pm_.c:138
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dupliser monteringspunkt %s"
 
-#: ../../install_steps.pm_.c:296
+#: ../../install_steps.pm_.c:299
 #, c-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: ../../install_steps.pm_.c:570
+#: ../../install_steps.pm_.c:573
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
 
@@ -2079,11 +2083,11 @@ msgstr "Ingen diskettstasjon tilgjengelig"
 msgid "Entering step `%s'\n"
 msgstr "Entrer trinn `%s'\n"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:312
+#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:327
 msgid "You must have a swap partition"
 msgstr "Du mх ha en vekslingspartisjon"
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:314
+#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:329
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2093,7 +2097,7 @@ msgstr ""
 "\n"
 "Fortsette likevel?"
 
-#: ../../install_steps_graphical.pm_.c:287 ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_graphical.pm_.c:287 ../../install_steps_gtk.pm_.c:351
 msgid "Choose the size you want to install"
 msgstr "Velg stјrrelsen du јnsker х installere"
 
@@ -2101,63 +2105,63 @@ msgstr "Velg stјrrelsen du јnsker х installere"
 msgid "Total size: "
 msgstr "Total stјrrelse: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:418
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:433
 #: ../../standalone/rpmdrake_.c:136
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versjon: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:419
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:434
 #: ../../standalone/rpmdrake_.c:137
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Stјrrelse: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:360
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:375
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du јnsker х installere"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:363
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:378
 msgid "Info"
 msgstr "Info"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:368
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:383
 #: ../../install_steps_interactive.pm_.c:92 ../../standalone/rpmdrake_.c:161
 msgid "Install"
 msgstr "Installer"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:483
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:498
 #: ../../install_steps_interactive.pm_.c:325
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:490
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:505
 msgid "Please wait, "
 msgstr "Vennligst vent, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:492
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:507
 msgid "Time remaining "
 msgstr "Tid som gjenstхr "
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:493
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:508
 msgid "Total time "
 msgstr "Total tid "
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:498
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:517
 #: ../../install_steps_interactive.pm_.c:325
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:513
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:561
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:580
 msgid "Go on anyway?"
 msgstr "Fortsette uansett?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:561
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:580
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefјlge:"
 
@@ -2166,7 +2170,7 @@ msgstr "Det var en feil ved endring av pakkenes rekkefјlge:"
 msgid "Use existing configuration for X11?"
 msgstr "Bruke eksisterende konfigurasjon for X11?"
 
-#: ../../install_steps_gtk.pm_.c:276
+#: ../../install_steps_gtk.pm_.c:291
 msgid ""
 "WARNING!\n"
 "\n"
@@ -2187,11 +2191,11 @@ msgstr ""
 "dine data.\n"
 "Nхr du er sikker, trykk Ok."
 
-#: ../../install_steps_gtk.pm_.c:295
+#: ../../install_steps_gtk.pm_.c:310
 msgid "Automatic resizing failed"
 msgstr "Automatisk endring av stјrrelse mislykket"
 
-#: ../../install_steps_gtk.pm_.c:331
+#: ../../install_steps_gtk.pm_.c:346
 msgid ""
 "Now that you've selected desired groups, please choose \n"
 "how many packages you want, ranging from minimal to full \n"
@@ -2201,55 +2205,62 @@ msgstr ""
 "hvor mange pakker du јnsker, fra minimal til full \n"
 "installasjon av hver valgte gruppe."
 
-#: ../../install_steps_gtk.pm_.c:334
+#: ../../install_steps_gtk.pm_.c:349
 msgid "You will be able to choose more precisely in next step"
 msgstr "Du vil kunne velge mere presist i neste trinn"
 
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:432
 msgid "Bad package"
 msgstr "Dхrlig pakke"
 
-#: ../../install_steps_gtk.pm_.c:420
+#: ../../install_steps_gtk.pm_.c:435
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Viktighet: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:441
+#: ../../install_steps_gtk.pm_.c:456
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total stјrrelse: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:468
 msgid "The following packages are going to be install/removed"
 msgstr "Fјlgende pakker vil bli installert/fjernet"
 
-#: ../../install_steps_gtk.pm_.c:462
+#: ../../install_steps_gtk.pm_.c:477
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Dette er en bestemt pakke, den kan ikke fjernes"
 
-#: ../../install_steps_gtk.pm_.c:486
+#: ../../install_steps_gtk.pm_.c:501
 msgid "Estimating"
 msgstr "Beregner"
 
-#: ../../install_steps_gtk.pm_.c:508
+#: ../../install_steps_gtk.pm_.c:514 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:195 ../../interactive_newt.pm_.c:50
+#: ../../interactive_newt.pm_.c:97 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:195 ../../my_gtk.pm_.c:435
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../../install_steps_gtk.pm_.c:527
 #, c-format
 msgid "%d packages"
 msgstr "%d pakker"
 
-#: ../../install_steps_gtk.pm_.c:508
+#: ../../install_steps_gtk.pm_.c:527
 msgid ", %U MB"
 msgstr ", %U MB"
 
-#: ../../install_steps_gtk.pm_.c:538
+#: ../../install_steps_gtk.pm_.c:557
 msgid "Installation CD /*1"
 msgstr "Installasjons-CD /*1"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:559
 #, c-format
 msgid "Installation CD /*%s"
 msgstr "Installasjons-CD /*%s"
 
-#: ../../install_steps_gtk.pm_.c:543
+#: ../../install_steps_gtk.pm_.c:562
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2264,7 +2275,7 @@ msgstr ""
 "ferdig.\n"
 "Hvis du ikke har den trykk Avbryt for х unngх installasjon fra denne CD'en."
 
-#: ../../install_steps_gtk.pm_.c:549
+#: ../../install_steps_gtk.pm_.c:568
 #, c-format
 msgid ""
 "Update installation image!\n"
@@ -2283,7 +2294,7 @@ msgstr ""
 "trykk Avbryt\n"
 "for х unngх installasjon fra dette CD-rom bildet."
 
-#: ../../install_steps_gtk.pm_.c:620 ../../install_steps_interactive.pm_.c:581
+#: ../../install_steps_gtk.pm_.c:643 ../../install_steps_interactive.pm_.c:581
 #: ../../install_steps_interactive.pm_.c:802
 #: ../../install_steps_interactive.pm_.c:911 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:196
@@ -2372,36 +2383,36 @@ msgstr "Tjener"
 msgid "What usage do you want?"
 msgstr "Hva slags bruk јnsker du?"
 
-#: ../../install_steps_interactive.pm_.c:143 ../../standalone/mousedrake_.c:25
+#: ../../install_steps_interactive.pm_.c:141 ../../standalone/mousedrake_.c:25
 msgid "What is the type of your mouse?"
 msgstr "Hva slags type er musen din?"
 
-#: ../../install_steps_interactive.pm_.c:151 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:149 ../../standalone/mousedrake_.c:38
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../../install_steps_interactive.pm_.c:152 ../../standalone/mousedrake_.c:39
+#: ../../install_steps_interactive.pm_.c:150 ../../standalone/mousedrake_.c:39
 msgid "Which serial port is your mouse connected to?"
 msgstr "Hvilken serieport er musen din koblet til?"
 
-#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:166
 msgid "no available partitions"
 msgstr "ingen tilgjengelige partisjoner"
 
-#: ../../install_steps_interactive.pm_.c:170
+#: ../../install_steps_interactive.pm_.c:168
 #, c-format
 msgid "(%dMb)"
 msgstr "(%dMb)"
 
-#: ../../install_steps_interactive.pm_.c:177
+#: ../../install_steps_interactive.pm_.c:175
 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:184
+#: ../../install_steps_interactive.pm_.c:182
 msgid "Choose the mount points"
 msgstr "Velg monteringspunktene"
 
-#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:194
 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"
@@ -3351,23 +3362,23 @@ msgstr "Ja"
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
-#: ../../install_steps_newt.pm_.c:19
+#: ../../install_steps_newt.pm_.c:21
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake installasjon %s"
 
-#: ../../install_steps_newt.pm_.c:30
+#: ../../install_steps_newt.pm_.c:32
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "  <Tab>/<Alt-Tab> mellom elementer  | <Space> velger | <F12> neste skjerm "
 
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:195
-#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:97
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:195
-#: ../../my_gtk.pm_.c:435
-msgid "Cancel"
-msgstr "Avbryt"
+#: ../../install_steps_newt.pm_.c:43
+#, c-format
+msgid ""
+"You can now partition your %s hard drive\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
 
 #: ../../interactive.pm_.c:213
 msgid "Please wait"
@@ -4554,42 +4565,71 @@ msgstr "Finner tillatelser"
 msgid "Finding leaves takes some time"
 msgstr "Finne tillatelser vil ta litt tid"
 
-#~ msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
-#~ msgstr "For mange pakker er valgt: %dMB passer ikke i %dMB"
+#~ msgid "User name:"
+#~ msgstr "Brukernavn:"
 
-#~ msgid "Going to install %d MB. You can choose to install more programs"
+#~ msgid "Password:"
+#~ msgstr "Passord:"
+
+#~ msgid ""
+#~ "Test page(s) have been sent to the printer daemon.\n"
+#~ "This may take a little time before printer start.\n"
+#~ "Does it work properly?"
 #~ msgstr ""
-#~ "%d MB vil bli installert. Du kan velge х installere flere programmer"
+#~ "Testsiden(e) har blitt sendt til skriver-daemonen.\n"
+#~ "Det kan ta litt tid fјr skriveren starter.\n"
+#~ "Virker det ordentlig?"
 
-#~ msgid "Bad kickstart file %s (failed %s)"
-#~ msgstr "Dхrlig kickstart-fil %s (mislykket %s)"
+#~ msgid ""
+#~ "Test page(s) have been sent to the printer daemon.\n"
+#~ "This may take a little time before printer start.\n"
+#~ "Printing status:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Does it work properly?"
+#~ msgstr ""
+#~ "Testsiden(e) har blitt sendt til skriver-daemonen.\n"
+#~ "Det kan ta litt tid fјr skriveren starter.\n"
+#~ "Utskriftstatus:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Virker det ordentlig?"
 
-#~ msgid "resizing"
-#~ msgstr "endrer stјrrelse"
+#~ msgid "Printing test page(s)..."
+#~ msgstr "Skriver ut testside(r)..."
 
-#~ msgid "formatting"
-#~ msgstr "formatering"
+#~ msgid "Do you want to test printing?"
+#~ msgstr "Vil du teste utskrift?"
 
-#~ msgid "changing type of"
-#~ msgstr "endrer type av"
+#~ msgid "Color depth options"
+#~ msgstr "Opsjoner fargedybde"
 
-#~ msgid "After %s partition %s,"
-#~ msgstr "Etter %s partisjon %s,"
+#~ msgid "Uniprint driver options"
+#~ msgstr "Opsjoner uniprint-driver"
 
-#~ msgid "linear"
-#~ msgstr "lineцr"
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Fikse trappestegs-tekst?"
 
-#~ msgid "Linear (needed for some SCSI drives)"
-#~ msgstr "Lineцr (behјves av noen SCSI-disker)"
+#~ msgid "Eject page after job?"
+#~ msgstr "Kjјr ut side etter jobb?"
 
-#~ msgid "Printer"
-#~ msgstr "Skriver"
+#~ msgid "Paper Size"
+#~ msgstr "Papirstјrrelse"
 
-#~ msgid "Would you like to configure a printer?"
-#~ msgstr "иnsker du х konfigurere en skriver?"
+#~ msgid "Printer options"
+#~ msgstr "Opsjoner for skriver"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Opsjoner for lokal skriver"
+#~ msgid "How is the printer connected?"
+#~ msgstr "Hvordan er skriveren tilkoblet?"
+
+#~ msgid "Select Printer Connection"
+#~ msgstr "Velg skrivertilkobling"
+
+#~ msgid "Spool directory:"
+#~ msgstr "Spolingskatalog:"
+
+#~ msgid "Name of queue:"
+#~ msgstr "Kјens navn:"
 
 #~ msgid ""
 #~ "Every print queue (which print jobs are directed to) needs a\n"
@@ -4600,68 +4640,39 @@ msgstr "Finne tillatelser vil ta litt tid"
 #~ "(ofte lp) og en spolingskatalog assosiert til denne. Hvilket\n"
 #~ "navn og katalog skal brukes for denne kјen?"
 
-#~ msgid "Name of queue:"
-#~ msgstr "Kјens navn:"
-
-#~ msgid "Spool directory:"
-#~ msgstr "Spolingskatalog:"
-
-#~ msgid "Select Printer Connection"
-#~ msgstr "Velg skrivertilkobling"
-
-#~ msgid "How is the printer connected?"
-#~ msgstr "Hvordan er skriveren tilkoblet?"
+#~ msgid "Local Printer Options"
+#~ msgstr "Opsjoner for lokal skriver"
 
-#~ msgid "Printer options"
-#~ msgstr "Opsjoner for skriver"
+#~ msgid "Would you like to configure a printer?"
+#~ msgstr "иnsker du х konfigurere en skriver?"
 
-#~ msgid "Paper Size"
-#~ msgstr "Papirstјrrelse"
+#~ msgid "Printer"
+#~ msgstr "Skriver"
 
-#~ msgid "Eject page after job?"
-#~ msgstr "Kjјr ut side etter jobb?"
+#~ msgid "Linear (needed for some SCSI drives)"
+#~ msgstr "Lineцr (behјves av noen SCSI-disker)"
 
-#~ msgid "Fix stair-stepping text?"
-#~ msgstr "Fikse trappestegs-tekst?"
+#~ msgid "linear"
+#~ msgstr "lineцr"
 
-#~ msgid "Uniprint driver options"
-#~ msgstr "Opsjoner uniprint-driver"
+#~ msgid "After %s partition %s,"
+#~ msgstr "Etter %s partisjon %s,"
 
-#~ msgid "Color depth options"
-#~ msgstr "Opsjoner fargedybde"
+#~ msgid "changing type of"
+#~ msgstr "endrer type av"
 
-#~ msgid "Do you want to test printing?"
-#~ msgstr "Vil du teste utskrift?"
+#~ msgid "formatting"
+#~ msgstr "formatering"
 
-#~ msgid "Printing test page(s)..."
-#~ msgstr "Skriver ut testside(r)..."
+#~ msgid "resizing"
+#~ msgstr "endrer stјrrelse"
 
-#~ msgid ""
-#~ "Test page(s) have been sent to the printer daemon.\n"
-#~ "This may take a little time before printer start.\n"
-#~ "Printing status:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Does it work properly?"
-#~ msgstr ""
-#~ "Testsiden(e) har blitt sendt til skriver-daemonen.\n"
-#~ "Det kan ta litt tid fјr skriveren starter.\n"
-#~ "Utskriftstatus:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Virker det ordentlig?"
+#~ msgid "Bad kickstart file %s (failed %s)"
+#~ msgstr "Dхrlig kickstart-fil %s (mislykket %s)"
 
-#~ msgid ""
-#~ "Test page(s) have been sent to the printer daemon.\n"
-#~ "This may take a little time before printer start.\n"
-#~ "Does it work properly?"
+#~ msgid "Going to install %d MB. You can choose to install more programs"
 #~ msgstr ""
-#~ "Testsiden(e) har blitt sendt til skriver-daemonen.\n"
-#~ "Det kan ta litt tid fјr skriveren starter.\n"
-#~ "Virker det ordentlig?"
-
-#~ msgid "Password:"
-#~ msgstr "Passord:"
+#~ "%d MB vil bli installert. Du kan velge х installere flere programmer"
 
-#~ msgid "User name:"
-#~ msgstr "Brukernavn:"
+#~ msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
+#~ msgstr "For mange pakker er valgt: %dMB passer ikke i %dMB"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index bf4de3081..075e29edb 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-03-22 15:43+0100\n"
+"POT-Creation-Date: 2000-03-24 13:11+0100\n"
 "PO-Revision-Date: 1999-08-09 16:39+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -594,8 +594,8 @@ msgstr ""
 msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:196 ../../install_any.pm_.c:249
-#: ../../install_steps.pm_.c:72 ../../install_steps_interactive.pm_.c:40
+#: ../../diskdrake.pm_.c:196 ../../install_any.pm_.c:242
+#: ../../install_steps.pm_.c:73 ../../install_steps_interactive.pm_.c:40
 #: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
 #: ../../standalone/rpmdrake_.c:304
 msgid "Error"
@@ -873,12 +873,12 @@ msgstr "Табела партиция за драјв %s ће бити записана на диск!"
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Морате рестартовати рачунар да би се измене извршиле"
 
-#: ../../diskdrake.pm_.c:560 ../../install_steps_gtk.pm_.c:271
+#: ../../diskdrake.pm_.c:560 ../../install_steps_gtk.pm_.c:286
 msgid "Computing fat filesystem bounds"
 msgstr "Прорачунавам границе FAT фајл-система"
 
 #: ../../diskdrake.pm_.c:560 ../../diskdrake.pm_.c:609
-#: ../../install_steps_gtk.pm_.c:271
+#: ../../install_steps_gtk.pm_.c:286
 msgid "Resizing"
 msgstr "Промена величине (resizing)"
 
@@ -897,7 +897,7 @@ msgid "Choose the new size"
 msgstr "Изаберите нову величину"
 
 #: ../../diskdrake.pm_.c:588 ../../install_steps_graphical.pm_.c:287
-#: ../../install_steps_graphical.pm_.c:334 ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_graphical.pm_.c:334 ../../install_steps_gtk.pm_.c:351
 msgid "MB"
 msgstr "MB"
 
@@ -934,15 +934,19 @@ msgid "Loopback file name: "
 msgstr ""
 
 #: ../../diskdrake.pm_.c:765
+msgid "File already used by another loopback, choose another one"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:766
 #, fuzzy
 msgid "File already exists. Use it?"
 msgstr "Унос %s већ постоји"
 
-#: ../../diskdrake.pm_.c:786 ../../diskdrake.pm_.c:802
+#: ../../diskdrake.pm_.c:788 ../../diskdrake.pm_.c:804
 msgid "Select file"
 msgstr "Изаберите фајл"
 
-#: ../../diskdrake.pm_.c:795
+#: ../../diskdrake.pm_.c:797
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -950,11 +954,11 @@ msgstr ""
 "Backup-ована табела партиция није исте величине\n"
 "Желите да наставите ?"
 
-#: ../../diskdrake.pm_.c:803
+#: ../../diskdrake.pm_.c:805
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../../diskdrake.pm_.c:804
+#: ../../diskdrake.pm_.c:806
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -962,27 +966,27 @@ msgstr ""
 "Убаците дискету у уређај\n"
 "Сви подаци на дискети ће бити избрисани !"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake.pm_.c:820
 msgid "Trying to rescue partition table"
 msgstr "Спасавање табеле партиция"
 
-#: ../../diskdrake.pm_.c:829
+#: ../../diskdrake.pm_.c:831
 msgid "device"
 msgstr "уређај"
 
-#: ../../diskdrake.pm_.c:830
+#: ../../diskdrake.pm_.c:832
 msgid "level"
 msgstr "ниво"
 
-#: ../../diskdrake.pm_.c:831
+#: ../../diskdrake.pm_.c:833
 msgid "chunk size"
 msgstr "chunk величина"
 
-#: ../../diskdrake.pm_.c:843
+#: ../../diskdrake.pm_.c:845
 msgid "Choose an existing RAID to add to"
 msgstr "Изабери постојеци RAID за додавање"
 
-#: ../../diskdrake.pm_.c:844
+#: ../../diskdrake.pm_.c:846
 msgid "new"
 msgstr "нови"
 
@@ -996,15 +1000,15 @@ msgstr "Форматирање %s није успело: %s"
 msgid "don't know how to format %s in type %s"
 msgstr "не знам како да форматирам %s у типу %s"
 
-#: ../../fs.pm_.c:173
+#: ../../fs.pm_.c:169
 msgid "nfs mount failed"
 msgstr "nfs монтирање није успело"
 
-#: ../../fs.pm_.c:190
+#: ../../fs.pm_.c:186
 msgid "mount failed: "
 msgstr "монтирање није успело"
 
-#: ../../fs.pm_.c:201
+#: ../../fs.pm_.c:197
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "Грешка при демонтирању %s: %s"
@@ -1889,7 +1893,7 @@ msgstr "Конфигурисање X окружења"
 msgid "Exit install"
 msgstr "Излаз из инсталације"
 
-#: ../../install2.pm_.c:317
+#: ../../install2.pm_.c:312
 #, fuzzy
 msgid ""
 "You must have a root partition.\n"
@@ -1899,7 +1903,7 @@ msgstr ""
 "За ово, креирајте партицију (или кликните на постојећу).\n"
 "Затим изаберите \"Тачка монтирања\" и подесите на `/'"
 
-#: ../../install_any.pm_.c:250 ../../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:243 ../../standalone/diskdrake_.c:61
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
 "I'll try to go on blanking bad partitions"
@@ -1907,7 +1911,7 @@ msgstr ""
 "Не могу прочитати табелу партиция, много је искварена за мене :(\n"
 "Покушаћу даље заобилазећи лоше партиције"
 
-#: ../../install_any.pm_.c:266
+#: ../../install_any.pm_.c:259
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -1915,39 +1919,39 @@ msgstr ""
 "DiskDrake не може да исправно прочита табелу партиция.\n"
 "Даљи наставак иде на ваш ризик !"
 
-#: ../../install_any.pm_.c:276
+#: ../../install_any.pm_.c:269
 msgid "Searching root partition."
 msgstr "Тражим root партицију."
 
-#: ../../install_any.pm_.c:305
+#: ../../install_any.pm_.c:298
 msgid "Information"
 msgstr "Информације"
 
-#: ../../install_any.pm_.c:306
+#: ../../install_any.pm_.c:299
 #, c-format
 msgid "%s: This is not a root partition, please select another one."
 msgstr "%s: Ово није root партиция, изаберите неку другу."
 
-#: ../../install_any.pm_.c:308
+#: ../../install_any.pm_.c:301
 msgid "No root partition found"
 msgstr "Нема root партиције"
 
-#: ../../install_any.pm_.c:345
+#: ../../install_any.pm_.c:338
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Није могућ пренос без NIS домена"
 
-#: ../../install_any.pm_.c:528
+#: ../../install_any.pm_.c:521
 msgid "Error reading file $f"
 msgstr "Грешка код отварања фајла $f"
 
-#: ../../install_any.pm_.c:770
+#: ../../install_any.pm_.c:763
 msgid ""
 "Linux does not yet fully support ultra dma 66.\n"
 "As a work-around i can make a custom floppy giving access the hard drive on "
 "ide2 and ide3"
 msgstr ""
 
-#: ../../install_any.pm_.c:795
+#: ../../install_any.pm_.c:788
 #, fuzzy
 msgid ""
 "Enter a floppy to create an HTP enabled boot\n"
@@ -1956,26 +1960,26 @@ msgstr ""
 "Убаците дискету у уређај\n"
 "Сви подаци на дискети ће бити избрисани !"
 
-#: ../../install_any.pm_.c:798 ../../install_steps_interactive.pm_.c:695
+#: ../../install_any.pm_.c:791 ../../install_steps_interactive.pm_.c:695
 msgid "Creating bootdisk"
 msgstr "Креирам стартни диск..."
 
-#: ../../install_any.pm_.c:812
+#: ../../install_any.pm_.c:805
 msgid "It is necessary to restart installation booting on the floppy"
 msgstr ""
 
-#: ../../install_any.pm_.c:813
+#: ../../install_any.pm_.c:806
 msgid "It is necessary to restart installation with the new parameters"
 msgstr ""
 
-#: ../../install_any.pm_.c:817
+#: ../../install_any.pm_.c:810
 #, c-format
 msgid ""
 "Failed to create an HTP boot floppy.\n"
 "You may have to restart installation and give ``%s'' at the prompt"
 msgstr ""
 
-#: ../../install_steps.pm_.c:73
+#: ../../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."
@@ -1983,17 +1987,17 @@ msgstr ""
 "Грешка, али незнам како да је разрешим.\n"
 "Наставите на ваш ризик!"
 
-#: ../../install_steps.pm_.c:137
+#: ../../install_steps.pm_.c:138
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Дупла тачка монтирања %s"
 
-#: ../../install_steps.pm_.c:296
+#: ../../install_steps.pm_.c:299
 #, fuzzy, c-format
 msgid "Welcome to %s"
 msgstr "Доброшли код Crackers-а"
 
-#: ../../install_steps.pm_.c:570
+#: ../../install_steps.pm_.c:573
 msgid "No floppy drive available"
 msgstr "Неприступачан floppy уређај"
 
@@ -2003,12 +2007,12 @@ msgstr "Неприступачан floppy уређај"
 msgid "Entering step `%s'\n"
 msgstr "Покрећем корак `%s'\n"
 
-#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:312
+#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:327
 #, fuzzy
 msgid "You must have a swap partition"
 msgstr "Морате имати swap партицију да бисте наставили са инсталацијом."
 
-#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:314
+#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:329
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -2018,7 +2022,7 @@ msgstr ""
 "\n"
 "Свеједно наставити даље ?"
 
-#: ../../install_steps_graphical.pm_.c:287 ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_graphical.pm_.c:287 ../../install_steps_gtk.pm_.c:351
 msgid "Choose the size you want to install"
 msgstr "Изаберите величину компоненти за инсталацију"
 
@@ -2026,63 +2030,63 @@ msgstr "Изаберите величину компоненти за инсталацију"
 msgid "Total size: "
 msgstr "Укупна величина: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:418
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:433
 #: ../../standalone/rpmdrake_.c:136
 #, c-format
 msgid "Version: %s\n"
 msgstr "Верзия: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:419
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:434
 #: ../../standalone/rpmdrake_.c:137
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Величина: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:360
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:375
 msgid "Choose the packages you want to install"
 msgstr "Изабери пакете за инсталацију"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:363
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:378
 msgid "Info"
 msgstr "Инфо"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:368
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:383
 #: ../../install_steps_interactive.pm_.c:92 ../../standalone/rpmdrake_.c:161
 msgid "Install"
 msgstr "Инсталирај"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:483
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:498
 #: ../../install_steps_interactive.pm_.c:325
 msgid "Installing"
 msgstr "Инсталирам"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:490
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:505
 msgid "Please wait, "
 msgstr "Молим сачекајте"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:492
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:507
 msgid "Time remaining "
 msgstr "Преостало време"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:493
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:508
 msgid "Total time "
 msgstr "Укупно време"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:498
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:517
 #: ../../install_steps_interactive.pm_.c:325
 msgid "Preparing installation"
 msgstr "Припремам инсталацију"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:513
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Инсталирам пакет %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:561
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:580
 msgid "Go on anyway?"
 msgstr "Свеједно наставити даље ?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:561
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:580
 msgid "There was an error ordering packages:"
 msgstr "Грешка у листи пакета:"
 
@@ -2091,7 +2095,7 @@ msgstr "Грешка у листи пакета:"
 msgid "Use existing configuration for X11?"
 msgstr "Да користим постојећу конфигурацију за X11 ?"
 
-#: ../../install_steps_gtk.pm_.c:276
+#: ../../install_steps_gtk.pm_.c:291
 msgid ""
 "WARNING!\n"
 "\n"
@@ -2110,69 +2114,76 @@ msgstr ""
 "података.\n"
 "Ако сте сигурни, притисните \"У реду\"."
 
-#: ../../install_steps_gtk.pm_.c:295
+#: ../../install_steps_gtk.pm_.c:310
 msgid "Automatic resizing failed"
 msgstr "Аутоматска измена величине неуспела"
 
-#: ../../install_steps_gtk.pm_.c:331
+#: ../../install_steps_gtk.pm_.c:346
 msgid ""
 "Now that you've selected desired groups, please choose \n"
 "how many packages you want, ranging from minimal to full \n"
 "installation of each selected groups."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:334
+#: ../../install_steps_gtk.pm_.c:349
 msgid "You will be able to choose more precisely in next step"
 msgstr "Моћи ћете да прецизније бирате у следецем кораку"
 
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:432
 #, fuzzy
 msgid "Bad package"
 msgstr "%d пакета"
 
-#: ../../install_steps_gtk.pm_.c:420
+#: ../../install_steps_gtk.pm_.c:435
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:441
+#: ../../install_steps_gtk.pm_.c:456
 #, fuzzy, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Укупна величина: "
 
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:468
 #, fuzzy
 msgid "The following packages are going to be install/removed"
 msgstr "Пакети за инсталацију"
 
-#: ../../install_steps_gtk.pm_.c:462
+#: ../../install_steps_gtk.pm_.c:477
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:486
+#: ../../install_steps_gtk.pm_.c:501
 msgid "Estimating"
 msgstr "Процењујем"
 
-#: ../../install_steps_gtk.pm_.c:508
+#: ../../install_steps_gtk.pm_.c:514 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:195 ../../interactive_newt.pm_.c:50
+#: ../../interactive_newt.pm_.c:97 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:195 ../../my_gtk.pm_.c:435
+msgid "Cancel"
+msgstr "Обустави"
+
+#: ../../install_steps_gtk.pm_.c:527
 #, c-format
 msgid "%d packages"
 msgstr "%d пакета"
 
-#: ../../install_steps_gtk.pm_.c:508
+#: ../../install_steps_gtk.pm_.c:527
 msgid ", %U MB"
 msgstr ", %U MB"
 
-#: ../../install_steps_gtk.pm_.c:538
+#: ../../install_steps_gtk.pm_.c:557
 #, fuzzy
 msgid "Installation CD /*1"
 msgstr "LILO инсталация"
 
-#: ../../install_steps_gtk.pm_.c:540
+#: ../../install_steps_gtk.pm_.c:559
 #, fuzzy, c-format
 msgid "Installation CD /*%s"
 msgstr "LILO инсталация"
 
-#: ../../install_steps_gtk.pm_.c:543
+#: ../../install_steps_gtk.pm_.c:562
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2182,7 +2193,7 @@ msgid ""
 "If you don't have it press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:549
+#: ../../install_steps_gtk.pm_.c:568
 #, c-format
 msgid ""
 "Update installation image!\n"
@@ -2194,7 +2205,7 @@ msgid ""
 "to avoid installation from this Cd-Rom image."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:620 ../../install_steps_interactive.pm_.c:581
+#: ../../install_steps_gtk.pm_.c:643 ../../install_steps_interactive.pm_.c:581
 #: ../../install_steps_interactive.pm_.c:802
 #: ../../install_steps_interactive.pm_.c:911 ../../interactive.pm_.c:74
 #: ../../interactive.pm_.c:84 ../../interactive.pm_.c:196
@@ -2284,36 +2295,36 @@ msgstr "Сервер"
 msgid "What usage do you want?"
 msgstr "Изабери коришћење желитe"
 
-#: ../../install_steps_interactive.pm_.c:143 ../../standalone/mousedrake_.c:25
+#: ../../install_steps_interactive.pm_.c:141 ../../standalone/mousedrake_.c:25
 msgid "What is the type of your mouse?"
 msgstr "Који тип миша имате?"
 
-#: ../../install_steps_interactive.pm_.c:151 ../../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:149 ../../standalone/mousedrake_.c:38
 msgid "Mouse Port"
 msgstr "Порт за миша"
 
-#: ../../install_steps_interactive.pm_.c:152 ../../standalone/mousedrake_.c:39
+#: ../../install_steps_interactive.pm_.c:150 ../../standalone/mousedrake_.c:39
 msgid "Which serial port is your mouse connected to?"
 msgstr "На који серијски порт је ваш миш прикључен?"
 
-#: ../../install_steps_interactive.pm_.c:168
+#: ../../install_steps_interactive.pm_.c:166
 msgid "no available partitions"
 msgstr "нема доступних партиция"
 
-#: ../../install_steps_interactive.pm_.c:170
+#: ../../install_steps_interactive.pm_.c:168
 #, c-format
 msgid "(%dMb)"
 msgstr "(%dMb)"
 
-#: ../../install_steps_interactive.pm_.c:177
+#: ../../install_steps_interactive.pm_.c:175
 msgid "Which partition do you want to use as your root partition"
 msgstr "Коју партицију желите да корисите као root партицију"
 
-#: ../../install_steps_interactive.pm_.c:184
+#: ../../install_steps_interactive.pm_.c:182
 msgid "Choose the mount points"
 msgstr "Изаберите тачке монтирања"
 
-#: ../../install_steps_interactive.pm_.c:196
+#: ../../install_steps_interactive.pm_.c:194
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Треба да ресетујете машину за примену измена у табели партиция"
 
@@ -3229,23 +3240,23 @@ msgstr "Да"
 msgid "See hardware info"
 msgstr "Погледај информације о хардверу"
 
-#: ../../install_steps_newt.pm_.c:19
+#: ../../install_steps_newt.pm_.c:21
 #, c-format
 msgid "Linux-Mandrake Installation %s"
 msgstr "Linux-Mandrake Инсталация %s"
 
-#: ../../install_steps_newt.pm_.c:30
+#: ../../install_steps_newt.pm_.c:32
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 "<Tab>/<Alt-Tab> крет. између елеменатa | <Space> избор | <F12> следећи екран"
 
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:195
-#: ../../interactive_newt.pm_.c:50 ../../interactive_newt.pm_.c:97
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:195
-#: ../../my_gtk.pm_.c:435
-msgid "Cancel"
-msgstr "Обустави"
+#: ../../install_steps_newt.pm_.c:43
+#, c-format
+msgid ""
+"You can now partition your %s hard drive\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
 
 #: ../../interactive.pm_.c:213
 msgid "Please wait"
@@ -4411,65 +4422,59 @@ msgstr ""
 msgid "Finding leaves takes some time"
 msgstr ""
 
-#~ msgid ""
-#~ "Test page(s) have been sent to the printer daemon.\n"
-#~ "This may take a little time before printer start.\n"
-#~ "Does it work properly?"
-#~ msgstr ""
-#~ "Тест стран(ице)а је послана штампач демону.\n"
-#~ "То може довести до малог одлагања старта штампача.\n"
-#~ "Да ли ради OK ?"
+#~ msgid "User name:"
+#~ msgstr "Корисничко имe:"
 
-#~ msgid ""
-#~ "Test page(s) have been sent to the printer daemon.\n"
-#~ "This may take a little time before printer start.\n"
-#~ "Printing status:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Does it work properly?"
-#~ msgstr ""
-#~ "Тест стран(ице)а је послана штампач демону.\n"
-#~ "То може довести до малог одлагања старта штампача.\n"
-#~ "Статус штампача:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Да ли ради OK ?"
+#~ msgid "Password:"
+#~ msgstr "Лозинка:"
 
-#~ msgid "Printing test page(s)..."
-#~ msgstr "Штампам тест стран(ице)у..."
+#~ msgid "Going to install %d MB. You can choose to install more programs"
+#~ msgstr "Инсталираћу %d MB. Можете изабрати да инсталирате још програма"
 
-#~ msgid "Do you want to test printing?"
-#~ msgstr "Да ли желите да тестирате штампач?"
+#~ msgid "Bad kickstart file %s (failed %s)"
+#~ msgstr "Погрешан kickstart фајл %s (није успео %s)"
 
-#~ msgid "Color depth options"
-#~ msgstr "Број боя опције"
+#~ msgid "Size: %s MB"
+#~ msgstr "Величина: %s MB"
 
-#~ msgid "Uniprint driver options"
-#~ msgstr "Унипринт драјвер опције"
+#~ msgid "resizing"
+#~ msgstr "промена величине"
 
-#~ msgid "Fix stair-stepping text?"
-#~ msgstr "Поправка 'ефекта степеница' у тексту?"
+#~ msgid "formatting"
+#~ msgstr "форматирање"
 
-#~ msgid "Eject page after job?"
-#~ msgstr "Избаци папир након штампе ?"
+#~ msgid "changing type of"
+#~ msgstr "мењање типа"
 
-#~ msgid "Paper Size"
-#~ msgstr "Величина папира"
+#~ msgid "After %s partition %s,"
+#~ msgstr "После %s партиция %s,"
 
-#~ msgid "Printer options"
-#~ msgstr "Опције штампача"
+#~ msgid "linear"
+#~ msgstr "линеар"
 
-#~ msgid "How is the printer connected?"
-#~ msgstr "Како је штампач повезан?"
+#~ msgid "Linear (needed for some SCSI drives)"
+#~ msgstr "Користи линеарни мод (потребан неким SCSI драјвовима)"
 
-#~ msgid "Select Printer Connection"
-#~ msgstr "Избор повезаности штампача"
+#~ msgid "beginner"
+#~ msgstr "почетник"
 
-#~ msgid "Spool directory:"
-#~ msgstr "'Spool' директоријум:"
+#~ msgid "developer"
+#~ msgstr "девелопер"
 
-#~ msgid "Name of queue:"
-#~ msgstr "Име реда за штампу:"
+#~ msgid "expert"
+#~ msgstr "експерт"
+
+#~ msgid "server"
+#~ msgstr "сервер"
+
+#~ msgid "Printer"
+#~ msgstr "Штампач"
+
+#~ msgid "Would you like to configure a printer?"
+#~ msgstr "Да ли бисте да подесите штампач?"
+
+#~ msgid "Local Printer Options"
+#~ msgstr "Опције локалног штампача"
 
 #~ msgid ""
 #~ "Every print queue (which print jobs are directed to) needs a\n"
@@ -4481,56 +4486,62 @@ msgstr ""
 #~ "директоријум\n"
 #~ "да користим за овај ред за штампу?"
 
-#~ msgid "Local Printer Options"
-#~ msgstr "Опције локалног штампача"
-
-#~ msgid "Would you like to configure a printer?"
-#~ msgstr "Да ли бисте да подесите штампач?"
-
-#~ msgid "Printer"
-#~ msgstr "Штампач"
-
-#~ msgid "server"
-#~ msgstr "сервер"
-
-#~ msgid "expert"
-#~ msgstr "експерт"
+#~ msgid "Name of queue:"
+#~ msgstr "Име реда за штампу:"
 
-#~ msgid "developer"
-#~ msgstr "девелопер"
+#~ msgid "Spool directory:"
+#~ msgstr "'Spool' директоријум:"
 
-#~ msgid "beginner"
-#~ msgstr "почетник"
+#~ msgid "Select Printer Connection"
+#~ msgstr "Избор повезаности штампача"
 
-#~ msgid "Linear (needed for some SCSI drives)"
-#~ msgstr "Користи линеарни мод (потребан неким SCSI драјвовима)"
+#~ msgid "How is the printer connected?"
+#~ msgstr "Како је штампач повезан?"
 
-#~ msgid "linear"
-#~ msgstr "линеар"
+#~ msgid "Printer options"
+#~ msgstr "Опције штампача"
 
-#~ msgid "After %s partition %s,"
-#~ msgstr "После %s партиция %s,"
+#~ msgid "Paper Size"
+#~ msgstr "Величина папира"
 
-#~ msgid "changing type of"
-#~ msgstr "мењање типа"
+#~ msgid "Eject page after job?"
+#~ msgstr "Избаци папир након штампе ?"
 
-#~ msgid "formatting"
-#~ msgstr "форматирање"
+#~ msgid "Fix stair-stepping text?"
+#~ msgstr "Поправка 'ефекта степеница' у тексту?"
 
-#~ msgid "resizing"
-#~ msgstr "промена величине"
+#~ msgid "Uniprint driver options"
+#~ msgstr "Унипринт драјвер опције"
 
-#~ msgid "Size: %s MB"
-#~ msgstr "Величина: %s MB"
+#~ msgid "Color depth options"
+#~ msgstr "Број боя опције"
 
-#~ msgid "Bad kickstart file %s (failed %s)"
-#~ msgstr "Погрешан kickstart фајл %s (није успео %s)"
+#~ msgid "Do you want to test printing?"
+#~ msgstr "Да ли желите да тестирате штампач?"
 
-#~ msgid "Going to install %d MB. You can choose to install more programs"
-#~ msgstr "Инсталираћу %d MB. Можете изабрати да инсталирате још програма"
+#~ msgid "Printing test page(s)..."
+#~ msgstr "Штампам тест стран(ице)у..."
 
-#~ msgid "Password:"
-#~ msgstr "Лозинка:"
+#~ msgid ""
+#~ "Test page(s) have been sent to the printer daemon.\n"
+#~ "This may take a little time before printer start.\n"
+#~ "Printing status:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Does it work properly?"
+#~ msgstr ""
+#~ "Тест стран(ице)а је послана штампач демону.\n"
+#~ "То може довести до малог одлагања старта штампача.\n"
+#~ "Статус штампача:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Да ли ради OK ?"
 
-#~ msgid "User name:"
-#~ msgstr "Корисничко имe:"
+#~ msgid ""
+#~ "Test page(s) have been sent to the printer daemon.\n"
+#~ "This may take a little time before printer start.\n"
+#~ "Does it work properly?"
+#~ msgstr ""
+#~ "Тест стран(ице)а је послана штампач демону.\n"
+#~ "То може довести до малог одлагања старта штампача.\n"
+#~ "Да ли ради OK ?"