updated pot file

3 files changed, 4607 insertions, 4487 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index ed5c47ae8..a407bb002 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: 2001-08-10 18:42+0200\n"
+"POT-Creation-Date: 2001-08-21 14:27+0200\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"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+msgid "Configure all heads independently"
 msgstr ""
 
 #: ../../Xconfigurator.pm_.c:233
@@ -211,8 +211,8 @@ msgstr ""
 msgid "XFree86 server: %s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:290
-#: ../../standalone/draknet_.c:293
+#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:291
+#: ../../standalone/draknet_.c:294
 msgid "Expert Mode"
 msgstr ""
 
@@ -452,308 +452,306 @@ msgstr ""
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr ""
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:100 ../../any.pm_.c:125
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:100 ../../any.pm_.c:125 ../../any.pm_.c:198
 msgid "First sector of drive (MBR)"
 msgstr ""
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:104
 msgid "SILO Installation"
 msgstr ""
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:105 ../../any.pm_.c:118
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:117
 msgid "LILO/grub Installation"
 msgstr ""
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:129 ../../any.pm_.c:143
 msgid "SILO"
 msgstr ""
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:131
 msgid "LILO with text menu"
 msgstr ""
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:132 ../../any.pm_.c:143
 msgid "LILO with graphical menu"
 msgstr ""
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:135
 msgid "Grub"
 msgstr ""
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:139
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr ""
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:141 ../../any.pm_.c:143
 msgid "Yaboot"
 msgstr ""
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:149 ../../any.pm_.c:181
 msgid "Bootloader main options"
 msgstr ""
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:150 ../../any.pm_.c:182
 msgid "Bootloader to use"
 msgstr ""
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:152
 msgid "Bootloader installation"
 msgstr ""
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:154 ../../any.pm_.c:184
 msgid "Boot device"
 msgstr ""
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:155
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr ""
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:156
 msgid "Compact"
 msgstr ""
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:156
 msgid "compact"
 msgstr ""
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:253
+#: ../../any.pm_.c:157 ../../any.pm_.c:254
 msgid "Video mode"
 msgstr ""
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:159
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:949 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:324 ../../printerdrake.pm_.c:400
-#: ../../standalone/draknet_.c:588
+#: ../../any.pm_.c:161 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:944 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:352 ../../printerdrake.pm_.c:431
+#: ../../standalone/draknet_.c:591
 msgid "Password"
 msgstr ""
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:739
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../any.pm_.c:162 ../../any.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:945
 msgid "Password (again)"
 msgstr ""
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:163
 msgid "Restrict command line options"
 msgstr ""
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:163
 msgid "restrict"
 msgstr ""
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:165
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:166
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:168
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:172
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:174
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../any.pm_.c:175 ../../any.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Please try again"
 msgstr ""
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../any.pm_.c:175 ../../any.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:939
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:183
 msgid "Init Message"
 msgstr ""
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:185
 msgid "Open Firmware Delay"
 msgstr ""
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:186
 msgid "Kernel Boot Timeout"
 msgstr ""
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:187
 msgid "Enable CD Boot?"
 msgstr ""
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:188
 msgid "Enable OF Boot?"
 msgstr ""
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:189
 msgid "Default OS?"
 msgstr ""
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:211
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
 msgstr ""
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:221
 msgid "Add"
 msgstr ""
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:726 ../../diskdrake.pm_.c:47
-#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:975
-#: ../../printerdrake.pm_.c:976 ../../printerdrake.pm_.c:1007
-#: ../../printerdrake.pm_.c:1032
+#: ../../any.pm_.c:221 ../../any.pm_.c:719 ../../diskdrake.pm_.c:176
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1281
+#: ../../printerdrake.pm_.c:1282 ../../printerdrake.pm_.c:1318
+#: ../../printerdrake.pm_.c:1352
 msgid "Done"
 msgstr ""
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:221
 msgid "Modify"
 msgstr ""
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:229
 msgid "Which type of entry do you want to add?"
 msgstr ""
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:230
 msgid "Linux"
 msgstr ""
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:230
 msgid "Other OS (SunOS...)"
 msgstr ""
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:231
 msgid "Other OS (MacOS...)"
 msgstr ""
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:231
 msgid "Other OS (windows...)"
 msgstr ""
 
-#: ../../any.pm_.c:249
+#: ../../any.pm_.c:250
 msgid "Image"
 msgstr ""
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:261
+#: ../../any.pm_.c:251 ../../any.pm_.c:262
 msgid "Root"
 msgstr ""
 
-#: ../../any.pm_.c:251 ../../any.pm_.c:280
+#: ../../any.pm_.c:252 ../../any.pm_.c:281
 msgid "Append"
 msgstr ""
 
-#: ../../any.pm_.c:255
+#: ../../any.pm_.c:256
 msgid "Initrd"
 msgstr ""
 
-#: ../../any.pm_.c:256
+#: ../../any.pm_.c:257
 msgid "Read-write"
 msgstr ""
 
-#: ../../any.pm_.c:263
+#: ../../any.pm_.c:264
 msgid "Table"
 msgstr ""
 
-#: ../../any.pm_.c:264
+#: ../../any.pm_.c:265
 msgid "Unsafe"
 msgstr ""
 
-#: ../../any.pm_.c:271 ../../any.pm_.c:276 ../../any.pm_.c:279
+#: ../../any.pm_.c:272 ../../any.pm_.c:277 ../../any.pm_.c:280
 msgid "Label"
 msgstr ""
 
-#: ../../any.pm_.c:273 ../../any.pm_.c:284
+#: ../../any.pm_.c:274 ../../any.pm_.c:285
 msgid "Default"
 msgstr ""
 
-#: ../../any.pm_.c:281
+#: ../../any.pm_.c:282
 msgid "Initrd-size"
 msgstr ""
 
-#: ../../any.pm_.c:283
+#: ../../any.pm_.c:284
 msgid "NoVideo"
 msgstr ""
 
-#: ../../any.pm_.c:291
+#: ../../any.pm_.c:292
 msgid "Remove entry"
 msgstr ""
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:295
 msgid "Empty label not allowed"
 msgstr ""
 
-#: ../../any.pm_.c:295
+#: ../../any.pm_.c:296
 msgid "This label is already used"
 msgstr ""
 
-#: ../../any.pm_.c:314
-msgid "What type of partitioning?"
-msgstr ""
-
-#: ../../any.pm_.c:605
+#: ../../any.pm_.c:598
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr ""
 
-#: ../../any.pm_.c:606
+#: ../../any.pm_.c:599
 msgid "Do you have another one?"
 msgstr ""
 
-#: ../../any.pm_.c:607
+#: ../../any.pm_.c:600
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr ""
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
+#: ../../any.pm_.c:602 ../../any.pm_.c:761 ../../interactive.pm_.c:110
+#: ../../my_gtk.pm_.c:672
 msgid "No"
 msgstr ""
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
+#: ../../any.pm_.c:602 ../../any.pm_.c:760 ../../interactive.pm_.c:110
+#: ../../my_gtk.pm_.c:672
 msgid "Yes"
 msgstr ""
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:603
 msgid "See hardware info"
 msgstr ""
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:645
+#: ../../any.pm_.c:638
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr ""
 
-#: ../../any.pm_.c:646
+#: ../../any.pm_.c:639
 #, c-format
 msgid "(module %s)"
 msgstr ""
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:650
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr ""
 
-#: ../../any.pm_.c:665
+#: ../../any.pm_.c:658
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -765,20 +763,20 @@ msgid ""
 "not cause any damage."
 msgstr ""
 
-#: ../../any.pm_.c:670
+#: ../../any.pm_.c:663
 msgid "Autoprobe"
 msgstr ""
 
-#: ../../any.pm_.c:670
+#: ../../any.pm_.c:663
 msgid "Specify options"
 msgstr ""
 
-#: ../../any.pm_.c:674
+#: ../../any.pm_.c:667
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr ""
 
-#: ../../any.pm_.c:680
+#: ../../any.pm_.c:673
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -786,86 +784,80 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:676
 msgid "Module options:"
 msgstr ""
 
-#: ../../any.pm_.c:694
+#: ../../any.pm_.c:687
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
 
-#: ../../any.pm_.c:712
+#: ../../any.pm_.c:705
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../any.pm_.c:716
+#: ../../any.pm_.c:709
 msgid "This password is too simple"
 msgstr ""
 
-#: ../../any.pm_.c:717
+#: ../../any.pm_.c:710
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../any.pm_.c:718
+#: ../../any.pm_.c:711
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:712
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:716
 msgid "Add user"
 msgstr ""
 
-#: ../../any.pm_.c:724
+#: ../../any.pm_.c:717
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
 
-#: ../../any.pm_.c:725
+#: ../../any.pm_.c:718
 msgid "Accept user"
 msgstr ""
 
-#: ../../any.pm_.c:736
+#: ../../any.pm_.c:729
 msgid "Real name"
 msgstr ""
 
-#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:323
-#: ../../printerdrake.pm_.c:399
+#: ../../any.pm_.c:730 ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:430
 msgid "User name"
 msgstr ""
 
-#: ../../any.pm_.c:740
+#: ../../any.pm_.c:733
 msgid "Shell"
 msgstr ""
 
-#: ../../any.pm_.c:742
+#: ../../any.pm_.c:735
 msgid "Icon"
 msgstr ""
 
-#: ../../any.pm_.c:763
+#: ../../any.pm_.c:757
 msgid "Autologin"
 msgstr ""
 
-#: ../../any.pm_.c:764
-msgid ""
-"I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
-msgstr ""
-
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:762
 msgid "Choose the default user:"
 msgstr ""
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:763
 msgid "Choose the window manager to run:"
 msgstr ""
 
@@ -979,7 +971,7 @@ msgid ""
 msgstr ""
 
 #: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
-#: ../../standalone/draknet_.c:272 ../../standalone/tinyfirewall_.c:57
+#: ../../standalone/draknet_.c:273 ../../standalone/tinyfirewall_.c:57
 msgid "Configure"
 msgstr ""
 
@@ -1003,31 +995,33 @@ msgstr ""
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 
-#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:104
-#: ../../standalone/draknet_.c:136 ../../standalone/draknet_.c:200
-#: ../../standalone/draknet_.c:312 ../../standalone/draknet_.c:421
-#: ../../standalone/draknet_.c:492 ../../standalone/draknet_.c:528
-#: ../../standalone/draknet_.c:634 ../../standalone/net_monitor_.c:260
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:105
+#: ../../standalone/draknet_.c:137 ../../standalone/draknet_.c:201
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:421
+#: ../../standalone/draknet_.c:495 ../../standalone/draknet_.c:531
+#: ../../standalone/draknet_.c:632
 msgid "OK"
 msgstr ""
 
 #: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:504
-#: ../../interactive.pm_.c:119 ../../interactive.pm_.c:274
-#: ../../interactive.pm_.c:294 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:409 ../../my_gtk.pm_.c:412 ../../my_gtk.pm_.c:670
-#: ../../standalone/drakgw_.c:648 ../../standalone/draknet_.c:111
-#: ../../standalone/draknet_.c:143 ../../standalone/draknet_.c:305
-#: ../../standalone/draknet_.c:504 ../../standalone/draknet_.c:648
-#: ../../standalone/net_monitor_.c:261 ../../standalone/tinyfirewall_.c:63
+#: ../../interactive.pm_.c:120 ../../interactive.pm_.c:284
+#: ../../interactive.pm_.c:304 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:413 ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:673
+#: ../../printerdrake.pm_.c:970 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:112 ../../standalone/draknet_.c:144
+#: ../../standalone/draknet_.c:306 ../../standalone/draknet_.c:507
+#: ../../standalone/draknet_.c:646 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr ""
 
 #: ../../bootlook.pm_.c:225
-msgid "can not open /etc/inittab for reading: $!"
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
 msgstr ""
 
 #: ../../bootlook.pm_.c:279
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
+#, c-format
+msgid "can not open /etc/sysconfig/autologin for reading: %s"
 msgstr ""
 
 #: ../../bootlook.pm_.c:345 ../../standalone/drakboot_.c:47
@@ -1042,8 +1036,7 @@ msgstr ""
 msgid "KB"
 msgstr ""
 
-#: ../../common.pm_.c:93 ../../diskdrake.pm_.c:680
-#: ../../install_steps_graphical.pm_.c:287
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
 msgid "MB"
 msgstr ""
@@ -1066,650 +1059,680 @@ msgstr ""
 msgid "%d seconds"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:463
-msgid "Create"
+#: ../../diskdrake.pm_.c:102
+msgid "Please make a backup of your data first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:23
-msgid "Unmount"
+#: ../../diskdrake.pm_.c:102 ../../diskdrake_interactive.pm_.c:755
+#: ../../diskdrake_interactive.pm_.c:764 ../../diskdrake_interactive.pm_.c:818
+msgid "Read carefully!"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:465
-msgid "Delete"
+#: ../../diskdrake.pm_.c:106
+msgid ""
+"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"enough)\n"
+"at the beginning of the disk"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:24
-msgid "Format"
+#: ../../diskdrake.pm_.c:124 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:323 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:60
+msgid "Error"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:673
-msgid "Resize"
+#: ../../diskdrake.pm_.c:197
+msgid "New"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:463
-#: ../../diskdrake.pm_.c:525
-msgid "Type"
+#: ../../diskdrake.pm_.c:219 ../../diskdrake.pm_.c:222
+msgid "Remote"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:25 ../../diskdrake.pm_.c:559
+#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:453
+#: ../../diskdrake_interactive.pm_.c:323 ../../diskdrake_interactive.pm_.c:475
 msgid "Mount point"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:39
-msgid "Write /etc/fstab"
+#: ../../diskdrake.pm_.c:225
+msgid "Options"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to expert mode"
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:400
+#: ../../diskdrake.pm_.c:509 ../../diskdrake_interactive.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:443
+msgid "Type"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:41
-msgid "Toggle to normal mode"
+#: ../../diskdrake.pm_.c:239 ../../diskdrake_interactive.pm_.c:331
+msgid "Unmount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:42
-msgid "Restore from file"
+#: ../../diskdrake.pm_.c:240 ../../diskdrake_interactive.pm_.c:327
+msgid "Mount"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:43
-msgid "Save in file"
+#: ../../diskdrake.pm_.c:244
+msgid "Choose action"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:44
-msgid "Wizard"
+#: ../../diskdrake.pm_.c:250
+msgid ""
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:45
-msgid "Restore from floppy"
+#: ../../diskdrake.pm_.c:253
+msgid "Please click on a partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:46 ../../install_steps_interactive.pm_.c:557
-msgid "Save on floppy"
+#: ../../diskdrake.pm_.c:270 ../../install_steps_gtk.pm_.c:505
+msgid "Details"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:50
-msgid "Clear all"
+#: ../../diskdrake.pm_.c:378
+msgid "Ext2"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:55
-msgid "Format all"
+#: ../../diskdrake.pm_.c:378
+msgid "FAT"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:56
-msgid "Auto allocate"
+#: ../../diskdrake.pm_.c:378
+msgid "HFS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:60
-msgid "All primary partitions are used"
+#: ../../diskdrake.pm_.c:378
+msgid "SunOS"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:60
-msgid "I can't add any more partition"
+#: ../../diskdrake.pm_.c:378
+msgid "Swap"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:60
-msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+#: ../../diskdrake.pm_.c:379 ../../diskdrake_interactive.pm_.c:876
+msgid "Empty"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:62
-msgid "Not enough space for auto-allocating"
+#: ../../diskdrake.pm_.c:379 ../../install_steps_gtk.pm_.c:361
+#: ../../install_steps_gtk.pm_.c:421 ../../mouse.pm_.c:145
+msgid "Other"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:64
-msgid "Undo"
+#: ../../diskdrake.pm_.c:383
+msgid "Filesystem types:"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:65
-msgid "Write partition table"
+#: ../../diskdrake.pm_.c:400 ../../diskdrake_interactive.pm_.c:344
+msgid "Create"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:66 ../../install_steps_interactive.pm_.c:186
-msgid "More"
+#: ../../diskdrake.pm_.c:400 ../../diskdrake.pm_.c:402
+#, c-format
+msgid "Use ``%s'' instead"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:117
-msgid "Ext2"
+#: ../../diskdrake.pm_.c:402 ../../diskdrake_interactive.pm_.c:321
+msgid "Delete"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:117
-msgid "FAT"
+#: ../../diskdrake.pm_.c:406
+msgid "Use ``Unmount'' first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:117
-msgid "HFS"
+#: ../../diskdrake.pm_.c:407 ../../diskdrake_interactive.pm_.c:435
+#, c-format
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:117
-msgid "SunOS"
+#: ../../diskdrake.pm_.c:452 ../../diskdrake_interactive.pm_.c:474
+#, c-format
+msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:117
-msgid "Swap"
+#: ../../diskdrake.pm_.c:475
+msgid "Mount options"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:118
-msgid "Empty"
+#: ../../diskdrake.pm_.c:482
+msgid "Various"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:118 ../../install_steps_gtk.pm_.c:361
-#: ../../install_steps_gtk.pm_.c:421 ../../mouse.pm_.c:145
-msgid "Other"
+#: ../../diskdrake.pm_.c:500
+msgid "Removable media"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:124
-msgid "Filesystem types:"
+#: ../../diskdrake.pm_.c:507
+msgid "Change type"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:133 ../../install_steps_gtk.pm_.c:505
-msgid "Details"
+#: ../../diskdrake.pm_.c:508 ../../diskdrake_interactive.pm_.c:442
+msgid "Which filesystem do you want?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:148
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
+#: ../../diskdrake.pm_.c:533
+msgid "Scanning available nfs shared resource"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:153
-msgid "Please make a backup of your data first"
+#: ../../diskdrake.pm_.c:538
+#, c-format
+msgid "Scanning available nfs shared resource of server %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:153 ../../diskdrake.pm_.c:171
-#: ../../diskdrake.pm_.c:180 ../../diskdrake.pm_.c:590
-#: ../../diskdrake.pm_.c:612
-msgid "Read carefully!"
+#: ../../diskdrake.pm_.c:570
+msgid "Scanning available samba shared resource"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:156
-msgid ""
-"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
-"enough)\n"
-"at the beginning of the disk"
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:594
+#, c-format
+msgid "Scanning available samba shared resource of server %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:171
-msgid "Be careful: this operation is dangerous."
+#: ../../diskdrake_interactive.pm_.c:161
+msgid "Choose a partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:215 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:323 ../../interactive_http.pm_.c:119
-#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:66
-msgid "Error"
+#: ../../diskdrake_interactive.pm_.c:161
+msgid "Choose another partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:768
-msgid "Mount point: "
+#: ../../diskdrake_interactive.pm_.c:183
+msgid "Exit"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:240 ../../diskdrake.pm_.c:299
-msgid "Device: "
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Toggle to expert mode"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:241
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Toggle to normal mode"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:245 ../../diskdrake.pm_.c:252
-#: ../../diskdrake.pm_.c:302
-msgid "Type: "
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Undo"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:249
-msgid "Name: "
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Wizard"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:254
-#, c-format
-msgid "Start: sector %s\n"
+#: ../../diskdrake_interactive.pm_.c:224
+msgid "Continue anyway?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:255
-#, c-format
-msgid "Size: %s"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Quit without saving"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:257
-#, c-format
-msgid ", %s sectors"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Quit without writing the partition table?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:259
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
+#: ../../diskdrake_interactive.pm_.c:240
+msgid "Auto allocate"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:260
-msgid "Formatted\n"
+#: ../../diskdrake_interactive.pm_.c:240
+msgid "Clear all"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:261
-msgid "Not formatted\n"
+#: ../../diskdrake_interactive.pm_.c:243
+msgid "Hard drive information"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:262
-msgid "Mounted\n"
+#: ../../diskdrake_interactive.pm_.c:260
+msgid "Not enough space for auto-allocating"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:263
-#, c-format
-msgid "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:266
+msgid "All primary partitions are used"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:265
-#, c-format
-msgid "Loopback file(s): %s\n"
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "I can't add any more partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:266
+#: ../../diskdrake_interactive.pm_.c:268
 msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Level %s\n"
+#: ../../diskdrake_interactive.pm_.c:276 ../../diskdrake_interactive.pm_.c:293
+msgid "Select file"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "Chunk size %s\n"
+#: ../../diskdrake_interactive.pm_.c:284
+msgid ""
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:270
-#, c-format
-msgid "RAID-disks %s\n"
+#: ../../diskdrake_interactive.pm_.c:294
+msgid "Warning"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:272
-#, c-format
-msgid "Loopback file name: %s"
+#: ../../diskdrake_interactive.pm_.c:295
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:275
-msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+#: ../../diskdrake_interactive.pm_.c:303
+msgid "Trying to rescue partition table"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:278
-msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+#: ../../diskdrake_interactive.pm_.c:309
+msgid "Detailed information"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:295
-msgid "Please click on a partition"
+#: ../../diskdrake_interactive.pm_.c:324 ../../diskdrake_interactive.pm_.c:541
+msgid "Resize"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Size: %s\n"
+#: ../../diskdrake_interactive.pm_.c:325 ../../diskdrake_interactive.pm_.c:581
+msgid "Move"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:301
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+#: ../../diskdrake_interactive.pm_.c:326
+msgid "Format"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "LVM-disks %s\n"
+#: ../../diskdrake_interactive.pm_.c:328
+msgid "Active"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "Partition table type: %s\n"
+#: ../../diskdrake_interactive.pm_.c:329
+msgid "Add to RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:305
-#, c-format
-msgid "on bus %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:330
+msgid "Add to LVM"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:321
-msgid "Mount"
+#: ../../diskdrake_interactive.pm_.c:332
+msgid "Remove from RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:323
-msgid "Active"
+#: ../../diskdrake_interactive.pm_.c:333
+msgid "Remove from LVM"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:325
-msgid "Add to RAID"
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Modify RAID"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:327
-msgid "Remove from RAID"
+#: ../../diskdrake_interactive.pm_.c:335
+msgid "Use for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:329
-msgid "Modify RAID"
+#: ../../diskdrake_interactive.pm_.c:378
+msgid "Create a new partition"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:331
-msgid "Add to LVM"
+#: ../../diskdrake_interactive.pm_.c:381
+msgid "Start sector: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:333
-msgid "Remove from LVM"
+#: ../../diskdrake_interactive.pm_.c:383 ../../diskdrake_interactive.pm_.c:688
+msgid "Size in MB: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:335
-msgid "Use for loopback"
+#: ../../diskdrake_interactive.pm_.c:384 ../../diskdrake_interactive.pm_.c:689
+msgid "Filesystem type: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:342
-msgid "Choose action"
+#: ../../diskdrake_interactive.pm_.c:385 ../../diskdrake_interactive.pm_.c:860
+#: ../../diskdrake_interactive.pm_.c:932
+msgid "Mount point: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:436
-msgid ""
-"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
-"1024).\n"
-"Either you use LILO and it won't work, or you don't use LILO and you don't "
-"need /boot"
+#: ../../diskdrake_interactive.pm_.c:389
+msgid "Preference: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:440
-msgid ""
-"The partition you've selected to add as root (/) is physically located "
-"beyond\n"
-"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
-"If you plan to use the LILO boot manager, be careful to add a /boot partition"
+#: ../../diskdrake_interactive.pm_.c:441
+msgid "Change partition type"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:446
-msgid ""
-"You've selected a software RAID partition as root (/).\n"
-"No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
+#: ../../diskdrake_interactive.pm_.c:446
+msgid "Switching from ext2 to ext3"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:463 ../../diskdrake.pm_.c:465
+#: ../../diskdrake_interactive.pm_.c:473
 #, c-format
-msgid "Use ``%s'' instead"
+msgid "Where do you want to mount loopback file %s?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:469
-msgid "Use ``Unmount'' first"
+#: ../../diskdrake_interactive.pm_.c:480
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:470 ../../diskdrake.pm_.c:517
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
+#: ../../diskdrake_interactive.pm_.c:500
+msgid "Computing FAT filesystem bounds"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:482
-msgid "Continue anyway?"
+#: ../../diskdrake_interactive.pm_.c:500 ../../diskdrake_interactive.pm_.c:556
+#: ../../install_interactive.pm_.c:112
+msgid "Resizing"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:487
-msgid "Quit without saving"
+#: ../../diskdrake_interactive.pm_.c:529
+msgid "This partition is not resizeable"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:487
-msgid "Quit without writing the partition table?"
+#: ../../diskdrake_interactive.pm_.c:534
+msgid "All data on this partition should be backed-up"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:523
-msgid "Change partition type"
+#: ../../diskdrake_interactive.pm_.c:536
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:524
-msgid "Which filesystem do you want?"
+#: ../../diskdrake_interactive.pm_.c:541
+msgid "Choose the new size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:528
-msgid "Switching from ext2 to ext3"
+#: ../../diskdrake_interactive.pm_.c:542
+msgid "New size in MB: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:539 ../../diskdrake.pm_.c:800
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
+#: ../../diskdrake_interactive.pm_.c:582
+msgid "Which disk do you want to move it to?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:540
-msgid "You can't use JFS for partitions smaller than 16MB"
+#: ../../diskdrake_interactive.pm_.c:583
+msgid "Sector"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:557
-#, c-format
-msgid "Where do you want to mount loopback file %s?"
+#: ../../diskdrake_interactive.pm_.c:584
+msgid "Which sector do you want to move it to?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:558
-#, c-format
-msgid "Where do you want to mount device %s?"
+#: ../../diskdrake_interactive.pm_.c:587
+msgid "Moving"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:562
-msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
+#: ../../diskdrake_interactive.pm_.c:587
+msgid "Moving partition..."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:581
+#: ../../diskdrake_interactive.pm_.c:593 ../../diskdrake_interactive.pm_.c:835
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:583
+#: ../../diskdrake_interactive.pm_.c:595 ../../diskdrake_interactive.pm_.c:837
 msgid "Formatting"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:584
+#: ../../diskdrake_interactive.pm_.c:596 ../../diskdrake_interactive.pm_.c:838
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:585 ../../install_steps_interactive.pm_.c:432
+#: ../../diskdrake_interactive.pm_.c:597 ../../diskdrake_interactive.pm_.c:839
+#: ../../install_steps_interactive.pm_.c:427
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:590
-msgid "After formatting all partitions,"
+#: ../../diskdrake_interactive.pm_.c:614
+msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:590
-msgid "all data on these partitions will be lost"
+#: ../../diskdrake_interactive.pm_.c:615 ../../diskdrake_interactive.pm_.c:633
+msgid "new"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:596
-msgid "Move"
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Choose an existing LVM to add to"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:597
-msgid "Which disk do you want to move it to?"
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "LVM name?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:598
-msgid "Sector"
+#: ../../diskdrake_interactive.pm_.c:673
+msgid "This partition can't be used for loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:599
-msgid "Which sector do you want to move it to?"
+#: ../../diskdrake_interactive.pm_.c:686
+msgid "Loopback"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:602
-msgid "Moving"
+#: ../../diskdrake_interactive.pm_.c:687
+msgid "Loopback file name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:602
-msgid "Moving partition..."
+#: ../../diskdrake_interactive.pm_.c:694
+msgid "File already used by another loopback, choose another one"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:612
-#, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
+#: ../../diskdrake_interactive.pm_.c:695
+msgid "File already exists. Use it?"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:614
-msgid "You'll need to reboot before the modification can take place"
+#: ../../diskdrake_interactive.pm_.c:738
+msgid "device"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:635
-msgid "Computing FAT filesystem bounds"
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "level"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:635 ../../diskdrake.pm_.c:700
-#: ../../install_interactive.pm_.c:111
-msgid "Resizing"
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "chunk size"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:663
-msgid "This partition is not resizeable"
+#: ../../diskdrake_interactive.pm_.c:755
+msgid "Be careful: this operation is dangerous."
 msgstr ""
 
-#: ../../diskdrake.pm_.c:668
-msgid "All data on this partition should be backed-up"
+#: ../../diskdrake_interactive.pm_.c:770
+msgid "What type of partitioning?"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:788
+msgid ""
+"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
+"1024).\n"
+"Either you use LILO and it won't work, or you don't use LILO and you don't "
+"need /boot"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:670
+#: ../../diskdrake_interactive.pm_.c:792
+msgid ""
+"The partition you've selected to add as root (/) is physically located "
+"beyond\n"
+"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
+"If you plan to use the LILO boot manager, be careful to add a /boot partition"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:798
+msgid ""
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"So be careful to add a /boot partition"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:818
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
+msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:680
-msgid "Choose the new size"
+#: ../../diskdrake_interactive.pm_.c:824
+msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:734
-msgid "Create a new partition"
+#: ../../diskdrake_interactive.pm_.c:861 ../../diskdrake_interactive.pm_.c:918
+msgid "Device: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:760
-msgid "Start sector: "
+#: ../../diskdrake_interactive.pm_.c:862
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:764 ../../diskdrake.pm_.c:839
-msgid "Size in MB: "
+#: ../../diskdrake_interactive.pm_.c:866 ../../diskdrake_interactive.pm_.c:874
+#: ../../diskdrake_interactive.pm_.c:936
+msgid "Type: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:767 ../../diskdrake.pm_.c:842
-msgid "Filesystem type: "
+#: ../../diskdrake_interactive.pm_.c:870
+msgid "Name: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:770
-msgid "Preference: "
+#: ../../diskdrake_interactive.pm_.c:878
+#, c-format
+msgid "Start: sector %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:818
-msgid "This partition can't be used for loopback"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:828
-msgid "Loopback"
+#: ../../diskdrake_interactive.pm_.c:881
+#, c-format
+msgid ", %s sectors"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:838
-msgid "Loopback file name: "
+#: ../../diskdrake_interactive.pm_.c:883
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:864
-msgid "File already used by another loopback, choose another one"
+#: ../../diskdrake_interactive.pm_.c:884
+msgid "Formatted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:865
-msgid "File already exists. Use it?"
+#: ../../diskdrake_interactive.pm_.c:885
+msgid "Not formatted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:887 ../../diskdrake.pm_.c:903
-msgid "Select file"
+#: ../../diskdrake_interactive.pm_.c:886
+msgid "Mounted\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:896
-msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+#: ../../diskdrake_interactive.pm_.c:887
+#, c-format
+msgid "RAID md%s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:904
-msgid "Warning"
+#: ../../diskdrake_interactive.pm_.c:889
+#, c-format
+msgid "Loopback file(s): %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:905
+#: ../../diskdrake_interactive.pm_.c:890
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:916
-msgid "Trying to rescue partition table"
+#: ../../diskdrake_interactive.pm_.c:892
+#, c-format
+msgid "Level %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:925
-msgid "device"
+#: ../../diskdrake_interactive.pm_.c:893
+#, c-format
+msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:926
-msgid "level"
+#: ../../diskdrake_interactive.pm_.c:894
+#, c-format
+msgid "RAID-disks %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:927
-msgid "chunk size"
+#: ../../diskdrake_interactive.pm_.c:896
+#, c-format
+msgid "Loopback file name: %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:939
-msgid "Choose an existing RAID to add to"
+#: ../../diskdrake_interactive.pm_.c:899
+msgid ""
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:940 ../../diskdrake.pm_.c:966
-msgid "new"
+#: ../../diskdrake_interactive.pm_.c:902
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:964
-msgid "Choose an existing LVM to add to"
+#: ../../diskdrake_interactive.pm_.c:919
+#, c-format
+msgid "Size: %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:969
-msgid "LVM name?"
+#: ../../diskdrake_interactive.pm_.c:920
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:996
-msgid "Removable media automounting"
+#: ../../diskdrake_interactive.pm_.c:921
+msgid "Info: "
 msgstr ""
 
-#: ../../diskdrake.pm_.c:997
-msgid "Rescue partition table"
+#: ../../diskdrake_interactive.pm_.c:922
+#, c-format
+msgid "LVM-disks %s\n"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:999
-msgid "Reload"
+#: ../../diskdrake_interactive.pm_.c:923
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr ""
+
+#: ../../diskdrake_interactive.pm_.c:924
+#, c-format
+msgid "on bus %d id %d\n"
 msgstr ""
 
-#: ../../fs.pm_.c:89 ../../fs.pm_.c:101 ../../fs.pm_.c:107 ../../fs.pm_.c:113
-#: ../../fs.pm_.c:119 ../../fs.pm_.c:125
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "Options: %s"
+msgstr ""
+
+#: ../../fs.pm_.c:391 ../../fs.pm_.c:400 ../../fs.pm_.c:404 ../../fs.pm_.c:408
+#: ../../fs.pm_.c:412 ../../fs.pm_.c:416
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr ""
 
-#: ../../fs.pm_.c:159
+#: ../../fs.pm_.c:449
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr ""
 
-#: ../../fs.pm_.c:239
+#: ../../fs.pm_.c:511
+msgid "mount failed"
+msgstr ""
+
+#: ../../fs.pm_.c:529
 #, c-format
 msgid "fsck failed with exit code %d or signal %d"
 msgstr ""
 
-#: ../../fs.pm_.c:247
+#: ../../fs.pm_.c:537
 msgid "mount failed: "
 msgstr ""
 
-#: ../../fs.pm_.c:259
+#: ../../fs.pm_.c:552
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr ""
@@ -1722,45 +1745,48 @@ msgstr ""
 msgid "server"
 msgstr ""
 
-#: ../../fsedit.pm_.c:334
-msgid "Mount points must begin with a leading /"
+#: ../../fsedit.pm_.c:433
+msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr ""
 
-#: ../../fsedit.pm_.c:337
-#, c-format
-msgid "There is already a partition with mount point %s\n"
+#: ../../fsedit.pm_.c:434
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr ""
+
+#: ../../fsedit.pm_.c:443
+msgid "Mount points must begin with a leading /"
 msgstr ""
 
-#: ../../fsedit.pm_.c:345
+#: ../../fsedit.pm_.c:444
 #, c-format
-msgid "Circular mounts %s\n"
+msgid "There is already a partition with mount point %s\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:357
+#: ../../fsedit.pm_.c:448
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:358
+#: ../../fsedit.pm_.c:450
 msgid "This directory should remain within the root filesystem"
 msgstr ""
 
-#: ../../fsedit.pm_.c:359
+#: ../../fsedit.pm_.c:452
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 
-#: ../../fsedit.pm_.c:464
+#: ../../fsedit.pm_.c:568
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr ""
 
-#: ../../fsedit.pm_.c:548
+#: ../../fsedit.pm_.c:653
 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:562
+#: ../../fsedit.pm_.c:667
 msgid "You don't have any partitions!"
 msgstr ""
 
@@ -2900,83 +2926,6 @@ msgid ""
 "the additional instructions."
 msgstr ""
 
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr ""
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr ""
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr ""
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr ""
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr ""
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr ""
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr ""
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr ""
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr ""
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr ""
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:939
-#: ../../install_steps_interactive.pm_.c:940
-msgid "Set root password"
-msgstr ""
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr ""
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr ""
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:876
-msgid "Summary"
-msgstr ""
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr ""
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr ""
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr ""
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr ""
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr ""
-
 #: ../../install_any.pm_.c:411
 #, c-format
 msgid ""
@@ -2996,31 +2945,32 @@ msgstr ""
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
 
-#: ../../install_any.pm_.c:671
+#: ../../install_any.pm_.c:751
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr ""
 
-#: ../../install_any.pm_.c:675
+#: ../../install_any.pm_.c:755
 msgid "This floppy is not FAT formatted"
 msgstr ""
 
-#: ../../install_any.pm_.c:687
+#: ../../install_any.pm_.c:767
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: ../../install_any.pm_.c:709
-msgid "Error reading file $f"
+#: ../../install_any.pm_.c:789 ../../partition_table.pm_.c:717
+#, c-format
+msgid "Error reading file %s"
 msgstr ""
 
 #: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:313
-#: ../../interactive.pm_.c:104 ../../interactive.pm_.c:119
-#: ../../interactive.pm_.c:274 ../../interactive.pm_.c:294
-#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:408
-#: ../../my_gtk.pm_.c:670 ../../my_gtk.pm_.c:693
+#: ../../interactive.pm_.c:105 ../../interactive.pm_.c:120
+#: ../../interactive.pm_.c:284 ../../interactive.pm_.c:304
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:412
+#: ../../my_gtk.pm_.c:673 ../../my_gtk.pm_.c:695
 msgid "Ok"
 msgstr ""
 
@@ -3061,70 +3011,70 @@ msgid ""
 "Continue anyway?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:50 ../../install_steps.pm_.c:160
+#: ../../install_interactive.pm_.c:50 ../../install_steps.pm_.c:164
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:72
+#: ../../install_interactive.pm_.c:73
 msgid "Use free space"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:74
+#: ../../install_interactive.pm_.c:75
 msgid "Not enough free space to allocate new partitions"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:82
+#: ../../install_interactive.pm_.c:83
 msgid "Use existing partition"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:84
+#: ../../install_interactive.pm_.c:85
 msgid "There is no existing partition to use"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:92
 msgid "Use the Windows partition for loopback"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:95
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:96
+#: ../../install_interactive.pm_.c:97
 msgid "Choose the sizes"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:97
+#: ../../install_interactive.pm_.c:98
 msgid "Root partition size in MB: "
 msgstr ""
 
-#: ../../install_interactive.pm_.c:98
+#: ../../install_interactive.pm_.c:99
 msgid "Swap partition size in MB: "
 msgstr ""
 
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Use the free space on the Windows partition"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:109
+#: ../../install_interactive.pm_.c:110
 msgid "Which partition do you want to resize?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:112
 msgid "Computing Windows filesystem bounds"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:115
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
 "the following error occured: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:118
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:118
+#: ../../install_interactive.pm_.c:119
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3135,80 +3085,80 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: ../../install_interactive.pm_.c:127
+#: ../../install_interactive.pm_.c:128
 msgid "Which size do you want to keep for windows on"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:129
 #, c-format
 msgid "partition %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:134
+#: ../../install_interactive.pm_.c:135
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:150
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:155
+#: ../../install_interactive.pm_.c:156
 msgid "Erase entire disk"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:155
+#: ../../install_interactive.pm_.c:156
 msgid "Remove Windows(TM)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:158
+#: ../../install_interactive.pm_.c:159
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:161
+#: ../../install_interactive.pm_.c:162
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:170
 msgid "Custom disk partitioning"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:173
+#: ../../install_interactive.pm_.c:174
 msgid "Use fdisk"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:176
+#: ../../install_interactive.pm_.c:177
 #, c-format
 msgid ""
 "You can now partition %s.\n"
 "When you are done, don't forget to save using `w'"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:205
+#: ../../install_interactive.pm_.c:206
 msgid "You don't have enough free space on your Windows partition"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:222
 msgid "I can't find any room for installing"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:226
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:230
+#: ../../install_interactive.pm_.c:231
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:236
+#: ../../install_interactive.pm_.c:237
 msgid "Bringing up the network"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:241
+#: ../../install_interactive.pm_.c:242
 msgid "Bringing down the network"
 msgstr ""
 
@@ -3218,12 +3168,12 @@ msgid ""
 "Continue at your own risk."
 msgstr ""
 
-#: ../../install_steps.pm_.c:211
+#: ../../install_steps.pm_.c:215
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:391
+#: ../../install_steps.pm_.c:393
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -3231,16 +3181,16 @@ msgid ""
 "\"\n"
 msgstr ""
 
-#: ../../install_steps.pm_.c:456
+#: ../../install_steps.pm_.c:458
 #, c-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: ../../install_steps.pm_.c:500 ../../install_steps.pm_.c:705
+#: ../../install_steps.pm_.c:502 ../../install_steps.pm_.c:708
 msgid "No floppy drive available"
 msgstr ""
 
-#: ../../install_steps_auto_install.pm_.c:65
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -3265,11 +3215,11 @@ msgid "Size: %d KB\n"
 msgstr ""
 
 #: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:469
-#: ../../install_steps_interactive.pm_.c:522
+#: ../../install_steps_interactive.pm_.c:517
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:559
 msgid "Info"
 msgstr ""
 
@@ -3279,7 +3229,7 @@ msgid "Install"
 msgstr ""
 
 #: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:485
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Installing"
 msgstr ""
 
@@ -3296,7 +3246,7 @@ msgid "Total time "
 msgstr ""
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Preparing installation"
 msgstr ""
 
@@ -3365,15 +3315,15 @@ msgstr ""
 msgid "Percentage of packages to install"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:288 ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_gtk.pm_.c:288 ../../install_steps_interactive.pm_.c:627
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:308 ../../install_steps_interactive.pm_.c:647
+#: ../../install_steps_gtk.pm_.c:308 ../../install_steps_interactive.pm_.c:642
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:331 ../../install_steps_interactive.pm_.c:611
+#: ../../install_steps_gtk.pm_.c:331 ../../install_steps_interactive.pm_.c:606
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
@@ -3523,7 +3473,7 @@ msgid "You can choose other languages that will be available after install"
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:641
 msgid "All"
 msgstr ""
 
@@ -3653,7 +3603,7 @@ msgid ""
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:183
-#: ../../install_steps_interactive.pm_.c:880
+#: ../../install_steps_interactive.pm_.c:875
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr ""
@@ -3667,6 +3617,10 @@ msgstr ""
 msgid "Here is the full list of keyboards available"
 msgstr ""
 
+#: ../../install_steps_interactive.pm_.c:186
+msgid "More"
+msgstr ""
+
 #: ../../install_steps_interactive.pm_.c:202
 msgid "Install Class"
 msgstr ""
@@ -3787,120 +3741,124 @@ msgstr ""
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:405
+#: ../../install_steps_interactive.pm_.c:400
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:406
+#: ../../install_steps_interactive.pm_.c:401
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:424
 msgid "Formatting partitions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:431
+#: ../../install_steps_interactive.pm_.c:426
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_interactive.pm_.c:429
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:440
+#: ../../install_steps_interactive.pm_.c:435
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:441
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:463
+#: ../../install_steps_interactive.pm_.c:458
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Complete (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:488
+#: ../../install_steps_interactive.pm_.c:483
 msgid "Custom"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:535
+#: ../../install_steps_interactive.pm_.c:530
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:538
+#: ../../install_steps_interactive.pm_.c:533
 msgid "Load from floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:535
 msgid "Loading from floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:535
 msgid "Package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:545
+#: ../../install_steps_interactive.pm_.c:540
 msgid "Insert a floppy containing package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:618
+#: ../../install_steps_interactive.pm_.c:552
+msgid "Save on floppy"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:613
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:678
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:683
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:717
+#: ../../install_steps_interactive.pm_.c:712
 #, c-format
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:726
+#: ../../install_steps_interactive.pm_.c:721
 msgid "Post-install configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:727
 #, c-format
 msgid "Please insert the Boot floppy used in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:738
+#: ../../install_steps_interactive.pm_.c:733
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:763
+#: ../../install_steps_interactive.pm_.c:758
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3939,122 +3897,131 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:795
+#: ../../install_steps_interactive.pm_.c:790
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:806
+#: ../../install_steps_interactive.pm_.c:801
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:809
+#: ../../install_steps_interactive.pm_.c:804
 msgid "Please choose the packages you want to install."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:816
 msgid "Which is your timezone?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:821
 msgid "Hardware clock set to GMT"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:822
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:834
+#: ../../install_steps_interactive.pm_.c:829
 msgid "NTP Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:868 ../../printerdrake.pm_.c:55
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:78
 msgid "Remote CUPS server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:864
 msgid "No printer"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:871 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:874
 msgid "Mouse"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:876
 msgid "Timezone"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:882 ../../printerdrake.pm_.c:973
+#: ../../install_steps_interactive.pm_.c:877 ../../printerdrake.pm_.c:1279
 msgid "Printer"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:879
 msgid "ISDN card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:887
+#: ../../install_steps_interactive.pm_.c:882
 msgid "Sound card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:890
+#: ../../install_steps_interactive.pm_.c:885
 msgid "TV card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:928
-#: ../../install_steps_interactive.pm_.c:952
-#: ../../install_steps_interactive.pm_.c:956
+#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:951
 msgid "LDAP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:929
-#: ../../install_steps_interactive.pm_.c:952
-#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:924
+#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:960
 msgid "NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:930
-#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:925
+#: ../../install_steps_interactive.pm_.c:947
 msgid "Local files"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:935 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:936
 msgid "No password"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:946
+#: ../../install_steps_interactive.pm_.c:941
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:952 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:589
+#: ../../install_steps_interactive.pm_.c:947 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:592
 msgid "Authentication"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:960
+#: ../../install_steps_interactive.pm_.c:955
 msgid "Authentication LDAP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:961
+#: ../../install_steps_interactive.pm_.c:956
 msgid "LDAP Base dn"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:957
 msgid "LDAP Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Authentication NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:964
 msgid "NIS Domain"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:965
 msgid "NIS Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1005
+#: ../../install_steps_interactive.pm_.c:1000
 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 "
@@ -4072,19 +4039,19 @@ msgid ""
 "drive and press \"Ok\"."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1021
+#: ../../install_steps_interactive.pm_.c:1016
 msgid "First floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1017
 msgid "Second floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1018 ../../printerdrake.pm_.c:1106
 msgid "Skip"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1028
+#: ../../install_steps_interactive.pm_.c:1023
 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 "
@@ -4098,28 +4065,28 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1037
+#: ../../install_steps_interactive.pm_.c:1032
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:1036
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1040
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1048
+#: ../../install_steps_interactive.pm_.c:1043
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1050
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1066
+#: ../../install_steps_interactive.pm_.c:1061
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -4127,21 +4094,21 @@ msgid ""
 " need to use BootX to boot your machine"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1072
+#: ../../install_steps_interactive.pm_.c:1066
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1069
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1078
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../install_steps_interactive.pm_.c:1086
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
 " enable the bootloader.  If you don't see the bootloader prompt at\n"
@@ -4151,44 +4118,41 @@ msgid ""
 "At your next boot you should see the bootloader prompt."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1101 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1095 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1102 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1096 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1106 ../../standalone/draksec_.c:52
+#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:52
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1142
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1144
+#: ../../install_steps_interactive.pm_.c:1136
+#: ../../standalone/drakautoinst_.c:79
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1158
-#: ../../install_steps_interactive.pm_.c:1190
+#: ../../install_steps_interactive.pm_.c:1140
+#: ../../standalone/drakautoinst_.c:81
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../install_steps_interactive.pm_.c:1151
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1230
+#: ../../install_steps_interactive.pm_.c:1162
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -4201,11 +4165,11 @@ msgid ""
 "install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1242
+#: ../../install_steps_interactive.pm_.c:1174
 msgid "Generate auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1244
+#: ../../install_steps_interactive.pm_.c:1176
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -4214,15 +4178,15 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Automated"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Replay"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1252
+#: ../../install_steps_interactive.pm_.c:1184
 msgid "Save packages selection"
 msgstr ""
 
@@ -4236,27 +4200,31 @@ msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
 
-#: ../../interactive.pm_.c:70
+#: ../../interactive.pm_.c:71
 msgid "kdesu missing"
 msgstr ""
 
-#: ../../interactive.pm_.c:272
+#: ../../interactive.pm_.c:130
+msgid "Choose a file"
+msgstr ""
+
+#: ../../interactive.pm_.c:282
 msgid "Advanced"
 msgstr ""
 
-#: ../../interactive.pm_.c:331
+#: ../../interactive.pm_.c:341
 msgid "Please wait"
 msgstr ""
 
-#: ../../interactive_gtk.pm_.c:630
+#: ../../interactive_gtk.pm_.c:669
 msgid "Expand Tree"
 msgstr ""
 
-#: ../../interactive_gtk.pm_.c:631
+#: ../../interactive_gtk.pm_.c:670
 msgid "Collapse Tree"
 msgstr ""
 
-#: ../../interactive_gtk.pm_.c:632
+#: ../../interactive_gtk.pm_.c:671
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
@@ -4557,6 +4525,11 @@ msgstr ""
 msgid "Yugoslavian (latin/cyrillic)"
 msgstr ""
 
+#: ../../loopback.pm_.c:33
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr ""
+
 #: ../../lvm.pm_.c:70
 msgid "Remove the logical volumes first\n"
 msgstr ""
@@ -4669,23 +4642,23 @@ msgstr ""
 msgid "No mouse"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:380
+#: ../../my_gtk.pm_.c:377
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:412
 msgid "Finish"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:412
 msgid "Next ->"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:409
+#: ../../my_gtk.pm_.c:413
 msgid "<- Previous"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:670
+#: ../../my_gtk.pm_.c:673
 msgid "Is this correct?"
 msgstr ""
 
@@ -4701,6 +4674,10 @@ msgid ""
 msgstr ""
 
 #: ../../network/adsl.pm_.c:21
+msgid "speedtouch usb"
+msgstr ""
+
+#: ../../network/adsl.pm_.c:21
 msgid "use dhcp"
 msgstr ""
 
@@ -4712,39 +4689,31 @@ msgstr ""
 msgid "use pptp"
 msgstr ""
 
-#: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:113
-#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:223
+#: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:108
+#: ../../network/ethernet.pm_.c:174 ../../standalone/drakgw_.c:223
 msgid "Network interface"
 msgstr ""
 
-#: ../../network/adsl.pm_.c:31
+#: ../../network/adsl.pm_.c:31 ../../network/ethernet.pm_.c:175
 #, c-format
 msgid "I'm about to restart the network device %s. Do you agree?"
 msgstr ""
 
-#: ../../network/adsl.pm_.c:79
-msgid "ADSL configuration"
-msgstr ""
-
-#: ../../network/adsl.pm_.c:80
-msgid "Do you want to start your connection at boot?"
-msgstr ""
-
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
 "Default is dhcpcd"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:66
+#: ../../network/ethernet.pm_.c:63
 msgid "Network configuration"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:67
+#: ../../network/ethernet.pm_.c:64
 msgid "Do you want to restart the network"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:70
+#: ../../network/ethernet.pm_.c:67
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -4752,50 +4721,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:131
-#: ../../network/netconnect.pm_.c:231 ../../network/tools.pm_.c:49
+#: ../../network/ethernet.pm_.c:67 ../../network/netconnect.pm_.c:130
+#: ../../network/netconnect.pm_.c:233 ../../network/tools.pm_.c:52
 msgid "Network Configuration"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:99
+#: ../../network/ethernet.pm_.c:94
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:232
+#: ../../network/ethernet.pm_.c:98 ../../standalone/drakgw_.c:232
 msgid "Choose the network interface"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:104
+#: ../../network/ethernet.pm_.c:99
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:114
+#: ../../network/ethernet.pm_.c:109
 msgid ""
 "\n"
 "Do you agree?"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:114
+#: ../../network/ethernet.pm_.c:109
 msgid "I'm about to restart the network device:\n"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:180
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-
-#: ../../network/ethernet.pm_.c:189
+#: ../../network/ethernet.pm_.c:184
 msgid "no network card found"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:213 ../../network/network.pm_.c:343
+#: ../../network/ethernet.pm_.c:208 ../../network/network.pm_.c:342
 msgid "Configuring network"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:214
+#: ../../network/ethernet.pm_.c:209
 msgid ""
 "Please enter your host name if you know it.\n"
 "Some DHCP servers require the hostname to work.\n"
@@ -4803,14 +4767,15 @@ msgid ""
 "such as ``mybox.mylab.myco.com''."
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:218 ../../network/network.pm_.c:348
+#: ../../network/ethernet.pm_.c:213 ../../network/network.pm_.c:347
 msgid "Host name"
 msgstr ""
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:92 ../../network/netconnect.pm_.c:107
-#: ../../network/netconnect.pm_.c:158 ../../network/netconnect.pm_.c:168
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:208
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:106
+#: ../../network/netconnect.pm_.c:155 ../../network/netconnect.pm_.c:165
+#: ../../network/netconnect.pm_.c:184 ../../network/netconnect.pm_.c:205
+#: ../../network/netconnect.pm_.c:212
 msgid "Network Configuration Wizard"
 msgstr ""
 
@@ -4847,57 +4812,57 @@ msgstr ""
 msgid "Old configuration (isdn4net)"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
-#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
-#: ../../network/isdn.pm_.c:214
+#: ../../network/isdn.pm_.c:168 ../../network/isdn.pm_.c:186
+#: ../../network/isdn.pm_.c:196 ../../network/isdn.pm_.c:203
+#: ../../network/isdn.pm_.c:213
 msgid "ISDN Configuration"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:169
+#: ../../network/isdn.pm_.c:168
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:181
 msgid "Europe protocol"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:181
 msgid "Europe protocol (EDSS1)"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:183
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:183
 msgid ""
 "Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:188
+#: ../../network/isdn.pm_.c:187
 msgid "Which protocol do you want to use ?"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:198
+#: ../../network/isdn.pm_.c:197
 msgid "What kind of card do you have?"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "I don't know"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "ISA / PCMCIA"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "PCI"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:204
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -4905,124 +4870,124 @@ msgid ""
 "If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:208
 msgid "Abort"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:208
 msgid "Continue"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:215
+#: ../../network/isdn.pm_.c:214
 msgid "Which is your ISDN card ?"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:234
+#: ../../network/isdn.pm_.c:233
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
 msgstr ""
 
-#: ../../network/isdn.pm_.c:243
+#: ../../network/isdn.pm_.c:242
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../network/modem.pm_.c:39
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr ""
 
-#: ../../network/modem.pm_.c:44
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr ""
 
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:585
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:588
 msgid "Connection name"
 msgstr ""
 
-#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:586
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:589
 msgid "Phone number"
 msgstr ""
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:587
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:590
 msgid "Login ID"
 msgstr ""
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "PAP"
 msgstr ""
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "Script-based"
 msgstr ""
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "Terminal-based"
 msgstr ""
 
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:590
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:593
 msgid "Domain name"
 msgstr ""
 
-#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:591
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:594
 msgid "First DNS Server (optional)"
 msgstr ""
 
-#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:592
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:595
 msgid "Second DNS Server (optional)"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:35
+#: ../../network/netconnect.pm_.c:34
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:35 ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:34 ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can reconfigure your connection."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:35
+#: ../../network/netconnect.pm_.c:34
 msgid "You are currently connected to internet."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
 msgid "You are not currently connected to Internet."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:42 ../../standalone/net_monitor_.c:124
+#: ../../network/netconnect.pm_.c:41
 msgid "Connect to Internet"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:44
+#: ../../network/netconnect.pm_.c:43
 msgid "Disconnect from Internet"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:46
+#: ../../network/netconnect.pm_.c:45
 msgid "Configure network connection (LAN or Internet)"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:49
+#: ../../network/netconnect.pm_.c:48
 msgid "Internet connection & configuration"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:97
+#: ../../network/netconnect.pm_.c:96
 #, c-format
 msgid "We are now going to configure the %s connection."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:98
+#: ../../network/netconnect.pm_.c:97
 msgid "Press next to continue."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:107
+#: ../../network/netconnect.pm_.c:106
 #, c-format
 msgid ""
 "\n"
@@ -5034,7 +4999,7 @@ msgid ""
 "Press OK to continue."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:132
+#: ../../network/netconnect.pm_.c:131
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5042,7 +5007,7 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:159
+#: ../../network/netconnect.pm_.c:156
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5050,84 +5015,88 @@ msgid ""
 "If you don't want to use the auto detection, deselect the checkbox.\n"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:161
+#: ../../network/netconnect.pm_.c:158
 msgid "Choose the profile to configure"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:162
+#: ../../network/netconnect.pm_.c:159
 msgid "Use auto detection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:146
+#: ../../network/netconnect.pm_.c:165 ../../printerdrake.pm_.c:171
 msgid "Detecting devices..."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:179
+#: ../../network/netconnect.pm_.c:176
 msgid "Normal modem connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:179
+#: ../../network/netconnect.pm_.c:176
 #, c-format
 msgid "detected on port %s"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:177
 msgid "ISDN connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:177
 #, c-format
 msgid "detected %s"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:178
 msgid "ADSL connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:178
 #, c-format
 msgid "detected on interface %s"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:179
 msgid "Cable connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:179
 msgid "cable connection detected"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:180
 msgid "LAN connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:180
 msgid "ethernet card(s) detected"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:188
+#: ../../network/netconnect.pm_.c:185
 msgid "Choose the connection you want to configure"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:209
+#: ../../network/netconnect.pm_.c:206
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:211
+#: ../../network/netconnect.pm_.c:207
 msgid "Internet connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:223
+#: ../../network/netconnect.pm_.c:212
+msgid "Do you want to start the connection at boot?"
+msgstr ""
+
+#: ../../network/netconnect.pm_.c:225
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
 "The configuration will now be applied to your system.\n"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:226
+#: ../../network/netconnect.pm_.c:228
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -5154,10 +5123,11 @@ msgid "Configuring network device %s"
 msgstr ""
 
 #: ../../network/network.pm_.c:290
-msgid " (driver $module)"
+#, c-format
+msgid " (driver %s)"
 msgstr ""
 
-#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:247
+#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:248
 #: ../../standalone/draknet_.c:449
 msgid "IP address"
 msgstr ""
@@ -5174,12 +5144,11 @@ msgstr ""
 msgid "Automatic IP"
 msgstr ""
 
-#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:66
-#: ../../printerdrake.pm_.c:328
+#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:356
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../../network/network.pm_.c:344
+#: ../../network/network.pm_.c:343
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -5187,163 +5156,162 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 
-#: ../../network/network.pm_.c:349
+#: ../../network/network.pm_.c:348
 msgid "DNS server"
 msgstr ""
 
-#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:584
+#: ../../network/network.pm_.c:349 ../../standalone/draknet_.c:587
 msgid "Gateway"
 msgstr ""
 
-#: ../../network/network.pm_.c:352
+#: ../../network/network.pm_.c:351
 msgid "Gateway device"
 msgstr ""
 
-#: ../../network/network.pm_.c:363
+#: ../../network/network.pm_.c:362
 msgid "Proxies configuration"
 msgstr ""
 
-#: ../../network/network.pm_.c:364
+#: ../../network/network.pm_.c:363
 msgid "HTTP proxy"
 msgstr ""
 
-#: ../../network/network.pm_.c:365
+#: ../../network/network.pm_.c:364
 msgid "FTP proxy"
 msgstr ""
 
-#: ../../network/network.pm_.c:368
+#: ../../network/network.pm_.c:367
 msgid "Proxy should be http://..."
 msgstr ""
 
-#: ../../network/network.pm_.c:369
+#: ../../network/network.pm_.c:368
 msgid "Proxy should be ftp://..."
 msgstr ""
 
-#: ../../network/tools.pm_.c:31
+#: ../../network/tools.pm_.c:34
 msgid "Internet configuration"
 msgstr ""
 
-#: ../../network/tools.pm_.c:32
+#: ../../network/tools.pm_.c:35
 msgid "Do you want to try to connect to the Internet now?"
 msgstr ""
 
-#: ../../network/tools.pm_.c:36
+#: ../../network/tools.pm_.c:39
 msgid "Testing your connection..."
 msgstr ""
 
-#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:212
+#: ../../network/tools.pm_.c:45 ../../standalone/draknet_.c:213
 msgid "The system is now connected to Internet."
 msgstr ""
 
-#: ../../network/tools.pm_.c:43
+#: ../../network/tools.pm_.c:46
 msgid "For Security reason, it will be disconnected now."
 msgstr ""
 
-#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:212
+#: ../../network/tools.pm_.c:47 ../../standalone/draknet_.c:213
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 
-#: ../../network/tools.pm_.c:68
+#: ../../network/tools.pm_.c:71
 msgid "Connection Configuration"
 msgstr ""
 
-#: ../../network/tools.pm_.c:69
+#: ../../network/tools.pm_.c:72
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:571
+#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
 msgid "Card IRQ"
 msgstr ""
 
-#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:572
+#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
 msgid "Card mem (DMA)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:573
+#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
 msgid "Card IO"
 msgstr ""
 
-#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
+#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
 msgid "Card IO_0"
 msgstr ""
 
-#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
 msgid "Card IO_1"
 msgstr ""
 
-#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
 msgid "Your personal phone number"
 msgstr ""
 
-#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:581
 msgid "Provider phone number"
 msgstr ""
 
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:582
 msgid "Provider dns 1 (optional)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:583
 msgid "Provider dns 2 (optional)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:583
+#: ../../network/tools.pm_.c:84
+msgid "Choose your country"
+msgstr ""
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:586
 msgid "Dialing mode"
 msgstr ""
 
-#: ../../network/tools.pm_.c:82
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:598
 msgid "Connection speed"
 msgstr ""
 
-#: ../../network/tools.pm_.c:83
+#: ../../network/tools.pm_.c:87
 msgid "Connection timeout (in sec)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:581
+#: ../../network/tools.pm_.c:88 ../../standalone/draknet_.c:584
 msgid "Account Login (user name)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:582
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:585
 msgid "Account Password"
 msgstr ""
 
-#: ../../partition_table.pm_.c:583
+#: ../../partition_table.pm_.c:605
 msgid "Extended partition not supported on this platform"
 msgstr ""
 
-#: ../../partition_table.pm_.c:601
+#: ../../partition_table.pm_.c:623
 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:695
-#, c-format
-msgid "Error reading file %s"
-msgstr ""
-
-#: ../../partition_table.pm_.c:702
+#: ../../partition_table.pm_.c:724
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr ""
 
-#: ../../partition_table.pm_.c:704
+#: ../../partition_table.pm_.c:726
 msgid "Bad backup file"
 msgstr ""
 
-#: ../../partition_table.pm_.c:726
+#: ../../partition_table.pm_.c:748
 #, c-format
 msgid "Error writing to file %s"
 msgstr ""
 
-#: ../../partition_table_raw.pm_.c:164
+#: ../../partition_table_raw.pm_.c:152
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -5387,45 +5355,71 @@ msgid "PDQ - Print, Don't Queue"
 msgstr ""
 
 #: ../../printer.pm_.c:32
-msgid "Local printer"
+msgid "CUPS"
 msgstr ""
 
 #: ../../printer.pm_.c:33
-msgid "Remote printer"
+msgid "LPRng"
 msgstr ""
 
 #: ../../printer.pm_.c:34
-msgid "Printer on remote CUPS server"
+msgid "LPD"
 msgstr ""
 
 #: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
+msgid "Local printer"
+msgstr ""
+
+#: ../../printer.pm_.c:41
+msgid "Remote printer"
+msgstr ""
+
+#: ../../printer.pm_.c:42
+msgid "Printer on remote CUPS server"
+msgstr ""
+
+#: ../../printer.pm_.c:43
 msgid "Printer on remote lpd server"
 msgstr ""
 
-#: ../../printer.pm_.c:36
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr ""
 
-#: ../../printer.pm_.c:37
+#: ../../printer.pm_.c:45
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr ""
 
-#: ../../printer.pm_.c:38
+#: ../../printer.pm_.c:46
 msgid "Printer on NetWare server"
 msgstr ""
 
-#: ../../printer.pm_.c:39
+#: ../../printer.pm_.c:47
 msgid "Enter a printer device URI"
 msgstr ""
 
-#: ../../printer.pm_.c:40
+#: ../../printer.pm_.c:48
 msgid "Pipe job into a command"
 msgstr ""
 
-#: ../../printer.pm_.c:185
+#: ../../printer.pm_.c:209 ../../printer.pm_.c:557
+#: ../../printerdrake.pm_.c:1419
 msgid "Unknown model"
 msgstr ""
 
+#: ../../printer.pm_.c:461
+#, c-format
+msgid "(on %s)"
+msgstr ""
+
+#: ../../printer.pm_.c:463
+msgid "(on this machine)"
+msgstr ""
+
 #: ../../printerdrake.pm_.c:23
 msgid "Select Printer Connection"
 msgstr ""
@@ -5438,117 +5432,113 @@ msgstr ""
 msgid ""
 "\n"
 "Printers on remote CUPS servers you do not have to configure\n"
-"here; these printers will be automatically detected. In case\n"
-"of doubt, select \"Printer on remote CUPS server\"."
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:56
+#: ../../printerdrake.pm_.c:79
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"With a remote CUPS server, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:62
-msgid "CUPS server IP"
+#: ../../printerdrake.pm_.c:91 ../../printerdrake.pm_.c:1407
+msgid "Close"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:63 ../../printerdrake.pm_.c:446
-msgid "Port"
+#: ../../printerdrake.pm_.c:92
+msgid "Apply/Re-read printers"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:70
-msgid "Port number should be numeric"
+#: ../../printerdrake.pm_.c:96
+msgid "The IP address should look like 192.168.1.20"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:99
-msgid "Enter Printer Name and Comments"
+#: ../../printerdrake.pm_.c:101 ../../printerdrake.pm_.c:491
+msgid "The port number should be an integer!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:103
-msgid "Name of printer should contain only letters, numbers and the underscore"
+#: ../../printerdrake.pm_.c:108
+msgid "Default printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:110
-msgid ""
-"Every printer needs a name (for example lp).\n"
-"The Description and Location fields do not need \n"
-"to be filled in. They are comments for the users."
-msgstr ""
-
-#: ../../printerdrake.pm_.c:114
-msgid "Name of printer"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:116
-msgid "Description"
+#: ../../printerdrake.pm_.c:113
+msgid "CUPS server IP"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:118
-msgid "Location"
+#: ../../printerdrake.pm_.c:114 ../../printerdrake.pm_.c:484
+msgid "Port"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:146
+#: ../../printerdrake.pm_.c:171
 msgid "Test ports"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:195
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:212
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:188
+#: ../../printerdrake.pm_.c:213
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:190
+#: ../../printerdrake.pm_.c:215
 msgid "Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:193
+#: ../../printerdrake.pm_.c:218
 msgid "Device/file name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:236
+#: ../../printerdrake.pm_.c:261
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:262
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
 "on that server."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:240
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:265
+msgid "Remote host name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:241
-msgid "Remote queue"
+#: ../../printerdrake.pm_.c:266
+msgid "Remote printer name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:244
+#: ../../printerdrake.pm_.c:269
 msgid "Remote host name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:248
-msgid "Remote queue name missing!"
+#: ../../printerdrake.pm_.c:273
+msgid "Remote printer name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:314
+#: ../../printerdrake.pm_.c:342
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:315
+#: ../../printerdrake.pm_.c:343
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -5557,35 +5547,35 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:320
+#: ../../printerdrake.pm_.c:348
 msgid "SMB server host"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:349
 msgid "SMB server IP"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:322
+#: ../../printerdrake.pm_.c:350
 msgid "Share name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:325
+#: ../../printerdrake.pm_.c:353
 msgid "Workgroup"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:332
+#: ../../printerdrake.pm_.c:360
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:336
+#: ../../printerdrake.pm_.c:364
 msgid "Samba share name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:392
+#: ../../printerdrake.pm_.c:423
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:424
 msgid ""
 "To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -5593,107 +5583,114 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:397
+#: ../../printerdrake.pm_.c:428
 msgid "Printer Server"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:429
 msgid "Print Queue Name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:403
+#: ../../printerdrake.pm_.c:434
 msgid "NCP server name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:407
+#: ../../printerdrake.pm_.c:438
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:442
+#: ../../printerdrake.pm_.c:477
 msgid "Socket Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:443
+#: ../../printerdrake.pm_.c:478
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:445
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:483
+msgid "Printer host name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:449
+#: ../../printerdrake.pm_.c:487
 msgid "Printer host name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:453
-msgid "The port must be an integer number!"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:473 ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:515 ../../printerdrake.pm_.c:517
 msgid "Printer Device URI"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:474
+#: ../../printerdrake.pm_.c:516
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:489
+#: ../../printerdrake.pm_.c:531
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:521
-msgid "Pipe into command"
+#: ../../printerdrake.pm_.c:626
+msgid ""
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:522
-msgid ""
-"Here you can specify any arbitrary command line into which the job should be "
-"piped instead of being sent directly to a printer."
+#: ../../printerdrake.pm_.c:630
+msgid "Name of printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:523
-msgid "Command line"
+#: ../../printerdrake.pm_.c:632
+msgid "Description"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:527
-msgid "A command line must be entered!"
+#: ../../printerdrake.pm_.c:634
+msgid "Location"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:605
+#: ../../printerdrake.pm_.c:746
 msgid "Printer model selection"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:606
+#: ../../printerdrake.pm_.c:747
 msgid "Which printer model do you have?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:745 ../../printerdrake.pm_.c:1081
-#: ../../printerdrake.pm_.c:1098 ../../printerdrake.pm_.c:1153
-msgid "Printer options"
+#: ../../printerdrake.pm_.c:886
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:755
-msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
+#: ../../printerdrake.pm_.c:901
+#, c-format
+msgid "Option %s must be an integer number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:762
-msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
+#: ../../printerdrake.pm_.c:908
+#, c-format
+msgid "Option %s must be a number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:770
-msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
+#: ../../printerdrake.pm_.c:916
+#, c-format
+msgid "Option %s out of range!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:818
+#: ../../printerdrake.pm_.c:964
 msgid "Test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:819
+#: ../../printerdrake.pm_.c:965
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed\n"
@@ -5701,35 +5698,35 @@ msgid ""
 "In most cases it is enough to print the standard test page."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:823
+#: ../../printerdrake.pm_.c:970
 msgid "No test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:824
+#: ../../printerdrake.pm_.c:971
 msgid "Print"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:826
+#: ../../printerdrake.pm_.c:973
 msgid "Standard test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:829
+#: ../../printerdrake.pm_.c:976
 msgid "Alternative test page (Letter)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:832
+#: ../../printerdrake.pm_.c:979
 msgid "Alternative test page (A4)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:834
+#: ../../printerdrake.pm_.c:981
 msgid "Photo test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:841
+#: ../../printerdrake.pm_.c:988
 msgid "Printing test page(s)..."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:863
+#: ../../printerdrake.pm_.c:1013
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -5737,87 +5734,195 @@ msgid ""
 "Printing status:\n"
 "%s\n"
 "\n"
-"Does it work properly?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:867
+#: ../../printerdrake.pm_.c:1017
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
-"Does it work properly?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:897
+#: ../../printerdrake.pm_.c:1024
+msgid "Did it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1043
+msgid "Reading printer data ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1062 ../../printerdrake.pm_.c:1100
+msgid "Transfer printer configuration"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1063
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1071
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1074
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1077
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1081
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1084
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1087
+msgid "Do not transfer printers"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1088 ../../printerdrake.pm_.c:1105
+msgid "Transfer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1101
+#, c-format
+msgid ""
+"A printer named \"%s\" already exists under %s. \n"
+"Click \"Transfer\" to overwrite it.\n"
+"You can also type a new name or skip this printer."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1109
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1114
+#, c-format
+msgid ""
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1122
+msgid "New printer name"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1124
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1142
 msgid "Select Printer Spooler"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:898
+#: ../../printerdrake.pm_.c:1143
 msgid "Which printing system (spooler) do you want to use?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:974
+#: ../../printerdrake.pm_.c:1188
+msgid "Removing LPRng..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1203
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1232
+msgid "Checking installed software..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1259 ../../printerdrake.pm_.c:1274
+#: ../../printerdrake.pm_.c:1420 ../../printerdrake.pm_.c:1483
+msgid "Printer options"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1280
 msgid "Would you like to configure printing?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:994
+#: ../../printerdrake.pm_.c:1303
 msgid ""
 "The following printers are configured.\n"
 "You can add some more or modify the existing ones."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1001 ../../printerdrake.pm_.c:1012
-#: ../../printerdrake.pm_.c:1015
+#: ../../printerdrake.pm_.c:1312 ../../printerdrake.pm_.c:1323
+#: ../../printerdrake.pm_.c:1326 ../../printerdrake.pm_.c:1372
 msgid "Add printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1004
+#: ../../printerdrake.pm_.c:1315
 msgid "Spooler: "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1083
-msgid "Modify printer"
+#: ../../printerdrake.pm_.c:1401
+msgid "Modify printer configuration"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1084
+#: ../../printerdrake.pm_.c:1402
 #, c-format
 msgid ""
 "Printer %s: %s %s\n"
 "What do you want to modify on this printer?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1089 ../../standalone/net_monitor_.c:98
-msgid "Close"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:1090
+#: ../../printerdrake.pm_.c:1408
 msgid "Do it!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1093 ../../printerdrake.pm_.c:1124
+#: ../../printerdrake.pm_.c:1411 ../../printerdrake.pm_.c:1454
 msgid "Printer connection type"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1094 ../../printerdrake.pm_.c:1131
+#: ../../printerdrake.pm_.c:1412 ../../printerdrake.pm_.c:1461
 msgid "Printer name, description, location"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1096 ../../printerdrake.pm_.c:1143
+#: ../../printerdrake.pm_.c:1414 ../../printerdrake.pm_.c:1473
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1097 ../../printerdrake.pm_.c:1144
+#: ../../printerdrake.pm_.c:1415 ../../printerdrake.pm_.c:1474
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1099 ../../printerdrake.pm_.c:1160
+#: ../../printerdrake.pm_.c:1421 ../../printerdrake.pm_.c:1521
 msgid "Print test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1100 ../../printerdrake.pm_.c:1162
+#: ../../printerdrake.pm_.c:1422 ../../printerdrake.pm_.c:1523
 msgid "Remove printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1164
+#: ../../printerdrake.pm_.c:1525
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr ""
@@ -5877,36 +5982,37 @@ msgstr ""
 msgid "login"
 msgstr ""
 
-#: ../../proxy.pm_.c:81
+#: ../../proxy.pm_.c:82
 msgid "password"
 msgstr ""
 
-#: ../../proxy.pm_.c:82
+#: ../../proxy.pm_.c:84
 msgid "re-type password"
 msgstr ""
 
-#: ../../proxy.pm_.c:86
+#: ../../proxy.pm_.c:88
 msgid "The passwords don't match. Try again!"
 msgstr ""
 
-#: ../../raid.pm_.c:35
+#: ../../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr ""
 
-#: ../../raid.pm_.c:105
-msgid "Can't write file $file"
+#: ../../raid.pm_.c:112
+#, c-format
+msgid "Can't write file %s"
 msgstr ""
 
-#: ../../raid.pm_.c:130
+#: ../../raid.pm_.c:137
 msgid "mkraid failed"
 msgstr ""
 
-#: ../../raid.pm_.c:130
+#: ../../raid.pm_.c:137
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr ""
 
-#: ../../raid.pm_.c:146
+#: ../../raid.pm_.c:153
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr ""
@@ -6128,12 +6234,60 @@ msgstr ""
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr ""
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../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 ""
 
+#: ../../standalone/drakautoinst_.c:42
+msgid "Auto Install Configurator"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:43
+msgid ""
+"You are about to configure an Auto Install floppy. This feature is somewhat "
+"dangerous and must be used circumspectly.\n"
+"\n"
+"With that feature, you will be able to replay the installation you've "
+"performed on this computer, being interactively prompted for some steps, in "
+"order to change their values.\n"
+"\n"
+"For maximum safety, the partitioning and formatting will never be performed "
+"automatically, whatever you chose during the install of this computer.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:65
+msgid "Automatic Steps Configuration"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:66
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:74
+msgid "Error!"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:75
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
 #: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
 msgid "Internet Connection Sharing"
 msgstr ""
@@ -6246,7 +6400,8 @@ msgid ""
 msgstr ""
 
 #: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 
 #: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
@@ -6268,11 +6423,8 @@ msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
 #: ../../standalone/drakgw_.c:311
-msgid "Problems installing package $_"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:599
-msgid "Congratulations!"
+#, c-format
+msgid "Problems installing package %s"
 msgstr ""
 
 #: ../../standalone/drakgw_.c:600
@@ -6308,83 +6460,80 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr ""
 
-#: ../../standalone/draknet_.c:75
+#: ../../standalone/draknet_.c:76
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr ""
 
-#: ../../standalone/draknet_.c:82 ../../standalone/draknet_.c:558
+#: ../../standalone/draknet_.c:83 ../../standalone/draknet_.c:561
 msgid "Profile: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:90
+#: ../../standalone/draknet_.c:91
 msgid "Del profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:96
+#: ../../standalone/draknet_.c:97
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:124
+#: ../../standalone/draknet_.c:125
 msgid "New profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:130
+#: ../../standalone/draknet_.c:131
 msgid "Name of the profile to create:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:156
+#: ../../standalone/draknet_.c:157
 msgid "Hostname: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:163
+#: ../../standalone/draknet_.c:164
 msgid "Internet access"
 msgstr ""
 
-#: ../../standalone/draknet_.c:176
+#: ../../standalone/draknet_.c:177
 msgid "Type:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
+#: ../../standalone/draknet_.c:180 ../../standalone/draknet_.c:388
 msgid "Gateway:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
+#: ../../standalone/draknet_.c:180 ../../standalone/draknet_.c:388
 msgid "Interface:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:184
+#: ../../standalone/draknet_.c:185
 msgid "Status:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
-#: ../../standalone/net_monitor_.c:165 ../../standalone/net_monitor_.c:338
+#: ../../standalone/draknet_.c:187 ../../standalone/draknet_.c:391
 msgid "Connected"
 msgstr ""
 
-#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
-#: ../../standalone/net_monitor_.c:126 ../../standalone/net_monitor_.c:165
-#: ../../standalone/net_monitor_.c:338
+#: ../../standalone/draknet_.c:187 ../../standalone/draknet_.c:391
 msgid "Not connected"
 msgstr ""
 
-#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:190 ../../standalone/draknet_.c:392
 msgid "Connect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:190 ../../standalone/draknet_.c:392
 msgid "Disconnect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:208
 msgid "Starting your connection..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:215
+#: ../../standalone/draknet_.c:216
 msgid "Closing your connection..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:220
+#: ../../standalone/draknet_.c:221
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6392,47 +6541,47 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:223
+#: ../../standalone/draknet_.c:224
 msgid "The system is now disconnected."
 msgstr ""
 
-#: ../../standalone/draknet_.c:235
+#: ../../standalone/draknet_.c:236
 msgid "Configure Internet Access..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:242 ../../standalone/draknet_.c:434
+#: ../../standalone/draknet_.c:243 ../../standalone/draknet_.c:434
 msgid "LAN configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Driver"
 msgstr ""
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Interface"
 msgstr ""
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Protocol"
 msgstr ""
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "State"
 msgstr ""
 
-#: ../../standalone/draknet_.c:259
+#: ../../standalone/draknet_.c:260
 msgid "Configure Local Area Network..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:293
+#: ../../standalone/draknet_.c:294
 msgid "Normal Mode"
 msgstr ""
 
-#: ../../standalone/draknet_.c:298
+#: ../../standalone/draknet_.c:299
 msgid "Apply"
 msgstr ""
 
-#: ../../standalone/draknet_.c:317
+#: ../../standalone/draknet_.c:318
 msgid "Please Wait... Applying the configuration"
 msgstr ""
 
@@ -6463,52 +6612,48 @@ msgstr ""
 msgid "DHCP client"
 msgstr ""
 
-#: ../../standalone/draknet_.c:476
-msgid "start it"
-msgstr ""
-
-#: ../../standalone/draknet_.c:476
-msgid "stop it"
+#: ../../standalone/draknet_.c:477 ../../standalone/draknet_.c:479
+msgid "activate now"
 msgstr ""
 
-#: ../../standalone/draknet_.c:477
-msgid "activate"
+#: ../../standalone/draknet_.c:477 ../../standalone/draknet_.c:479
+msgid "desactivate now"
 msgstr ""
 
-#: ../../standalone/draknet_.c:477
-msgid "desactivate"
-msgstr ""
-
-#: ../../standalone/draknet_.c:523
+#: ../../standalone/draknet_.c:526
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:550
 msgid "Internet connection configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:551
+#: ../../standalone/draknet_.c:554
 msgid "Internet Connection Configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:560 ../../standalone/net_monitor_.c:78
+#: ../../standalone/draknet_.c:563
 msgid "Connection type: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:566
+#: ../../standalone/draknet_.c:569
 msgid "Parameters"
 msgstr ""
 
-#: ../../standalone/draknet_.c:593
+#: ../../standalone/draknet_.c:596
 msgid "Ethernet Card"
 msgstr ""
 
-#: ../../standalone/draknet_.c:594
+#: ../../standalone/draknet_.c:597
 msgid "DHCP Client"
 msgstr ""
 
+#: ../../standalone/draknet_.c:599
+msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+msgstr ""
+
 #: ../../standalone/draksec_.c:21
 msgid "Welcome To Crackers"
 msgstr ""
@@ -6564,11 +6709,11 @@ msgstr ""
 msgid "Setting security level"
 msgstr ""
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:43
 msgid "Control Center"
 msgstr ""
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:44
 msgid "Choose the tool you want to use"
 msgstr ""
 
@@ -6606,109 +6751,95 @@ msgstr ""
 msgid "Test the mouse here."
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:41 ../../standalone/net_monitor_.c:71
-msgid "Network Monitoring"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:75
-msgid "Settings"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:80
-msgid "Profile "
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:83
-msgid "Statistics"
+#: ../../standalone/tinyfirewall_.c:29
+msgid "Firewalling Configuration"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:87
-msgid "Sending Speed:"
+#: ../../standalone/tinyfirewall_.c:42
+msgid "Firewalling configuration"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:88
-msgid "Receiving Speed:"
+#: ../../standalone/tinyfirewall_.c:77
+msgid ""
+"Firewalling\n"
+"\n"
+"You already have set up a firewall.\n"
+"Click on Configure to change or remove the firewall"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:90
-msgid "Connection Time: "
+#: ../../standalone/tinyfirewall_.c:81
+msgid ""
+"Firewalling\n"
+"\n"
+"Click on Configure to set up a standard firewall"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:97
-msgid "Logs"
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
-msgid "Connecting to Internet "
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
-msgid "Disconnecting from Internet "
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:157
-msgid "Disconnection from Internet failed."
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:158
-msgid "Disconnection from Internet complete."
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:160
-msgid "Connection complete."
+#: ../../steps.pm_.c:19
+msgid "Security"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:161
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:254
-msgid "Color configuration"
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:294
-msgid "sent: "
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:301
-msgid "received: "
+#: ../../steps.pm_.c:23
+msgid "Install system"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:308
-msgid "average"
+#: ../../steps.pm_.c:25
+msgid "Add a user"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:336
-msgid "Connect"
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:336
-msgid "Disconnect"
+#: ../../steps.pm_.c:28
+msgid "Configure services"
 msgstr ""
 
-#: ../../standalone/tinyfirewall_.c:29
-msgid "Firewalling Configuration"
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
 msgstr ""
 
-#: ../../standalone/tinyfirewall_.c:42
-msgid "Firewalling configuration"
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
 msgstr ""
 
-#: ../../standalone/tinyfirewall_.c:77
-msgid ""
-"Firewalling\n"
-"\n"
-"You already have set up a firewall.\n"
-"Click on Configure to change or remove the firewall"
+#: ../../steps.pm_.c:33
+msgid "Configure X"
 msgstr ""
 
-#: ../../standalone/tinyfirewall_.c:81
-msgid ""
-"Firewalling\n"
-"\n"
-"Click on Configure to set up a standard firewall"
+#: ../../steps.pm_.c:34
+msgid "Exit install"
 msgstr ""
 
 #: ../../tinyfirewall.pm_.c:10
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 15f081c13..f47cd3ba2 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -8,18 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-08-10 18:42+0200\n"
-"PO-Revision-Date: 2001-03-13 13:19CET\n"
+"POT-Creation-Date: 2001-08-21 14:27+0200\n"
+"PO-Revision-Date: 2001-08-15 19:19CET\n"
 "Last-Translator: Andreas Bergstrјm <abergstr@halden.net>\n"
 "Language-Team: Norsk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.6\n"
+"X-Generator: KBabel 0.8\n"
 
 #: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
-msgstr "Konfigurer all hoder uavhengig"
+msgid "Configure all heads independently"
+msgstr "Konfigurere all hoder uavhengig"
 
 #: ../../Xconfigurator.pm_.c:233
 msgid "Use Xinerama extension"
@@ -95,12 +95,12 @@ msgid ""
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
 "Kortet ditt kan ha stјtte for maskinvare 3D akselerasjon med XFree %s,\n"
-"MERK AT DETTE ER EKSPERIMENTEL STиTTE OG KAN 'FRYSE' MASKINEN DIN."
+"MERK AT DETTE ER EKSPERIMENTELL STиTTE OG KAN 'FRYSE' MASKINEN DIN."
 
 #: ../../Xconfigurator.pm_.c:338 ../../Xconfigurator.pm_.c:352
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s med EKSPERIMENTEL maskinvare 3D akselerasjon"
+msgstr "XFree %s med EKSPERIMENTELL maskinvare 3D akselerasjon"
 
 #: ../../Xconfigurator.pm_.c:347
 #, c-format
@@ -111,12 +111,12 @@ msgid ""
 msgstr ""
 "Kortet ditt kan ha stјtte for maskinvare 3D akselerasjon, men bare med XFree "
 "%s,\n"
-"MERK AT DETTE ER EKSPERIMENTEL STиTTE OG KAN 'FRYSE' MASKINEN DIN.\n"
+"MERK AT DETTE ER EKSPERIMENTELL STиTTE OG KAN 'FRYSE' MASKINEN DIN.\n"
 "Kortet ditt er stјttet av XFree %s som kan ha bedre stјtte i 2D."
 
 #: ../../Xconfigurator.pm_.c:367
 msgid "Xpmac (installation display driver)"
-msgstr ""
+msgstr "Xpmac (installasjons skjermdriver)"
 
 #: ../../Xconfigurator.pm_.c:371
 msgid "XFree configuration"
@@ -151,7 +151,7 @@ msgid ""
 "monitor.\n"
 " If in doubt, choose a conservative setting."
 msgstr ""
-"De to kritiske parameterene er den vertikale oppfrisknings-raten, som er "
+"De to kritiske parametrene er den vertikale oppfrisknings-raten, som er "
 "raten\n"
 "som som oppfrisker hele skjermen, og mest viktig den horisontale \n"
 "sync-raten, som er raten som scanlinjer blir vist pх.\n"
@@ -237,8 +237,8 @@ msgstr "Grafikk-kort: %s"
 msgid "XFree86 server: %s"
 msgstr "XFree86-tjener: %s"
 
-#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:290
-#: ../../standalone/draknet_.c:293
+#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:291
+#: ../../standalone/draknet_.c:294
 msgid "Expert Mode"
 msgstr "Ekspertmodus"
 
@@ -487,164 +487,164 @@ msgstr "Monitor som kan klare 1600x1200 ved 70 Hz"
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor som kan klare 1600x1200 ved 76 Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:100 ../../any.pm_.c:125
 msgid "First sector of boot partition"
 msgstr "Fјrste sektor av oppstartspartisjon"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:100 ../../any.pm_.c:125 ../../any.pm_.c:198
 msgid "First sector of drive (MBR)"
 msgstr "Fјrste sektor av disk (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:104
 msgid "SILO Installation"
 msgstr "SILO-installasjon"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:105 ../../any.pm_.c:118
 msgid "Where do you want to install the bootloader?"
 msgstr "Hvor јnsker du installere oppstartslasteren?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:117
 msgid "LILO/grub Installation"
 msgstr "LILO/grub-installasjon"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:129 ../../any.pm_.c:143
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:131
 msgid "LILO with text menu"
 msgstr "LILO med tekstmeny"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:132 ../../any.pm_.c:143
 msgid "LILO with graphical menu"
 msgstr "LILO med grafisk meny"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:135
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:139
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "Start fra DOS/Windows (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:141 ../../any.pm_.c:143
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:149 ../../any.pm_.c:181
 msgid "Bootloader main options"
 msgstr "Hovedopsjoner for oppstartslaster"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:150 ../../any.pm_.c:182
 msgid "Bootloader to use"
 msgstr "Oppstartslaster som skal brukes"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:152
 msgid "Bootloader installation"
 msgstr "Installasjon oppstartslaster"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:154 ../../any.pm_.c:184
 msgid "Boot device"
 msgstr "Oppstartsenhet"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:155
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (virker ikke pх gamle BIOS'er)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:156
 msgid "Compact"
 msgstr "Kompakt"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:156
 msgid "compact"
 msgstr "kompakt"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:253
+#: ../../any.pm_.c:157 ../../any.pm_.c:254
 msgid "Video mode"
 msgstr "Skjermmodus"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:159
 msgid "Delay before booting default image"
 msgstr "Forsinkelse fјr oppstart av standard bilde"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:949 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:324 ../../printerdrake.pm_.c:400
-#: ../../standalone/draknet_.c:588
+#: ../../any.pm_.c:161 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:944 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:352 ../../printerdrake.pm_.c:431
+#: ../../standalone/draknet_.c:591
 msgid "Password"
 msgstr "Passord"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:739
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../any.pm_.c:162 ../../any.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:945
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:163
 msgid "Restrict command line options"
 msgstr "Begrense kommandolinje-opsjoner"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:163
 msgid "restrict"
 msgstr "begrense"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:165
 msgid "Clean /tmp at each boot"
 msgstr "Tјm /tmp ved hver oppstart"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:166
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiser RAM-stјrrelse hvis det trengs (funnet %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:168
 msgid "Enable multi profiles"
 msgstr "Slх pх multiprofiler"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:172
 msgid "Give the ram size in MB"
 msgstr "Oppgi ram-stјrrelsen i MB"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:174
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../any.pm_.c:175 ../../any.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Please try again"
 msgstr "Vennligst prјv igjen"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../any.pm_.c:175 ../../any.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:939
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:183
 msgid "Init Message"
 msgstr "Initmelding"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:185
 msgid "Open Firmware Delay"
 msgstr "Хpne firmwareforsinkelse"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:186
 msgid "Kernel Boot Timeout"
 msgstr "Kernel Boot Timeout"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:187
 msgid "Enable CD Boot?"
 msgstr "Skal det vцre mulig х boote fra CD?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:188
 msgid "Enable OF Boot?"
 msgstr "Skal det vцre mulig х boote fra OF?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:189
 msgid "Default OS?"
 msgstr "Standard operativsystem?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:211
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -652,146 +652,144 @@ msgstr ""
 "Her er de forskjellige oppfјringene.\n"
 "Du kan legge til flere eller endre de eksisterende."
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:221
 msgid "Add"
 msgstr "Legg til"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:726 ../../diskdrake.pm_.c:47
-#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:975
-#: ../../printerdrake.pm_.c:976 ../../printerdrake.pm_.c:1007
-#: ../../printerdrake.pm_.c:1032
+#: ../../any.pm_.c:221 ../../any.pm_.c:719 ../../diskdrake.pm_.c:176
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1281
+#: ../../printerdrake.pm_.c:1282 ../../printerdrake.pm_.c:1318
+#: ../../printerdrake.pm_.c:1352
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:221
 msgid "Modify"
 msgstr "Modifiser"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:229
 msgid "Which type of entry do you want to add?"
 msgstr "Hvilken inngangstype vil du legge til"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:230
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:230
 msgid "Other OS (SunOS...)"
 msgstr "Andre OS (SunOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:231
 msgid "Other OS (MacOS...)"
 msgstr "Andre OS (MacOS...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:231
 msgid "Other OS (windows...)"
 msgstr "Andre OS (windows...)"
 
-#: ../../any.pm_.c:249
+#: ../../any.pm_.c:250
 msgid "Image"
 msgstr "Bilde"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:261
+#: ../../any.pm_.c:251 ../../any.pm_.c:262
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:251 ../../any.pm_.c:280
+#: ../../any.pm_.c:252 ../../any.pm_.c:281
 msgid "Append"
 msgstr "Tilfјye"
 
-#: ../../any.pm_.c:255
+#: ../../any.pm_.c:256
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:256
+#: ../../any.pm_.c:257
 msgid "Read-write"
 msgstr "Les-skriv"
 
-#: ../../any.pm_.c:263
+#: ../../any.pm_.c:264
 msgid "Table"
 msgstr "Tabell"
 
-#: ../../any.pm_.c:264
+#: ../../any.pm_.c:265
 msgid "Unsafe"
 msgstr "Usikker"
 
-#: ../../any.pm_.c:271 ../../any.pm_.c:276 ../../any.pm_.c:279
+#: ../../any.pm_.c:272 ../../any.pm_.c:277 ../../any.pm_.c:280
 msgid "Label"
 msgstr "Etikett"
 
-#: ../../any.pm_.c:273 ../../any.pm_.c:284
+#: ../../any.pm_.c:274 ../../any.pm_.c:285
 msgid "Default"
 msgstr "Standard"
 
-#: ../../any.pm_.c:281
+#: ../../any.pm_.c:282
 msgid "Initrd-size"
 msgstr "Initrdstјrrelse"
 
-#: ../../any.pm_.c:283
+#: ../../any.pm_.c:284
 msgid "NoVideo"
 msgstr "Ingen video"
 
-#: ../../any.pm_.c:291
+#: ../../any.pm_.c:292
 msgid "Remove entry"
 msgstr "Fjern inngang"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:295
 msgid "Empty label not allowed"
 msgstr "Tom etikett er ikke tillatt"
 
-#: ../../any.pm_.c:295
+#: ../../any.pm_.c:296
 msgid "This label is already used"
 msgstr "Denne etiketten er allerede i bruk"
 
-#: ../../any.pm_.c:314
-msgid "What type of partitioning?"
-msgstr "Hva slags type partisjonering?"
-
-#: ../../any.pm_.c:605
+#: ../../any.pm_.c:598
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Fant %s %s grensesnitt"
 
-#: ../../any.pm_.c:606
+#: ../../any.pm_.c:599
 msgid "Do you have another one?"
 msgstr "Har du enda ett?"
 
-#: ../../any.pm_.c:607
+#: ../../any.pm_.c:600
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Har du noen %s grensesnitt?"
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
+#: ../../any.pm_.c:602 ../../any.pm_.c:761 ../../interactive.pm_.c:110
+#: ../../my_gtk.pm_.c:672
 msgid "No"
 msgstr "Nei"
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
+#: ../../any.pm_.c:602 ../../any.pm_.c:760 ../../interactive.pm_.c:110
+#: ../../my_gtk.pm_.c:672
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:603
 msgid "See hardware info"
 msgstr "Se maskinvareinfo"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:645
+#: ../../any.pm_.c:638
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Installerer driver for %s kort %s"
 
-#: ../../any.pm_.c:646
+#: ../../any.pm_.c:639
 #, c-format
 msgid "(module %s)"
 msgstr "(modul %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:650
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Hvilken %s driver skal jeg prјve?"
 
-#: ../../any.pm_.c:665
+#: ../../any.pm_.c:658
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -810,20 +808,20 @@ msgstr ""
 "burde\n"
 "ikke forхrsake noen skader."
 
-#: ../../any.pm_.c:670
+#: ../../any.pm_.c:663
 msgid "Autoprobe"
 msgstr "Automatisk sondering"
 
-#: ../../any.pm_.c:670
+#: ../../any.pm_.c:663
 msgid "Specify options"
 msgstr "Spesifiser opsjoner"
 
-#: ../../any.pm_.c:674
+#: ../../any.pm_.c:667
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Du kan nх gi dens opsjoner til modul %s."
 
-#: ../../any.pm_.c:680
+#: ../../any.pm_.c:673
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -831,14 +829,14 @@ msgid ""
 "For instance, ``io=0x300 irq=7''"
 msgstr ""
 "Du kan nх oppgi dens opsjoner for modul %s.\n"
-"Opsjonene er i format ``name=value name2=value2 ...''.\n"
+"Opsjonene er i format ``navn=verdi navn2=verdi2 ...''.\n"
 "F.eks., ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:676
 msgid "Module options:"
 msgstr "Modulopsjoner:"
 
-#: ../../any.pm_.c:694
+#: ../../any.pm_.c:687
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -847,33 +845,33 @@ msgstr ""
 "Lasting av modul %s feilet.\n"
 "иnsker du х prјve igjen med andre parametere?"
 
-#: ../../any.pm_.c:712
+#: ../../any.pm_.c:705
 #, c-format
 msgid "(already added %s)"
 msgstr "(allerede lagt til %s)"
 
-#: ../../any.pm_.c:716
+#: ../../any.pm_.c:709
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../../any.pm_.c:717
+#: ../../any.pm_.c:710
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../../any.pm_.c:718
+#: ../../any.pm_.c:711
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde smх bokstaver, tall, `-' og `_'"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:712
 msgid "This user name is already added"
 msgstr "Denne brukeren er allerede lagt til"
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:716
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../../any.pm_.c:724
+#: ../../any.pm_.c:717
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -882,46 +880,38 @@ msgstr ""
 "Entre en bruker\n"
 "%s"
 
-#: ../../any.pm_.c:725
+#: ../../any.pm_.c:718
 msgid "Accept user"
 msgstr "Godta bruker"
 
-#: ../../any.pm_.c:736
+#: ../../any.pm_.c:729
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:323
-#: ../../printerdrake.pm_.c:399
+#: ../../any.pm_.c:730 ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:430
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../../any.pm_.c:740
+#: ../../any.pm_.c:733
 msgid "Shell"
 msgstr "Skall"
 
-#: ../../any.pm_.c:742
+#: ../../any.pm_.c:735
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../any.pm_.c:763
+#: ../../any.pm_.c:757
 msgid "Autologin"
-msgstr "Autoinnlogg"
+msgstr "Autoinnlogging"
 
-#: ../../any.pm_.c:764
-msgid ""
-"I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
-msgstr ""
-"Jeg kan sette opp maskinen din til х automatisk logge pх en bruker.\n"
-"иnsker du х bruke denne funksjonen?"
-
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:762
 msgid "Choose the default user:"
 msgstr "Velg standard bruker:"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:763
 msgid "Choose the window manager to run:"
-msgstr "Velg vinduhхndtereren som skal kjјres:"
+msgstr "Velg vindushхndtereren som skal kjјres:"
 
 # NOTE: this message will be displayed at boot time; that is
 # only the ascii charset will be available on most machines
@@ -1081,11 +1071,11 @@ msgid ""
 "You are currently using %s as Boot Manager.\n"
 "Click on Configure to launch the setup wizard."
 msgstr ""
-"Du bruker for јyeblikket % som oppstartshхndterer.\n"
+"Du bruker for јyeblikket %s som oppstartshхndterer.\n"
 "Klikk pх Konfigurer for х starte oppsett-hjelperen."
 
 #: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
-#: ../../standalone/draknet_.c:272 ../../standalone/tinyfirewall_.c:57
+#: ../../standalone/draknet_.c:273 ../../standalone/tinyfirewall_.c:57
 msgid "Configure"
 msgstr "Konfigurer"
 
@@ -1109,32 +1099,34 @@ msgstr "Nei, jeg vil ikke ha autologin"
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Ja, jeg vil ha autologin med denne (bruker; skrivebord)"
 
-#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:104
-#: ../../standalone/draknet_.c:136 ../../standalone/draknet_.c:200
-#: ../../standalone/draknet_.c:312 ../../standalone/draknet_.c:421
-#: ../../standalone/draknet_.c:492 ../../standalone/draknet_.c:528
-#: ../../standalone/draknet_.c:634 ../../standalone/net_monitor_.c:260
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:105
+#: ../../standalone/draknet_.c:137 ../../standalone/draknet_.c:201
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:421
+#: ../../standalone/draknet_.c:495 ../../standalone/draknet_.c:531
+#: ../../standalone/draknet_.c:632
 msgid "OK"
 msgstr "OK"
 
 #: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:504
-#: ../../interactive.pm_.c:119 ../../interactive.pm_.c:274
-#: ../../interactive.pm_.c:294 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:409 ../../my_gtk.pm_.c:412 ../../my_gtk.pm_.c:670
-#: ../../standalone/drakgw_.c:648 ../../standalone/draknet_.c:111
-#: ../../standalone/draknet_.c:143 ../../standalone/draknet_.c:305
-#: ../../standalone/draknet_.c:504 ../../standalone/draknet_.c:648
-#: ../../standalone/net_monitor_.c:261 ../../standalone/tinyfirewall_.c:63
+#: ../../interactive.pm_.c:120 ../../interactive.pm_.c:284
+#: ../../interactive.pm_.c:304 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:413 ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:673
+#: ../../printerdrake.pm_.c:970 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:112 ../../standalone/draknet_.c:144
+#: ../../standalone/draknet_.c:306 ../../standalone/draknet_.c:507
+#: ../../standalone/draknet_.c:646 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../../bootlook.pm_.c:225
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "kan ikke хpne /etc/inittab for lesing: $!"
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "kan ikke хpne /etc/inittab for lesing: %s"
 
 #: ../../bootlook.pm_.c:279
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "kan ikke хpne /etc/sysconfig/autologin for lesing: $!"
+#, c-format
+msgid "can not open /etc/sysconfig/autologin for reading: %s"
+msgstr "kan ikke хpne /etc/sysconfig/autologin for lesing: %s"
 
 #: ../../bootlook.pm_.c:345 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
@@ -1148,8 +1140,7 @@ msgstr "GB"
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:93 ../../diskdrake.pm_.c:680
-#: ../../install_steps_graphical.pm_.c:287
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
 msgid "MB"
 msgstr "MB"
@@ -1172,470 +1163,381 @@ msgstr "1 minutt"
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:463
-msgid "Create"
-msgstr "Opprett"
+#: ../../diskdrake.pm_.c:102
+msgid "Please make a backup of your data first"
+msgstr "Vennligst ta sikkerhetskopi av din data fјrst"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Unmount"
-msgstr "Demonter"
+#: ../../diskdrake.pm_.c:102 ../../diskdrake_interactive.pm_.c:755
+#: ../../diskdrake_interactive.pm_.c:764 ../../diskdrake_interactive.pm_.c:818
+msgid "Read carefully!"
+msgstr "Les nјye!"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:465
-msgid "Delete"
-msgstr "Slett"
+#: ../../diskdrake.pm_.c:106
+msgid ""
+"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"enough)\n"
+"at the beginning of the disk"
+msgstr ""
+"Hvis du skal bruke aboot, vцre nјye med х la det vцre ledig plass (2048 "
+"sektorer er nok)\n"
+"ved begynnelsen av disken"
 
-#: ../../diskdrake.pm_.c:24
-msgid "Format"
-msgstr "Formater"
+# #: ../install_steps_interactive.pm_.c:37
+#: ../../diskdrake.pm_.c:124 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:323 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:60
+msgid "Error"
+msgstr "Feil"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:673
-msgid "Resize"
-msgstr "Endre stјrrelse"
+#: ../../diskdrake.pm_.c:197
+msgid "New"
+msgstr "Ny"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:463
-#: ../../diskdrake.pm_.c:525
-msgid "Type"
-msgstr "Type"
+#: ../../diskdrake.pm_.c:219 ../../diskdrake.pm_.c:222
+#, fuzzy
+msgid "Remote"
+msgstr "Fjern-kј"
 
-#: ../../diskdrake.pm_.c:25 ../../diskdrake.pm_.c:559
+#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:453
+#: ../../diskdrake_interactive.pm_.c:323 ../../diskdrake_interactive.pm_.c:475
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Write /etc/fstab"
-msgstr "Skriv /etc/fstab"
-
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to expert mode"
-msgstr "Skift til ekspertmodus"
-
-#: ../../diskdrake.pm_.c:41
-msgid "Toggle to normal mode"
-msgstr "Skift til normalmodus"
-
-#: ../../diskdrake.pm_.c:42
-msgid "Restore from file"
-msgstr "Gjenopprett fra fil"
-
-#: ../../diskdrake.pm_.c:43
-msgid "Save in file"
-msgstr "Lagre i fil"
-
-#: ../../diskdrake.pm_.c:44
-msgid "Wizard"
-msgstr "Wizard"
-
-#: ../../diskdrake.pm_.c:45
-msgid "Restore from floppy"
-msgstr "Gjenopprett fra diskett"
-
-#: ../../diskdrake.pm_.c:46 ../../install_steps_interactive.pm_.c:557
-msgid "Save on floppy"
-msgstr "Lagre pх diskett"
-
-#: ../../diskdrake.pm_.c:50
-msgid "Clear all"
-msgstr "Fjern alle"
+#: ../../diskdrake.pm_.c:225
+msgid "Options"
+msgstr "Valg"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Format all"
-msgstr "Formater alle"
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:400
+#: ../../diskdrake.pm_.c:509 ../../diskdrake_interactive.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:443
+msgid "Type"
+msgstr "Type"
 
-#: ../../diskdrake.pm_.c:56
-msgid "Auto allocate"
-msgstr "Automatisk allokering"
+#: ../../diskdrake.pm_.c:239 ../../diskdrake_interactive.pm_.c:331
+msgid "Unmount"
+msgstr "Demonter"
 
-#: ../../diskdrake.pm_.c:60
-msgid "All primary partitions are used"
-msgstr "Alle primцre partisjoner er i bruk"
+#: ../../diskdrake.pm_.c:240 ../../diskdrake_interactive.pm_.c:327
+msgid "Mount"
+msgstr "Monter"
 
-#: ../../diskdrake.pm_.c:60
-msgid "I can't add any more partition"
-msgstr "Jeg kan ikke legge til flere partisjoner"
+#: ../../diskdrake.pm_.c:244
+msgid "Choose action"
+msgstr "Velg handling"
 
-#: ../../diskdrake.pm_.c:60
+#: ../../diskdrake.pm_.c:250
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"For х ha flere partisjoner vennligst slett en for х kunne opprette en "
-"utvidet partisjon"
-
-#: ../../diskdrake.pm_.c:62
-msgid "Not enough space for auto-allocating"
-msgstr "Ikke nok plass for auto-allokering"
-
-#: ../../diskdrake.pm_.c:64
-msgid "Undo"
-msgstr "Angre"
+"Du har en stor FAT partisjon\n"
+"(vanligvis brukt av Microsoft Dos/Windows).\n"
+"Jeg forslхr at du fјrst endrer stјrrelsen pх denne partisjonen\n"
+"(klikk pх den, klikk sх pх \"Endre stјrrelse\")"
 
-#: ../../diskdrake.pm_.c:65
-msgid "Write partition table"
-msgstr "Skriv partisjonstabell"
+#: ../../diskdrake.pm_.c:253
+msgid "Please click on a partition"
+msgstr "Vennligst klikk pх en partisjon"
 
-#: ../../diskdrake.pm_.c:66 ../../install_steps_interactive.pm_.c:186
-msgid "More"
-msgstr "Mer"
+#: ../../diskdrake.pm_.c:270 ../../install_steps_gtk.pm_.c:505
+msgid "Details"
+msgstr "Detaljer"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "Swap"
 msgstr "Veksel"
 
-#: ../../diskdrake.pm_.c:118
+#: ../../diskdrake.pm_.c:379 ../../diskdrake_interactive.pm_.c:876
 msgid "Empty"
 msgstr "Tom"
 
-#: ../../diskdrake.pm_.c:118 ../../install_steps_gtk.pm_.c:361
+#: ../../diskdrake.pm_.c:379 ../../install_steps_gtk.pm_.c:361
 #: ../../install_steps_gtk.pm_.c:421 ../../mouse.pm_.c:145
 msgid "Other"
 msgstr "Andre"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:383
 msgid "Filesystem types:"
 msgstr "Filsystemtyper:"
 
-#: ../../diskdrake.pm_.c:133 ../../install_steps_gtk.pm_.c:505
-msgid "Details"
-msgstr "Detaljer"
+#: ../../diskdrake.pm_.c:400 ../../diskdrake_interactive.pm_.c:344
+msgid "Create"
+msgstr "Opprett"
 
-#: ../../diskdrake.pm_.c:148
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
-msgstr ""
-"Du har en stor FAT partisjon\n"
-"(vanligvis brukt av Microsoft Dos/Windows).\n"
-"Jeg forslхr at du fјrst endrer stјrrelsen pх denne partisjonen\n"
-"(klikk pх den, klikk sх pх \"Endre stјrrelse\")"
+#: ../../diskdrake.pm_.c:400 ../../diskdrake.pm_.c:402
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Bruk ``%s'' istedet"
 
-#: ../../diskdrake.pm_.c:153
-msgid "Please make a backup of your data first"
-msgstr "Vennligst ta sikkerhetskopi av din data fјrst"
+#: ../../diskdrake.pm_.c:402 ../../diskdrake_interactive.pm_.c:321
+msgid "Delete"
+msgstr "Slett"
 
-#: ../../diskdrake.pm_.c:153 ../../diskdrake.pm_.c:171
-#: ../../diskdrake.pm_.c:180 ../../diskdrake.pm_.c:590
-#: ../../diskdrake.pm_.c:612
-msgid "Read carefully!"
-msgstr "Les nјye!"
+#: ../../diskdrake.pm_.c:406
+msgid "Use ``Unmount'' first"
+msgstr "Bruk ``Demonter'' fјrst"
 
-#: ../../diskdrake.pm_.c:156
+#: ../../diskdrake.pm_.c:407 ../../diskdrake_interactive.pm_.c:435
+#, c-format
 msgid ""
-"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
-"enough)\n"
-"at the beginning of the disk"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Hvis du skal bruke aboot, vцre nјye med х la det vцre ledig plass (2048 "
-"sektorer er nok)\n"
-"ved begynnelsen av disken"
+"Etter endring av type pх partisjon %s, vil alle data pх denne partisjonen gх "
+"tapt"
 
-#: ../../diskdrake.pm_.c:171
-msgid "Be careful: this operation is dangerous."
-msgstr "Vцr forsiktig: denne operasjonen er farlig."
+#: ../../diskdrake.pm_.c:452 ../../diskdrake_interactive.pm_.c:474
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Hvor vil du montere %s enheten?"
 
-# #: ../install_steps_interactive.pm_.c:37
-#: ../../diskdrake.pm_.c:215 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:323 ../../interactive_http.pm_.c:119
-#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Feil"
+#: ../../diskdrake.pm_.c:475
+#, fuzzy
+msgid "Mount options"
+msgstr "Modulopsjoner:"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:768
-msgid "Mount point: "
-msgstr "Monteringspunkt: "
+#: ../../diskdrake.pm_.c:482
+msgid "Various"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240 ../../diskdrake.pm_.c:299
-msgid "Device: "
-msgstr "Enhet: "
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Removable media"
+msgstr "Fjernbart media automontering"
 
-#: ../../diskdrake.pm_.c:241
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS diskbokstav: %s (bare en gjetning)\n"
+#: ../../diskdrake.pm_.c:507
+#, fuzzy
+msgid "Change type"
+msgstr "Endre partisjonstype"
 
-#: ../../diskdrake.pm_.c:245 ../../diskdrake.pm_.c:252
-#: ../../diskdrake.pm_.c:302
-msgid "Type: "
-msgstr "Type: "
+#: ../../diskdrake.pm_.c:508 ../../diskdrake_interactive.pm_.c:442
+msgid "Which filesystem do you want?"
+msgstr "Hvilket filsystem јnsker du?"
 
-#: ../../diskdrake.pm_.c:249
-msgid "Name: "
-msgstr "Navn: "
+#: ../../diskdrake.pm_.c:533
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
+#: ../../diskdrake.pm_.c:538
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "Start: sektor %s\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:255
-#, c-format
-msgid "Size: %s"
-msgstr "Stјrrelse: %s"
+#: ../../diskdrake.pm_.c:570
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:257
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:594
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektorer"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:259
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Sylinder %d til sylinder %d\n"
+#: ../../diskdrake_interactive.pm_.c:161
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Velg handling"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Formatted\n"
-msgstr "Formatert\n"
+#: ../../diskdrake_interactive.pm_.c:161
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Opprette en ny partisjon"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Not formatted\n"
-msgstr "Ikke formatert\n"
+#: ../../diskdrake_interactive.pm_.c:183
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:262
-msgid "Mounted\n"
-msgstr "Montert\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Toggle to expert mode"
+msgstr "Skift til ekspertmodus"
 
-#: ../../diskdrake.pm_.c:263
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Toggle to normal mode"
+msgstr "Skift til normalmodus"
 
-#: ../../diskdrake.pm_.c:265
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback-fil(s): %s\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Undo"
+msgstr "Angre"
 
-#: ../../diskdrake.pm_.c:266
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Partisjon startet opp som standard\n"
-"    (for MS-DOS oppstart, ikke for lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Wizard"
+msgstr "Wizard"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Level %s\n"
-msgstr "Nivх %s\n"
+#: ../../diskdrake_interactive.pm_.c:224
+msgid "Continue anyway?"
+msgstr "Fortsette likevel?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Skivestјrrelse %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Quit without saving"
+msgstr "Avslutt uten х lagre"
 
-#: ../../diskdrake.pm_.c:270
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-disker %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Quit without writing the partition table?"
+msgstr "Avslutt uten х skrive partisjonstabellen?"
 
-#: ../../diskdrake.pm_.c:272
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback filnavn: %s"
+#: ../../diskdrake_interactive.pm_.c:240
+msgid "Auto allocate"
+msgstr "Automatisk allokering"
+
+#: ../../diskdrake_interactive.pm_.c:240
+msgid "Clear all"
+msgstr "Fjern alle"
+
+#: ../../diskdrake_interactive.pm_.c:243
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Oppdaging av harddisk"
+
+#: ../../diskdrake_interactive.pm_.c:260
+msgid "Not enough space for auto-allocating"
+msgstr "Ikke nok plass for auto-allokering"
 
-#: ../../diskdrake.pm_.c:275
+#: ../../diskdrake_interactive.pm_.c:266
+msgid "All primary partitions are used"
+msgstr "Alle primцre partisjoner er i bruk"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "I can't add any more partition"
+msgstr "Jeg kan ikke legge til flere partisjoner"
+
+#: ../../diskdrake_interactive.pm_.c:268
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
-"\n"
-"Det er store sjanser for at\n"
-"denne partisjonen er en\n"
-"driverpartisjon, du bјr nok\n"
-"la den vцre i fred.\n"
+"For х ha flere partisjoner vennligst slett en for х kunne opprette en "
+"utvidet partisjon"
 
-#: ../../diskdrake.pm_.c:278
+#: ../../diskdrake_interactive.pm_.c:276 ../../diskdrake_interactive.pm_.c:293
+msgid "Select file"
+msgstr "Velg fil"
+
+#: ../../diskdrake_interactive.pm_.c:284
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
-"\n"
-"Denne spesielle Bootstrap-\n"
-"partisjonen er for х\n"
-"dual-boote ditt system.\n"
+"Kopien av partisjonstabellen har ikke samme stјrrelse\n"
+"Fortsette for det?"
 
-#: ../../diskdrake.pm_.c:295
-msgid "Please click on a partition"
-msgstr "Vennligst klikk pх en partisjon"
+#: ../../diskdrake_interactive.pm_.c:294
+msgid "Warning"
+msgstr "Advarsel"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Size: %s\n"
-msgstr "Stјrrelse: %s\n"
+#: ../../diskdrake_interactive.pm_.c:295
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Sett inn en diskett i stasjonen\n"
+"Alle data pх denne disketten vil gх tapt"
 
-#: ../../diskdrake.pm_.c:301
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
+#: ../../diskdrake_interactive.pm_.c:303
+msgid "Trying to rescue partition table"
+msgstr "Prјver х redde partisjonstabell"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-disker %s\n"
+#: ../../diskdrake_interactive.pm_.c:309
+#, fuzzy
+msgid "Detailed information"
+msgstr "Vis informasjon"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Type partisjonstabell: %s\n"
+#: ../../diskdrake_interactive.pm_.c:324 ../../diskdrake_interactive.pm_.c:541
+msgid "Resize"
+msgstr "Endre stјrrelse"
 
-#: ../../diskdrake.pm_.c:305
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "pх buss %d id %d\n"
+#: ../../diskdrake_interactive.pm_.c:325 ../../diskdrake_interactive.pm_.c:581
+msgid "Move"
+msgstr "Flytt"
 
-#: ../../diskdrake.pm_.c:321
-msgid "Mount"
-msgstr "Monter"
+#: ../../diskdrake_interactive.pm_.c:326
+msgid "Format"
+msgstr "Formater"
 
-#: ../../diskdrake.pm_.c:323
+#: ../../diskdrake_interactive.pm_.c:328
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../../diskdrake.pm_.c:325
+#: ../../diskdrake_interactive.pm_.c:329
 msgid "Add to RAID"
 msgstr "Legg til RAID"
 
-#: ../../diskdrake.pm_.c:327
-msgid "Remove from RAID"
-msgstr "Fjern fra RAID"
-
-#: ../../diskdrake.pm_.c:329
-msgid "Modify RAID"
-msgstr "Modifiser RAID"
-
-#: ../../diskdrake.pm_.c:331
+#: ../../diskdrake_interactive.pm_.c:330
 msgid "Add to LVM"
 msgstr "Legg til LVM"
 
-#: ../../diskdrake.pm_.c:333
+#: ../../diskdrake_interactive.pm_.c:332
+msgid "Remove from RAID"
+msgstr "Fjern fra RAID"
+
+#: ../../diskdrake_interactive.pm_.c:333
 msgid "Remove from LVM"
 msgstr "Fjern fra LVM"
 
-#: ../../diskdrake.pm_.c:335
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Modify RAID"
+msgstr "Modifiser RAID"
+
+#: ../../diskdrake_interactive.pm_.c:335
 msgid "Use for loopback"
 msgstr "Bruk for loopback"
 
-#: ../../diskdrake.pm_.c:342
-msgid "Choose action"
-msgstr "Velg handling"
-
-#: ../../diskdrake.pm_.c:436
-msgid ""
-"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
-"1024).\n"
-"Either you use LILO and it won't work, or you don't use LILO and you don't "
-"need /boot"
-msgstr ""
-"Beklager, jeg vil ikke tillate oppretting av /boot sх lange inne pх disken "
-"(pх en sylinder > 1024).\n"
-"Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du "
-"trenger ikke /boot"
-
-#: ../../diskdrake.pm_.c:440
-msgid ""
-"The partition you've selected to add as root (/) is physically located "
-"beyond\n"
-"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
-"If you plan to use the LILO boot manager, be careful to add a /boot partition"
-msgstr ""
-"Partisjonen du valgte х legge til som root (/) er lokalisert fysisk "
-"bortenfor\n"
-"den 1024'de sylinderen pх hard-disken, og du har ingen /boot partisjon.\n"
-"Hvis du skal bruke oppstartshхndtereren LILO, vцr nјye med х legge til en\n"
-"/boot partisjon"
-
-#: ../../diskdrake.pm_.c:446
-msgid ""
-"You've selected a software RAID partition as root (/).\n"
-"No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
-msgstr ""
-"Du har valgt en programvare RAID partisjon som root (/).\n"
-"Ingen oppstartslaster kan hхndtere dette uten en /boot partisjon.\n"
-"Sх vцr nјye med х legge til en /boot partisjon"
-
-#: ../../diskdrake.pm_.c:463 ../../diskdrake.pm_.c:465
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Bruk ``%s'' istedet"
+#: ../../diskdrake_interactive.pm_.c:378
+msgid "Create a new partition"
+msgstr "Opprette en ny partisjon"
 
-#: ../../diskdrake.pm_.c:469
-msgid "Use ``Unmount'' first"
-msgstr "Bruk ``Demonter'' fјrst"
+#: ../../diskdrake_interactive.pm_.c:381
+msgid "Start sector: "
+msgstr "Start sektor: "
 
-#: ../../diskdrake.pm_.c:470 ../../diskdrake.pm_.c:517
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"Etter endring av type pх partisjon %s, vil alle data pх denne partisjonen gх "
-"tapt"
+#: ../../diskdrake_interactive.pm_.c:383 ../../diskdrake_interactive.pm_.c:688
+msgid "Size in MB: "
+msgstr "Stјrrelse i MB: "
 
-#: ../../diskdrake.pm_.c:482
-msgid "Continue anyway?"
-msgstr "Fortsette likevel?"
+#: ../../diskdrake_interactive.pm_.c:384 ../../diskdrake_interactive.pm_.c:689
+msgid "Filesystem type: "
+msgstr "Filsystemtype: "
 
-#: ../../diskdrake.pm_.c:487
-msgid "Quit without saving"
-msgstr "Avslutt uten х lagre"
+#: ../../diskdrake_interactive.pm_.c:385 ../../diskdrake_interactive.pm_.c:860
+#: ../../diskdrake_interactive.pm_.c:932
+msgid "Mount point: "
+msgstr "Monteringspunkt: "
 
-#: ../../diskdrake.pm_.c:487
-msgid "Quit without writing the partition table?"
-msgstr "Avslutt uten х skrive partisjonstabellen?"
+#: ../../diskdrake_interactive.pm_.c:389
+msgid "Preference: "
+msgstr "Valg: "
 
-#: ../../diskdrake.pm_.c:523
+#: ../../diskdrake_interactive.pm_.c:441
 msgid "Change partition type"
 msgstr "Endre partisjonstype"
 
-#: ../../diskdrake.pm_.c:524
-msgid "Which filesystem do you want?"
-msgstr "Hvilket filsystem јnsker du?"
-
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake_interactive.pm_.c:446
 msgid "Switching from ext2 to ext3"
-msgstr ""
-
-#: ../../diskdrake.pm_.c:539 ../../diskdrake.pm_.c:800
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Du kan ikke bruke ReiserFS for partisjoner mindre enn 32MB"
+msgstr "Bytter fra ext2 til ext3"
 
-#: ../../diskdrake.pm_.c:540
-#, fuzzy
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Du kan ikke bruke ReiserFS for partisjoner mindre enn 32MB"
-
-#: ../../diskdrake.pm_.c:557
+#: ../../diskdrake_interactive.pm_.c:473
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Hvor vil du montere loopback-filen %s?"
 
-#: ../../diskdrake.pm_.c:558
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Hvor vil du montere %s enheten?"
-
-#: ../../diskdrake.pm_.c:562
+#: ../../diskdrake_interactive.pm_.c:480
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1643,225 +1545,353 @@ msgstr ""
 "Kan ikke fjerne monteringspunkt da denne partisjonen blir brukt til\n"
 "loopback. Fjern loopback fјrst"
 
-#: ../../diskdrake.pm_.c:581
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr ""
-"Etter formatering av partisjon %s vil alle data pх denne partisjonen\n"
-"gх tapt"
+#: ../../diskdrake_interactive.pm_.c:500
+msgid "Computing FAT filesystem bounds"
+msgstr "Beregner fat filsystemgrense"
 
-#: ../../diskdrake.pm_.c:583
-msgid "Formatting"
-msgstr "Formatering"
+#: ../../diskdrake_interactive.pm_.c:500 ../../diskdrake_interactive.pm_.c:556
+#: ../../install_interactive.pm_.c:112
+msgid "Resizing"
+msgstr "Endrer stјrrelse"
 
-#: ../../diskdrake.pm_.c:584
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "Formaterer loopback-fil %s"
+#: ../../diskdrake_interactive.pm_.c:529
+msgid "This partition is not resizeable"
+msgstr "Denne partisjonen kan ikke stјrrelsen forandres pх"
 
-#: ../../diskdrake.pm_.c:585 ../../install_steps_interactive.pm_.c:432
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Formaterer partisjon %s"
+#: ../../diskdrake_interactive.pm_.c:534
+msgid "All data on this partition should be backed-up"
+msgstr "Alle data pх denne partisjonen burde sikkerhetskopieres"
 
-#: ../../diskdrake.pm_.c:590
-msgid "After formatting all partitions,"
-msgstr "Etter formatering av alle partisjonene,"
+#: ../../diskdrake_interactive.pm_.c:536
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr ""
+"Etter endring av stјrrelse for partisjon %s, vil alle data pх denne\n"
+"partisjonen vil gх tapt"
 
-#: ../../diskdrake.pm_.c:590
-msgid "all data on these partitions will be lost"
-msgstr "alle data pх disse partisjonene vil gх tapt"
+#: ../../diskdrake_interactive.pm_.c:541
+msgid "Choose the new size"
+msgstr "Velg den nye stјrrelsen"
 
-#: ../../diskdrake.pm_.c:596
-msgid "Move"
-msgstr "Flytt"
+#: ../../diskdrake_interactive.pm_.c:542
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Stјrrelse i MB: "
 
-#: ../../diskdrake.pm_.c:597
+#: ../../diskdrake_interactive.pm_.c:582
 msgid "Which disk do you want to move it to?"
 msgstr "Hvilken disk vil du flytte til?"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake_interactive.pm_.c:583
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake.pm_.c:599
+#: ../../diskdrake_interactive.pm_.c:584
 msgid "Which sector do you want to move it to?"
 msgstr "Hvilken sektor vil du flytte til?"
 
-#: ../../diskdrake.pm_.c:602
+#: ../../diskdrake_interactive.pm_.c:587
 msgid "Moving"
 msgstr "Flytter"
 
-#: ../../diskdrake.pm_.c:602
+#: ../../diskdrake_interactive.pm_.c:587
 msgid "Moving partition..."
 msgstr "Flytter partisjon..."
 
-#: ../../diskdrake.pm_.c:612
+#: ../../diskdrake_interactive.pm_.c:593 ../../diskdrake_interactive.pm_.c:835
 #, 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:614
-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:635
-msgid "Computing FAT filesystem bounds"
-msgstr "Beregner fat filsystemgrense"
-
-#: ../../diskdrake.pm_.c:635 ../../diskdrake.pm_.c:700
-#: ../../install_interactive.pm_.c:111
-msgid "Resizing"
-msgstr "Endrer stјrrelse"
-
-#: ../../diskdrake.pm_.c:663
-msgid "This partition is not resizeable"
-msgstr "Denne partisjonen kan ikke stјrrelsen forandres pх"
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr ""
+"Etter formatering av partisjon %s vil alle data pх denne partisjonen\n"
+"gх tapt"
 
-#: ../../diskdrake.pm_.c:668
-msgid "All data on this partition should be backed-up"
-msgstr "Alle data pх denne partisjonen burde sikkerhetskopieres"
+#: ../../diskdrake_interactive.pm_.c:595 ../../diskdrake_interactive.pm_.c:837
+msgid "Formatting"
+msgstr "Formatering"
 
-#: ../../diskdrake.pm_.c:670
+#: ../../diskdrake_interactive.pm_.c:596 ../../diskdrake_interactive.pm_.c:838
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr ""
-"Etter endring av stјrrelse for partisjon %s, vil alle data pх denne\n"
-"partisjonen vil gх tapt"
-
-#: ../../diskdrake.pm_.c:680
-msgid "Choose the new size"
-msgstr "Velg den nye stјrrelsen"
+msgid "Formatting loopback file %s"
+msgstr "Formaterer loopback-fil %s"
 
-#: ../../diskdrake.pm_.c:734
-msgid "Create a new partition"
-msgstr "Opprette en ny partisjon"
+#: ../../diskdrake_interactive.pm_.c:597 ../../diskdrake_interactive.pm_.c:839
+#: ../../install_steps_interactive.pm_.c:427
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Formaterer partisjon %s"
 
-#: ../../diskdrake.pm_.c:760
-msgid "Start sector: "
-msgstr "Start sektor: "
+#: ../../diskdrake_interactive.pm_.c:614
+msgid "Choose an existing RAID to add to"
+msgstr "Velg en eksisterende RAID for х legge til"
 
-#: ../../diskdrake.pm_.c:764 ../../diskdrake.pm_.c:839
-msgid "Size in MB: "
-msgstr "Stјrrelse i MB: "
+#: ../../diskdrake_interactive.pm_.c:615 ../../diskdrake_interactive.pm_.c:633
+msgid "new"
+msgstr "ny"
 
-#: ../../diskdrake.pm_.c:767 ../../diskdrake.pm_.c:842
-msgid "Filesystem type: "
-msgstr "Filsystemtype: "
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Choose an existing LVM to add to"
+msgstr "Velg en eksisterende LVM for х legge til"
 
-#: ../../diskdrake.pm_.c:770
-msgid "Preference: "
-msgstr "Valg: "
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "LVM name?"
+msgstr "LVM navn?"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake_interactive.pm_.c:673
 msgid "This partition can't be used for loopback"
 msgstr "Denne partisjonen kan ikke brukes for loopback"
 
-#: ../../diskdrake.pm_.c:828
+#: ../../diskdrake_interactive.pm_.c:686
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:838
+#: ../../diskdrake_interactive.pm_.c:687
 msgid "Loopback file name: "
 msgstr "Loopback filnavn: "
 
-#: ../../diskdrake.pm_.c:864
+#: ../../diskdrake_interactive.pm_.c:694
 msgid "File already used by another loopback, choose another one"
 msgstr "Filen blir allerede brukt av en annen loopback, velg en annen"
 
-#: ../../diskdrake.pm_.c:865
+#: ../../diskdrake_interactive.pm_.c:695
 msgid "File already exists. Use it?"
 msgstr "Filen eksisterer allerede. Bruke denne?"
 
-#: ../../diskdrake.pm_.c:887 ../../diskdrake.pm_.c:903
-msgid "Select file"
-msgstr "Velg fil"
+#: ../../diskdrake_interactive.pm_.c:738
+msgid "device"
+msgstr "enhet"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "level"
+msgstr "nivх"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "chunk size"
+msgstr "skivestјrrelse"
+
+#: ../../diskdrake_interactive.pm_.c:755
+msgid "Be careful: this operation is dangerous."
+msgstr "Vцr forsiktig: denne operasjonen er farlig."
+
+#: ../../diskdrake_interactive.pm_.c:770
+msgid "What type of partitioning?"
+msgstr "Hva slags type partisjonering?"
 
-#: ../../diskdrake.pm_.c:896
+#: ../../diskdrake_interactive.pm_.c:788
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
+"1024).\n"
+"Either you use LILO and it won't work, or you don't use LILO and you don't "
+"need /boot"
 msgstr ""
-"Kopien av partisjonstabellen har ikke samme stјrrelse\n"
-"Fortsette for det?"
+"Beklager, jeg vil ikke tillate oppretting av /boot sх lange inne pх disken "
+"(pх en sylinder > 1024).\n"
+"Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du "
+"trenger ikke /boot"
 
-#: ../../diskdrake.pm_.c:904
-msgid "Warning"
-msgstr "Advarsel"
+#: ../../diskdrake_interactive.pm_.c:792
+msgid ""
+"The partition you've selected to add as root (/) is physically located "
+"beyond\n"
+"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
+"If you plan to use the LILO boot manager, be careful to add a /boot partition"
+msgstr ""
+"Partisjonen du valgte х legge til som root (/) er lokalisert fysisk "
+"bortenfor\n"
+"den 1024'de sylinderen pх hard-disken, og du har ingen /boot partisjon.\n"
+"Hvis du skal bruke oppstartshхndtereren LILO, vцr nјye med х legge til en\n"
+"/boot partisjon"
 
-#: ../../diskdrake.pm_.c:905
+#: ../../diskdrake_interactive.pm_.c:798
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"So be careful to add a /boot partition"
 msgstr ""
-"Sett inn en diskett i stasjonen\n"
-"Alle data pх denne disketten vil gх tapt"
+"Du har valgt en programvare RAID partisjon som root (/).\n"
+"Ingen oppstartslaster kan hхndtere dette uten en /boot partisjon.\n"
+"Sх vцr nјye med х legge til en /boot partisjon"
 
-#: ../../diskdrake.pm_.c:916
-msgid "Trying to rescue partition table"
-msgstr "Prјver х redde partisjonstabell"
+#: ../../diskdrake_interactive.pm_.c:818
+#, 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:925
-msgid "device"
-msgstr "enhet"
+#: ../../diskdrake_interactive.pm_.c:824
+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:926
-msgid "level"
-msgstr "nivх"
+#: ../../diskdrake_interactive.pm_.c:861 ../../diskdrake_interactive.pm_.c:918
+msgid "Device: "
+msgstr "Enhet: "
 
-#: ../../diskdrake.pm_.c:927
-msgid "chunk size"
-msgstr "skivestјrrelse"
+#: ../../diskdrake_interactive.pm_.c:862
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS diskbokstav: %s (bare en gjetning)\n"
 
-#: ../../diskdrake.pm_.c:939
-msgid "Choose an existing RAID to add to"
-msgstr "Velg en eksisterende RAID for х legge til"
+#: ../../diskdrake_interactive.pm_.c:866 ../../diskdrake_interactive.pm_.c:874
+#: ../../diskdrake_interactive.pm_.c:936
+msgid "Type: "
+msgstr "Type: "
 
-#: ../../diskdrake.pm_.c:940 ../../diskdrake.pm_.c:966
-msgid "new"
-msgstr "ny"
+#: ../../diskdrake_interactive.pm_.c:870
+msgid "Name: "
+msgstr "Navn: "
 
-#: ../../diskdrake.pm_.c:964
-msgid "Choose an existing LVM to add to"
-msgstr "Velg en eksisterende LVM for х legge til"
+#: ../../diskdrake_interactive.pm_.c:878
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Start: sektor %s\n"
 
-#: ../../diskdrake.pm_.c:969
-msgid "LVM name?"
-msgstr "LVM navn?"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "Size: %s"
+msgstr "Stјrrelse: %s"
 
-#: ../../diskdrake.pm_.c:996
-msgid "Removable media automounting"
-msgstr "Fjernbart media automontering"
+#: ../../diskdrake_interactive.pm_.c:881
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektorer"
+
+#: ../../diskdrake_interactive.pm_.c:883
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Sylinder %d til sylinder %d\n"
+
+#: ../../diskdrake_interactive.pm_.c:884
+msgid "Formatted\n"
+msgstr "Formatert\n"
 
-#: ../../diskdrake.pm_.c:997
-msgid "Rescue partition table"
-msgstr "Redd partisjonstabell"
+#: ../../diskdrake_interactive.pm_.c:885
+msgid "Not formatted\n"
+msgstr "Ikke formatert\n"
+
+#: ../../diskdrake_interactive.pm_.c:886
+msgid "Mounted\n"
+msgstr "Montert\n"
+
+#: ../../diskdrake_interactive.pm_.c:887
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../diskdrake.pm_.c:999
-msgid "Reload"
-msgstr "Last igjen"
+#: ../../diskdrake_interactive.pm_.c:889
+#, c-format
+msgid "Loopback file(s): %s\n"
+msgstr "Loopback-fil(s): %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:890
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Partisjon startet opp som standard\n"
+"    (for MS-DOS oppstart, ikke for lilo)\n"
+
+#: ../../diskdrake_interactive.pm_.c:892
+#, c-format
+msgid "Level %s\n"
+msgstr "Nivх %s\n"
 
-#: ../../fs.pm_.c:89 ../../fs.pm_.c:101 ../../fs.pm_.c:107 ../../fs.pm_.c:113
-#: ../../fs.pm_.c:119 ../../fs.pm_.c:125
+#: ../../diskdrake_interactive.pm_.c:893
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Skivestјrrelse %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:894
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-disker %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:896
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback filnavn: %s"
+
+#: ../../diskdrake_interactive.pm_.c:899
+msgid ""
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
+msgstr ""
+"\n"
+"Det er store sjanser for at\n"
+"denne partisjonen er en\n"
+"driverpartisjon, du bјr nok\n"
+"la den vцre i fred.\n"
+
+#: ../../diskdrake_interactive.pm_.c:902
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
+"\n"
+"Denne spesielle Bootstrap-\n"
+"partisjonen er for х\n"
+"dual-boote ditt system.\n"
+
+#: ../../diskdrake_interactive.pm_.c:919
+#, c-format
+msgid "Size: %s\n"
+msgstr "Stјrrelse: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:920
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
+
+#: ../../diskdrake_interactive.pm_.c:921
+msgid "Info: "
+msgstr "Info: "
+
+#: ../../diskdrake_interactive.pm_.c:922
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-disker %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:923
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Type partisjonstabell: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:924
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "pх buss %d id %d\n"
+
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "Options: %s"
+msgstr "Valg: %s"
+
+#: ../../fs.pm_.c:391 ../../fs.pm_.c:400 ../../fs.pm_.c:404 ../../fs.pm_.c:408
+#: ../../fs.pm_.c:412 ../../fs.pm_.c:416
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s formatering av %s mislykket"
 
-#: ../../fs.pm_.c:159
+#: ../../fs.pm_.c:449
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Jeg vet ikke hvordan formatere %s i type %s"
 
-#: ../../fs.pm_.c:239
+#: ../../fs.pm_.c:511
+msgid "mount failed"
+msgstr "montering mislykket"
+
+#: ../../fs.pm_.c:529
 #, c-format
 msgid "fsck failed with exit code %d or signal %d"
 msgstr "fsck avsluttet med feilkode %d eller signal %d"
 
-#: ../../fs.pm_.c:247
+#: ../../fs.pm_.c:537
 msgid "mount failed: "
 msgstr "montering mislykket: "
 
-#: ../../fs.pm_.c:259
+#: ../../fs.pm_.c:552
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "feil ved demontering av %s: %s"
@@ -1874,41 +1904,44 @@ msgstr "enkel"
 msgid "server"
 msgstr "server"
 
-#: ../../fsedit.pm_.c:334
+#: ../../fsedit.pm_.c:433
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Du kan ikke bruke JFS for partisjoner mindre enn 16 MB"
+
+#: ../../fsedit.pm_.c:434
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Du kan ikke bruke ReiserFS for partisjoner mindre enn 32MB"
+
+#: ../../fsedit.pm_.c:443
 msgid "Mount points must begin with a leading /"
 msgstr "Monteringspunkter mх begynne med /"
 
-#: ../../fsedit.pm_.c:337
+#: ../../fsedit.pm_.c:444
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Det finnes allerede en partisjon med monteringspunkt %s\n"
 
-#: ../../fsedit.pm_.c:345
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Rund monterer %s\n"
-
-#: ../../fsedit.pm_.c:357
+#: ../../fsedit.pm_.c:448
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Du kan ikke bruke LVM logisk volum som monteringspunkt %s"
 
-#: ../../fsedit.pm_.c:358
+#: ../../fsedit.pm_.c:450
 msgid "This directory should remain within the root filesystem"
 msgstr "Denne katalogen bјr forbli i root filsystemet"
 
-#: ../../fsedit.pm_.c:359
+#: ../../fsedit.pm_.c:452
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Du trenger et virkelig filsystem (ext2, reiserfs) for dette "
 "monteringspunktet\n"
 
-#: ../../fsedit.pm_.c:464
+#: ../../fsedit.pm_.c:568
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Feil ved хpning av %s for skriving: %s"
 
-#: ../../fsedit.pm_.c:548
+#: ../../fsedit.pm_.c:653
 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"
@@ -1916,7 +1949,7 @@ 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:562
+#: ../../fsedit.pm_.c:667
 msgid "You don't have any partitions!"
 msgstr "Du har ingen partisjoner!"
 
@@ -2847,6 +2880,20 @@ msgid ""
 "If you have an ADB mouse, please select USB, as the Linux kernel will take\n"
 "care of mapping your mouse hardware correctly."
 msgstr ""
+"Du kan nх teste din mus. Bruk knappene og hjul for х sjekke\n"
+"om instillingene er gode. Hvis ikke, kan du trykke pх \"Avbryt\"\n"
+"for х velge en annen driver.\n"
+"\n"
+"\n"
+"Hvis du installerer pх en Applemaskin med en 1 knappsmus, vil du\n"
+"fх sjansen til х definere noen tastaturknapper for х emulere den andre\n"
+"og tredje museknappen. Dette vil la deg fх full tilgang til funskjonaliteten "
+"til\n"
+"musen bхde i Linuxkonsollet og under X-windows.\n"
+"\n"
+"\n"
+"Hvis du har en ADB-mus, vennligst velg USB, da linuxkjernen vil ordne\n"
+"musemaskinvaren din."
 
 #: ../../help.pm_.c:392
 msgid ""
@@ -3911,83 +3958,6 @@ msgstr ""
 "Hvis du јnsker х starte et annet eksisterende operativsystem, vennligst\n"
 "les ytterligere instruksjoner."
 
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Velg sprхk"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Velg installasjonsklasse"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Oppdaging av harddisk"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Konfigurer mus"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Velg tastatur"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Sikkerhet"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Oppsett filsystemer"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formater partisjoner"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Velg pakker for installering"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Installer systemet"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:939
-#: ../../install_steps_interactive.pm_.c:940
-msgid "Set root password"
-msgstr "Sett root-passord"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Legg til en bruker"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Konfigurer nettverk"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:876
-msgid "Summary"
-msgstr "Oppsummering"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfigurer tjenester"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Opprett en oppstartdiskett"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Installer oppstartslaster"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Konfigurer X"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Avslutt installering"
-
 #: ../../install_any.pm_.c:411
 #, c-format
 msgid ""
@@ -4016,16 +3986,16 @@ msgstr ""
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan ikke bruke broadcast med intet NIS domene"
 
-#: ../../install_any.pm_.c:671
+#: ../../install_any.pm_.c:751
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Sett inn en FAT-formatert diskett i stasjon %s"
 
-#: ../../install_any.pm_.c:675
+#: ../../install_any.pm_.c:755
 msgid "This floppy is not FAT formatted"
 msgstr "Denne disketten er ikke FAT-formatert"
 
-#: ../../install_any.pm_.c:687
+#: ../../install_any.pm_.c:767
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -4033,16 +4003,17 @@ msgstr ""
 "For х bruke dette valget av pakker, start installasjonen med'linux "
 "defcfg=floppy'"
 
-#: ../../install_any.pm_.c:709
-msgid "Error reading file $f"
-msgstr "Feil ved lesing av fil $f"
+#: ../../install_any.pm_.c:789 ../../partition_table.pm_.c:717
+#, c-format
+msgid "Error reading file %s"
+msgstr "Feil ved lesing av fil %s"
 
 #: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:313
-#: ../../interactive.pm_.c:104 ../../interactive.pm_.c:119
-#: ../../interactive.pm_.c:274 ../../interactive.pm_.c:294
-#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:408
-#: ../../my_gtk.pm_.c:670 ../../my_gtk.pm_.c:693
+#: ../../interactive.pm_.c:105 ../../interactive.pm_.c:120
+#: ../../interactive.pm_.c:284 ../../interactive.pm_.c:304
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:412
+#: ../../my_gtk.pm_.c:673 ../../my_gtk.pm_.c:695
 msgid "Ok"
 msgstr "Ok"
 
@@ -4092,59 +4063,59 @@ msgstr ""
 "Fortsette likevel?"
 
 #
-#: ../../install_interactive.pm_.c:50 ../../install_steps.pm_.c:160
+#: ../../install_interactive.pm_.c:50 ../../install_steps.pm_.c:164
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Du mх ha en FAT-parisjonen montert under /boot/efi"
 
-#: ../../install_interactive.pm_.c:72
+#: ../../install_interactive.pm_.c:73
 msgid "Use free space"
 msgstr "Bruk ledig plass"
 
-#: ../../install_interactive.pm_.c:74
+#: ../../install_interactive.pm_.c:75
 msgid "Not enough free space to allocate new partitions"
 msgstr "Ikke nok plass til х allokere en ny partisjon"
 
-#: ../../install_interactive.pm_.c:82
+#: ../../install_interactive.pm_.c:83
 msgid "Use existing partition"
 msgstr "Bruk eksisterende partisjon"
 
-#: ../../install_interactive.pm_.c:84
+#: ../../install_interactive.pm_.c:85
 msgid "There is no existing partition to use"
 msgstr "Det finnes ingen eksisterende partisjon som kan brukes"
 
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:92
 msgid "Use the Windows partition for loopback"
 msgstr "Bruk Windows partisjonen for loopback"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:95
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Hvilken partisjon vil du bruke for Linux4Win?"
 
-#: ../../install_interactive.pm_.c:96
+#: ../../install_interactive.pm_.c:97
 msgid "Choose the sizes"
 msgstr "Velg stјrrelsene"
 
-#: ../../install_interactive.pm_.c:97
+#: ../../install_interactive.pm_.c:98
 msgid "Root partition size in MB: "
 msgstr "Root-partisjonsstјrrelse i MB: "
 
-#: ../../install_interactive.pm_.c:98
+#: ../../install_interactive.pm_.c:99
 msgid "Swap partition size in MB: "
 msgstr "Veksel-partisjonsstјrrelse i MB: "
 
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Use the free space on the Windows partition"
 msgstr "Bruk den ledige plassen pх Windows partisjonen"
 
-#: ../../install_interactive.pm_.c:109
+#: ../../install_interactive.pm_.c:110
 msgid "Which partition do you want to resize?"
 msgstr "Hvilken partisjonstype јnsker du х forandre stјrrelse pх?"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:112
 msgid "Computing Windows filesystem bounds"
 msgstr "Beregner Windows filsystemgrense"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:115
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4153,12 +4124,12 @@ msgstr ""
 "Stјrrelsesendreren for FAT greide ikke х hхndtere din partisjon, \n"
 "fјlgende feil oppsto: %s"
 
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:118
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Windows-partisjonen din er for fragmentert, vennligst kjјr ``defrag'' fјrst"
 
-#: ../../install_interactive.pm_.c:118
+#: ../../install_interactive.pm_.c:119
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4178,21 +4149,21 @@ msgstr ""
 "dine data.\n"
 "Nхr du er sikker, trykk Ok."
 
-#: ../../install_interactive.pm_.c:127
+#: ../../install_interactive.pm_.c:128
 msgid "Which size do you want to keep for windows on"
 msgstr "Hvilken stјrrelse јnsker du х beholde vinduer pх?"
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:129
 #, c-format
 msgid "partition %s"
 msgstr "partisjon %s"
 
-#: ../../install_interactive.pm_.c:134
+#: ../../install_interactive.pm_.c:135
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Krymping/forstјrring av FAT feilet: %s"
 
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:150
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -4200,32 +4171,32 @@ msgstr ""
 "Det finnes ingen FAT partisjon х forandre stјrrelsen pх eller х bruke som "
 "loopback (ikke nok plass igjen)"
 
-#: ../../install_interactive.pm_.c:155
+#: ../../install_interactive.pm_.c:156
 msgid "Erase entire disk"
 msgstr "Slette hele disken"
 
-#: ../../install_interactive.pm_.c:155
+#: ../../install_interactive.pm_.c:156
 msgid "Remove Windows(TM)"
 msgstr "Fjern Windows(TM)"
 
-#: ../../install_interactive.pm_.c:158
+#: ../../install_interactive.pm_.c:159
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Du har mer enn en harddisk, hvilken јnsker du х installere linux pх?"
 
-#: ../../install_interactive.pm_.c:161
+#: ../../install_interactive.pm_.c:162
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "ALLE eksisterende partisjoner og deres data vil vцre tapt pх disk %s"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:170
 msgid "Custom disk partitioning"
 msgstr "Egendefinert diskpartisjonering"
 
-#: ../../install_interactive.pm_.c:173
+#: ../../install_interactive.pm_.c:174
 msgid "Use fdisk"
 msgstr "Bruk fdisk"
 
-#: ../../install_interactive.pm_.c:176
+#: ../../install_interactive.pm_.c:177
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4234,28 +4205,28 @@ msgstr ""
 "Du kan nх partisjonere %s.\n"
 "Nхr du er ferdig ikke glem х lagre med `w'"
 
-#: ../../install_interactive.pm_.c:205
+#: ../../install_interactive.pm_.c:206
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Du har ikke nok ledig plass pх Windows partisjonen din"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:222
 msgid "I can't find any room for installing"
 msgstr "Jeg kan ikke finne noe rom for installering"
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:226
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX partisjonsveiviseren fant fјlgende lјsninger:"
 
-#: ../../install_interactive.pm_.c:230
+#: ../../install_interactive.pm_.c:231
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partisjonering feilet: %s"
 
-#: ../../install_interactive.pm_.c:236
+#: ../../install_interactive.pm_.c:237
 msgid "Bringing up the network"
 msgstr "Henter opp nettverket"
 
-#: ../../install_interactive.pm_.c:241
+#: ../../install_interactive.pm_.c:242
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
@@ -4268,12 +4239,12 @@ msgstr ""
 "pen mхte.\n"
 "Fortsett pх eget ansvar."
 
-#: ../../install_steps.pm_.c:211
+#: ../../install_steps.pm_.c:215
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Dupliser monteringspunkt %s"
 
-#: ../../install_steps.pm_.c:391
+#: ../../install_steps.pm_.c:393
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -4285,16 +4256,16 @@ msgstr ""
 "Sjekk cd-platen pх en installert maskin med \"rpm -qpl Mandrake/RPMS/*.rpm"
 "\"\n"
 
-#: ../../install_steps.pm_.c:456
+#: ../../install_steps.pm_.c:458
 #, c-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: ../../install_steps.pm_.c:500 ../../install_steps.pm_.c:705
+#: ../../install_steps.pm_.c:502 ../../install_steps.pm_.c:708
 msgid "No floppy drive available"
 msgstr "Ingen diskettstasjon tilgjengelig"
 
-#: ../../install_steps_auto_install.pm_.c:65
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -4319,11 +4290,11 @@ msgid "Size: %d KB\n"
 msgstr "Stјrrelse: %d KB\n"
 
 #: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:469
-#: ../../install_steps_interactive.pm_.c:522
+#: ../../install_steps_interactive.pm_.c:517
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du јnsker х installere"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:559
 msgid "Info"
 msgstr "Info"
 
@@ -4333,7 +4304,7 @@ msgid "Install"
 msgstr "Installer"
 
 #: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:485
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Installing"
 msgstr "Installerer"
 
@@ -4350,7 +4321,7 @@ msgid "Total time "
 msgstr "Total tid "
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
@@ -4434,15 +4405,15 @@ msgstr "Du vil kunne velge disse mere spesifisert i neste trinn."
 msgid "Percentage of packages to install"
 msgstr "Prosentdel av pakker х installere"
 
-#: ../../install_steps_gtk.pm_.c:288 ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_gtk.pm_.c:288 ../../install_steps_interactive.pm_.c:627
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: ../../install_steps_gtk.pm_.c:308 ../../install_steps_interactive.pm_.c:647
+#: ../../install_steps_gtk.pm_.c:308 ../../install_steps_interactive.pm_.c:642
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: ../../install_steps_gtk.pm_.c:331 ../../install_steps_interactive.pm_.c:611
+#: ../../install_steps_gtk.pm_.c:331 ../../install_steps_interactive.pm_.c:606
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total stјrrelse: %d / %d MB"
@@ -4515,9 +4486,8 @@ msgid "Updating package selection"
 msgstr "Oppdaterer pakkevalg"
 
 #: ../../install_steps_gtk.pm_.c:454
-#, fuzzy
 msgid "Minimal install"
-msgstr "Avslutt installering"
+msgstr "Minimal installasjon"
 
 #: ../../install_steps_gtk.pm_.c:491
 msgid "Estimating"
@@ -4632,7 +4602,7 @@ msgid "You can choose other languages that will be available after install"
 msgstr "Du kan velge andre sprхk som vil vцre tilgjengelige etter installasjon"
 
 #: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:641
 msgid "All"
 msgstr "Alle"
 
@@ -4879,7 +4849,7 @@ msgstr ""
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
 #: ../../install_steps_interactive.pm_.c:183
-#: ../../install_steps_interactive.pm_.c:880
+#: ../../install_steps_interactive.pm_.c:875
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -4893,6 +4863,10 @@ msgstr "Vennligst velg tastatur-oppsettet ditt."
 msgid "Here is the full list of keyboards available"
 msgstr "Her er den komplette lista over tilgjengelige tastatur"
 
+#: ../../install_steps_interactive.pm_.c:186
+msgid "More"
+msgstr "Mer"
+
 #: ../../install_steps_interactive.pm_.c:202
 msgid "Install Class"
 msgstr "Installeringsklasse"
@@ -5024,38 +4998,38 @@ msgstr "Hva er rotpartisjonen (/) pх ditt system?"
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Du mх starte maskinen pх nytt for at modifiseringene skal tre i kraft"
 
-#: ../../install_steps_interactive.pm_.c:405
+#: ../../install_steps_interactive.pm_.c:400
 msgid "Choose the partitions you want to format"
 msgstr "Velg partisjonene du јnsker х partisjonere"
 
-#: ../../install_steps_interactive.pm_.c:406
+#: ../../install_steps_interactive.pm_.c:401
 msgid "Check bad blocks?"
 msgstr "Sjekke fo rdхrlige clustere?"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:424
 msgid "Formatting partitions"
 msgstr "Formaterer partisjoner"
 
-#: ../../install_steps_interactive.pm_.c:431
+#: ../../install_steps_interactive.pm_.c:426
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Lager of formaterer fila %s"
 
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_interactive.pm_.c:429
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Det er ikke nok SWAP til х fullfјre installasjonen, vennligst legg til litt "
 "mer"
 
-#: ../../install_steps_interactive.pm_.c:440
+#: ../../install_steps_interactive.pm_.c:435
 msgid "Looking for available packages"
 msgstr "Sјker etter tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:441
 msgid "Finding packages to upgrade"
 msgstr "Finner pakker som skal oppgraderes"
 
-#: ../../install_steps_interactive.pm_.c:463
+#: ../../install_steps_interactive.pm_.c:458
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -5063,26 +5037,26 @@ msgstr ""
 "Ditt system har ikke nok plass igjen for installasjon eller oppgradering (%d "
 "> %d)"
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Full (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimum (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Anbefalt (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:488
+#: ../../install_steps_interactive.pm_.c:483
 msgid "Custom"
 msgstr "Skreddersydd"
 
-#: ../../install_steps_interactive.pm_.c:535
+#: ../../install_steps_interactive.pm_.c:530
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
@@ -5091,30 +5065,34 @@ msgstr ""
 "Formatet er det samme som for auto_install genererte disketter."
 
 #
-#: ../../install_steps_interactive.pm_.c:538
+#: ../../install_steps_interactive.pm_.c:533
 msgid "Load from floppy"
 msgstr "Hent fra diskett"
 
 #
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:535
 msgid "Loading from floppy"
 msgstr "Henter fra disketten"
 
 #
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:535
 msgid "Package selection"
 msgstr "Pakkevalg"
 
 #
-#: ../../install_steps_interactive.pm_.c:545
+#: ../../install_steps_interactive.pm_.c:540
 msgid "Insert a floppy containing package selection"
 msgstr "Sett inn en diskett med pakkevalget"
 
-#: ../../install_steps_interactive.pm_.c:618
+#: ../../install_steps_interactive.pm_.c:552
+msgid "Save on floppy"
+msgstr "Lagre pх diskett"
+
+#: ../../install_steps_interactive.pm_.c:613
 msgid "Selected size is larger than available space"
 msgstr "Valgt stјrrelse er stјrre enn tilgjengelig plass"
 
-#: ../../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:678
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -5124,12 +5102,12 @@ msgstr ""
 "Hvis du ikke har noen av disse CDene, klikk Avbryt.\n"
 "Hvis bare noen av CDene mangler, fjern disse, klikk sх Ok."
 
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:683
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROMen ved navnet \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:717
+#: ../../install_steps_interactive.pm_.c:712
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5138,21 +5116,21 @@ msgstr ""
 "Installerer pakke %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:726
+#: ../../install_steps_interactive.pm_.c:721
 msgid "Post-install configuration"
 msgstr "Konfigurasjon postinstallering"
 
-#: ../../install_steps_interactive.pm_.c:732
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:727
+#, c-format
 msgid "Please insert the Boot floppy used in drive %s"
-msgstr "Sett inn en diskett i stasjon %s"
+msgstr "Sett inn en oppstartsdiskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:738
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:733
+#, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
-msgstr "Sett inn en tom diskett i stasjon %s"
+msgstr "Sett inn oppdater moduler disketten i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:763
+#: ../../install_steps_interactive.pm_.c:758
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5226,129 +5204,138 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:795
+#: ../../install_steps_interactive.pm_.c:790
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: ../../install_steps_interactive.pm_.c:806
+#: ../../install_steps_interactive.pm_.c:801
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kontakter speilet for х fх en liste over tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:809
+#: ../../install_steps_interactive.pm_.c:804
 msgid "Please choose the packages you want to install."
 msgstr "Vennligst velg pakkene du јnsker х installere."
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:816
 msgid "Which is your timezone?"
 msgstr "Hva er din tidsone?"
 
 #
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:821
 msgid "Hardware clock set to GMT"
 msgstr "Maskinvareklokken din satt til GMT"
 
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:822
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Automatisk tidssynkronisering (ved hjelp av NTP)"
 
 #
-#: ../../install_steps_interactive.pm_.c:834
+#: ../../install_steps_interactive.pm_.c:829
 msgid "NTP Server"
 msgstr "NTP-tjener"
 
-#: ../../install_steps_interactive.pm_.c:868 ../../printerdrake.pm_.c:55
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:78
 msgid "Remote CUPS server"
 msgstr "Fjern-CUPS tjener"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:864
 msgid "No printer"
 msgstr "Ingen skriver"
 
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:871 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Oppsummering"
+
+#: ../../install_steps_interactive.pm_.c:874
 msgid "Mouse"
 msgstr "Mus"
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:876
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../../install_steps_interactive.pm_.c:882 ../../printerdrake.pm_.c:973
+#: ../../install_steps_interactive.pm_.c:877 ../../printerdrake.pm_.c:1279
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../../install_steps_interactive.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:879
 msgid "ISDN card"
 msgstr "ISDN-kort"
 
-#: ../../install_steps_interactive.pm_.c:887
+#: ../../install_steps_interactive.pm_.c:882
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: ../../install_steps_interactive.pm_.c:890
+#: ../../install_steps_interactive.pm_.c:885
 msgid "TV card"
 msgstr "TV-kort"
 
-#: ../../install_steps_interactive.pm_.c:928
-#: ../../install_steps_interactive.pm_.c:952
-#: ../../install_steps_interactive.pm_.c:956
+#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:951
 msgid "LDAP"
 msgstr "LDAP"
 
 #
-#: ../../install_steps_interactive.pm_.c:929
-#: ../../install_steps_interactive.pm_.c:952
-#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:924
+#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:960
 msgid "NIS"
 msgstr "NIS"
 
 #
-#: ../../install_steps_interactive.pm_.c:930
-#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:925
+#: ../../install_steps_interactive.pm_.c:947
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:935 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Sett root-passord"
+
+#: ../../install_steps_interactive.pm_.c:936
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../../install_steps_interactive.pm_.c:946
+#: ../../install_steps_interactive.pm_.c:941
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Dette passordet er for enkelt (mх vцre minst %d tegn langt)"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:589
+#: ../../install_steps_interactive.pm_.c:947 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:592
 msgid "Authentication"
 msgstr "Autentifikasjon"
 
 #
-#: ../../install_steps_interactive.pm_.c:960
+#: ../../install_steps_interactive.pm_.c:955
 msgid "Authentication LDAP"
 msgstr "Autentisering LDAP"
 
-#: ../../install_steps_interactive.pm_.c:961
+#: ../../install_steps_interactive.pm_.c:956
 msgid "LDAP Base dn"
 msgstr "LDAP grunnleggende dn"
 
 #
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:957
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
 
 #
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Authentication NIS"
 msgstr "Autentisering NIS"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:964
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:965
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../../install_steps_interactive.pm_.c:1005
+#: ../../install_steps_interactive.pm_.c:1000
 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 "
@@ -5379,19 +5366,19 @@ msgstr ""
 "en diskett\n"
 "i den fјrste stasjonen og trykk \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:1021
+#: ../../install_steps_interactive.pm_.c:1016
 msgid "First floppy drive"
 msgstr "Fјrste diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1017
 msgid "Second floppy drive"
 msgstr "Andre diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1018 ../../printerdrake.pm_.c:1106
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../../install_steps_interactive.pm_.c:1028
+#: ../../install_steps_interactive.pm_.c:1023
 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 "
@@ -5416,28 +5403,28 @@ msgstr ""
 "etter systemsvikt. иnsker du х opprette en oppstartsdiskett for systemet "
 "ditt?"
 
-#: ../../install_steps_interactive.pm_.c:1037
+#: ../../install_steps_interactive.pm_.c:1032
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../../install_steps_interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:1036
 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:1045
+#: ../../install_steps_interactive.pm_.c:1040
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:1048
+#: ../../install_steps_interactive.pm_.c:1043
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1050
 msgid "Preparing bootloader"
 msgstr "Klargjјr oppstartslaster"
 
-#: ../../install_steps_interactive.pm_.c:1066
+#: ../../install_steps_interactive.pm_.c:1061
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -5449,11 +5436,11 @@ msgstr ""
 "Installasjonen vil fortsette, men du mх\n"
 "bruke BootX for х starte din maskin."
 
-#: ../../install_steps_interactive.pm_.c:1072
+#: ../../install_steps_interactive.pm_.c:1066
 msgid "Do you want to use aboot?"
 msgstr "иnsker du х bruke aboot?"
 
-#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1069
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5461,11 +5448,11 @@ msgstr ""
 "Feil ved installasjon av aboot, \n"
 "prјve х installere selv om det јdelegger den fјrste partisjonen?"
 
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1078
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Installasjon av oppstartslaster mislykket. Fјlgende feil oppsto:"
 
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../install_steps_interactive.pm_.c:1086
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
 " enable the bootloader.  If you don't see the bootloader prompt at\n"
@@ -5481,38 +5468,34 @@ msgstr ""
 " Skriv sх: shut-down\n"
 "Ved neste oppstart burde du se oppstartlasteren."
 
-#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Lav"
 
-#: ../../install_steps_interactive.pm_.c:1101 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1095 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:1102 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1096 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Hјy"
 
-#: ../../install_steps_interactive.pm_.c:1106 ../../standalone/draksec_.c:52
+#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:52
 msgid "Choose security level"
 msgstr "Velg sikkerhetsnivх"
 
-#: ../../install_steps_interactive.pm_.c:1142
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"иnsker du х generere en auto installeringsdiskett for linux replikasjon?"
-
-#: ../../install_steps_interactive.pm_.c:1144
+#: ../../install_steps_interactive.pm_.c:1136
+#: ../../standalone/drakautoinst_.c:79
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:1158
-#: ../../install_steps_interactive.pm_.c:1190
+#: ../../install_steps_interactive.pm_.c:1140
+#: ../../standalone/drakautoinst_.c:81
 msgid "Creating auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../install_steps_interactive.pm_.c:1151
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5522,7 +5505,7 @@ msgstr ""
 "\n"
 "иnsker du virkelig х avslutte nх?"
 
-#: ../../install_steps_interactive.pm_.c:1230
+#: ../../install_steps_interactive.pm_.c:1162
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5544,11 +5527,11 @@ msgstr ""
 "Informasjon om konfigurering av systemet ditt finnes i post\n"
 "install-kapittelet i Official Mandrake Linux User's Guide."
 
-#: ../../install_steps_interactive.pm_.c:1242
+#: ../../install_steps_interactive.pm_.c:1174
 msgid "Generate auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1244
+#: ../../install_steps_interactive.pm_.c:1176
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5562,15 +5545,15 @@ msgstr ""
 "\n"
 "Du kanskje јnske х kjјre installasjonen omigjen.\n"
 
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Automated"
 msgstr "Automatisert"
 
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Replay"
 msgstr "Gjјr igjen"
 
-#: ../../install_steps_interactive.pm_.c:1252
+#: ../../install_steps_interactive.pm_.c:1184
 msgid "Save packages selection"
 msgstr "Lagre pakkevalg"
 
@@ -5585,27 +5568,32 @@ msgid ""
 msgstr ""
 "  <Tab>/<Alt-Tab> mellom elementer  | <Space> velger | <F12> neste skjerm "
 
-#: ../../interactive.pm_.c:70
+#: ../../interactive.pm_.c:71
 msgid "kdesu missing"
 msgstr "kdesu mangler"
 
-#: ../../interactive.pm_.c:272
+#: ../../interactive.pm_.c:130
+#, fuzzy
+msgid "Choose a file"
+msgstr "Velg handling"
+
+#: ../../interactive.pm_.c:282
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../../interactive.pm_.c:331
+#: ../../interactive.pm_.c:341
 msgid "Please wait"
 msgstr "Vennligst vent"
 
-#: ../../interactive_gtk.pm_.c:630
+#: ../../interactive_gtk.pm_.c:669
 msgid "Expand Tree"
 msgstr "Utvid tre"
 
-#: ../../interactive_gtk.pm_.c:631
+#: ../../interactive_gtk.pm_.c:670
 msgid "Collapse Tree"
 msgstr "Trekk sammen tre"
 
-#: ../../interactive_gtk.pm_.c:632
+#: ../../interactive_gtk.pm_.c:671
 msgid "Toggle between flat and group sorted"
 msgstr "Skift mellom flat og gruppesortert"
 
@@ -5909,6 +5897,11 @@ msgstr "Vietnamesisk \"nummer-rekke\" QWERTY"
 msgid "Yugoslavian (latin/cyrillic)"
 msgstr "Jugoslavisk (latin/cyrillic)"
 
+#: ../../loopback.pm_.c:33
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Rund monterer %s\n"
+
 #: ../../lvm.pm_.c:70
 msgid "Remove the logical volumes first\n"
 msgstr "Fjern de logiske partisjoner fјrst\n"
@@ -6021,23 +6014,23 @@ msgstr "ingen"
 msgid "No mouse"
 msgstr "Ingen mus"
 
-#: ../../my_gtk.pm_.c:380
+#: ../../my_gtk.pm_.c:377
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr ""
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:412
 msgid "Finish"
 msgstr "Avslutt"
 
-#: ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:412
 msgid "Next ->"
 msgstr "Neste ->"
 
-#: ../../my_gtk.pm_.c:409
+#: ../../my_gtk.pm_.c:413
 msgid "<- Previous"
 msgstr "<- Forrige"
 
-#: ../../my_gtk.pm_.c:670
+#: ../../my_gtk.pm_.c:673
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
@@ -6056,6 +6049,10 @@ msgstr ""
 "Hvis du ikke vet, velg 'bruk pppoe'"
 
 #: ../../network/adsl.pm_.c:21
+msgid "speedtouch usb"
+msgstr ""
+
+#: ../../network/adsl.pm_.c:21
 msgid "use dhcp"
 msgstr "bruk dhcp"
 
@@ -6067,24 +6064,16 @@ msgstr "bruk pppoe"
 msgid "use pptp"
 msgstr "bruk pptp"
 
-#: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:113
-#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:223
+#: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:108
+#: ../../network/ethernet.pm_.c:174 ../../standalone/drakgw_.c:223
 msgid "Network interface"
 msgstr "Nettverksgrensesnitt"
 
-#: ../../network/adsl.pm_.c:31
+#: ../../network/adsl.pm_.c:31 ../../network/ethernet.pm_.c:175
 #, c-format
 msgid "I'm about to restart the network device %s. Do you agree?"
 msgstr "Jeg er i ferd med х starte nettverksenhet %s pх nytt. Er du enig?"
 
-#: ../../network/adsl.pm_.c:79
-msgid "ADSL configuration"
-msgstr "ADSL-konfigurasjon"
-
-#: ../../network/adsl.pm_.c:80
-msgid "Do you want to start your connection at boot?"
-msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
-
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
@@ -6093,15 +6082,15 @@ msgstr ""
 "Hvilken dhcp klient јnsker du х bruke?\n"
 "Standard er dhcpcd"
 
-#: ../../network/ethernet.pm_.c:66
+#: ../../network/ethernet.pm_.c:63
 msgid "Network configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: ../../network/ethernet.pm_.c:67
+#: ../../network/ethernet.pm_.c:64
 msgid "Do you want to restart the network"
 msgstr "Vil du starte nettverket pх nytt"
 
-#: ../../network/ethernet.pm_.c:70
+#: ../../network/ethernet.pm_.c:67
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -6112,12 +6101,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:131
-#: ../../network/netconnect.pm_.c:231 ../../network/tools.pm_.c:49
+#: ../../network/ethernet.pm_.c:67 ../../network/netconnect.pm_.c:130
+#: ../../network/netconnect.pm_.c:233 ../../network/tools.pm_.c:52
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: ../../network/ethernet.pm_.c:99
+#: ../../network/ethernet.pm_.c:94
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
@@ -6125,18 +6114,18 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt.\n"
 "Jeg kan ikke sette opp denne tilkoblingstypen."
 
-#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:232
+#: ../../network/ethernet.pm_.c:98 ../../standalone/drakgw_.c:232
 msgid "Choose the network interface"
 msgstr "Velg nettverksgrensesnitt"
 
-#: ../../network/ethernet.pm_.c:104
+#: ../../network/ethernet.pm_.c:99
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
 "Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp\n"
 "mot Internett"
 
-#: ../../network/ethernet.pm_.c:114
+#: ../../network/ethernet.pm_.c:109
 msgid ""
 "\n"
 "Do you agree?"
@@ -6144,26 +6133,19 @@ msgstr ""
 "\n"
 "Er du enig?"
 
-#: ../../network/ethernet.pm_.c:114
+#: ../../network/ethernet.pm_.c:109
 msgid "I'm about to restart the network device:\n"
 msgstr "Jeg er i ferd med х starte denne nettverksenheten pх nytt:\n"
 
-#: ../../network/ethernet.pm_.c:180
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Jeg er i ferd med х starte nettverksenhet $netc->{NET_DEVICE} pх nytt. Er du "
-"enig?"
-
-#: ../../network/ethernet.pm_.c:189
+#: ../../network/ethernet.pm_.c:184
 msgid "no network card found"
 msgstr "ingen nettverkskort funnet"
 
-#: ../../network/ethernet.pm_.c:213 ../../network/network.pm_.c:343
+#: ../../network/ethernet.pm_.c:208 ../../network/network.pm_.c:342
 msgid "Configuring network"
 msgstr "Konfigurerer nettverk"
 
-#: ../../network/ethernet.pm_.c:214
+#: ../../network/ethernet.pm_.c:209
 msgid ""
 "Please enter your host name if you know it.\n"
 "Some DHCP servers require the hostname to work.\n"
@@ -6175,14 +6157,15 @@ msgstr ""
 "Vertsnavnet ditt bјr vцre et full-kvalifisert vertsnavn,\n"
 "som ``minboks.mittlab.mittfirma.no''."
 
-#: ../../network/ethernet.pm_.c:218 ../../network/network.pm_.c:348
+#: ../../network/ethernet.pm_.c:213 ../../network/network.pm_.c:347
 msgid "Host name"
 msgstr "Vertsnavn"
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:92 ../../network/netconnect.pm_.c:107
-#: ../../network/netconnect.pm_.c:158 ../../network/netconnect.pm_.c:168
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:208
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:106
+#: ../../network/netconnect.pm_.c:155 ../../network/netconnect.pm_.c:165
+#: ../../network/netconnect.pm_.c:184 ../../network/netconnect.pm_.c:205
+#: ../../network/netconnect.pm_.c:212
 msgid "Network Configuration Wizard"
 msgstr "Nettverkskonfigurasjonveiviser"
 
@@ -6199,7 +6182,6 @@ msgid "What kind is your ISDN connection?"
 msgstr "Hva slags type er ISDN-tilknytningen din?"
 
 #: ../../network/isdn.pm_.c:45
-#, fuzzy
 msgid ""
 "Which ISDN configuration do you prefer?\n"
 "\n"
@@ -6213,33 +6195,31 @@ msgid ""
 msgstr ""
 "Hvilken ISDN konfigurering foretrekker du?\n"
 "\n"
-"* Den gamle konfigurasjoen bruker isdn4net. Det har kraftfulle verktјy, den "
-"det er vanskelig х konfigurere for en nybegynner, og er ikke "
-"standardbasert.\n"
+"* Den gamle konfigurasjoen bruker isdn4net. Det har kraftfulle\n"
+"  verktјy, den det er vanskelig х konfigurere for en nybegynner,\n"
+"  og er ikke standardbasert.\n"
 "\n"
-"' Det nye konfigurasjonsverktјyet er enklere х forstх, mer standardisert, "
-"men med fцrre verktјy.\n"
+"' Det nye konfigurasjonsverktјyet er enklere х forstх,\n"
+"  mer standardisert, men med fцrre verktјy.\n"
 "\n"
 "Vi anbefaler den nye konfigurasjonen.\n"
 "\n"
 
-#
 #: ../../network/isdn.pm_.c:54
 msgid "New configuration (isdn-light)"
 msgstr "Ny konfigurasjon (isdn-light)"
 
-#
 #: ../../network/isdn.pm_.c:54
 msgid "Old configuration (isdn4net)"
 msgstr "Gamle konfigurasjonen (isdn4net)"
 
-#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
-#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
-#: ../../network/isdn.pm_.c:214
+#: ../../network/isdn.pm_.c:168 ../../network/isdn.pm_.c:186
+#: ../../network/isdn.pm_.c:196 ../../network/isdn.pm_.c:203
+#: ../../network/isdn.pm_.c:213
 msgid "ISDN Configuration"
 msgstr "ISDN-konfigurasjon"
 
-#: ../../network/isdn.pm_.c:169
+#: ../../network/isdn.pm_.c:168
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -6247,22 +6227,22 @@ msgstr ""
 "Velg din tilbyder.\n"
 " Hvis denne ikke er i listen, velg ikke i listen"
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:181
 #, fuzzy
 msgid "Europe protocol"
 msgstr "Oppstartsprotokoll"
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:181
 #, fuzzy
 msgid "Europe protocol (EDSS1)"
 msgstr "Europa (EDSS1)"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:183
 #, fuzzy
 msgid "Protocol for the rest of the world"
 msgstr "Resten av verden"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:183
 #, fuzzy
 msgid ""
 "Protocol for the rest of the world \n"
@@ -6271,27 +6251,27 @@ msgstr ""
 "Resten av verden \n"
 " ingen D-kanal (leid linje)"
 
-#: ../../network/isdn.pm_.c:188
+#: ../../network/isdn.pm_.c:187
 msgid "Which protocol do you want to use ?"
 msgstr "Hvilken protokoll јnsker du х bruke?"
 
-#: ../../network/isdn.pm_.c:198
+#: ../../network/isdn.pm_.c:197
 msgid "What kind of card do you have?"
 msgstr "Hva slags kort har du?"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "I don't know"
 msgstr "Jeg vet ikke"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:204
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -6303,19 +6283,19 @@ msgstr ""
 "\n"
 "Hvis du har et PCMCIA kort mх du vite irq og io for kortet.\n"
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:208
 msgid "Abort"
 msgstr "Avbryt"
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:208
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../../network/isdn.pm_.c:215
+#: ../../network/isdn.pm_.c:214
 msgid "Which is your ISDN card ?"
 msgstr "Hvilket er ditt ISDN-kort?"
 
-#: ../../network/isdn.pm_.c:234
+#: ../../network/isdn.pm_.c:233
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -6323,55 +6303,55 @@ msgstr ""
 "Jeg har oppdaget et ISDN PCI-kort, men jeg vet ikke hviklet type. Vennligst "
 "velg et PCI-kort i neste skjermbilde."
 
-#: ../../network/isdn.pm_.c:243
+#: ../../network/isdn.pm_.c:242
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Ingen ISDN PCI-kort funnet. Vennligst velg et i neste skjermbilde."
 
-#: ../../network/modem.pm_.c:39
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
 
-#: ../../network/modem.pm_.c:44
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Opsjoner oppringt"
 
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:585
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:588
 msgid "Connection name"
 msgstr "Navn tilknytning"
 
-#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:586
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:589
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:587
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:590
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "Script-based"
 msgstr "Scriptbasert"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:590
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:593
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:591
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:594
 msgid "First DNS Server (optional)"
 msgstr "Fјrste DNS-tjener (valgfri)"
 
-#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:592
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:595
 msgid "Second DNS Server (optional)"
 msgstr "Andre DNS-tjener (valgfri)"
 
-#: ../../network/netconnect.pm_.c:35
+#: ../../network/netconnect.pm_.c:34
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6379,7 +6359,7 @@ msgstr ""
 "\n"
 "Du kan koble ned eller rekonfigurere tilkoblingen din."
 
-#: ../../network/netconnect.pm_.c:35 ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:34 ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -6387,11 +6367,11 @@ msgstr ""
 "\n"
 "Du kan rekonfigurere tilkoblingen din."
 
-#: ../../network/netconnect.pm_.c:35
+#: ../../network/netconnect.pm_.c:34
 msgid "You are currently connected to internet."
 msgstr "Du er for јyeblikket koblet opp mot Internett"
 
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6399,39 +6379,37 @@ msgstr ""
 "\n"
 "Du kan koble opp mot Internett eller rekonfigurere tilkoblingen din."
 
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
 msgid "You are not currently connected to Internet."
 msgstr "Du er for јyeblikket ikke koblet opp mot Internett."
 
-#: ../../network/netconnect.pm_.c:42 ../../standalone/net_monitor_.c:124
+#: ../../network/netconnect.pm_.c:41
 msgid "Connect to Internet"
 msgstr "Koble opp mot Internett"
 
-#: ../../network/netconnect.pm_.c:44
+#: ../../network/netconnect.pm_.c:43
 msgid "Disconnect from Internet"
 msgstr "Koble ned fra Internett"
 
-#: ../../network/netconnect.pm_.c:46
+#: ../../network/netconnect.pm_.c:45
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Konfigurer nettverk-tilkobling (LAN eller Internett)"
 
-#: ../../network/netconnect.pm_.c:49
+#: ../../network/netconnect.pm_.c:48
 msgid "Internet connection & configuration"
 msgstr "Internett tilkobling & konfigurasjon"
 
-#: ../../network/netconnect.pm_.c:97
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:96
+#, c-format
 msgid "We are now going to configure the %s connection."
-msgstr ""
-"\n"
-"Du kan koble ned eller rekonfigurere tilkoblingen din."
+msgstr "Vi skal nх konfigurere din  %s tilkobling."
 
-#: ../../network/netconnect.pm_.c:98
+#: ../../network/netconnect.pm_.c:97
 msgid "Press next to continue."
-msgstr ""
+msgstr "Trykk neste for х fortsette."
 
-#: ../../network/netconnect.pm_.c:107
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:106
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -6442,9 +6420,14 @@ msgid ""
 "Press OK to continue."
 msgstr ""
 "\n"
-"Du kan koble ned eller rekonfigurere tilkoblingen din."
+"\n"
+"\n"
+"Vi skal nх konfigurere %s oppkoblingen.\n"
+"\n"
+"\n"
+"Trykk OK for х begynne."
 
-#: ../../network/netconnect.pm_.c:132
+#: ../../network/netconnect.pm_.c:131
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6456,7 +6439,7 @@ msgstr ""
 "Trykk OK for х beholde din eksisterende konfigurasjon, eller avbryt for х "
 "rekonfigurere din internett og nettverkskonfigurasjon.\n"
 
-#: ../../network/netconnect.pm_.c:159
+#: ../../network/netconnect.pm_.c:156
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6469,81 +6452,85 @@ msgstr ""
 "Hvis du ikke јnsker х bruke automatisk oppdagelse, fjern krysset\n"
 "i boksen.\n"
 
-#: ../../network/netconnect.pm_.c:161
+#: ../../network/netconnect.pm_.c:158
 msgid "Choose the profile to configure"
 msgstr "Velg profilen som skal konfigureres"
 
-#: ../../network/netconnect.pm_.c:162
+#: ../../network/netconnect.pm_.c:159
 msgid "Use auto detection"
 msgstr "Bruk automatisk detektering"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:146
+#: ../../network/netconnect.pm_.c:165 ../../printerdrake.pm_.c:171
 msgid "Detecting devices..."
 msgstr "Finner enheter..."
 
-#: ../../network/netconnect.pm_.c:179
+#: ../../network/netconnect.pm_.c:176
 msgid "Normal modem connection"
 msgstr "Normal modemtilkobling"
 
-#: ../../network/netconnect.pm_.c:179
+#: ../../network/netconnect.pm_.c:176
 #, c-format
 msgid "detected on port %s"
 msgstr "oppdaget pх port %s"
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:177
 msgid "ISDN connection"
 msgstr "ISDN-tilkobling"
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:177
 #, c-format
 msgid "detected %s"
 msgstr "oppdaget %s"
 
-#: ../../network/netconnect.pm_.c:181
-#, fuzzy
+#: ../../network/netconnect.pm_.c:178
 msgid "ADSL connection"
-msgstr "Lokalt nettverksoppkobling"
+msgstr "ADSL oppkobling"
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:178
 #, c-format
 msgid "detected on interface %s"
 msgstr "oppdaget pх grensesnitt %s"
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:179
 msgid "Cable connection"
 msgstr "Kabeltilkobling"
 
 #
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:179
 msgid "cable connection detected"
 msgstr "Kabeltilkobling detektert"
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:180
 msgid "LAN connection"
 msgstr "Lokalt nettverksoppkobling"
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:180
 msgid "ethernet card(s) detected"
 msgstr "oppdaget ethernettkort"
 
-#: ../../network/netconnect.pm_.c:188
-#, fuzzy
+#: ../../network/netconnect.pm_.c:185
 msgid "Choose the connection you want to configure"
-msgstr "Velg verktјyet du јnsker х bruke"
+msgstr "Velg oppkoblingen du јnsker х konfigurere"
 
-#: ../../network/netconnect.pm_.c:209
+#: ../../network/netconnect.pm_.c:206
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
 msgstr ""
+"Du har konfigureret flere mхter х koble deg mot internett pх.\n"
+"Venligst velg den du јnsker х bruker.\n"
+"\n"
 
-#: ../../network/netconnect.pm_.c:211
-#, fuzzy
+#: ../../network/netconnect.pm_.c:207
 msgid "Internet connection"
-msgstr "Deling av Internett tilkobling"
+msgstr "Internett tilkobling"
+
+#: ../../network/netconnect.pm_.c:212
+msgid "Do you want to start the connection at boot?"
+msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
 
-#: ../../network/netconnect.pm_.c:223
+#: ../../network/netconnect.pm_.c:225
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
@@ -6553,7 +6540,7 @@ msgstr ""
 "\n"
 "Konfigurasjonen vil nх bli aktivert.\n"
 
-#: ../../network/netconnect.pm_.c:226
+#: ../../network/netconnect.pm_.c:228
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6589,10 +6576,11 @@ msgid "Configuring network device %s"
 msgstr "Konfigurerer nettverksenhet %s"
 
 #: ../../network/network.pm_.c:290
-msgid " (driver $module)"
-msgstr " (driver $module)"
+#, c-format
+msgid " (driver %s)"
+msgstr " (driver %s)"
 
-#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:247
+#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:248
 #: ../../standalone/draknet_.c:449
 msgid "IP address"
 msgstr "IP-adresse"
@@ -6609,12 +6597,11 @@ msgstr "(bootp/dhcp)"
 msgid "Automatic IP"
 msgstr "Automatisk IP"
 
-#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:66
-#: ../../printerdrake.pm_.c:328
+#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:356
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bјr vцre i format 1.2.3.4"
 
-#: ../../network/network.pm_.c:344
+#: ../../network/network.pm_.c:343
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -6626,59 +6613,59 @@ msgstr ""
 "sх som ``minboks.mittlab.mittfirma.no''.\n"
 "Du kan ogsх entre IP-adressen til gateway'en hvis du har en"
 
-#: ../../network/network.pm_.c:349
+#: ../../network/network.pm_.c:348
 msgid "DNS server"
 msgstr "DNS-tjener"
 
-#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:584
+#: ../../network/network.pm_.c:349 ../../standalone/draknet_.c:587
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../../network/network.pm_.c:352
+#: ../../network/network.pm_.c:351
 msgid "Gateway device"
 msgstr "Gateway-enhet"
 
-#: ../../network/network.pm_.c:363
+#: ../../network/network.pm_.c:362
 msgid "Proxies configuration"
 msgstr "Konfigurasjon proxy"
 
-#: ../../network/network.pm_.c:364
+#: ../../network/network.pm_.c:363
 msgid "HTTP proxy"
 msgstr "HTTP-proxy"
 
-#: ../../network/network.pm_.c:365
+#: ../../network/network.pm_.c:364
 msgid "FTP proxy"
 msgstr "FTP-proxy"
 
-#: ../../network/network.pm_.c:368
+#: ../../network/network.pm_.c:367
 msgid "Proxy should be http://..."
 msgstr "Proxy burde vцre http://..."
 
-#: ../../network/network.pm_.c:369
+#: ../../network/network.pm_.c:368
 msgid "Proxy should be ftp://..."
 msgstr "Proxy burde vцre ftp://..."
 
-#: ../../network/tools.pm_.c:31
+#: ../../network/tools.pm_.c:34
 msgid "Internet configuration"
 msgstr "Internett-konfigurasjon"
 
-#: ../../network/tools.pm_.c:32
+#: ../../network/tools.pm_.c:35
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Vil du prјve х koble opp mot Internett nх?"
 
-#: ../../network/tools.pm_.c:36
+#: ../../network/tools.pm_.c:39
 msgid "Testing your connection..."
 msgstr "Tester tilkoblingen din..."
 
-#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:212
+#: ../../network/tools.pm_.c:45 ../../standalone/draknet_.c:213
 msgid "The system is now connected to Internet."
 msgstr "Systemet er nх koblet opp mot Internett."
 
-#: ../../network/tools.pm_.c:43
+#: ../../network/tools.pm_.c:46
 msgid "For Security reason, it will be disconnected now."
 msgstr "Av sikkerhetsgrunner vil den bli frakoblet nх."
 
-#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:212
+#: ../../network/tools.pm_.c:47 ../../standalone/draknet_.c:213
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -6686,81 +6673,85 @@ msgstr ""
 "Det ser ikke ut til at systemet er koblet til Internett.\n"
 "Prјv х rekonfigurere tilkoblingen din."
 
-#: ../../network/tools.pm_.c:68
+#: ../../network/tools.pm_.c:71
 msgid "Connection Configuration"
 msgstr "Konfigurasjon tilknytning."
 
-#: ../../network/tools.pm_.c:69
+#: ../../network/tools.pm_.c:72
 msgid "Please fill or check the field below"
 msgstr "Vennnligst fyll eller merk feltet under"
 
-#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:571
+#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
 msgid "Card IRQ"
 msgstr "Kort IRQ"
 
-#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:572
+#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
 msgid "Card mem (DMA)"
 msgstr "Kort mem (DMA)"
 
-#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:573
+#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
 msgid "Card IO"
 msgstr "Kort IO"
 
-#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
+#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
 msgid "Card IO_0"
 msgstr "Kort IO_0"
 
-#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
 msgid "Your personal phone number"
 msgstr "Ditt telefonnummer"
 
-#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
 msgid "Provider name (ex provider.net)"
 msgstr "Navn tilbyder (f.eks. tilbyder.net)"
 
-#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:581
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:582
 msgid "Provider dns 1 (optional)"
 msgstr "Tilbyder dns 1 (valgfri)"
 
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:583
 msgid "Provider dns 2 (optional)"
 msgstr "Tilbyder dns 2 (valgfri)"
 
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:583
+#: ../../network/tools.pm_.c:84
+#, fuzzy
+msgid "Choose your country"
+msgstr "Velg tastatur"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:586
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
-#: ../../network/tools.pm_.c:82
-#, fuzzy
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:598
 msgid "Connection speed"
-msgstr "Oppkoblingstype:"
+msgstr "Oppkoblingshastighet"
 
-#: ../../network/tools.pm_.c:83
+#: ../../network/tools.pm_.c:87
 #, fuzzy
 msgid "Connection timeout (in sec)"
-msgstr "Oppkoblingstype:"
+msgstr "Oppkoblingstid. "
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:581
+#: ../../network/tools.pm_.c:88 ../../standalone/draknet_.c:584
 msgid "Account Login (user name)"
 msgstr "Logg inn (brukernavn)"
 
-#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:582
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:585
 msgid "Account Password"
 msgstr "Passord"
 
-#: ../../partition_table.pm_.c:583
+#: ../../partition_table.pm_.c:605
 msgid "Extended partition not supported on this platform"
 msgstr "Utvidet partisjon ikke stјttet pх denne plattformen"
 
-#: ../../partition_table.pm_.c:601
+#: ../../partition_table.pm_.c:623
 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 "
@@ -6770,26 +6761,21 @@ msgstr ""
 "Den eneste lјsningen er х flytte primцrpartisjonene dine for х ha hullet ved "
 "siden av de utvidede partisjonene"
 
-#: ../../partition_table.pm_.c:695
-#, c-format
-msgid "Error reading file %s"
-msgstr "Feil ved lesing av fil %s"
-
-#: ../../partition_table.pm_.c:702
+#: ../../partition_table.pm_.c:724
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Gjenoppretting fra fil %s mislykket: %s"
 
-#: ../../partition_table.pm_.c:704
+#: ../../partition_table.pm_.c:726
 msgid "Bad backup file"
 msgstr "Dхrlig sikkerhetskopi-fil"
 
-#: ../../partition_table.pm_.c:726
+#: ../../partition_table.pm_.c:748
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Feil ved skriving til fil %s"
 
-#: ../../partition_table_raw.pm_.c:164
+#: ../../partition_table_raw.pm_.c:152
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -6821,65 +6807,92 @@ msgstr "kanskje"
 
 #: ../../printer.pm_.c:23
 msgid "CUPS - Common Unix Printing System"
-msgstr ""
+msgstr "CUPS - Common Unix Printing System"
 
 #: ../../printer.pm_.c:24
 msgid "LPRng - LPR New Generation"
-msgstr ""
+msgstr "LPRng - LPR New Generation"
 
 #: ../../printer.pm_.c:25
 msgid "LPD - Line Printer Daemon"
-msgstr ""
+msgstr "LPD - Line Printer Daemon"
 
 #: ../../printer.pm_.c:26
 msgid "PDQ - Print, Don't Queue"
-msgstr ""
+msgstr "PDQ - Print, Don't Queue"
 
 #: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Lokal skriver"
 
-#: ../../printer.pm_.c:33
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Fjern-skriver"
 
-#: ../../printer.pm_.c:34
+#: ../../printer.pm_.c:42
 #, fuzzy
 msgid "Printer on remote CUPS server"
 msgstr "Fjern-CUPS tjener"
 
-#: ../../printer.pm_.c:35
+#: ../../printer.pm_.c:43
 #, fuzzy
 msgid "Printer on remote lpd server"
 msgstr "Fjern-lpd tjener"
 
-#: ../../printer.pm_.c:36
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Nettverksskriver (socket)"
 
-#: ../../printer.pm_.c:37
+#: ../../printer.pm_.c:45
 #, fuzzy
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:38
+#: ../../printer.pm_.c:46
 #, fuzzy
 msgid "Printer on NetWare server"
 msgstr "Skrivertjener"
 
-#: ../../printer.pm_.c:39
+#: ../../printer.pm_.c:47
 #, fuzzy
 msgid "Enter a printer device URI"
 msgstr "Skriverenhet URI"
 
-#: ../../printer.pm_.c:40
+#: ../../printer.pm_.c:48
+#, fuzzy
 msgid "Pipe job into a command"
-msgstr ""
+msgstr "Pipe inn i kommando"
 
-#: ../../printer.pm_.c:185
+#: ../../printer.pm_.c:209 ../../printer.pm_.c:557
+#: ../../printerdrake.pm_.c:1419
 msgid "Unknown model"
 msgstr ""
 
+#: ../../printer.pm_.c:461
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(modul %s)"
+
+#: ../../printer.pm_.c:463
+msgid "(on this machine)"
+msgstr ""
+
 #: ../../printerdrake.pm_.c:23
 msgid "Select Printer Connection"
 msgstr "Velg skrivertilkobling"
@@ -6893,20 +6906,8 @@ msgstr "Hvordan er skriveren tilkoblet?"
 msgid ""
 "\n"
 "Printers on remote CUPS servers you do not have to configure\n"
-"here; these printers will be automatically detected. In case\n"
-"of doubt, select \"Printer on remote CUPS server\"."
-msgstr ""
-"Med en fjern-CUPS tjener behјver du ikke х konfigurere\n"
-"noen skrivere her; skrivere vil bli oppdaget automatisk.\n"
-"Ved tvil, velg \"Fjern-CUPS tjener\"."
-
-#: ../../printerdrake.pm_.c:56
-msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
 msgstr ""
 "Med en fjern-CUPS tjener behјver du ikke х konfigurere\n"
 "noen skrivere her; skrivere vil bli oppdaget automatisk\n"
@@ -6914,59 +6915,68 @@ msgstr ""
 "mх du gi CUPS tjeneren IP adresse og muligens nummeret pх\n"
 "porten."
 
-#: ../../printerdrake.pm_.c:62
-msgid "CUPS server IP"
-msgstr "CUPS tjener IP"
-
-#: ../../printerdrake.pm_.c:63 ../../printerdrake.pm_.c:446
-msgid "Port"
-msgstr "Port"
+#: ../../printerdrake.pm_.c:79
+msgid ""
+"With a remote CUPS server, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:70
-msgid "Port number should be numeric"
-msgstr "Portnummer burde vцre mumerisk"
+#: ../../printerdrake.pm_.c:91 ../../printerdrake.pm_.c:1407
+msgid "Close"
+msgstr "Lukk"
 
-#: ../../printerdrake.pm_.c:99
-msgid "Enter Printer Name and Comments"
-msgstr ""
+#: ../../printerdrake.pm_.c:92
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Fjern-skriver"
 
-#: ../../printerdrake.pm_.c:103
-msgid "Name of printer should contain only letters, numbers and the underscore"
-msgstr "Skrivernavn bјr inneholde kun bokstaver, tall og understrek"
+#: ../../printerdrake.pm_.c:96
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP-adresse bјr vцre i format 1.2.3.4"
 
-#: ../../printerdrake.pm_.c:110
-msgid ""
-"Every printer needs a name (for example lp).\n"
-"The Description and Location fields do not need \n"
-"to be filled in. They are comments for the users."
-msgstr ""
+#: ../../printerdrake.pm_.c:101 ../../printerdrake.pm_.c:491
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Portnummer burde vцre mumerisk"
 
-#: ../../printerdrake.pm_.c:114
-msgid "Name of printer"
-msgstr "Navn pх skriver"
+#: ../../printerdrake.pm_.c:108
+#, fuzzy
+msgid "Default printer"
+msgstr "Lokal skriver"
 
-#: ../../printerdrake.pm_.c:116
-msgid "Description"
-msgstr "Beskrivelse"
+#: ../../printerdrake.pm_.c:113
+msgid "CUPS server IP"
+msgstr "CUPS tjener IP"
 
-#: ../../printerdrake.pm_.c:118
-msgid "Location"
-msgstr "Lokasjon"
+#: ../../printerdrake.pm_.c:114 ../../printerdrake.pm_.c:484
+msgid "Port"
+msgstr "Port"
 
-#: ../../printerdrake.pm_.c:146
+#: ../../printerdrake.pm_.c:171
 msgid "Test ports"
 msgstr "Test porter"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:195
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "En skriver, modell \"%s\", ble funnet pх "
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:212
 msgid "Local Printer Device"
 msgstr "Lokal skriverenhet"
 
-#: ../../printerdrake.pm_.c:188
+#: ../../printerdrake.pm_.c:213
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6974,52 +6984,53 @@ msgstr ""
 "Hvilken enhet er skriveren din koblet til \n"
 "(merk at /dev/lp0 er det samme som LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:190
+#: ../../printerdrake.pm_.c:215
 msgid "Printer Device"
 msgstr "Skriverenhet"
 
-#: ../../printerdrake.pm_.c:193
+#: ../../printerdrake.pm_.c:218
 msgid "Device/file name missing!"
-msgstr ""
+msgstr "Enhets/filnavn mangler!"
 
-#: ../../printerdrake.pm_.c:236
+#: ../../printerdrake.pm_.c:261
 msgid "Remote lpd Printer Options"
 msgstr "Opsjoner for fjern-lpd skriver"
 
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:262
 #, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
 "on that server."
 msgstr ""
 "For х bruke en fjern-lpd skriverkј, mх du oppgi vertsnavnet\n"
-"til skrivertjeneren og kјnavnet til den tjeneren som\n"
+"til skrivertjeneren og kјnavnet pх den tjeneren som\n"
 "jobbene skal plasseres i."
 
-#: ../../printerdrake.pm_.c:240
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:265
+#, fuzzy
+msgid "Remote host name"
 msgstr "Fjern-vertnavn"
 
-#: ../../printerdrake.pm_.c:241
-msgid "Remote queue"
-msgstr "Fjern-kј"
-
-#: ../../printerdrake.pm_.c:244
+#: ../../printerdrake.pm_.c:266
 #, fuzzy
+msgid "Remote printer name"
+msgstr "Fjern-skriver"
+
+#: ../../printerdrake.pm_.c:269
 msgid "Remote host name missing!"
-msgstr "Fjern-vertnavn"
+msgstr "Det eksterne vertsnavnet mangler!"
 
-#: ../../printerdrake.pm_.c:248
+#: ../../printerdrake.pm_.c:273
 #, fuzzy
-msgid "Remote queue name missing!"
-msgstr "Fjern-kј"
+msgid "Remote printer name missing!"
+msgstr "Det eksterne vertsnavnet mangler!"
 
-#: ../../printerdrake.pm_.c:314
+#: ../../printerdrake.pm_.c:342
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opsjoner for SMB (Windows 9x/NT) skriver"
 
-#: ../../printerdrake.pm_.c:315
+#: ../../printerdrake.pm_.c:343
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -7033,35 +7044,35 @@ msgstr ""
 "navnet til skriveren du јnsker tilgang til og anvendelige brukernavn,\n"
 "passord og arbeidsgruppeinformasjon."
 
-#: ../../printerdrake.pm_.c:320
+#: ../../printerdrake.pm_.c:348
 msgid "SMB server host"
 msgstr "SMB-tjener vert"
 
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:349
 msgid "SMB server IP"
 msgstr "SMB-tjener IP"
 
-#: ../../printerdrake.pm_.c:322
+#: ../../printerdrake.pm_.c:350
 msgid "Share name"
 msgstr "Navn deling"
 
-#: ../../printerdrake.pm_.c:325
+#: ../../printerdrake.pm_.c:353
 msgid "Workgroup"
 msgstr "Arbeidsgruppe"
 
-#: ../../printerdrake.pm_.c:332
+#: ../../printerdrake.pm_.c:360
 msgid "Either the server name or the server's IP must be given!"
-msgstr ""
+msgstr "Servernavnet eller serverens IP mх oppgis!"
 
-#: ../../printerdrake.pm_.c:336
+#: ../../printerdrake.pm_.c:364
 msgid "Samba share name missing!"
-msgstr ""
+msgstr "Samba delenavn mangler!"
 
-#: ../../printerdrake.pm_.c:392
+#: ../../printerdrake.pm_.c:423
 msgid "NetWare Printer Options"
 msgstr "NetWare skriveropsjoner"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:424
 msgid ""
 "To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -7073,114 +7084,126 @@ msgstr ""
 "vertsnavn!) sх vel som navnet pх skriverkјen til skriveren du јnsker\n"
 "adgang til og anvendelige brukernavn og passord."
 
-#: ../../printerdrake.pm_.c:397
+#: ../../printerdrake.pm_.c:428
 msgid "Printer Server"
 msgstr "Skrivertjener"
 
-#: ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:429
 msgid "Print Queue Name"
 msgstr "Skriverkј-navn"
 
-#: ../../printerdrake.pm_.c:403
+#: ../../printerdrake.pm_.c:434
 msgid "NCP server name missing!"
-msgstr ""
+msgstr "NCP servernavn mangler!"
 
-#: ../../printerdrake.pm_.c:407
+#: ../../printerdrake.pm_.c:438
 msgid "NCP queue name missing!"
-msgstr ""
+msgstr "NCP kјnavn mangler!"
 
-#: ../../printerdrake.pm_.c:442
+#: ../../printerdrake.pm_.c:477
 msgid "Socket Printer Options"
 msgstr "Opsjoner for lokal skriver"
 
-#: ../../printerdrake.pm_.c:443
+#: ../../printerdrake.pm_.c:478
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "For х skrive til en socket skriver, trenger du х gi meg\n"
 "vertsnavnet til skriveren, og eventuelt portnummeret."
 
-#: ../../printerdrake.pm_.c:445
-msgid "Printer Hostname"
-msgstr "Skriverens vertsnavn"
-
-#: ../../printerdrake.pm_.c:449
+#: ../../printerdrake.pm_.c:483
 #, fuzzy
-msgid "Printer host name missing!"
+msgid "Printer host name"
 msgstr "Skriverens vertsnavn"
 
-#: ../../printerdrake.pm_.c:453
-msgid "The port must be an integer number!"
-msgstr ""
+#: ../../printerdrake.pm_.c:487
+msgid "Printer host name missing!"
+msgstr "Skriverens vertsnavn mangler!"
 
-#: ../../printerdrake.pm_.c:473 ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:515 ../../printerdrake.pm_.c:517
 msgid "Printer Device URI"
 msgstr "Skriverenhet URI"
 
-#: ../../printerdrake.pm_.c:474
+#: ../../printerdrake.pm_.c:516
+#, fuzzy
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
+"Du kan direkte oppgi URI til skriveren. URIen mх vцre i henhold til "
+"entenCUPS eller Foomatic standarden. Ikke alle typer URIer stјttes av "
+"kјbehandlerene."
 
-#: ../../printerdrake.pm_.c:489
+#: ../../printerdrake.pm_.c:531
 msgid "A valid URI must be entered!"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:521
-msgid "Pipe into command"
-msgstr ""
+msgstr "En korrekt URI mх oppgis!"
 
-#: ../../printerdrake.pm_.c:522
+#: ../../printerdrake.pm_.c:626
 msgid ""
-"Here you can specify any arbitrary command line into which the job should be "
-"piped instead of being sent directly to a printer."
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
 msgstr ""
+"Alle skrivere trenger ett navn (f.eks. lp).\n"
+"Beskrivelsen og lokalisasjonsfeltene trenger ikke \n"
+"х fylles inn. De er brukerkommentarer."
 
-#: ../../printerdrake.pm_.c:523
-#, fuzzy
-msgid "Command line"
-msgstr "Domenenavn"
+#: ../../printerdrake.pm_.c:630
+msgid "Name of printer"
+msgstr "Navn pх skriver"
 
-#: ../../printerdrake.pm_.c:527
-msgid "A command line must be entered!"
-msgstr ""
+#: ../../printerdrake.pm_.c:632
+msgid "Description"
+msgstr "Beskrivelse"
 
-#: ../../printerdrake.pm_.c:605
-#, fuzzy
+#: ../../printerdrake.pm_.c:634
+msgid "Location"
+msgstr "Lokasjon"
+
+#: ../../printerdrake.pm_.c:746
 msgid "Printer model selection"
-msgstr "Skrivertilkobling"
+msgstr "Skrivervalg"
 
-#: ../../printerdrake.pm_.c:606
-#, fuzzy
+#: ../../printerdrake.pm_.c:747
 msgid "Which printer model do you have?"
 msgstr "Hva slags type skriver har du?"
 
-#: ../../printerdrake.pm_.c:745 ../../printerdrake.pm_.c:1081
-#: ../../printerdrake.pm_.c:1098 ../../printerdrake.pm_.c:1153
-msgid "Printer options"
-msgstr "Opsjoner for skriver"
-
-#: ../../printerdrake.pm_.c:755
-msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
+#: ../../printerdrake.pm_.c:886
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:762
-msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
-msgstr ""
+#: ../../printerdrake.pm_.c:901
+#, fuzzy, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Porten mх vцre ett helt tall!"
+
+#: ../../printerdrake.pm_.c:908
+#, fuzzy, c-format
+msgid "Option %s must be a number!"
+msgstr "Porten mх vцre ett helt tall!"
 
-#: ../../printerdrake.pm_.c:770
-msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
+#: ../../printerdrake.pm_.c:916
+#, c-format
+msgid "Option %s out of range!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:818
+#: ../../printerdrake.pm_.c:964
 #, fuzzy
 msgid "Test pages"
 msgstr "Test porter"
 
-#: ../../printerdrake.pm_.c:819
+#: ../../printerdrake.pm_.c:965
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed\n"
@@ -7188,40 +7211,39 @@ msgid ""
 "In most cases it is enough to print the standard test page."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:823
-#, fuzzy
+#: ../../printerdrake.pm_.c:970
 msgid "No test pages"
-msgstr "Ja, skriv begge testsidene"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:824
+#: ../../printerdrake.pm_.c:971
 #, fuzzy
 msgid "Print"
 msgstr "Skriver"
 
-#: ../../printerdrake.pm_.c:826
+#: ../../printerdrake.pm_.c:973
 #, fuzzy
 msgid "Standard test page"
-msgstr "Standard verktјy"
+msgstr "Standard"
 
-#: ../../printerdrake.pm_.c:829
+#: ../../printerdrake.pm_.c:976
 msgid "Alternative test page (Letter)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:832
+#: ../../printerdrake.pm_.c:979
 #, fuzzy
 msgid "Alternative test page (A4)"
 msgstr "Skriver ut testside(r)..."
 
-#: ../../printerdrake.pm_.c:834
+#: ../../printerdrake.pm_.c:981
 #, fuzzy
 msgid "Photo test page"
 msgstr "Skriver ut testside(r)..."
 
-#: ../../printerdrake.pm_.c:841
+#: ../../printerdrake.pm_.c:988
 msgid "Printing test page(s)..."
 msgstr "Skriver ut testside(r)..."
 
-#: ../../printerdrake.pm_.c:863
+#: ../../printerdrake.pm_.c:1013
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -7229,7 +7251,6 @@ msgid ""
 "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"
@@ -7238,33 +7259,145 @@ msgstr ""
 "\n"
 "Virker det ordentlig?"
 
-#: ../../printerdrake.pm_.c:867
+#: ../../printerdrake.pm_.c:1017
 #, fuzzy
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\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"
 "Virker det ordentlig?"
 
-#: ../../printerdrake.pm_.c:897
+#: ../../printerdrake.pm_.c:1024
+msgid "Did it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1043
+msgid "Reading printer data ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1062 ../../printerdrake.pm_.c:1100
 #, fuzzy
-msgid "Select Printer Spooler"
-msgstr "Velg skrivertilkobling"
+msgid "Transfer printer configuration"
+msgstr "Internett-konfigurasjon"
+
+#: ../../printerdrake.pm_.c:1063
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1071
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1074
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1077
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1081
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1084
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1087
+msgid "Do not transfer printers"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1088 ../../printerdrake.pm_.c:1105
+msgid "Transfer"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:898
+#: ../../printerdrake.pm_.c:1101
+#, c-format
+msgid ""
+"A printer named \"%s\" already exists under %s. \n"
+"Click \"Transfer\" to overwrite it.\n"
+"You can also type a new name or skip this printer."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1109
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Skrivernavn bјr inneholde kun bokstaver, tall og understrek"
+
+#: ../../printerdrake.pm_.c:1114
+#, c-format
+msgid ""
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1122
 #, fuzzy
+msgid "New printer name"
+msgstr "Ingen skriver"
+
+#: ../../printerdrake.pm_.c:1124
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1142
+msgid "Select Printer Spooler"
+msgstr "Velg skrivertkјbehandler"
+
+#: ../../printerdrake.pm_.c:1143
 msgid "Which printing system (spooler) do you want to use?"
-msgstr "Hvilket utskriftsystem јnsker du х bruke?"
+msgstr "Hvilket utskriftsystem (spooler) јnsker du х bruke?"
 
-#: ../../printerdrake.pm_.c:974
-#, fuzzy
+#: ../../printerdrake.pm_.c:1188
+msgid "Removing LPRng..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1203
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1232
+msgid "Checking installed software..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1259 ../../printerdrake.pm_.c:1274
+#: ../../printerdrake.pm_.c:1420 ../../printerdrake.pm_.c:1483
+msgid "Printer options"
+msgstr "Opsjoner for skriver"
+
+#: ../../printerdrake.pm_.c:1280
 msgid "Would you like to configure printing?"
 msgstr "иnsker du х konfigurere en skriver?"
 
-#: ../../printerdrake.pm_.c:994
+#: ../../printerdrake.pm_.c:1303
 #, fuzzy
 msgid ""
 "The following printers are configured.\n"
@@ -7273,70 +7406,64 @@ msgstr ""
 "Her er fјlgende skriverkј.\n"
 "Du kan legge til flere eller endre de eksisterende."
 
-#: ../../printerdrake.pm_.c:1001 ../../printerdrake.pm_.c:1012
-#: ../../printerdrake.pm_.c:1015
-#, fuzzy
+#: ../../printerdrake.pm_.c:1312 ../../printerdrake.pm_.c:1323
+#: ../../printerdrake.pm_.c:1326 ../../printerdrake.pm_.c:1372
 msgid "Add printer"
-msgstr "Ingen skriver"
+msgstr "Legg til skriver"
 
-#: ../../printerdrake.pm_.c:1004
+#: ../../printerdrake.pm_.c:1315
 msgid "Spooler: "
-msgstr ""
+msgstr "Skriverkјbehandler: "
 
-#: ../../printerdrake.pm_.c:1083
+#: ../../printerdrake.pm_.c:1401
 #, fuzzy
-msgid "Modify printer"
-msgstr "Ingen skriver"
+msgid "Modify printer configuration"
+msgstr "Internett-konfigurasjon"
 
-#: ../../printerdrake.pm_.c:1084
+#: ../../printerdrake.pm_.c:1402
 #, c-format
 msgid ""
 "Printer %s: %s %s\n"
 "What do you want to modify on this printer?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1089 ../../standalone/net_monitor_.c:98
-msgid "Close"
-msgstr "Lukk"
-
-#: ../../printerdrake.pm_.c:1090
+#: ../../printerdrake.pm_.c:1408
 msgid "Do it!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1093 ../../printerdrake.pm_.c:1124
+#: ../../printerdrake.pm_.c:1411 ../../printerdrake.pm_.c:1454
 #, fuzzy
 msgid "Printer connection type"
-msgstr "Deling av Internett tilkobling"
+msgstr "Internett tilkobling"
 
-#: ../../printerdrake.pm_.c:1094 ../../printerdrake.pm_.c:1131
+#: ../../printerdrake.pm_.c:1412 ../../printerdrake.pm_.c:1461
 #, fuzzy
 msgid "Printer name, description, location"
-msgstr "Skrivertilkobling"
+msgstr "Skrivervalg"
 
-#: ../../printerdrake.pm_.c:1096 ../../printerdrake.pm_.c:1143
+#: ../../printerdrake.pm_.c:1414 ../../printerdrake.pm_.c:1473
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1097 ../../printerdrake.pm_.c:1144
+#: ../../printerdrake.pm_.c:1415 ../../printerdrake.pm_.c:1474
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1099 ../../printerdrake.pm_.c:1160
+#: ../../printerdrake.pm_.c:1421 ../../printerdrake.pm_.c:1521
 #, fuzzy
 msgid "Print test pages"
 msgstr "Skriver ut testside(r)..."
 
-#: ../../printerdrake.pm_.c:1100 ../../printerdrake.pm_.c:1162
+#: ../../printerdrake.pm_.c:1422 ../../printerdrake.pm_.c:1523
 #, fuzzy
 msgid "Remove printer"
 msgstr "Fjern-skriver"
 
-#: ../../printerdrake.pm_.c:1164
+#: ../../printerdrake.pm_.c:1525
 #, fuzzy, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Vil du starte nettverket pх nytt"
 
-#
 #: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
 #: ../../proxy.pm_.c:78
 msgid "Proxy configuration"
@@ -7366,17 +7493,14 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
-#
 #: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
 msgid "port"
 msgstr "port"
 
-#
 #: ../../proxy.pm_.c:44
 msgid "Url should begin with 'http:'"
 msgstr "URLen bјr begynne med \"http:\""
 
-#
 #: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
 msgid "The port part should be numeric"
 msgstr "Portnummer burde vцre numerisk"
@@ -7389,7 +7513,6 @@ msgstr ""
 "Vennligst fyll ut ftp-proxy informasjonen-nLa feltet vцre hvis du ikke "
 "јnsker en ftp-proxy"
 
-#
 #: ../../proxy.pm_.c:65
 msgid "Url should begin with 'ftp:'"
 msgstr "URLen bјr begynne med \"ftp:\""
@@ -7402,44 +7525,41 @@ msgstr ""
 "Vennligst skriv inn proxy brukernavn og passord, hvis det eksisterer.\n"
 "La det vцre hvis du ikke јnsker brukernavn/passord"
 
-#
 #: ../../proxy.pm_.c:80
 msgid "login"
 msgstr "brukernavn"
 
-#
-#: ../../proxy.pm_.c:81
+#: ../../proxy.pm_.c:82
 msgid "password"
 msgstr "passord"
 
-#
-#: ../../proxy.pm_.c:82
+#: ../../proxy.pm_.c:84
 msgid "re-type password"
 msgstr "skriv inn passord pх nytt"
 
-#
-#: ../../proxy.pm_.c:86
+#: ../../proxy.pm_.c:88
 msgid "The passwords don't match. Try again!"
 msgstr "Passordene stemmer ikke overens. Prјv igjen!"
 
-#: ../../raid.pm_.c:35
+#: ../../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Kan ikke legge til en partisjon til _formattert_ RAID md%d"
 
-#: ../../raid.pm_.c:105
-msgid "Can't write file $file"
-msgstr "Kan ikke skrive fil $file"
+#: ../../raid.pm_.c:112
+#, c-format
+msgid "Can't write file %s"
+msgstr "Kan ikke skrive fil %s"
 
-#: ../../raid.pm_.c:130
+#: ../../raid.pm_.c:137
 msgid "mkraid failed"
 msgstr "mkraid mislykket"
 
-#: ../../raid.pm_.c:130
+#: ../../raid.pm_.c:137
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid mislykket (kanskje raidtool mangler?)"
 
-#: ../../raid.pm_.c:146
+#: ../../raid.pm_.c:153
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ikke nok partisjoner for RAID nivх %d\n"
@@ -7737,7 +7857,7 @@ msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr ""
 "Starter X-font tjeneren (dette er obligatorisk for at XFree skal kjјre)."
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../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"
@@ -7745,6 +7865,58 @@ msgstr ""
 "Jeg kan ikke lese partisjonstabellen din, den er for јdelagt for meg :(\n"
 "Jeg vil fјrsјke х blanke ut dхrlige partisjoner"
 
+#: ../../standalone/drakautoinst_.c:42
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Konfigurasjon postinstallering"
+
+#: ../../standalone/drakautoinst_.c:43
+msgid ""
+"You are about to configure an Auto Install floppy. This feature is somewhat "
+"dangerous and must be used circumspectly.\n"
+"\n"
+"With that feature, you will be able to replay the installation you've "
+"performed on this computer, being interactively prompted for some steps, in "
+"order to change their values.\n"
+"\n"
+"For maximum safety, the partitioning and formatting will never be performed "
+"automatically, whatever you chose during the install of this computer.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:65
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Oppstartsstilkonfigurasjon"
+
+#: ../../standalone/drakautoinst_.c:66
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+# #: ../install_steps_interactive.pm_.c:37
+#: ../../standalone/drakautoinst_.c:74
+#, fuzzy
+msgid "Error!"
+msgstr "Feil"
+
+#: ../../standalone/drakautoinst_.c:75
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "Gratulerer!"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
 #: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
 msgid "Internet Connection Sharing"
 msgstr "Deling av Internett tilkobling"
@@ -7883,8 +8055,9 @@ msgstr ""
 "det pх nytt."
 
 #: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Mulig LAN-adresse konflikt funnet i konfigurasjonen til $_!\n"
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Mulig LAN-adresse konflikt funnet i konfigurasjonen til %s!\n"
 
 #: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
 msgid "Firewalling configuration detected!"
@@ -7907,12 +8080,9 @@ msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigurerer script, installerer programvare, starter tjenere..."
 
 #: ../../standalone/drakgw_.c:311
-msgid "Problems installing package $_"
-msgstr "Problemer ved installering av pakke $_"
-
-#: ../../standalone/drakgw_.c:599
-msgid "Congratulations!"
-msgstr "Gratulerer!"
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Problemer ved installering av pakke %s"
 
 #: ../../standalone/drakgw_.c:600
 msgid ""
@@ -7955,83 +8125,80 @@ msgstr ""
 "\n"
 "Klikk pх Konfigurer for х starte oppsett-hjelperen."
 
-#: ../../standalone/draknet_.c:75
+#: ../../standalone/draknet_.c:76
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Nettverkskonfigurasjon (%d adaptere"
 
-#: ../../standalone/draknet_.c:82 ../../standalone/draknet_.c:558
+#: ../../standalone/draknet_.c:83 ../../standalone/draknet_.c:561
 msgid "Profile: "
 msgstr "Profil: "
 
-#: ../../standalone/draknet_.c:90
+#: ../../standalone/draknet_.c:91
 msgid "Del profile..."
 msgstr "Slett profil..."
 
-#: ../../standalone/draknet_.c:96
+#: ../../standalone/draknet_.c:97
 msgid "Profile to delete:"
 msgstr "Profil som skal slettes:"
 
-#: ../../standalone/draknet_.c:124
+#: ../../standalone/draknet_.c:125
 msgid "New profile..."
 msgstr "Ny profil...."
 
-#: ../../standalone/draknet_.c:130
+#: ../../standalone/draknet_.c:131
 msgid "Name of the profile to create:"
 msgstr "Navnet pх profilen som skal lages:"
 
-#: ../../standalone/draknet_.c:156
+#: ../../standalone/draknet_.c:157
 msgid "Hostname: "
 msgstr "Vertsnavn: "
 
-#: ../../standalone/draknet_.c:163
+#: ../../standalone/draknet_.c:164
 msgid "Internet access"
 msgstr "Internett-tilgang"
 
-#: ../../standalone/draknet_.c:176
+#: ../../standalone/draknet_.c:177
 msgid "Type:"
 msgstr "Type:"
 
-#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
+#: ../../standalone/draknet_.c:180 ../../standalone/draknet_.c:388
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
+#: ../../standalone/draknet_.c:180 ../../standalone/draknet_.c:388
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../../standalone/draknet_.c:184
+#: ../../standalone/draknet_.c:185
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
-#: ../../standalone/net_monitor_.c:165 ../../standalone/net_monitor_.c:338
+#: ../../standalone/draknet_.c:187 ../../standalone/draknet_.c:391
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
-#: ../../standalone/net_monitor_.c:126 ../../standalone/net_monitor_.c:165
-#: ../../standalone/net_monitor_.c:338
+#: ../../standalone/draknet_.c:187 ../../standalone/draknet_.c:391
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:190 ../../standalone/draknet_.c:392
 msgid "Connect..."
 msgstr "Koble til..."
 
-#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:190 ../../standalone/draknet_.c:392
 msgid "Disconnect..."
 msgstr "Koble fra..."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:208
 msgid "Starting your connection..."
 msgstr "Starter tilkoblingen din..."
 
-#: ../../standalone/draknet_.c:215
+#: ../../standalone/draknet_.c:216
 msgid "Closing your connection..."
 msgstr "Lukker tilkoblingen din..."
 
-#: ../../standalone/draknet_.c:220
+#: ../../standalone/draknet_.c:221
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -8043,48 +8210,48 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "i root."
 
-#: ../../standalone/draknet_.c:223
+#: ../../standalone/draknet_.c:224
 msgid "The system is now disconnected."
 msgstr "Systemet er nх nedkoblet."
 
-#: ../../standalone/draknet_.c:235
+#: ../../standalone/draknet_.c:236
 msgid "Configure Internet Access..."
 msgstr "Konfigurer internetttilgang...."
 
-#: ../../standalone/draknet_.c:242 ../../standalone/draknet_.c:434
+#: ../../standalone/draknet_.c:243 ../../standalone/draknet_.c:434
 msgid "LAN configuration"
 msgstr "LAN-konfigurasjon"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Interface"
 msgstr "rensesnitt"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 #, fuzzy
 msgid "State"
 msgstr "Status:"
 
-#: ../../standalone/draknet_.c:259
+#: ../../standalone/draknet_.c:260
 msgid "Configure Local Area Network..."
 msgstr "Konfigurer lokalt nettverk"
 
-#: ../../standalone/draknet_.c:293
+#: ../../standalone/draknet_.c:294
 msgid "Normal Mode"
 msgstr "Normalt modus"
 
-#: ../../standalone/draknet_.c:298
+#: ../../standalone/draknet_.c:299
 msgid "Apply"
 msgstr "Bruk"
 
-#: ../../standalone/draknet_.c:317
+#: ../../standalone/draknet_.c:318
 msgid "Please Wait... Applying the configuration"
 msgstr "Vennligst vent . . . Setter konfigurasjonen pх plass"
 
@@ -8117,25 +8284,17 @@ msgstr "Startet ved oppstart"
 msgid "DHCP client"
 msgstr "DHCP-klient"
 
-#: ../../standalone/draknet_.c:476
+#: ../../standalone/draknet_.c:477 ../../standalone/draknet_.c:479
 #, fuzzy
-msgid "start it"
-msgstr "begrense"
-
-#: ../../standalone/draknet_.c:476
-msgid "stop it"
-msgstr ""
+msgid "activate now"
+msgstr "Aktiv"
 
-#: ../../standalone/draknet_.c:477
+#: ../../standalone/draknet_.c:477 ../../standalone/draknet_.c:479
 #, fuzzy
-msgid "activate"
+msgid "desactivate now"
 msgstr "Aktiv"
 
-#: ../../standalone/draknet_.c:477
-msgid "desactivate"
-msgstr ""
-
-#: ../../standalone/draknet_.c:523
+#: ../../standalone/draknet_.c:526
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -8143,30 +8302,35 @@ msgstr ""
 "Du har ingen internett-tilkobling.\n"
 "Opprett en fјrst ved х klikke pх 'Konfigurer'"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:550
 msgid "Internet connection configuration"
 msgstr "Internett tilkobling konfigurasjon"
 
-#: ../../standalone/draknet_.c:551
+#: ../../standalone/draknet_.c:554
 msgid "Internet Connection Configuration"
 msgstr "Internett tilkobling konfigurasjon"
 
-#: ../../standalone/draknet_.c:560 ../../standalone/net_monitor_.c:78
+#: ../../standalone/draknet_.c:563
 msgid "Connection type: "
 msgstr "Oppkoblingstype:"
 
-#: ../../standalone/draknet_.c:566
+#: ../../standalone/draknet_.c:569
 msgid "Parameters"
 msgstr "Parametere"
 
-#: ../../standalone/draknet_.c:593
+#: ../../standalone/draknet_.c:596
 msgid "Ethernet Card"
 msgstr "Ethernettkort"
 
-#: ../../standalone/draknet_.c:594
+#: ../../standalone/draknet_.c:597
 msgid "DHCP Client"
 msgstr "DHCP-klient"
 
+#: ../../standalone/draknet_.c:599
+#, fuzzy
+msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+msgstr "Oppkoblingstid. "
+
 #: ../../standalone/draksec_.c:21
 msgid "Welcome To Crackers"
 msgstr "Velkommen til Crackers"
@@ -8236,11 +8400,11 @@ msgstr ""
 msgid "Setting security level"
 msgstr "Setter sikkerhetsnivх"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:43
 msgid "Control Center"
 msgstr "Kontrollpanel"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:44
 msgid "Choose the tool you want to use"
 msgstr "Velg verktјyet du јnsker х bruke"
 
@@ -8281,92 +8445,6 @@ msgstr "Emulere tredje knapp?"
 msgid "Test the mouse here."
 msgstr "Vennligst test musen."
 
-#: ../../standalone/net_monitor_.c:41 ../../standalone/net_monitor_.c:71
-msgid "Network Monitoring"
-msgstr "Nettverksovervхking"
-
-#: ../../standalone/net_monitor_.c:75
-msgid "Settings"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:80
-msgid "Profile "
-msgstr "Profil "
-
-#: ../../standalone/net_monitor_.c:83
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: ../../standalone/net_monitor_.c:87
-msgid "Sending Speed:"
-msgstr "Sendehastighet: "
-
-#: ../../standalone/net_monitor_.c:88
-msgid "Receiving Speed:"
-msgstr "Mottakshastighet: "
-
-#: ../../standalone/net_monitor_.c:90
-#, fuzzy
-msgid "Connection Time: "
-msgstr "Oppkoblingstype:"
-
-#: ../../standalone/net_monitor_.c:97
-msgid "Logs"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
-msgid "Connecting to Internet "
-msgstr "Kobler opp mot Internett "
-
-#: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
-msgid "Disconnecting from Internet "
-msgstr "Kobler ned fra Internett "
-
-#: ../../standalone/net_monitor_.c:157
-msgid "Disconnection from Internet failed."
-msgstr "Nedkobling fra Internett mislykket."
-
-#: ../../standalone/net_monitor_.c:158
-msgid "Disconnection from Internet complete."
-msgstr "Nedkobling fra Internett ferdig."
-
-#: ../../standalone/net_monitor_.c:160
-msgid "Connection complete."
-msgstr "Tilkobling ferdig."
-
-#: ../../standalone/net_monitor_.c:161
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Tilkoblinhg mislykket.\n"
-"Verifiser konfigurasjonen din i Mandrake kontrollsenter."
-
-#: ../../standalone/net_monitor_.c:254
-#, fuzzy
-msgid "Color configuration"
-msgstr "Konfigurasjon"
-
-#: ../../standalone/net_monitor_.c:294
-msgid "sent: "
-msgstr "sendt: "
-
-#: ../../standalone/net_monitor_.c:301
-msgid "received: "
-msgstr "mottatt: "
-
-#: ../../standalone/net_monitor_.c:308
-msgid "average"
-msgstr ""
-
-#: ../../standalone/net_monitor_.c:336
-msgid "Connect"
-msgstr "Tilkoble"
-
-#: ../../standalone/net_monitor_.c:336
-msgid "Disconnect"
-msgstr "Koble fra"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Brannmurkonfigurasjon"
@@ -8397,6 +8475,74 @@ msgstr ""
 "\n"
 "Klikk pх Konfigurer for х sette opp en standard brannmur"
 
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Velg sprхk"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Velg installasjonsklasse"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Oppdaging av harddisk"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Konfigurer mus"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Velg tastatur"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Sikkerhet"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Oppsett filsystemer"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Formater partisjoner"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Velg pakker for installering"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Installer systemet"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Legg til en bruker"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Konfigurer nettverk"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Konfigurer tjenester"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Opprett en oppstartdiskett"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Installer oppstartslaster"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Konfigurer X"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Avslutt installering"
+
 #: ../../tinyfirewall.pm_.c:10
 msgid ""
 "tinyfirewall configurator\n"
@@ -8563,663 +8709,217 @@ msgstr "Kan ikke хpne %s: %s\n"
 msgid "Can't open %s for writing: %s\n"
 msgstr "Kan ikke хpne %s for skriving: %s\n"
 
-#~ msgid "/File/_New"
-#~ msgstr "/File/_Ny"
-
-#~ msgid "<control>N"
-#~ msgstr "<control>N"
-
-#~ msgid "/File/_Open"
-#~ msgstr "/File/_Хpne"
-
-#~ msgid "<control>O"
-#~ msgstr "<control>O"
-
-#~ msgid "/File/_Save"
-#~ msgstr "/File/_Lagre"
-
-#~ msgid "<control>S"
-#~ msgstr "<control>S"
-
-#~ msgid "/File/Save _As"
-#~ msgstr "/File/Lagre _som"
-
-#~ msgid "/File/-"
-#~ msgstr "/Fil/-"
-
-#~ msgid "/_Options"
-#~ msgstr "/_Valg"
-
-#~ msgid "/Options/Test"
-#~ msgstr "/Valg/Test"
-
-# #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
-#~ msgid "/_Help"
-#~ msgstr "/_Hjelp"
-
-#~ msgid "/Help/_About..."
-#~ msgstr "/Hjelp/_Om..."
-
-#
-#~ msgid "Default Runlevel"
-#~ msgstr "Standard runlevel"
-
-#~ msgid "Which printing system do you want to use?"
-#~ msgstr "Hvilket utskriftsystem јnsker du х bruke?"
-
-#~ msgid "Europe"
-#~ msgstr "Europa"
-
-#~ msgid "NetWare"
-#~ msgstr "NetWare"
-
-#, fuzzy
-#~ msgid "Do you want to print a test page?"
-#~ msgstr "Vil du teste utskrift?"
-
-#~ msgid "Remove queue"
-#~ msgstr "Fjern kј"
-
-#~ msgid "Config file content could not be interpreted."
-#~ msgstr "Innhold i konfig-fil kunne ikke bli tolket."
-
-#~ msgid "Unrecognized config file"
-#~ msgstr "Ukjent konfigurasjonsfil"
-
-#~ msgid "Adapter"
-#~ msgstr "Adapter"
-
-#, fuzzy
-#~ msgid "Disable network"
-#~ msgstr "Slх av"
-
-#, fuzzy
-#~ msgid "Enable network"
-#~ msgstr "Slх pх"
-
-#~ msgid ""
-#~ "You can now test your mouse. Use buttons and wheel to verify\n"
-#~ "if settings are good. If not, you can click on \"Cancel\" to choose "
-#~ "another\n"
-#~ "driver."
-#~ msgstr ""
-#~ "Du kan nх teste musen din. Bruk knapper og hjul for х verifisere\n"
-#~ "om innstillingene er ok. Hvis ikke kan du klikke pх \"Avbryt\" for х "
-#~ "velge en\n"
-#~ "annen driver."
-
-#~ msgid "DSL (or ADSL) connection"
-#~ msgstr "DSL- (eller ADSL) tilkobling"
-
-#
-#~ msgid "Choose"
-#~ msgstr "Velg"
-
-#~ msgid "You can specify directly the URI to access the printer with CUPS."
-#~ msgstr "Du kan spesifisere URIen for х fх tilgang til skriveren med CUPS."
-
-#~ msgid "Yes, print ASCII test page"
-#~ msgstr "Ja, skriv ASCII testside"
-
-#~ msgid "Yes, print PostScript test page"
-#~ msgstr "Ja, skriv PostScript testside"
-
-#~ msgid "Configure Printer"
-#~ msgstr "Konfigurer skriver"
-
-#~ msgid "Paper Size"
-#~ msgstr "Papirstјrrelse"
-
-#~ msgid "Eject page after job?"
-#~ msgstr "Kjјr ut side etter jobb?"
-
-#~ msgid "Uniprint driver options"
-#~ msgstr "Opsjoner uniprint-driver"
-
-#~ msgid "Color depth options"
-#~ msgstr "Opsjoner fargedybde"
-
-#~ msgid "Print text as PostScript?"
-#~ msgstr "Skrive ut tekst som PostScript?"
-
-#~ msgid "Fix stair-stepping text?"
-#~ msgstr "Fikse trappestegs-tekst?"
-
-#~ msgid "Number of pages per output pages"
-#~ msgstr "Nummer av sider pr. sider ut"
-
-#~ msgid "Right/Left margins in points (1/72 of inch)"
-#~ msgstr "Hјyre/venstre marginer i punkter (1/72 av inch)"
-
-#~ msgid "Top/Bottom margins in points (1/72 of inch)"
-#~ msgstr "Topp/bunn marginer i punkter (1/72 av inch)"
-
-#~ msgid "Extra GhostScript options"
-#~ msgstr "Ekstra GhostScript opsjoner"
-
-#~ msgid "Extra Text options"
-#~ msgstr "Ekstra tekstopsjoner"
-
-#~ msgid "Reverse page order"
-#~ msgstr "Reversere siderekkefјlge"
-
-#~ msgid "CUPS starting"
-#~ msgstr "CUPS starter"
-
-#~ msgid "Reading CUPS drivers database..."
-#~ msgstr "Leser CUPS driver database..."
-
-#~ msgid "Select Remote Printer Connection"
-#~ msgstr "Velg tilkobling fjern-skriver"
-
 #~ msgid ""
-#~ "Every printer need a name (for example lp).\n"
-#~ "Other parameters such as the description of the printer or its location\n"
-#~ "can be defined. What name should be used for this printer and\n"
-#~ "how is the printer connected?"
+#~ "I can set up your computer to automatically log on one user.\n"
+#~ "If you don't want to use this feature, click on the cancel button."
 #~ msgstr ""
-#~ "Hver skriver hхndtert av CUPS trenger et navn (f.eks. lp).\n"
-#~ "Andre parametere som beskrivelse av skriveren eller dennes lokasjon\n"
-#~ "kan defineres. Hvilket navn skal brukes for denne skriveren og\n"
-#~ "hvordan er skriveren tilkoblet?"
-
-#~ 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 and how is the printer "
-#~ "connected?"
-#~ msgstr ""
-#~ "Hver skriverkј (som skrivejobber sendes til) trenger et navn\n"
-#~ "(ofte lp) og en spolingskatalog direkte assosiert med denne. Hvilket\n"
-#~ "navn og katalog skal brukes for denne kјen og hvordan er skriveren "
-#~ "tilkoblet?"
-
-#~ msgid "Name of queue"
-#~ msgstr "Kјens navn"
-
-#~ msgid "Spool directory"
-#~ msgstr "Spolingskatalog"
-
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "Klienter for forskjellige protokoller inkludert ssh"
-
-#~ msgid "Development"
-#~ msgstr "Utvikling"
+#~ "Jeg kan sette opp maskinen din til х automatisk logge pх en bruker.\n"
+#~ "иnsker du х bruke denne funksjonen?"
 
-#~ msgid "Workstation"
-#~ msgstr "Arbeidstasjon"
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Skriv /etc/fstab"
 
-#~ msgid "Firewall/Router"
-#~ msgstr "Server, Brannmur/ruter"
+#~ msgid "Restore from file"
+#~ msgstr "Gjenopprett fra fil"
 
-#~ msgid "Personal Information Management"
-#~ msgstr "Personling informasjonshхndtering"
+#~ msgid "Save in file"
+#~ msgstr "Lagre i fil"
 
-#~ msgid "Multimedia - Graphics"
-#~ msgstr "Multimedia - Grafikk"
+#~ msgid "Restore from floppy"
+#~ msgstr "Gjenopprett fra diskett"
 
-#~ msgid "Internet"
-#~ msgstr "Internett"
+#~ msgid "Format all"
+#~ msgstr "Formater alle"
 
-#~ msgid "Network Computer (client)"
-#~ msgstr "Nettverksmaskin (klient)"
+#~ msgid "Write partition table"
+#~ msgstr "Skriv partisjonstabell"
 
-#~ msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-#~ msgstr "Lydrelaterte verktјy: mp3 eller midi-spillere, miksere etc."
+#~ msgid "After formatting all partitions,"
+#~ msgstr "Etter formatering av alle partisjonene,"
 
-#~ msgid "Internet station"
-#~ msgstr "Internettstasjon"
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "alle data pх disse partisjonene vil gх tapt"
 
-#~ msgid "Office"
-#~ msgstr "Office"
+#~ msgid "Rescue partition table"
+#~ msgstr "Redd partisjonstabell"
 
-#~ msgid "Multimedia station"
-#~ msgstr "Multimediastasjon"
+#~ msgid "Reload"
+#~ msgstr "Last igjen"
 
 #~ msgid ""
-#~ "Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-#~ "browse the Web"
+#~ "Do you want to generate an auto install floppy for linux replication?"
 #~ msgstr ""
-#~ "Sett med verktјy for х lese og sende e-post og nyheter (pine, mutt, "
-#~ "tin...) og for se pх webben"
+#~ "иnsker du х generere en auto installeringsdiskett for linux replikasjon?"
 
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "C og C++ utviklingsbibliotek, programmer og include filer"
-
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "Tjener for domenenavn og nettverksinformasjon"
-
-#~ msgid "Programs to manage your finance, such as gnucash"
-#~ msgstr "Programmer for х hхndtere dine finanser, sх som gnucash"
-
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "PostgreSQL eller MySQL database tjener"
-
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
-
-#~ msgid "Documentation"
-#~ msgstr "Dokumentasjon"
-
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, Window Maker, Enlightenment, Fvwm etc"
-
-#~ msgid "Utilities"
-#~ msgstr "Verktјy"
-
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS"
-
-#~ msgid "Graphical Environment"
-#~ msgstr "Grafisk miljј"
-
-#~ msgid "Multimedia - Sound"
-#~ msgstr "Multimedia - Lyd"
-
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "Underholdningsprogrammer: arkade, bordspill, strategi etc"
-
-#~ msgid "Video players and editors"
-#~ msgstr "Videospillere og redigerere"
-
-#~ msgid "Console Tools"
-#~ msgstr "Konsollverktјy"
-
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "Lyd og bilde avspilling/redigeringsprogrammer"
-
-#~ msgid "Scientific Workstation"
-#~ msgstr "Vitenskaplig arbeidsstasjon"
-
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "Redigerere, skall, filverktјy, terminaler"
-
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "Bјker og howto's om Linux og fri programvare"
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL-konfigurasjon"
 
 #~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
 #~ msgstr ""
-#~ "Et grafisk miljј med et brukervennlig sett med applikasjoner og "
-#~ "skrivebords- verktјy"
-
-#~ msgid "Postfix mail server, Inn news server"
-#~ msgstr "Postfix posttjener, Inn nyhetstjener"
+#~ "Med en fjern-CUPS tjener behјver du ikke х konfigurere\n"
+#~ "noen skrivere her; skrivere vil bli oppdaget automatisk\n"
+#~ "hvis du ikke har en tjener pх et annet nettverk; i sх fall\n"
+#~ "mх du gi CUPS tjeneren IP adresse og muligens nummeret pх\n"
+#~ "porten."
 
-#~ msgid "Games"
-#~ msgstr "Spill"
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "Oppgi skrivernavn og kommentarer"
 
-#~ msgid "Multimedia - Video"
-#~ msgstr "Multimedia - Video"
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Navnet pх den eksterne kјen mangler!"
 
-#~ msgid "Network Computer server"
-#~ msgstr "Nettverk datamaskintjener"
-
-#~ msgid "Graphics programs such as The Gimp"
-#~ msgstr "Grafiske programmer sх som Gimp"
-
-#~ msgid "Office Workstation"
-#~ msgstr "Kontor og arbeidsmaskin"
+#~ msgid "Pipe into command"
+#~ msgstr "Pipe inn i kommando"
 
 #~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
 #~ msgstr ""
-#~ "K Desktop Environment, basis grafikkmiljј med en samling av passende "
-#~ "verktјy"
-
-#~ msgid "More Graphical Desktops (Gnome, IceWM)"
-#~ msgstr "Mere grafiske skrivebord (Gnome, IceWM)"
+#~ "Her kan du oppgi den kommandolinjen som jobben bјr sendes til istedenfor "
+#~ "retttil skriveren."
 
-#~ msgid "Tools to create and burn CD's"
-#~ msgstr "Verktјy for х opprette og brenne CD'er"
+#~ msgid "Command line"
+#~ msgstr "Kommandolinje"
 
-#~ msgid "Multimedia - CD Burning"
-#~ msgstr "Multimedia - CD-brenning"
+#~ msgid "A command line must be entered!"
+#~ msgstr "En kommandolinje mх oppgis!"
 
-#~ msgid "Archiving, emulators, monitoring"
-#~ msgstr "Arkivering, emulatorer, overvхkning"
+#~ msgid "Network Monitoring"
+#~ msgstr "Nettverksovervхking"
 
-#~ msgid "Database"
-#~ msgstr "Database"
+#~ msgid "Settings"
+#~ msgstr "Instillinger"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Kontorprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
-#~ "gnumeric), pdf fremvisere etc"
+#~ msgid "Profile "
+#~ msgstr "Profil "
 
-#~ msgid "Web/FTP"
-#~ msgstr "Web/FTP"
+#~ msgid "Statistics"
+#~ msgstr "Statistikk"
 
-#~ msgid "Server"
-#~ msgstr "Tjener"
+#~ msgid "Sending Speed:"
+#~ msgstr "Sendehastighet: "
 
-#~ msgid "Personal Finance"
-#~ msgstr "Personlig finans"
+#~ msgid "Receiving Speed:"
+#~ msgstr "Mottakshastighet: "
 
-#~ msgid "KDE Workstation"
-#~ msgstr "KDE arbeidstasjon"
+#~ msgid "Connection Time: "
+#~ msgstr "Oppkoblingstid. "
 
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "Andre grafiske skrivebord"
+#~ msgid "Logs"
+#~ msgstr "Logger"
 
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache og Pro-ftpd"
+#~ msgid "Connecting to Internet "
+#~ msgstr "Kobler opp mot Internett "
 
-#~ msgid "Mail/Groupware/News"
-#~ msgstr "Server, Mail/Gruppevare/News"
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Kobler ned fra Internett "
 
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnome arbeidstasjon"
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Nedkobling fra Internett mislykket."
 
-#~ msgid "Internet gateway"
-#~ msgstr "Internett-gateway"
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Nedkobling fra Internett ferdig."
 
-#~ msgid "Tools for your Palm Pilot or your Visor"
-#~ msgstr "Verktјy for din Palm Pilot eller din Visor"
-
-#~ msgid "Game station"
-#~ msgstr "Spillstasjon"
-
-#~ msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm etc"
-
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "Verktјy for х forenkle konfigurasjonen pх maskinen din"
-
-#~ msgid "Set of tools for mail, news, web, file transfer, and chat"
-#~ msgstr "Sett med verktјy for e-post, nyheter, web, filoverfјring og chat"
-
-#~ msgid ""
-#~ "To enable a more secure system, you should select \"Use shadow file\" "
-#~ "and\n"
-#~ "\"Use MD5 passwords\"."
-#~ msgstr ""
-#~ "For et mere sikkert system, burde du velge \"Bruk skyggefil\" og\n"
-#~ "\"Bruk MD5 passord\"."
-
-#~ msgid ""
-#~ "If your network uses NIS, select \"Use NIS\". If you don't know, ask "
-#~ "your\n"
-#~ "network administrator."
-#~ msgstr ""
-#~ "Hvis nettverket ditt bruker NIS, velg \"Bruk NIS\". Hvis du ikke vet "
-#~ "dette,\n"
-#~ "spјr nettverksadministratoren din."
-
-#~ msgid "yellow pages"
-#~ msgstr "gule sider"
-
-#, fuzzy
-#~ msgid "Light configuration"
-#~ msgstr "LAN-konfigurasjon"
-
-#~ msgid "Provider dns 1"
-#~ msgstr "Tilbyder dns 1"
-
-#~ msgid "Provider dns 2"
-#~ msgstr "Tilbyder dns 2"
-
-#~ msgid "Choose which services should be automatically started at boot time"
-#~ msgstr "Velg hvilke tjenester som skal startes automatisk ved oppstart"
-
-#, fuzzy
-#~ msgid "Services"
-#~ msgstr "enhet"
-
-#~ msgid "running"
-#~ msgstr "kjјrer"
-
-#~ msgid "stopped"
-#~ msgstr "stoppet"
-
-#~ msgid "Services and deamons"
-#~ msgstr "Tjenester og daemoner"
-
-#~ msgid ""
-#~ "No additionnal information\n"
-#~ "about this service, sorry."
-#~ msgstr ""
-#~ "Ingen tilleggsinformasjon\n"
-#~ "om denne tjenesten, begklager."
-
-#~ msgid "On boot"
-#~ msgstr "Ved oppstart"
-
-#~ msgid "How do you want to connect to the Internet?"
-#~ msgstr "Hvordan vil du koble opp mot Internett?"
-
-#~ msgid "cannot fork: "
-#~ msgstr "kan ikke dele: "
-
-#~ msgid "Lilo/Grub configuration"
-#~ msgstr "Lilo/Grub konfigurasjon"
-
-#~ msgid "Selected size %d%s"
-#~ msgstr "Valgt stјrrelse %d%s"
-
-#~ msgid "Opening your connection..."
-#~ msgstr "Хpner tilkoblingen din..."
-
-#~ msgid "Configure..."
-#~ msgstr "Konfigurer..."
-
-#~ msgid "Configuration de Lilo/Grub"
-#~ msgstr "Konfigurasjon Lilo/Grub"
-
-#~ msgid "This startup script try to load your modules for your usb mouse."
-#~ msgstr "Dette oppstartsscriptet prјver х laste modulene for usb-musen din."
-
-#~ msgid "Boot style configuration"
-#~ msgstr "Oppstartsstilkonfigurasjon"
+#~ msgid "Connection complete."
+#~ msgstr "Tilkobling ferdig."
 
 #~ msgid ""
-#~ "Now that your Internet connection is configured,\n"
-#~ "your computer can be configured to share its Internet connection.\n"
-#~ "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-#~ "(LAN).\n"
-#~ "\n"
-#~ "Would you like to setup the Internet Connection Sharing?\n"
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
 #~ msgstr ""
-#~ "Nх nхr Internett-tilknytningen er konfigurert, kan\n"
-#~ "maskinen din konfigureres til х dele Internett-tilknytningen.\n"
-#~ "Merk: du trenger et dedikert nettverksadapter for х sette opp et lokalt "
-#~ "nettverk (LAN).\n"
-#~ "\n"
-#~ "иnsker du х sette opp deling av Internett-tilknytning?\n"
-
-#~ msgid "Welcome to the Internet Connection Sharing utility!"
-#~ msgstr "Velkommen til verktјyet for deling av Internett tilkobling!"
+#~ "Tilkoblinhg mislykket.\n"
+#~ "Verifiser konfigurasjonen din i Mandrake kontrollsenter."
 
-#~ msgid "Automatic dependencies"
-#~ msgstr "Avhengigheter automatisk"
+#~ msgid "Color configuration"
+#~ msgstr "Fargekonfigurasjon"
 
-#~ msgid "Configure LILO/GRUB"
-#~ msgstr "Konfigurer LILO/GRUB"
+#~ msgid "sent: "
+#~ msgstr "sendt: "
 
-#~ msgid "Create a boot floppy"
-#~ msgstr "Opprett en oppstartdiskett"
+#~ msgid "received: "
+#~ msgstr "mottatt: "
 
-#~ msgid "Format floppy"
-#~ msgstr "Formater diskett"
+#~ msgid "average"
+#~ msgstr "gjennomsnittlig"
 
-#~ msgid "Choice"
-#~ msgstr "Valg"
+#~ msgid "Connect"
+#~ msgstr "Tilkoble"
 
-#~ msgid "horizontal nice looking aurora"
-#~ msgstr "horisontal og fin aurora"
+#~ msgid "Disconnect"
+#~ msgstr "Koble fra"
 
-#~ msgid "vertical traditional aurora"
-#~ msgstr "vertikal og tradisjonell aurora"
-
-#~ msgid "gMonitor"
-#~ msgstr "gMonitor"
+#~ msgid "/File/_New"
+#~ msgstr "/File/_Ny"
 
-#~ msgid ""
-#~ "You can now select some miscellaneous options for your system.\n"
-#~ "\n"
-#~ "* Use hard drive optimizations: this option can improve hard disk "
-#~ "performance but is only for advanced users. Some buggy\n"
-#~ "  chipsets can ruin your data, so beware. Note that the kernel has a "
-#~ "builtin blacklist of drives and chipsets, but if\n"
-#~ "  you want to avoid bad surprises, leave this option unset.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Choose security level: you can choose a security level for your system. "
-#~ "Please refer to the manual for complete\n"
-#~ "  information. Basically, if you don't know what to choose, keep the "
-#~ "default option.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Precise RAM if needed: unfortunately, there is no standard method to "
-#~ "ask the BIOS about the amount of RAM present in\n"
-#~ "  your computer. As consequence, Linux may fail to detect your amount of "
-#~ "RAM correctly. If this is the case, you can\n"
-#~ "  specify the correct amount or RAM here. Please note that a difference "
-#~ "of 2 or 4 MB between detected memory and memory\n"
-#~ "  present in your system is normal.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Removable media automounting: if you would prefer not to manually mount "
-#~ "removable media (CD-Rom, floppy, Zip, etc.) by\n"
-#~ "  typing \"mount\" and \"umount\", select this option.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Clean \"/tmp\" at each boot: if you want delete all files and "
-#~ "directories stored in \"/tmp\" when you boot your system,\n"
-#~ "  select this option.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Enable num lock at startup: if you want NumLock key enabled after "
-#~ "booting, select this option. Please note that you\n"
-#~ "  should not enable this option on laptops and that NumLock may or may "
-#~ "not work under X."
-#~ msgstr ""
-#~ "Du kan nх velge noen forskjellige opsjoner for systemet ditt.\n"
-#~ "\n"
-#~ "* Bruk harddisk-optimisering: Denne opsjonen kan forbedre harddisk "
-#~ "ytelse, men er bare for erfarne brukere: noen ustabile\n"
-#~ "  chip-sett kan јdelegge dataene dine, sх vцr forsiktig. Merk at kjernen "
-#~ "har en innebygd svarteliste over disker og chip-sett,\n"
-#~ "  men hvis du vil unngх leie overraskelser, la denne opsjonen vцre "
-#~ "avslхtt.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Velg sikkerhetsnivх: Du kan velge et sikkerhetsnivх for systemet ditt. "
-#~ "Se i manualen for mer informasjon. \n"
-#~ "  Basis: hvis du ikke vet hva du skal velge, bruk standard valg.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Presiser RAM-stјrrelse ved behov: dessverre er det ingen standardmetode "
-#~ "for х spјrre BIOS om mengden av RAM i maskinen din.\n"
-#~ "  Som en konsekvens kan Linux mislykkes i finne hvor mye RAM du har. Hvis "
-#~ "dette er tilfelle, kan du spesifisere riktig\n"
-#~ "  RAM-mengde her. Merk at en differanse pх 2 eller 4 MB mellom minne som "
-#~ "er funnet og minnet i systemet\n"
-#~ "  er normalt.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Fjernbart media automontering: Hvis du јnsker х ikke montere fjernbare "
-#~ "media manuelt (CD-ROM, diskett, Zip) ved х skrive\n"
-#~ " \"mount\" og \"umount\", velg denne opsjonen.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Tјm \"/tmp\" ved hver oppstart: hvis du јnsker х slette alle filer og "
-#~ "kataloger lagret i \"/tmp\" nхr du starter opp systemet ditt,\n"
-#~ "  velg denne opsjonen.\n"
-#~ "\n"
-#~ "\n"
-#~ "* Slх pх NumLock ved oppstart: Hvis du јnsker NumLock slхtt pх etter "
-#~ "oppstart, velg denne opsjonen. Merk at du ikke burde slх\n"
-#~ "  pх denn funksjonen pх bцrbare og at NumLock vil kanskje/kanskje ikke "
-#~ "virke under X."
-
-#~ msgid "Sorry, the mail configuration is not yet implemented. Be patient."
-#~ msgstr ""
-#~ "Beklager, mailkonfigurasjonen er ennх ikke implementert. Vennlist vцr "
-#~ "tхlmodig."
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
 
-#~ msgid ""
-#~ "Welcome to The Network Configuration Wizard.\n"
-#~ "Which components do you want to configure?\n"
-#~ msgstr ""
-#~ "Velkommen til nettverkskonfigurasjonsveiviseren.\n"
-#~ "Hvilke komponenter јnsker du х konfigurere?\n"
+#~ msgid "/File/_Open"
+#~ msgstr "/File/_Хpne"
 
-#~ msgid "Internet/Network access"
-#~ msgstr "Internett og nettverkskonfigurasjon"
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
 
-#~ msgid "Mail information"
-#~ msgstr "Mailinformasjon"
+#~ msgid "/File/_Save"
+#~ msgstr "/File/_Lagre"
 
-#~ msgid "Firewall Configuration Wizard"
-#~ msgstr "Konfigurasjonveiviser for brannmur"
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
 
-#~ msgid "Miscellaneous"
-#~ msgstr "Diverse"
+#~ msgid "/File/Save _As"
+#~ msgstr "/File/Lagre _som"
 
-#~ msgid "Miscellaneous questions"
-#~ msgstr "Forskjellige spјrsmхl"
+#~ msgid "/File/-"
+#~ msgstr "/Fil/-"
 
-#~ msgid "Can't use supermount in high security level"
-#~ msgstr "Kan ikke bruke supermount i hјyt sikkerhetsnivх"
+#~ msgid "/_Options"
+#~ msgstr "/_Valg"
 
-#~ msgid ""
-#~ "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
-#~ "If you want to be root, you have to login as a user and then use \"su\".\n"
-#~ "More generally, do not expect to use your machine for anything but as a "
-#~ "server.\n"
-#~ "You have been warned."
-#~ msgstr ""
-#~ "Merk: I DETTE SIKKERHETSNIVХET ER ROOT INNLOGG VED KONSOLL IKKE TILLATT!\n"
-#~ "Hvis du јnsker х vцre root mх du logge inn som bruker for sх х bruke \"su"
-#~ "\".\n"
-#~ "Mere generelt, ikke forvent х bruke maskinen din til annet enn en "
-#~ "tjener.\n"
-#~ "Du har blitt advart."
+#~ msgid "/Options/Test"
+#~ msgstr "/Valg/Test"
 
-#~ msgid ""
-#~ "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
-#~ "give digits instead of normal letters (eg: pressing `p' gives `6')"
-#~ msgstr ""
-#~ "Vцr forsiktig, х ha numlock slхtt pх forхrsaker at mange av tastene\n"
-#~ "gir tall istedenfor vanlige bokstaver (f.eks: `p' gir `6')"
+# #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
+#~ msgid "/_Help"
+#~ msgstr "/_Hjelp"
 
-#~ msgid "not connected"
-#~ msgstr "ikke tilkoblet"
+#~ msgid "/Help/_About..."
+#~ msgstr "/Hjelp/_Om..."
 
-#~ msgid "Actions"
-#~ msgstr "Muligheter"
+#
+#~ msgid "Default Runlevel"
+#~ msgstr "Standard runlevel"
 
-#~ msgid "Scientific applications"
-#~ msgstr "Vitenskaplige applikasjoner"
+#~ msgid "Which printing system do you want to use?"
+#~ msgstr "Hvilket utskriftsystem јnsker du х bruke?"
 
-#~ msgid "toot"
-#~ msgstr "toot"
+#~ msgid "Europe"
+#~ msgstr "Europa"
 
-#~ msgid "File/Print/Samba"
-#~ msgstr "Server. Fil/utskrift/samba"
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
 
-#~ msgid "DNS/DHCP "
-#~ msgstr "Server, DNS/DHCP"
+#~ msgid "Do you want to print a test page?"
+#~ msgstr "Vil du teste utskrift?"
 
-#~ msgid "First DNS Server"
-#~ msgstr "Fјrste DNS-tjener"
+#~ msgid "Remove queue"
+#~ msgstr "Fjern kј"
 
-#~ msgid "Second DNS Server"
-#~ msgstr "Andre DNS-tjener"
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Innhold i konfig-fil kunne ikke bli tolket."
 
-#~ msgid "using module"
-#~ msgstr "bruker modul"
+#~ msgid "Unrecognized config file"
+#~ msgstr "Ukjent konfigurasjonsfil"
 
-#~ msgid "Development, Database"
-#~ msgstr "Utvikling, database"
+#~ msgid "Adapter"
+#~ msgstr "Adapter"
 
-#~ msgid "Development, Integrated Environment"
-#~ msgstr "Utvikling, Intergrert miljј"
+#~ msgid "Disable network"
+#~ msgstr "Slх av nettverk"
 
-#~ msgid "Development, Standard tools"
-#~ msgstr "Utvikling. Standardverktјy"
+#~ msgid "Enable network"
+#~ msgstr "Slх pх nettverk"
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index cc2800d11..005f42948 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: 2001-08-10 18:42+0200\n"
+"POT-Creation-Date: 2001-08-21 14:27+0200\n"
 "PO-Revision-Date: 2001-08-12 13:12GMT+1\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: SERBIAN <office@mandrake.co.yu>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 0.8\n"
 
 #: ../../Xconfigurator.pm_.c:232
-msgid "Configure all heads independantly"
+msgid "Configure all heads independently"
 msgstr "Подеси све главе независно"
 
 #: ../../Xconfigurator.pm_.c:233
@@ -232,8 +232,8 @@ msgstr "Графичка картица: %s"
 msgid "XFree86 server: %s"
 msgstr "XFree86 сервер: %s"
 
-#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:290
-#: ../../standalone/draknet_.c:293
+#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:291
+#: ../../standalone/draknet_.c:294
 msgid "Expert Mode"
 msgstr "Експертни мод"
 
@@ -479,164 +479,164 @@ msgstr "Монитор који ради са 1600x1200 на 70 Hz"
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Монитор који ради са 1600x1200 на 76 Hz"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124
+#: ../../any.pm_.c:100 ../../any.pm_.c:125
 msgid "First sector of boot partition"
 msgstr "Први сектор стартне партиције"
 
-#: ../../any.pm_.c:99 ../../any.pm_.c:124 ../../any.pm_.c:197
+#: ../../any.pm_.c:100 ../../any.pm_.c:125 ../../any.pm_.c:198
 msgid "First sector of drive (MBR)"
 msgstr "Први сектор диска (MBR)"
 
-#: ../../any.pm_.c:103
+#: ../../any.pm_.c:104
 msgid "SILO Installation"
 msgstr "SILO инсталација"
 
-#: ../../any.pm_.c:104 ../../any.pm_.c:117
+#: ../../any.pm_.c:105 ../../any.pm_.c:118
 msgid "Where do you want to install the bootloader?"
 msgstr "Где бисте да инсталирате стартер?"
 
-#: ../../any.pm_.c:116
+#: ../../any.pm_.c:117
 msgid "LILO/grub Installation"
 msgstr "LILO/grub инсталација"
 
-#: ../../any.pm_.c:128 ../../any.pm_.c:142
+#: ../../any.pm_.c:129 ../../any.pm_.c:143
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:130
+#: ../../any.pm_.c:131
 msgid "LILO with text menu"
 msgstr "LILO са текстуалним мениjeм"
 
-#: ../../any.pm_.c:131 ../../any.pm_.c:142
+#: ../../any.pm_.c:132 ../../any.pm_.c:143
 msgid "LILO with graphical menu"
 msgstr "LILO са графичким мениjем"
 
-#: ../../any.pm_.c:134
+#: ../../any.pm_.c:135
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:138
+#: ../../any.pm_.c:139
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "Стартaње из DOS/Windows-a (loadlin)"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:142
+#: ../../any.pm_.c:141 ../../any.pm_.c:143
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:148 ../../any.pm_.c:180
+#: ../../any.pm_.c:149 ../../any.pm_.c:181
 msgid "Bootloader main options"
 msgstr "Главне опције стартерa"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:181
+#: ../../any.pm_.c:150 ../../any.pm_.c:182
 msgid "Bootloader to use"
 msgstr "Стартер коjи ћe се користити"
 
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:152
 msgid "Bootloader installation"
 msgstr "Инсталациja стартерa"
 
-#: ../../any.pm_.c:153 ../../any.pm_.c:183
+#: ../../any.pm_.c:154 ../../any.pm_.c:184
 msgid "Boot device"
 msgstr "Стартни (boot) уређај"
 
-#: ../../any.pm_.c:154
+#: ../../any.pm_.c:155
 msgid "LBA (doesn't work on old BIOSes)"
 msgstr "LBA (не ради на старим BIOS-имa)"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:156
 msgid "Compact"
 msgstr "Компакт"
 
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:156
 msgid "compact"
 msgstr "компакт"
 
-#: ../../any.pm_.c:156 ../../any.pm_.c:253
+#: ../../any.pm_.c:157 ../../any.pm_.c:254
 msgid "Video mode"
 msgstr "Видео мод"
 
-#: ../../any.pm_.c:158
+#: ../../any.pm_.c:159
 msgid "Delay before booting default image"
 msgstr "Пауза пре стартања default image-а"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:949 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:324 ../../printerdrake.pm_.c:400
-#: ../../standalone/draknet_.c:588
+#: ../../any.pm_.c:161 ../../any.pm_.c:731
+#: ../../install_steps_interactive.pm_.c:944 ../../network/modem.pm_.c:46
+#: ../../printerdrake.pm_.c:352 ../../printerdrake.pm_.c:431
+#: ../../standalone/draknet_.c:591
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../../any.pm_.c:161 ../../any.pm_.c:739
-#: ../../install_steps_interactive.pm_.c:950
+#: ../../any.pm_.c:162 ../../any.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:945
 msgid "Password (again)"
 msgstr "Лозинка (поновите)"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:163
 msgid "Restrict command line options"
 msgstr "Ограничена командна линика - опције"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:163
 msgid "restrict"
 msgstr "ограничено"
 
-#: ../../any.pm_.c:164
+#: ../../any.pm_.c:165
 msgid "Clean /tmp at each boot"
 msgstr "Очисти /tmp при сваком стартaњу"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:166
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Дефиниши величину RAM ако је потребно (детектовано је %d MB)"
 
-#: ../../any.pm_.c:167
+#: ../../any.pm_.c:168
 msgid "Enable multi profiles"
 msgstr "Омогући мулти-профиле"
 
-#: ../../any.pm_.c:171
+#: ../../any.pm_.c:172
 msgid "Give the ram size in MB"
 msgstr "Прикажи величину RAM-а у Mb"
 
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:174
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Опција``Ограничена командна линика - опције'' је неупотребљива без лозинке"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../any.pm_.c:175 ../../any.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:939
 msgid "Please try again"
 msgstr "Пробајте поново"
 
-#: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:944
+#: ../../any.pm_.c:175 ../../any.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:939
 msgid "The passwords do not match"
 msgstr "Неподударност лозинки"
 
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:183
 msgid "Init Message"
 msgstr "Инициjална порукa"
 
-#: ../../any.pm_.c:184
+#: ../../any.pm_.c:185
 msgid "Open Firmware Delay"
 msgstr "Отпочни Firmware паузу"
 
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:186
 msgid "Kernel Boot Timeout"
 msgstr "Пауза при стартaњу кернелa"
 
-#: ../../any.pm_.c:186
+#: ../../any.pm_.c:187
 msgid "Enable CD Boot?"
 msgstr "Омогући стартaње са CD-a?"
 
-#: ../../any.pm_.c:187
+#: ../../any.pm_.c:188
 msgid "Enable OF Boot?"
 msgstr "Омогући OF стартaње?"
 
-#: ../../any.pm_.c:188
+#: ../../any.pm_.c:189
 msgid "Default OS?"
 msgstr "Подразумевани ОС ?"
 
-#: ../../any.pm_.c:210
+#: ../../any.pm_.c:211
 msgid ""
 "Here are the different entries.\n"
 "You can add some more or change the existing ones."
@@ -644,146 +644,144 @@ msgstr ""
 "Ово су постављне опције.\n"
 "Можете додати нове или изменити старе."
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:221
 msgid "Add"
 msgstr "Додај"
 
-#: ../../any.pm_.c:220 ../../any.pm_.c:726 ../../diskdrake.pm_.c:47
-#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:975
-#: ../../printerdrake.pm_.c:976 ../../printerdrake.pm_.c:1007
-#: ../../printerdrake.pm_.c:1032
+#: ../../any.pm_.c:221 ../../any.pm_.c:719 ../../diskdrake.pm_.c:176
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:1281
+#: ../../printerdrake.pm_.c:1282 ../../printerdrake.pm_.c:1318
+#: ../../printerdrake.pm_.c:1352
 msgid "Done"
 msgstr "Урађено"
 
-#: ../../any.pm_.c:220
+#: ../../any.pm_.c:221
 msgid "Modify"
 msgstr "Промени"
 
-#: ../../any.pm_.c:228
+#: ../../any.pm_.c:229
 msgid "Which type of entry do you want to add?"
 msgstr "Коју врсту уносa додаjетe ?"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:230
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:229
+#: ../../any.pm_.c:230
 msgid "Other OS (SunOS...)"
 msgstr "Други ОС-ови (SunOS,BSD,...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:231
 msgid "Other OS (MacOS...)"
 msgstr "Други ОС-ови (MacOS,BSD,...)"
 
-#: ../../any.pm_.c:230
+#: ../../any.pm_.c:231
 msgid "Other OS (windows...)"
 msgstr "Други ОС-ови (Windows,BSD,BeOS,...)"
 
-#: ../../any.pm_.c:249
+#: ../../any.pm_.c:250
 msgid "Image"
 msgstr "Слика"
 
-#: ../../any.pm_.c:250 ../../any.pm_.c:261
+#: ../../any.pm_.c:251 ../../any.pm_.c:262
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:251 ../../any.pm_.c:280
+#: ../../any.pm_.c:252 ../../any.pm_.c:281
 msgid "Append"
 msgstr "Додатaк"
 
-#: ../../any.pm_.c:255
+#: ../../any.pm_.c:256
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:256
+#: ../../any.pm_.c:257
 msgid "Read-write"
 msgstr "Читање-писање RW"
 
-#: ../../any.pm_.c:263
+#: ../../any.pm_.c:264
 msgid "Table"
 msgstr "Табела"
 
-#: ../../any.pm_.c:264
+#: ../../any.pm_.c:265
 msgid "Unsafe"
 msgstr "Несигурно"
 
-#: ../../any.pm_.c:271 ../../any.pm_.c:276 ../../any.pm_.c:279
+#: ../../any.pm_.c:272 ../../any.pm_.c:277 ../../any.pm_.c:280
 msgid "Label"
 msgstr "Ознака"
 
-#: ../../any.pm_.c:273 ../../any.pm_.c:284
+#: ../../any.pm_.c:274 ../../any.pm_.c:285
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../../any.pm_.c:281
+#: ../../any.pm_.c:282
 msgid "Initrd-size"
 msgstr "Initrd-величинa"
 
-#: ../../any.pm_.c:283
+#: ../../any.pm_.c:284
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:291
+#: ../../any.pm_.c:292
 msgid "Remove entry"
 msgstr "Уклањам унос"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:295
 msgid "Empty label not allowed"
 msgstr "Празна ознака није дозвољена"
 
-#: ../../any.pm_.c:295
+#: ../../any.pm_.c:296
 msgid "This label is already used"
 msgstr "Ова ознака је већ у употреби"
 
-#: ../../any.pm_.c:314
-msgid "What type of partitioning?"
-msgstr "Коју врсту партиционирaњa?"
-
-#: ../../any.pm_.c:605
+#: ../../any.pm_.c:598
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Пронађено  %s %s интерфејсa"
 
-#: ../../any.pm_.c:606
+#: ../../any.pm_.c:599
 msgid "Do you have another one?"
 msgstr "Да ли имате још један?"
 
-#: ../../any.pm_.c:607
+#: ../../any.pm_.c:600
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Имате ли још %s интерфејса?"
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
+#: ../../any.pm_.c:602 ../../any.pm_.c:761 ../../interactive.pm_.c:110
+#: ../../my_gtk.pm_.c:672
 msgid "No"
 msgstr "Не"
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
+#: ../../any.pm_.c:602 ../../any.pm_.c:760 ../../interactive.pm_.c:110
+#: ../../my_gtk.pm_.c:672
 msgid "Yes"
 msgstr "Да"
 
-#: ../../any.pm_.c:610
+#: ../../any.pm_.c:603
 msgid "See hardware info"
 msgstr "Погледај информације о хардверу"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:645
+#: ../../any.pm_.c:638
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Инсталирам драјвер за %s картицу %s"
 
-#: ../../any.pm_.c:646
+#: ../../any.pm_.c:639
 #, c-format
 msgid "(module %s)"
 msgstr "(модул %s)"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:650
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Који %s драјвер да пробам?"
 
-#: ../../any.pm_.c:665
+#: ../../any.pm_.c:658
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -799,20 +797,20 @@ msgstr ""
 "сами да унесете додатне податке за њега, или да их драјвер сам одреди?\n"
 "Могуће је да ће проба заглавити ваш рачунар, али неће нанети никакву штету."
 
-#: ../../any.pm_.c:670
+#: ../../any.pm_.c:663
 msgid "Autoprobe"
 msgstr "Аутоматска проба"
 
-#: ../../any.pm_.c:670
+#: ../../any.pm_.c:663
 msgid "Specify options"
 msgstr "Наведите опције"
 
-#: ../../any.pm_.c:674
+#: ../../any.pm_.c:667
 #, c-format
 msgid "You may now provide its options to module %s."
 msgstr "Можете навести његове опције за модул %s."
 
-#: ../../any.pm_.c:680
+#: ../../any.pm_.c:673
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -823,11 +821,11 @@ msgstr ""
 "Опције су у формату ``име=вредност име2=вредност2 ...''.\n"
 "На пример, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:683
+#: ../../any.pm_.c:676
 msgid "Module options:"
 msgstr "Опције модула:"
 
-#: ../../any.pm_.c:694
+#: ../../any.pm_.c:687
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -836,33 +834,33 @@ msgstr ""
 "Подизање модула %s неуспело.\n"
 "Да ли желите покушате поново са другим параметрима ?"
 
-#: ../../any.pm_.c:712
+#: ../../any.pm_.c:705
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s већ постоји)"
 
-#: ../../any.pm_.c:716
+#: ../../any.pm_.c:709
 msgid "This password is too simple"
 msgstr "Ова лозинка је превише проста"
 
-#: ../../any.pm_.c:717
+#: ../../any.pm_.c:710
 msgid "Please give a user name"
 msgstr "Одредите корисничко име"
 
-#: ../../any.pm_.c:718
+#: ../../any.pm_.c:711
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Корисничко име може садржати само мала слова, бројеве, `-' и `_'"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:712
 msgid "This user name is already added"
 msgstr "Ово корисничко име већ постоји"
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:716
 msgid "Add user"
 msgstr "Додај корисника"
 
-#: ../../any.pm_.c:724
+#: ../../any.pm_.c:717
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -871,45 +869,36 @@ msgstr ""
 "Унеси корисника\n"
 "%s"
 
-#: ../../any.pm_.c:725
+#: ../../any.pm_.c:718
 msgid "Accept user"
 msgstr "Прихвати корисника"
 
-#: ../../any.pm_.c:736
+#: ../../any.pm_.c:729
 msgid "Real name"
 msgstr "Право име"
 
-#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:323
-#: ../../printerdrake.pm_.c:399
+#: ../../any.pm_.c:730 ../../printerdrake.pm_.c:351
+#: ../../printerdrake.pm_.c:430
 msgid "User name"
 msgstr "Корисничко име"
 
-#: ../../any.pm_.c:740
+#: ../../any.pm_.c:733
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:742
+#: ../../any.pm_.c:735
 msgid "Icon"
 msgstr "Иконa"
 
-#: ../../any.pm_.c:763
+#: ../../any.pm_.c:757
 msgid "Autologin"
 msgstr "Ауто логовaњe"
 
-#: ../../any.pm_.c:764
-msgid ""
-"I can set up your computer to automatically log on one user.\n"
-"If you don't want to use this feature, click on the cancel button."
-msgstr ""
-"Ja могу подести ваш рачунар да аутоматски улогуje jeдног корисникa.\n"
-"Уколико не желите да користите ову опциjу, кликните на  тастер поништи"
-"(cancel) ?"
-
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:762
 msgid "Choose the default user:"
 msgstr "Изаберите default (основног) корисникa:"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:763
 msgid "Choose the window manager to run:"
 msgstr "Изаберите window менадзер коjи желите да користите:"
 
@@ -1069,7 +1058,7 @@ msgstr ""
 "Кликните на Подеси (Configure) да би покренули подeшававање."
 
 #: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
-#: ../../standalone/draknet_.c:272 ../../standalone/tinyfirewall_.c:57
+#: ../../standalone/draknet_.c:273 ../../standalone/tinyfirewall_.c:57
 msgid "Configure"
 msgstr "Подеси"
 
@@ -1093,32 +1082,34 @@ msgstr "Не, ja не желим аутологовaњe"
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Да, jа желим аутологовaњe са овим(корисник,десктоп)"
 
-#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:104
-#: ../../standalone/draknet_.c:136 ../../standalone/draknet_.c:200
-#: ../../standalone/draknet_.c:312 ../../standalone/draknet_.c:421
-#: ../../standalone/draknet_.c:492 ../../standalone/draknet_.c:528
-#: ../../standalone/draknet_.c:634 ../../standalone/net_monitor_.c:260
+#: ../../bootlook.pm_.c:155 ../../standalone/draknet_.c:105
+#: ../../standalone/draknet_.c:137 ../../standalone/draknet_.c:201
+#: ../../standalone/draknet_.c:313 ../../standalone/draknet_.c:421
+#: ../../standalone/draknet_.c:495 ../../standalone/draknet_.c:531
+#: ../../standalone/draknet_.c:632
 msgid "OK"
 msgstr "У реду"
 
 #: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:504
-#: ../../interactive.pm_.c:119 ../../interactive.pm_.c:274
-#: ../../interactive.pm_.c:294 ../../interactive_stdio.pm_.c:27
-#: ../../my_gtk.pm_.c:409 ../../my_gtk.pm_.c:412 ../../my_gtk.pm_.c:670
-#: ../../standalone/drakgw_.c:648 ../../standalone/draknet_.c:111
-#: ../../standalone/draknet_.c:143 ../../standalone/draknet_.c:305
-#: ../../standalone/draknet_.c:504 ../../standalone/draknet_.c:648
-#: ../../standalone/net_monitor_.c:261 ../../standalone/tinyfirewall_.c:63
+#: ../../interactive.pm_.c:120 ../../interactive.pm_.c:284
+#: ../../interactive.pm_.c:304 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:413 ../../my_gtk.pm_.c:416 ../../my_gtk.pm_.c:673
+#: ../../printerdrake.pm_.c:970 ../../standalone/drakgw_.c:648
+#: ../../standalone/draknet_.c:112 ../../standalone/draknet_.c:144
+#: ../../standalone/draknet_.c:306 ../../standalone/draknet_.c:507
+#: ../../standalone/draknet_.c:646 ../../standalone/tinyfirewall_.c:63
 msgid "Cancel"
 msgstr "Обустави"
 
 #: ../../bootlook.pm_.c:225
-msgid "can not open /etc/inittab for reading: $!"
-msgstr "не могу отворити /etc/inittab за читaњe: $!"
+#, c-format
+msgid "can not open /etc/inittab for reading: %s"
+msgstr "не могу отворити /etc/inittab за читaњe: %s"
 
 #: ../../bootlook.pm_.c:279
-msgid "can not open /etc/sysconfig/autologin for reading: $!"
-msgstr "не могу отворити /etc/sysconfig/autologin за читaњe: $!"
+#, c-format
+msgid "can not open /etc/sysconfig/autologin for reading: %s"
+msgstr "не могу отворити /etc/sysconfig/autologin за читaњe: %s"
 
 #: ../../bootlook.pm_.c:345 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
@@ -1132,8 +1123,7 @@ msgstr "GB"
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:93 ../../diskdrake.pm_.c:680
-#: ../../install_steps_graphical.pm_.c:287
+#: ../../common.pm_.c:93 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
 msgid "MB"
 msgstr "MB"
@@ -1156,464 +1146,380 @@ msgstr "1 минут"
 msgid "%d seconds"
 msgstr "%d секунди"
 
-#: ../../diskdrake.pm_.c:22 ../../diskdrake.pm_.c:463
-msgid "Create"
-msgstr "Креирај"
+#: ../../diskdrake.pm_.c:102
+msgid "Please make a backup of your data first"
+msgstr "Молим вас, прво направите копију ваших података"
 
-#: ../../diskdrake.pm_.c:23
-msgid "Unmount"
-msgstr "Демонтирај"
+#: ../../diskdrake.pm_.c:102 ../../diskdrake_interactive.pm_.c:755
+#: ../../diskdrake_interactive.pm_.c:764 ../../diskdrake_interactive.pm_.c:818
+msgid "Read carefully!"
+msgstr "ПАЖЉИВО ПРОЧИТАЈ !"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:465
-msgid "Delete"
-msgstr "Обриши"
+#: ../../diskdrake.pm_.c:106
+msgid ""
+"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"enough)\n"
+"at the beginning of the disk"
+msgstr ""
+"Уколико планирате да користите  aboot, оставитe празан простор (2048 "
+"секторана почетку \n"
+"диска)"
 
-#: ../../diskdrake.pm_.c:24
-msgid "Format"
-msgstr "Форматирање"
+#: ../../diskdrake.pm_.c:124 ../../install_steps.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:323 ../../interactive_http.pm_.c:119
+#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:60
+msgid "Error"
+msgstr "Грешка"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:673
-msgid "Resize"
-msgstr "Промени величину"
+#: ../../diskdrake.pm_.c:197
+msgid "New"
+msgstr "Нови"
 
-#: ../../diskdrake.pm_.c:24 ../../diskdrake.pm_.c:463
-#: ../../diskdrake.pm_.c:525
-msgid "Type"
-msgstr "Тип"
+#: ../../diskdrake.pm_.c:219 ../../diskdrake.pm_.c:222
+#, fuzzy
+msgid "Remote"
+msgstr "Удаљени ред:"
 
-#: ../../diskdrake.pm_.c:25 ../../diskdrake.pm_.c:559
+#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:453
+#: ../../diskdrake_interactive.pm_.c:323 ../../diskdrake_interactive.pm_.c:475
 msgid "Mount point"
 msgstr "Тачка монтирања"
 
-#: ../../diskdrake.pm_.c:39
-msgid "Write /etc/fstab"
-msgstr "Испиши /etc/fstab"
-
-#: ../../diskdrake.pm_.c:40
-msgid "Toggle to expert mode"
-msgstr "Пређи на експерт мод"
-
-#: ../../diskdrake.pm_.c:41
-msgid "Toggle to normal mode"
-msgstr "Пређи на нормални мод"
-
-#: ../../diskdrake.pm_.c:42
-msgid "Restore from file"
-msgstr "Поврати (restore) из датотекe"
-
-#: ../../diskdrake.pm_.c:43
-msgid "Save in file"
-msgstr "Сними у датотеку"
-
-#: ../../diskdrake.pm_.c:44
-msgid "Wizard"
-msgstr "чаробњак (помоћник)"
-
-#: ../../diskdrake.pm_.c:45
-msgid "Restore from floppy"
-msgstr "Поврати (restore) са дискете"
-
-#: ../../diskdrake.pm_.c:46 ../../install_steps_interactive.pm_.c:557
-msgid "Save on floppy"
-msgstr "Сними на дискету"
-
-#: ../../diskdrake.pm_.c:50
-msgid "Clear all"
-msgstr "Очисти све"
+#: ../../diskdrake.pm_.c:225
+msgid "Options"
+msgstr "Опциje"
 
-#: ../../diskdrake.pm_.c:55
-msgid "Format all"
-msgstr "Форматирај све"
+#: ../../diskdrake.pm_.c:227 ../../diskdrake.pm_.c:400
+#: ../../diskdrake.pm_.c:509 ../../diskdrake_interactive.pm_.c:322
+#: ../../diskdrake_interactive.pm_.c:443
+msgid "Type"
+msgstr "Тип"
 
-#: ../../diskdrake.pm_.c:56
-msgid "Auto allocate"
-msgstr "Ауто дислоцирање"
+#: ../../diskdrake.pm_.c:239 ../../diskdrake_interactive.pm_.c:331
+msgid "Unmount"
+msgstr "Демонтирај"
 
-#: ../../diskdrake.pm_.c:60
-msgid "All primary partitions are used"
-msgstr "Све примарне партиције су заузете"
+#: ../../diskdrake.pm_.c:240 ../../diskdrake_interactive.pm_.c:327
+msgid "Mount"
+msgstr "Монтирај"
 
-#: ../../diskdrake.pm_.c:60
-msgid "I can't add any more partition"
-msgstr "Не могу додати више ни једну партицију"
+#: ../../diskdrake.pm_.c:244
+msgid "Choose action"
+msgstr "Изаберите акцију"
 
-#: ../../diskdrake.pm_.c:60
+#: ../../diskdrake.pm_.c:250
 msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
 msgstr ""
-"Да би омогућили креирање још (extended) партиција избришите једну од "
-"постојећих"
-
-#: ../../diskdrake.pm_.c:62
-msgid "Not enough space for auto-allocating"
-msgstr "Нема довољно слободног простора за еауто-алоцирaње"
-
-#: ../../diskdrake.pm_.c:64
-msgid "Undo"
-msgstr "Поништи радњу"
+"Диск садржи једну велику FAT партицију\n"
+"(углавном је користе MicroSoft Dos/Windows-и, на жалост).\n"
+"Предлажем да прво измените величну (resize) те партиције (кликните на њу,\n"
+"а потом на \"Промени величину\")"
 
-#: ../../diskdrake.pm_.c:65
-msgid "Write partition table"
-msgstr "Упиши табелу партиција"
+#: ../../diskdrake.pm_.c:253
+msgid "Please click on a partition"
+msgstr "Кликните на партицију"
 
-#: ../../diskdrake.pm_.c:66 ../../install_steps_interactive.pm_.c:186
-msgid "More"
-msgstr "Jош"
+#: ../../diskdrake.pm_.c:270 ../../install_steps_gtk.pm_.c:505
+msgid "Details"
+msgstr "Детаљи"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake.pm_.c:117
+#: ../../diskdrake.pm_.c:378
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake.pm_.c:118
+#: ../../diskdrake.pm_.c:379 ../../diskdrake_interactive.pm_.c:876
 msgid "Empty"
 msgstr "Празно"
 
-#: ../../diskdrake.pm_.c:118 ../../install_steps_gtk.pm_.c:361
+#: ../../diskdrake.pm_.c:379 ../../install_steps_gtk.pm_.c:361
 #: ../../install_steps_gtk.pm_.c:421 ../../mouse.pm_.c:145
 msgid "Other"
 msgstr "Друго"
 
-#: ../../diskdrake.pm_.c:124
+#: ../../diskdrake.pm_.c:383
 msgid "Filesystem types:"
 msgstr "Врста фајл система:"
 
-#: ../../diskdrake.pm_.c:133 ../../install_steps_gtk.pm_.c:505
-msgid "Details"
-msgstr "Детаљи"
+#: ../../diskdrake.pm_.c:400 ../../diskdrake_interactive.pm_.c:344
+msgid "Create"
+msgstr "Креирај"
 
-#: ../../diskdrake.pm_.c:148
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
-msgstr ""
-"Диск садржи једну велику FAT партицију\n"
-"(углавном је користе MicroSoft Dos/Windows-и, на жалост).\n"
-"Предлажем да прво измените величну (resize) те партиције (кликните на њу,\n"
-"а потом на \"Промени величину\")"
+#: ../../diskdrake.pm_.c:400 ../../diskdrake.pm_.c:402
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Уместо тога пробајте ``%s''"
 
-#: ../../diskdrake.pm_.c:153
-msgid "Please make a backup of your data first"
-msgstr "Молим вас, прво направите копију ваших података"
+#: ../../diskdrake.pm_.c:402 ../../diskdrake_interactive.pm_.c:321
+msgid "Delete"
+msgstr "Обриши"
 
-#: ../../diskdrake.pm_.c:153 ../../diskdrake.pm_.c:171
-#: ../../diskdrake.pm_.c:180 ../../diskdrake.pm_.c:590
-#: ../../diskdrake.pm_.c:612
-msgid "Read carefully!"
-msgstr "ПАЖЉИВО ПРОЧИТАЈ !"
+#: ../../diskdrake.pm_.c:406
+msgid "Use ``Unmount'' first"
+msgstr "Прво урадите ``Демонтирај''"
 
-#: ../../diskdrake.pm_.c:156
+#: ../../diskdrake.pm_.c:407 ../../diskdrake_interactive.pm_.c:435
+#, c-format
 msgid ""
-"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
-"enough)\n"
-"at the beginning of the disk"
+"After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
-"Уколико планирате да користите  aboot, оставитe празан простор (2048 "
-"секторана почетку \n"
-"диска)"
+"После промене типа партициje %s, сви подаци на овој партицији ће бити "
+"избрисани"
 
-#: ../../diskdrake.pm_.c:171
-msgid "Be careful: this operation is dangerous."
-msgstr "ПАЖЉИВО,ова операција jе опасна."
+#: ../../diskdrake.pm_.c:452 ../../diskdrake_interactive.pm_.c:474
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Где бисте да монтирате %s уређај ?"
 
-#: ../../diskdrake.pm_.c:215 ../../install_steps.pm_.c:72
-#: ../../install_steps_interactive.pm_.c:37
-#: ../../install_steps_interactive.pm_.c:323 ../../interactive_http.pm_.c:119
-#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:66
-msgid "Error"
-msgstr "Грешка"
+#: ../../diskdrake.pm_.c:475
+#, fuzzy
+msgid "Mount options"
+msgstr "Опције модула:"
 
-#: ../../diskdrake.pm_.c:239 ../../diskdrake.pm_.c:768
-msgid "Mount point: "
-msgstr "Тачка монтирања: "
+#: ../../diskdrake.pm_.c:482
+msgid "Various"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:240 ../../diskdrake.pm_.c:299
-msgid "Device: "
-msgstr "Уређај: "
+#: ../../diskdrake.pm_.c:500
+#, fuzzy
+msgid "Removable media"
+msgstr "Аутомонтирање преносивих медија"
 
-#: ../../diskdrake.pm_.c:241
-#, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "Ознака DOS партиције: %s (само претпоставка)\n"
+#: ../../diskdrake.pm_.c:507
+#, fuzzy
+msgid "Change type"
+msgstr "Промена типа партиције"
 
-#: ../../diskdrake.pm_.c:245 ../../diskdrake.pm_.c:252
-#: ../../diskdrake.pm_.c:302
-msgid "Type: "
-msgstr "Унеси: "
+#: ../../diskdrake.pm_.c:508 ../../diskdrake_interactive.pm_.c:442
+msgid "Which filesystem do you want?"
+msgstr "Коју  датотечни систем желите ?"
 
-#: ../../diskdrake.pm_.c:249
-msgid "Name: "
-msgstr "Име: "
+#: ../../diskdrake.pm_.c:533
+msgid "Scanning available nfs shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:254
+#: ../../diskdrake.pm_.c:538
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "Почетак: сектор %s\n"
+msgid "Scanning available nfs shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:255
-#, c-format
-msgid "Size: %s"
-msgstr "Величина: %s"
+#: ../../diskdrake.pm_.c:570
+msgid "Scanning available samba shared resource"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:257
+#: ../../diskdrake.pm_.c:581 ../../diskdrake.pm_.c:594
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s сектора"
+msgid "Scanning available samba shared resource of server %s"
+msgstr ""
 
-#: ../../diskdrake.pm_.c:259
-#, c-format
-msgid "Cylinder %d to cylinder %d\n"
-msgstr "Цилиндар %d до цилиндра %d\n"
+#: ../../diskdrake_interactive.pm_.c:161
+#, fuzzy
+msgid "Choose a partition"
+msgstr "Изаберите акцију"
 
-#: ../../diskdrake.pm_.c:260
-msgid "Formatted\n"
-msgstr "Форматирано\n"
+#: ../../diskdrake_interactive.pm_.c:161
+#, fuzzy
+msgid "Choose another partition"
+msgstr "Креирај нову партицију"
 
-#: ../../diskdrake.pm_.c:261
-msgid "Not formatted\n"
-msgstr "Није форматирано\n"
+#: ../../diskdrake_interactive.pm_.c:183
+#, fuzzy
+msgid "Exit"
+msgstr "Ext2"
 
-#: ../../diskdrake.pm_.c:262
-msgid "Mounted\n"
-msgstr "Монтирано\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Toggle to expert mode"
+msgstr "Пређи на експерт мод"
 
-#: ../../diskdrake.pm_.c:263
-#, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Toggle to normal mode"
+msgstr "Пређи на нормални мод"
 
-#: ../../diskdrake.pm_.c:265
-#, c-format
-msgid "Loopback file(s): %s\n"
-msgstr "Loopback фаjл(ови): %s\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Undo"
+msgstr "Поништи радњу"
 
-#: ../../diskdrake.pm_.c:266
-msgid ""
-"Partition booted by default\n"
-"    (for MS-DOS boot, not for lilo)\n"
-msgstr ""
-"Boot партиција по default-у\n"
-"   (за подизање MS-DOSа, не за lilo)\n"
+#: ../../diskdrake_interactive.pm_.c:205
+msgid "Wizard"
+msgstr "чаробњак (помоћник)"
 
-#: ../../diskdrake.pm_.c:268
-#, c-format
-msgid "Level %s\n"
-msgstr "Ниво %s\n"
+#: ../../diskdrake_interactive.pm_.c:224
+msgid "Continue anyway?"
+msgstr "Свеједно наставити ?"
 
-#: ../../diskdrake.pm_.c:269
-#, c-format
-msgid "Chunk size %s\n"
-msgstr "Chunk-уј %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Quit without saving"
+msgstr "Крај без снимања промена"
 
-#: ../../diskdrake.pm_.c:270
-#, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-дискови %s\n"
+#: ../../diskdrake_interactive.pm_.c:229
+msgid "Quit without writing the partition table?"
+msgstr "Крај без снимања промена у табеле партиција?"
 
-#: ../../diskdrake.pm_.c:272
-#, c-format
-msgid "Loopback file name: %s"
-msgstr "Имe Loopback датотекe: %s"
+#: ../../diskdrake_interactive.pm_.c:240
+msgid "Auto allocate"
+msgstr "Ауто дислоцирање"
+
+#: ../../diskdrake_interactive.pm_.c:240
+msgid "Clear all"
+msgstr "Очисти све"
+
+#: ../../diskdrake_interactive.pm_.c:243
+#, fuzzy
+msgid "Hard drive information"
+msgstr "Детекција хард дискa"
+
+#: ../../diskdrake_interactive.pm_.c:260
+msgid "Not enough space for auto-allocating"
+msgstr "Нема довољно слободног простора за еауто-алоцирaње"
 
-#: ../../diskdrake.pm_.c:275
+#: ../../diskdrake_interactive.pm_.c:266
+msgid "All primary partitions are used"
+msgstr "Све примарне партиције су заузете"
+
+#: ../../diskdrake_interactive.pm_.c:267
+msgid "I can't add any more partition"
+msgstr "Не могу додати више ни једну партицију"
+
+#: ../../diskdrake_interactive.pm_.c:268
 msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
-"\n"
-"Наjвероватниjе je, да jе ова партициja\n"
-"Driver партициja, па неби требали\n"
-"да jе диратe.\n"
+"Да би омогућили креирање још (extended) партиција избришите једну од "
+"постојећих"
 
-#: ../../diskdrake.pm_.c:278
+#: ../../diskdrake_interactive.pm_.c:276 ../../diskdrake_interactive.pm_.c:293
+msgid "Select file"
+msgstr "Изаберите датотеку"
+
+#: ../../diskdrake_interactive.pm_.c:284
 msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
-"\n"
-"Ово jе специjална Bootstrap\n"
-"партициjа и користи сe\n"
-"dual-booting вaшег системa.\n"
+"Похрaњенa(снимљена) табела партиција није исте величине\n"
+"Желите да наставите ?"
 
-#: ../../diskdrake.pm_.c:295
-msgid "Please click on a partition"
-msgstr "Кликните на партицију"
+#: ../../diskdrake_interactive.pm_.c:294
+msgid "Warning"
+msgstr "Упозорење"
 
-#: ../../diskdrake.pm_.c:300
-#, c-format
-msgid "Size: %s\n"
-msgstr "Величина: %s\n"
+#: ../../diskdrake_interactive.pm_.c:295
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Убаците дискету у уређај\n"
+"Сви подаци на дискети ће бити избрисани !"
 
-#: ../../diskdrake.pm_.c:301
-#, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Геометрија: %s цилиндара, %s глава, %s сектора\n"
+#: ../../diskdrake_interactive.pm_.c:303
+msgid "Trying to rescue partition table"
+msgstr "Спасавање табеле партиција"
 
-#: ../../diskdrake.pm_.c:303
-#, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-дискови %s\n"
+#: ../../diskdrake_interactive.pm_.c:309
+#, fuzzy
+msgid "Detailed information"
+msgstr "Прикажи информације"
 
-#: ../../diskdrake.pm_.c:304
-#, c-format
-msgid "Partition table type: %s\n"
-msgstr "Тип табелe партиција : %s\n"
+#: ../../diskdrake_interactive.pm_.c:324 ../../diskdrake_interactive.pm_.c:541
+msgid "Resize"
+msgstr "Промени величину"
 
-#: ../../diskdrake.pm_.c:305
-#, c-format
-msgid "on bus %d id %d\n"
-msgstr "на бусу %d ID %d\n"
+#: ../../diskdrake_interactive.pm_.c:325 ../../diskdrake_interactive.pm_.c:581
+msgid "Move"
+msgstr "Премести"
 
-#: ../../diskdrake.pm_.c:321
-msgid "Mount"
-msgstr "Монтирај"
+#: ../../diskdrake_interactive.pm_.c:326
+msgid "Format"
+msgstr "Форматирање"
 
-#: ../../diskdrake.pm_.c:323
+#: ../../diskdrake_interactive.pm_.c:328
 msgid "Active"
 msgstr "Активирај"
 
-#: ../../diskdrake.pm_.c:325
+#: ../../diskdrake_interactive.pm_.c:329
 msgid "Add to RAID"
 msgstr "Додај на RAID"
 
-#: ../../diskdrake.pm_.c:327
-msgid "Remove from RAID"
-msgstr "Уклони са RAID-а"
-
-#: ../../diskdrake.pm_.c:329
-msgid "Modify RAID"
-msgstr "Промени RAID"
-
-#: ../../diskdrake.pm_.c:331
+#: ../../diskdrake_interactive.pm_.c:330
 msgid "Add to LVM"
 msgstr "Додај на LVM"
 
-#: ../../diskdrake.pm_.c:333
+#: ../../diskdrake_interactive.pm_.c:332
+msgid "Remove from RAID"
+msgstr "Уклони са RAID-а"
+
+#: ../../diskdrake_interactive.pm_.c:333
 msgid "Remove from LVM"
 msgstr "Уклони са LVM-а"
 
-#: ../../diskdrake.pm_.c:335
+#: ../../diskdrake_interactive.pm_.c:334
+msgid "Modify RAID"
+msgstr "Промени RAID"
+
+#: ../../diskdrake_interactive.pm_.c:335
 msgid "Use for loopback"
 msgstr "Користи за loopback"
 
-#: ../../diskdrake.pm_.c:342
-msgid "Choose action"
-msgstr "Изаберите акцију"
-
-#: ../../diskdrake.pm_.c:436
-msgid ""
-"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
-"1024).\n"
-"Either you use LILO and it won't work, or you don't use LILO and you don't "
-"need /boot"
-msgstr ""
-"Није могуће креирати /boot за сада на хард диску (на цилиндру > 1024).\n"
-"Или користите LILO који не ради, или га не користите па вам не треба /boot"
-
-#: ../../diskdrake.pm_.c:440
-msgid ""
-"The partition you've selected to add as root (/) is physically located "
-"beyond\n"
-"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
-"If you plan to use the LILO boot manager, be careful to add a /boot partition"
-msgstr ""
-"Партиција коју сте изабрали за root (/) је физички лоцирана изнад\n"
-"1024-тог цилиндра хард диска,и немате /boot партицију.\n"
-"Уколико планирате да кориситите LILO boot менаджер, морате\n"
-"додати /boot партицији."
-
-#: ../../diskdrake.pm_.c:446
-msgid ""
-"You've selected a software RAID partition as root (/).\n"
-"No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
-msgstr ""
-"Изабрали сте софтверску RAID партициjу као root (/).\n"
-"Ниjедан стартер не може да ради са тим без /boot партициje.\n"
-"Зато пазите дa додате /boot партициjу"
-
-#: ../../diskdrake.pm_.c:463 ../../diskdrake.pm_.c:465
-#, c-format
-msgid "Use ``%s'' instead"
-msgstr "Уместо тога пробајте ``%s''"
+#: ../../diskdrake_interactive.pm_.c:378
+msgid "Create a new partition"
+msgstr "Креирај нову партицију"
 
-#: ../../diskdrake.pm_.c:469
-msgid "Use ``Unmount'' first"
-msgstr "Прво урадите ``Демонтирај''"
+#: ../../diskdrake_interactive.pm_.c:381
+msgid "Start sector: "
+msgstr "Почетни сектор: "
 
-#: ../../diskdrake.pm_.c:470 ../../diskdrake.pm_.c:517
-#, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"После промене типа партициje %s, сви подаци на овој партицији ће бити "
-"избрисани"
+#: ../../diskdrake_interactive.pm_.c:383 ../../diskdrake_interactive.pm_.c:688
+msgid "Size in MB: "
+msgstr "Величина у MB:"
 
-#: ../../diskdrake.pm_.c:482
-msgid "Continue anyway?"
-msgstr "Свеједно наставити ?"
+#: ../../diskdrake_interactive.pm_.c:384 ../../diskdrake_interactive.pm_.c:689
+msgid "Filesystem type: "
+msgstr "Врста татотeчноg система:"
 
-#: ../../diskdrake.pm_.c:487
-msgid "Quit without saving"
-msgstr "Крај без снимања промена"
+#: ../../diskdrake_interactive.pm_.c:385 ../../diskdrake_interactive.pm_.c:860
+#: ../../diskdrake_interactive.pm_.c:932
+msgid "Mount point: "
+msgstr "Тачка монтирања: "
 
-#: ../../diskdrake.pm_.c:487
-msgid "Quit without writing the partition table?"
-msgstr "Крај без снимања промена у табеле партиција?"
+#: ../../diskdrake_interactive.pm_.c:389
+msgid "Preference: "
+msgstr "Карактеристике: "
 
-#: ../../diskdrake.pm_.c:523
+#: ../../diskdrake_interactive.pm_.c:441
 msgid "Change partition type"
 msgstr "Промена типа партиције"
 
-#: ../../diskdrake.pm_.c:524
-msgid "Which filesystem do you want?"
-msgstr "Коју  датотечни систем желите ?"
-
-#: ../../diskdrake.pm_.c:528
+#: ../../diskdrake_interactive.pm_.c:446
 msgid "Switching from ext2 to ext3"
 msgstr "Мењам ext2 на ext3"
 
-#: ../../diskdrake.pm_.c:539 ../../diskdrake.pm_.c:800
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Нe можете користити ReiserFS за партициjе мање од 32MB"
-
-#: ../../diskdrake.pm_.c:540
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Нe можете користити JFS за партициjе мање од 16MB"
-
-#: ../../diskdrake.pm_.c:557
+#: ../../diskdrake_interactive.pm_.c:473
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Где бисте да монтирате loopback датотеку  %s?"
 
-#: ../../diskdrake.pm_.c:558
-#, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Где бисте да монтирате %s уређај ?"
-
-#: ../../diskdrake.pm_.c:562
+#: ../../diskdrake_interactive.pm_.c:480
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1621,222 +1527,346 @@ msgstr ""
 "Демонтирaњe ниjе могуће,jер се партициjа корисити за loop back.\n"
 "Прво уклоните loopback"
 
-#: ../../diskdrake.pm_.c:581
-#, c-format
-msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr ""
-"После форматирaњa партициje %s,сви подаци на овој партицији ће бити избрисани"
+#: ../../diskdrake_interactive.pm_.c:500
+msgid "Computing FAT filesystem bounds"
+msgstr "Прорачунавам границе FAT датотeчног система"
 
-#: ../../diskdrake.pm_.c:583
-msgid "Formatting"
-msgstr "Форматирање"
+#: ../../diskdrake_interactive.pm_.c:500 ../../diskdrake_interactive.pm_.c:556
+#: ../../install_interactive.pm_.c:112
+msgid "Resizing"
+msgstr "Промена величине (resizing)"
 
-#: ../../diskdrake.pm_.c:584
-#, c-format
-msgid "Formatting loopback file %s"
-msgstr "Форматирање loopback датотекe %s"
+#: ../../diskdrake_interactive.pm_.c:529
+msgid "This partition is not resizeable"
+msgstr "Овоj партицици ниjе могућe променити величину"
 
-#: ../../diskdrake.pm_.c:585 ../../install_steps_interactive.pm_.c:432
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Форматирање партиције %s"
+#: ../../diskdrake_interactive.pm_.c:534
+msgid "All data on this partition should be backed-up"
+msgstr "Cви подаци на овој партицији би требали бити сaчувани"
 
-#: ../../diskdrake.pm_.c:590
-msgid "After formatting all partitions,"
-msgstr "После форматирања свих партиција,"
+#: ../../diskdrake_interactive.pm_.c:536
+#, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "После промене величинe %s партициjе сви подаци ће бити избрисани"
 
-#: ../../diskdrake.pm_.c:590
-msgid "all data on these partitions will be lost"
-msgstr "сви подаци на њима ће бити уништени"
+#: ../../diskdrake_interactive.pm_.c:541
+msgid "Choose the new size"
+msgstr "Изаберите нову величину"
 
-#: ../../diskdrake.pm_.c:596
-msgid "Move"
-msgstr "Премести"
+#: ../../diskdrake_interactive.pm_.c:542
+#, fuzzy
+msgid "New size in MB: "
+msgstr "Величина у MB:"
 
-#: ../../diskdrake.pm_.c:597
+#: ../../diskdrake_interactive.pm_.c:582
 msgid "Which disk do you want to move it to?"
 msgstr "Који диск желите да преместите?"
 
-#: ../../diskdrake.pm_.c:598
+#: ../../diskdrake_interactive.pm_.c:583
 msgid "Sector"
 msgstr "Сектор"
 
-#: ../../diskdrake.pm_.c:599
+#: ../../diskdrake_interactive.pm_.c:584
 msgid "Which sector do you want to move it to?"
 msgstr "Где желитe да инсталирате стартер?"
 
-#: ../../diskdrake.pm_.c:602
+#: ../../diskdrake_interactive.pm_.c:587
 msgid "Moving"
 msgstr "Премештање"
 
-#: ../../diskdrake.pm_.c:602
+#: ../../diskdrake_interactive.pm_.c:587
 msgid "Moving partition..."
 msgstr "Премештање партиције..."
 
-#: ../../diskdrake.pm_.c:612
+#: ../../diskdrake_interactive.pm_.c:593 ../../diskdrake_interactive.pm_.c:835
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Табела партиција за уређај %s ће бити записана на диск!"
-
-#: ../../diskdrake.pm_.c:614
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Морате рестартовати рачунар да би се измене извршиле"
-
-#: ../../diskdrake.pm_.c:635
-msgid "Computing FAT filesystem bounds"
-msgstr "Прорачунавам границе FAT датотeчног система"
-
-#: ../../diskdrake.pm_.c:635 ../../diskdrake.pm_.c:700
-#: ../../install_interactive.pm_.c:111
-msgid "Resizing"
-msgstr "Промена величине (resizing)"
-
-#: ../../diskdrake.pm_.c:663
-msgid "This partition is not resizeable"
-msgstr "Овоj партицици ниjе могућe променити величину"
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr ""
+"После форматирaњa партициje %s,сви подаци на овој партицији ће бити избрисани"
 
-#: ../../diskdrake.pm_.c:668
-msgid "All data on this partition should be backed-up"
-msgstr "Cви подаци на овој партицији би требали бити сaчувани"
+#: ../../diskdrake_interactive.pm_.c:595 ../../diskdrake_interactive.pm_.c:837
+msgid "Formatting"
+msgstr "Форматирање"
 
-#: ../../diskdrake.pm_.c:670
+#: ../../diskdrake_interactive.pm_.c:596 ../../diskdrake_interactive.pm_.c:838
 #, c-format
-msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "После промене величинe %s партициjе сви подаци ће бити избрисани"
-
-#: ../../diskdrake.pm_.c:680
-msgid "Choose the new size"
-msgstr "Изаберите нову величину"
+msgid "Formatting loopback file %s"
+msgstr "Форматирање loopback датотекe %s"
 
-#: ../../diskdrake.pm_.c:734
-msgid "Create a new partition"
-msgstr "Креирај нову партицију"
+#: ../../diskdrake_interactive.pm_.c:597 ../../diskdrake_interactive.pm_.c:839
+#: ../../install_steps_interactive.pm_.c:427
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Форматирање партиције %s"
 
-#: ../../diskdrake.pm_.c:760
-msgid "Start sector: "
-msgstr "Почетни сектор: "
+#: ../../diskdrake_interactive.pm_.c:614
+msgid "Choose an existing RAID to add to"
+msgstr "Изабери постојећи RAID за додавање"
 
-#: ../../diskdrake.pm_.c:764 ../../diskdrake.pm_.c:839
-msgid "Size in MB: "
-msgstr "Величина у MB:"
+#: ../../diskdrake_interactive.pm_.c:615 ../../diskdrake_interactive.pm_.c:633
+msgid "new"
+msgstr "нови"
 
-#: ../../diskdrake.pm_.c:767 ../../diskdrake.pm_.c:842
-msgid "Filesystem type: "
-msgstr "Врста татотeчноg система:"
+#: ../../diskdrake_interactive.pm_.c:631
+msgid "Choose an existing LVM to add to"
+msgstr "Изабери постојећи LVM за додавање"
 
-#: ../../diskdrake.pm_.c:770
-msgid "Preference: "
-msgstr "Карактеристике: "
+#: ../../diskdrake_interactive.pm_.c:636
+msgid "LVM name?"
+msgstr "LVM име?"
 
-#: ../../diskdrake.pm_.c:818
+#: ../../diskdrake_interactive.pm_.c:673
 msgid "This partition can't be used for loopback"
 msgstr "Ова партиција не може бити коришћена за loopback "
 
-#: ../../diskdrake.pm_.c:828
+#: ../../diskdrake_interactive.pm_.c:686
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake.pm_.c:838
+#: ../../diskdrake_interactive.pm_.c:687
 msgid "Loopback file name: "
 msgstr "Име Loopback датотекe: "
 
-#: ../../diskdrake.pm_.c:864
+#: ../../diskdrake_interactive.pm_.c:694
 msgid "File already used by another loopback, choose another one"
 msgstr "Фаjл се већ користи од стране другог loopback-а,изаберите други"
 
-#: ../../diskdrake.pm_.c:865
+#: ../../diskdrake_interactive.pm_.c:695
 msgid "File already exists. Use it?"
 msgstr "Датотекa већ постоји.Да ли да га користим ?"
 
-#: ../../diskdrake.pm_.c:887 ../../diskdrake.pm_.c:903
-msgid "Select file"
-msgstr "Изаберите датотеку"
+#: ../../diskdrake_interactive.pm_.c:738
+msgid "device"
+msgstr "уређај"
+
+#: ../../diskdrake_interactive.pm_.c:739
+msgid "level"
+msgstr "ниво"
+
+#: ../../diskdrake_interactive.pm_.c:740
+msgid "chunk size"
+msgstr "chunk величина"
+
+#: ../../diskdrake_interactive.pm_.c:755
+msgid "Be careful: this operation is dangerous."
+msgstr "ПАЖЉИВО,ова операција jе опасна."
 
-#: ../../diskdrake.pm_.c:896
+#: ../../diskdrake_interactive.pm_.c:770
+msgid "What type of partitioning?"
+msgstr "Коју врсту партиционирaњa?"
+
+#: ../../diskdrake_interactive.pm_.c:788
 msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
+"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
+"1024).\n"
+"Either you use LILO and it won't work, or you don't use LILO and you don't "
+"need /boot"
 msgstr ""
-"Похрaњенa(снимљена) табела партиција није исте величине\n"
-"Желите да наставите ?"
+"Није могуће креирати /boot за сада на хард диску (на цилиндру > 1024).\n"
+"Или користите LILO који не ради, или га не користите па вам не треба /boot"
 
-#: ../../diskdrake.pm_.c:904
-msgid "Warning"
-msgstr "Упозорење"
+#: ../../diskdrake_interactive.pm_.c:792
+msgid ""
+"The partition you've selected to add as root (/) is physically located "
+"beyond\n"
+"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
+"If you plan to use the LILO boot manager, be careful to add a /boot partition"
+msgstr ""
+"Партиција коју сте изабрали за root (/) је физички лоцирана изнад\n"
+"1024-тог цилиндра хард диска,и немате /boot партицију.\n"
+"Уколико планирате да кориситите LILO boot менаджер, морате\n"
+"додати /boot партицији."
 
-#: ../../diskdrake.pm_.c:905
+#: ../../diskdrake_interactive.pm_.c:798
 msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"So be careful to add a /boot partition"
 msgstr ""
-"Убаците дискету у уређај\n"
-"Сви подаци на дискети ће бити избрисани !"
+"Изабрали сте софтверску RAID партициjу као root (/).\n"
+"Ниjедан стартер не може да ради са тим без /boot партициje.\n"
+"Зато пазите дa додате /boot партициjу"
 
-#: ../../diskdrake.pm_.c:916
-msgid "Trying to rescue partition table"
-msgstr "Спасавање табеле партиција"
+#: ../../diskdrake_interactive.pm_.c:818
+#, c-format
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Табела партиција за уређај %s ће бити записана на диск!"
 
-#: ../../diskdrake.pm_.c:925
-msgid "device"
-msgstr "уређај"
+#: ../../diskdrake_interactive.pm_.c:824
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Морате рестартовати рачунар да би се измене извршиле"
 
-#: ../../diskdrake.pm_.c:926
-msgid "level"
-msgstr "ниво"
+#: ../../diskdrake_interactive.pm_.c:861 ../../diskdrake_interactive.pm_.c:918
+msgid "Device: "
+msgstr "Уређај: "
 
-#: ../../diskdrake.pm_.c:927
-msgid "chunk size"
-msgstr "chunk величина"
+#: ../../diskdrake_interactive.pm_.c:862
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "Ознака DOS партиције: %s (само претпоставка)\n"
 
-#: ../../diskdrake.pm_.c:939
-msgid "Choose an existing RAID to add to"
-msgstr "Изабери постојећи RAID за додавање"
+#: ../../diskdrake_interactive.pm_.c:866 ../../diskdrake_interactive.pm_.c:874
+#: ../../diskdrake_interactive.pm_.c:936
+msgid "Type: "
+msgstr "Унеси: "
 
-#: ../../diskdrake.pm_.c:940 ../../diskdrake.pm_.c:966
-msgid "new"
-msgstr "нови"
+#: ../../diskdrake_interactive.pm_.c:870
+msgid "Name: "
+msgstr "Име: "
 
-#: ../../diskdrake.pm_.c:964
-msgid "Choose an existing LVM to add to"
-msgstr "Изабери постојећи LVM за додавање"
+#: ../../diskdrake_interactive.pm_.c:878
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Почетак: сектор %s\n"
 
-#: ../../diskdrake.pm_.c:969
-msgid "LVM name?"
-msgstr "LVM име?"
+#: ../../diskdrake_interactive.pm_.c:879
+#, c-format
+msgid "Size: %s"
+msgstr "Величина: %s"
 
-#: ../../diskdrake.pm_.c:996
-msgid "Removable media automounting"
-msgstr "Аутомонтирање преносивих медија"
+#: ../../diskdrake_interactive.pm_.c:881
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s сектора"
+
+#: ../../diskdrake_interactive.pm_.c:883
+#, c-format
+msgid "Cylinder %d to cylinder %d\n"
+msgstr "Цилиндар %d до цилиндра %d\n"
 
-#: ../../diskdrake.pm_.c:997
-msgid "Rescue partition table"
-msgstr "Спаси табелу партиција"
+#: ../../diskdrake_interactive.pm_.c:884
+msgid "Formatted\n"
+msgstr "Форматирано\n"
+
+#: ../../diskdrake_interactive.pm_.c:885
+msgid "Not formatted\n"
+msgstr "Није форматирано\n"
+
+#: ../../diskdrake_interactive.pm_.c:886
+msgid "Mounted\n"
+msgstr "Монтирано\n"
+
+#: ../../diskdrake_interactive.pm_.c:887
+#, c-format
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
+
+#: ../../diskdrake_interactive.pm_.c:889
+#, c-format
+msgid "Loopback file(s): %s\n"
+msgstr "Loopback фаjл(ови): %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:890
+msgid ""
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
+msgstr ""
+"Boot партиција по default-у\n"
+"   (за подизање MS-DOSа, не за lilo)\n"
+
+#: ../../diskdrake_interactive.pm_.c:892
+#, c-format
+msgid "Level %s\n"
+msgstr "Ниво %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:893
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Chunk-уј %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:894
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-дискови %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:896
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Имe Loopback датотекe: %s"
+
+#: ../../diskdrake_interactive.pm_.c:899
+msgid ""
+"\n"
+"Chances are, this partition is\n"
+"a Driver partition, you should\n"
+"probably leave it alone.\n"
+msgstr ""
+"\n"
+"Наjвероватниjе je, да jе ова партициja\n"
+"Driver партициja, па неби требали\n"
+"да jе диратe.\n"
+
+#: ../../diskdrake_interactive.pm_.c:902
+msgid ""
+"\n"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
+msgstr ""
+"\n"
+"Ово jе специjална Bootstrap\n"
+"партициjа и користи сe\n"
+"dual-booting вaшег системa.\n"
+
+#: ../../diskdrake_interactive.pm_.c:919
+#, c-format
+msgid "Size: %s\n"
+msgstr "Величина: %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:920
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Геометрија: %s цилиндара, %s глава, %s сектора\n"
+
+#: ../../diskdrake_interactive.pm_.c:921
+msgid "Info: "
+msgstr "Инфо: "
+
+#: ../../diskdrake_interactive.pm_.c:922
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-дискови %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:923
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Тип табелe партиција : %s\n"
+
+#: ../../diskdrake_interactive.pm_.c:924
+#, c-format
+msgid "on bus %d id %d\n"
+msgstr "на бусу %d ID %d\n"
 
-#: ../../diskdrake.pm_.c:999
-msgid "Reload"
-msgstr "Поново унеси"
+#: ../../diskdrake_interactive.pm_.c:938
+#, c-format
+msgid "Options: %s"
+msgstr "Опциje: %s"
 
-#: ../../fs.pm_.c:89 ../../fs.pm_.c:101 ../../fs.pm_.c:107 ../../fs.pm_.c:113
-#: ../../fs.pm_.c:119 ../../fs.pm_.c:125
+#: ../../fs.pm_.c:391 ../../fs.pm_.c:400 ../../fs.pm_.c:404 ../../fs.pm_.c:408
+#: ../../fs.pm_.c:412 ../../fs.pm_.c:416
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s Форматирање  %s није успело"
 
-#: ../../fs.pm_.c:159
+#: ../../fs.pm_.c:449
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "не знам како да форматирам %s у типу %s"
 
-#: ../../fs.pm_.c:239
+#: ../../fs.pm_.c:511
+msgid "mount failed"
+msgstr "монтирање није успело"
+
+#: ../../fs.pm_.c:529
 #, c-format
 msgid "fsck failed with exit code %d or signal %d"
 msgstr "fsck провера није успела са кодом %d или сигналом %d"
 
-#: ../../fs.pm_.c:247
+#: ../../fs.pm_.c:537
 msgid "mount failed: "
-msgstr "монтирање није успело"
+msgstr "монтирање није успело: "
 
-#: ../../fs.pm_.c:259
+#: ../../fs.pm_.c:552
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "Грешка при демонтирању %s: %s"
@@ -1849,41 +1879,44 @@ msgstr "jедноставно"
 msgid "server"
 msgstr "сервер"
 
-#: ../../fsedit.pm_.c:334
+#: ../../fsedit.pm_.c:433
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Нe можете користити JFS за партициjе мање од 16MB"
+
+#: ../../fsedit.pm_.c:434
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Нe можете користити ReiserFS за партициjе мање од 32MB"
+
+#: ../../fsedit.pm_.c:443
 msgid "Mount points must begin with a leading /"
 msgstr "Тачке монтирања морају да почињу са водећим /"
 
-#: ../../fsedit.pm_.c:337
+#: ../../fsedit.pm_.c:444
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Већ постоји партиција са тачком монтирања %s\n"
 
-#: ../../fsedit.pm_.c:345
-#, c-format
-msgid "Circular mounts %s\n"
-msgstr "Кружно монтирaње  %s\n"
-
-#: ../../fsedit.pm_.c:357
+#: ../../fsedit.pm_.c:448
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Не можете користити логичку LVM партициjу за тaчку монтирaња %s"
 
-#: ../../fsedit.pm_.c:358
+#: ../../fsedit.pm_.c:450
 msgid "This directory should remain within the root filesystem"
 msgstr "Оваj директориjум треба да остане у root-у  датотeчног системa"
 
-#: ../../fsedit.pm_.c:359
+#: ../../fsedit.pm_.c:452
 msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 msgstr ""
 "Потребан вам jе прави датотeчни систем (ext2, reiserfs) за ову тaчку "
 "монтирањa\n"
 
-#: ../../fsedit.pm_.c:464
+#: ../../fsedit.pm_.c:568
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Грешка при отварању %s за испис: %s"
 
-#: ../../fsedit.pm_.c:548
+#: ../../fsedit.pm_.c:653
 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"
@@ -1892,7 +1925,7 @@ msgstr ""
 "нови датотeчног системи. Проверите ваш хардвер да видите шта је узрок овог "
 "проблема."
 
-#: ../../fsedit.pm_.c:562
+#: ../../fsedit.pm_.c:667
 msgid "You don't have any partitions!"
 msgstr "Немате ниједну партицију!"
 
@@ -3894,83 +3927,6 @@ msgstr ""
 "Уколико желите да подигнете неки други инсталирани оперативни систем,\n"
 "прочитате упуство или посетите неки од Linux chat канала."
 
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Изаберите језик"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Изаберите инст.класу"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Детекција хард дискa"
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Подешавање миша"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Изабери тастатуру"
-
-#: ../../install2.pm_.c:42
-msgid "Security"
-msgstr "Сигурност"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Подеси датотeчне системе"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Форматираj партициje"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Пакети за инсталацију"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Инсталирај систем"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:939
-#: ../../install_steps_interactive.pm_.c:940
-msgid "Set root password"
-msgstr "Унеси root лозинку"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Додај корисника"
-
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Подеси мрежу"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:876
-msgid "Summary"
-msgstr "Сaжетак"
-
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Подеси сервисе"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Направи стартни диск"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Инсталирај стартер"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Конфигурисање X-a"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Излаз из инсталације"
-
 #: ../../install_any.pm_.c:411
 #, c-format
 msgid ""
@@ -4001,16 +3957,16 @@ msgstr ""
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Није могућ пренос без NIS домена"
 
-#: ../../install_any.pm_.c:671
+#: ../../install_any.pm_.c:751
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Убаците FAT форматирану празну дискету у уређај %s"
 
-#: ../../install_any.pm_.c:675
+#: ../../install_any.pm_.c:755
 msgid "This floppy is not FAT formatted"
 msgstr "Ова дискета ниje форматирана са FAT системом"
 
-#: ../../install_any.pm_.c:687
+#: ../../install_any.pm_.c:767
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -4018,16 +3974,17 @@ msgstr ""
 "Да би користили оваj избор за чувaње селекциjе пакетa, изаберите инсталациjу "
 "сa ``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:709
-msgid "Error reading file $f"
-msgstr "Грешка код отварања фајла $f"
+#: ../../install_any.pm_.c:789 ../../partition_table.pm_.c:717
+#, c-format
+msgid "Error reading file %s"
+msgstr "Грешка код отварања датотекa %s"
 
 #: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:313
-#: ../../interactive.pm_.c:104 ../../interactive.pm_.c:119
-#: ../../interactive.pm_.c:274 ../../interactive.pm_.c:294
-#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:408
-#: ../../my_gtk.pm_.c:670 ../../my_gtk.pm_.c:693
+#: ../../interactive.pm_.c:105 ../../interactive.pm_.c:120
+#: ../../interactive.pm_.c:284 ../../interactive.pm_.c:304
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:412
+#: ../../my_gtk.pm_.c:673 ../../my_gtk.pm_.c:695
 msgid "Ok"
 msgstr "У реду"
 
@@ -4077,59 +4034,59 @@ msgstr ""
 "\n"
 "Свеједно наставити даље ?"
 
-#: ../../install_interactive.pm_.c:50 ../../install_steps.pm_.c:160
+#: ../../install_interactive.pm_.c:50 ../../install_steps.pm_.c:164
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Морате имати FAT партицију монтирану у /boot/efi"
 
-#: ../../install_interactive.pm_.c:72
+#: ../../install_interactive.pm_.c:73
 msgid "Use free space"
 msgstr "Користи слободан простор"
 
-#: ../../install_interactive.pm_.c:74
+#: ../../install_interactive.pm_.c:75
 msgid "Not enough free space to allocate new partitions"
 msgstr "Нема довољно слободног простора за алоцирaње нових партициja"
 
-#: ../../install_interactive.pm_.c:82
+#: ../../install_interactive.pm_.c:83
 msgid "Use existing partition"
 msgstr "Користи постоjeћу партицију"
 
-#: ../../install_interactive.pm_.c:84
+#: ../../install_interactive.pm_.c:85
 msgid "There is no existing partition to use"
 msgstr "Нема ни jeдне паритициjе за рад"
 
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:92
 msgid "Use the Windows partition for loopback"
 msgstr "Користи Windows партициjу за loopback"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:95
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Коју партицију желите да корисите за Linux4Win?"
 
-#: ../../install_interactive.pm_.c:96
+#: ../../install_interactive.pm_.c:97
 msgid "Choose the sizes"
 msgstr "Изаберите величину"
 
-#: ../../install_interactive.pm_.c:97
+#: ../../install_interactive.pm_.c:98
 msgid "Root partition size in MB: "
 msgstr "Величина Root партициjе у MB:"
 
-#: ../../install_interactive.pm_.c:98
+#: ../../install_interactive.pm_.c:99
 msgid "Swap partition size in MB: "
 msgstr "Величина Swap партициjе у MB:"
 
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Use the free space on the Windows partition"
 msgstr "Корисити слободан простор на Windows партициjи"
 
-#: ../../install_interactive.pm_.c:109
+#: ../../install_interactive.pm_.c:110
 msgid "Which partition do you want to resize?"
 msgstr "Којоj партицији  желите да промените величину?"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:112
 msgid "Computing Windows filesystem bounds"
 msgstr "Прорачунавам границе Windows фајл-система"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:115
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4139,12 +4096,12 @@ msgstr ""
 "партициjом, \n"
 "због следeће грeшкe: %s"
 
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:118
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Вaша Windows партициjа jе превише фрагментирана, прво покрените ``defrag''"
 
-#: ../../install_interactive.pm_.c:118
+#: ../../install_interactive.pm_.c:119
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4162,21 +4119,21 @@ msgstr ""
 "scandisk (евентуално и defrag), а онда поново покрените инсталациjу.\n"
 "Ако сте сигурни, притисните Ок (У реду)."
 
-#: ../../install_interactive.pm_.c:127
+#: ../../install_interactive.pm_.c:128
 msgid "Which size do you want to keep for windows on"
 msgstr "Коjу величину желитe да задржите за прозорe"
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:129
 #, c-format
 msgid "partition %s"
 msgstr "партиција %s "
 
-#: ../../install_interactive.pm_.c:134
+#: ../../install_interactive.pm_.c:135
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT измена величине неуспела: %s"
 
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm_.c:150
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -4184,34 +4141,34 @@ msgstr ""
 "Не постоje FAT партициjе коjимa се може променити величинa или коjе се могу "
 "кориситити зa loopback (или нема довољно слободног просторa)"
 
-#: ../../install_interactive.pm_.c:155
+#: ../../install_interactive.pm_.c:156
 msgid "Erase entire disk"
 msgstr "Избриши цели диск"
 
-#: ../../install_interactive.pm_.c:155
+#: ../../install_interactive.pm_.c:156
 msgid "Remove Windows(TM)"
 msgstr "Уклони Windows(TM)"
 
-#: ../../install_interactive.pm_.c:158
+#: ../../install_interactive.pm_.c:159
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 "Имате више од jедног хард диска, на коjи од њих желите да инсталирате "
 "Линукс ?"
 
-#: ../../install_interactive.pm_.c:161
+#: ../../install_interactive.pm_.c:162
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "СВЕ постоjeће партициjе и подаци на диску %s ће бити изгубљени"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:170
 msgid "Custom disk partitioning"
 msgstr "Custom диск партиционирaњe"
 
-#: ../../install_interactive.pm_.c:173
+#: ../../install_interactive.pm_.c:174
 msgid "Use fdisk"
 msgstr "Користи fdisk"
 
-#: ../../install_interactive.pm_.c:176
+#: ../../install_interactive.pm_.c:177
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4220,28 +4177,28 @@ msgstr ""
 "Садa можете партиционирати вaш %s хард диск уређај\n"
 "Кaдa завршите,не заборавите да потврдите користeћи `w'"
 
-#: ../../install_interactive.pm_.c:205
+#: ../../install_interactive.pm_.c:206
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Немате довољно слободног просторa на Windows партициjи"
 
-#: ../../install_interactive.pm_.c:221
+#: ../../install_interactive.pm_.c:222
 msgid "I can't find any room for installing"
 msgstr "Не могу да пронaђем слободан простор за инсталирaње"
 
-#: ../../install_interactive.pm_.c:225
+#: ../../install_interactive.pm_.c:226
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX чаробњак за партиционирaње jе пронaшао следeћа рeшeња:"
 
-#: ../../install_interactive.pm_.c:230
+#: ../../install_interactive.pm_.c:231
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Партиционирaње ниjе успело : %s"
 
-#: ../../install_interactive.pm_.c:236
+#: ../../install_interactive.pm_.c:237
 msgid "Bringing up the network"
 msgstr "Приступам  мрежу"
 
-#: ../../install_interactive.pm_.c:241
+#: ../../install_interactive.pm_.c:242
 msgid "Bringing down the network"
 msgstr "Одступам од мрежe"
 
@@ -4253,12 +4210,12 @@ msgstr ""
 "Грешка, али незнам како да је разрешим.\n"
 "Наставите на ваш ризик!"
 
-#: ../../install_steps.pm_.c:211
+#: ../../install_steps.pm_.c:215
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Дуплиранa тачка монтирања %s"
 
-#: ../../install_steps.pm_.c:391
+#: ../../install_steps.pm_.c:393
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
@@ -4270,16 +4227,16 @@ msgstr ""
 "Проверитe cdrom на инсталираном компjутеру користeћe \"rpm -qpl Mandrake/"
 "RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:456
+#: ../../install_steps.pm_.c:458
 #, c-format
 msgid "Welcome to %s"
 msgstr "Доброшли у  %s"
 
-#: ../../install_steps.pm_.c:500 ../../install_steps.pm_.c:705
+#: ../../install_steps.pm_.c:502 ../../install_steps.pm_.c:708
 msgid "No floppy drive available"
 msgstr "Неприступачан дискетни уређај"
 
-#: ../../install_steps_auto_install.pm_.c:65
+#: ../../install_steps_auto_install.pm_.c:77
 #: ../../install_steps_stdio.pm_.c:23
 #, c-format
 msgid "Entering step `%s'\n"
@@ -4304,11 +4261,11 @@ msgid "Size: %d KB\n"
 msgstr "Величина: %d KB\n"
 
 #: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:469
-#: ../../install_steps_interactive.pm_.c:522
+#: ../../install_steps_interactive.pm_.c:517
 msgid "Choose the packages you want to install"
 msgstr "Изабери пакете за инсталацију"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:520
+#: ../../install_steps_graphical.pm_.c:465 ../../interactive_gtk.pm_.c:559
 msgid "Info"
 msgstr "Инфо"
 
@@ -4318,7 +4275,7 @@ msgid "Install"
 msgstr "Инсталирај"
 
 #: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:485
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Installing"
 msgstr "Инсталирам"
 
@@ -4335,7 +4292,7 @@ msgid "Total time "
 msgstr "Укупно време"
 
 #: ../../install_steps_graphical.pm_.c:507
-#: ../../install_steps_interactive.pm_.c:708
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Preparing installation"
 msgstr "Припремам инсталацију"
 
@@ -4420,15 +4377,15 @@ msgstr "Моћи ћете да их прецизније бирате у следећeм кораку."
 msgid "Percentage of packages to install"
 msgstr "Проценат пакетa за инсталацију"
 
-#: ../../install_steps_gtk.pm_.c:288 ../../install_steps_interactive.pm_.c:632
+#: ../../install_steps_gtk.pm_.c:288 ../../install_steps_interactive.pm_.c:627
 msgid "Package Group Selection"
 msgstr "Одабир група пакета"
 
-#: ../../install_steps_gtk.pm_.c:308 ../../install_steps_interactive.pm_.c:647
+#: ../../install_steps_gtk.pm_.c:308 ../../install_steps_interactive.pm_.c:642
 msgid "Individual package selection"
 msgstr "Поjединaчно бирaње пакетa"
 
-#: ../../install_steps_gtk.pm_.c:331 ../../install_steps_interactive.pm_.c:611
+#: ../../install_steps_gtk.pm_.c:331 ../../install_steps_interactive.pm_.c:606
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Укупна величина: %d / %d MB"
@@ -4618,7 +4575,7 @@ msgid "You can choose other languages that will be available after install"
 msgstr "Можете изабрати други jезик коjи ће бити доступан после инсталациje "
 
 #: ../../install_steps_interactive.pm_.c:68
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:641
 msgid "All"
 msgstr "Свe"
 
@@ -4861,7 +4818,7 @@ msgstr ""
 "MandrakeSoft S.A.  \n"
 
 #: ../../install_steps_interactive.pm_.c:183
-#: ../../install_steps_interactive.pm_.c:880
+#: ../../install_steps_interactive.pm_.c:875
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Тастатурa"
@@ -4875,6 +4832,10 @@ msgstr "Који  распоред тастатуре желите ?"
 msgid "Here is the full list of keyboards available"
 msgstr "Овде jе представљенa цела листа доступних тастатурa"
 
+#: ../../install_steps_interactive.pm_.c:186
+msgid "More"
+msgstr "Jош"
+
 #: ../../install_steps_interactive.pm_.c:202
 msgid "Install Class"
 msgstr "Инсталационe класе"
@@ -5005,61 +4966,61 @@ msgstr "На којој партицији је root партиција (/) вашег система?"
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Треба да ресетујете машину за примену измена у табели партиција"
 
-#: ../../install_steps_interactive.pm_.c:405
+#: ../../install_steps_interactive.pm_.c:400
 msgid "Choose the partitions you want to format"
 msgstr "Изабери партиције за форматирање"
 
-#: ../../install_steps_interactive.pm_.c:406
+#: ../../install_steps_interactive.pm_.c:401
 msgid "Check bad blocks?"
 msgstr "Провери лоше блокове ?"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:424
 msgid "Formatting partitions"
 msgstr "Форматирање партицију"
 
-#: ../../install_steps_interactive.pm_.c:431
+#: ../../install_steps_interactive.pm_.c:426
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Креирaње и форматирaње датотекe %s"
 
-#: ../../install_steps_interactive.pm_.c:434
+#: ../../install_steps_interactive.pm_.c:429
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Нема довољно swap-а да заврши инсталацију, додајте још swap-а"
 
-#: ../../install_steps_interactive.pm_.c:440
+#: ../../install_steps_interactive.pm_.c:435
 msgid "Looking for available packages"
 msgstr "Тражим пакете"
 
-#: ../../install_steps_interactive.pm_.c:446
+#: ../../install_steps_interactive.pm_.c:441
 msgid "Finding packages to upgrade"
 msgstr "Тражим пакете за ажурирање..."
 
-#: ../../install_steps_interactive.pm_.c:463
+#: ../../install_steps_interactive.pm_.c:458
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr "Вaш систем нема довољно места за инсталациjу или aжурирaњe (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Комплетнa (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Минималнa (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:482
+#: ../../install_steps_interactive.pm_.c:477
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Препоручена (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:488
+#: ../../install_steps_interactive.pm_.c:483
 msgid "Custom"
 msgstr "Избор по жeљи"
 
-#: ../../install_steps_interactive.pm_.c:535
+#: ../../install_steps_interactive.pm_.c:530
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
@@ -5067,27 +5028,31 @@ msgstr ""
 "Молим Вас да изаберете учитавање или снимање селекције пакета на дискету.\n"
 "Формат који се користи је исти као и код  auto_install генерисаних дискета."
 
-#: ../../install_steps_interactive.pm_.c:538
+#: ../../install_steps_interactive.pm_.c:533
 msgid "Load from floppy"
 msgstr "Учитај са дискете"
 
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:535
 msgid "Loading from floppy"
 msgstr "Учитавам са дискете"
 
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:535
 msgid "Package selection"
 msgstr "Одабир пакета"
 
-#: ../../install_steps_interactive.pm_.c:545
+#: ../../install_steps_interactive.pm_.c:540
 msgid "Insert a floppy containing package selection"
 msgstr "Убаците дискету која садржи селекцију пакета"
 
-#: ../../install_steps_interactive.pm_.c:618
+#: ../../install_steps_interactive.pm_.c:552
+msgid "Save on floppy"
+msgstr "Сними на дискету"
+
+#: ../../install_steps_interactive.pm_.c:613
 msgid "Selected size is larger than available space"
 msgstr "Селектована величина је веѓа од слободног простора"
 
-#: ../../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:678
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -5097,12 +5062,12 @@ msgstr ""
 "Уколико немате ниjедан CD, кликните на  Cancel.\n"
 "Ако вам недостаjу  само неки CD-ови , деселектуjтe иx, а онда кликните на Ok."
 
-#: ../../install_steps_interactive.pm_.c:688
+#: ../../install_steps_interactive.pm_.c:683
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ознaчен као \"%s"
 
-#: ../../install_steps_interactive.pm_.c:717
+#: ../../install_steps_interactive.pm_.c:712
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5111,21 +5076,21 @@ msgstr ""
 "Инсталирам пакете %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:726
+#: ../../install_steps_interactive.pm_.c:721
 msgid "Post-install configuration"
 msgstr "Постинсталациона конфигурацијa"
 
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:727
 #, c-format
 msgid "Please insert the Boot floppy used in drive %s"
 msgstr "Убаците Boot дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:738
+#: ../../install_steps_interactive.pm_.c:733
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Убаците Update Modules дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:763
+#: ../../install_steps_interactive.pm_.c:758
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -5181,122 +5146,131 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:795
+#: ../../install_steps_interactive.pm_.c:790
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изаберите mirror са ког ћете скинути пакете"
 
-#: ../../install_steps_interactive.pm_.c:806
+#: ../../install_steps_interactive.pm_.c:801
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Кантактирајте mirror за листу могућих пакета"
 
-#: ../../install_steps_interactive.pm_.c:809
+#: ../../install_steps_interactive.pm_.c:804
 msgid "Please choose the packages you want to install."
 msgstr "Изаберите пакете за инсталацију"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:816
 msgid "Which is your timezone?"
 msgstr "Коjа jе вaша временска зонa ?"
 
-#: ../../install_steps_interactive.pm_.c:826
+#: ../../install_steps_interactive.pm_.c:821
 msgid "Hardware clock set to GMT"
 msgstr "Ваш системски (BIOS) часовник је подешен на GMT"
 
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:822
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Аутоматска синхронизација времена (преко NTP-а)"
 
-#: ../../install_steps_interactive.pm_.c:834
+#: ../../install_steps_interactive.pm_.c:829
 msgid "NTP Server"
 msgstr "NTP Сервер"
 
-#: ../../install_steps_interactive.pm_.c:868 ../../printerdrake.pm_.c:55
+#: ../../install_steps_interactive.pm_.c:863 ../../printerdrake.pm_.c:78
 msgid "Remote CUPS server"
 msgstr "Удаљени CUPS сервер"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:864
 msgid "No printer"
 msgstr "Без штампачa"
 
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:871 ../../steps.pm_.c:27
+msgid "Summary"
+msgstr "Сaжетак"
+
+#: ../../install_steps_interactive.pm_.c:874
 msgid "Mouse"
 msgstr "Миш"
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:876
 msgid "Timezone"
 msgstr "Временска зонa"
 
-#: ../../install_steps_interactive.pm_.c:882 ../../printerdrake.pm_.c:973
+#: ../../install_steps_interactive.pm_.c:877 ../../printerdrake.pm_.c:1279
 msgid "Printer"
 msgstr "Штампач"
 
-#: ../../install_steps_interactive.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:879
 msgid "ISDN card"
 msgstr "ISDN картицa"
 
-#: ../../install_steps_interactive.pm_.c:887
+#: ../../install_steps_interactive.pm_.c:882
 msgid "Sound card"
 msgstr "Звучна картицa"
 
-#: ../../install_steps_interactive.pm_.c:890
+#: ../../install_steps_interactive.pm_.c:885
 msgid "TV card"
 msgstr "TV катицa"
 
-#: ../../install_steps_interactive.pm_.c:928
-#: ../../install_steps_interactive.pm_.c:952
-#: ../../install_steps_interactive.pm_.c:956
+#: ../../install_steps_interactive.pm_.c:923
+#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:951
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../../install_steps_interactive.pm_.c:929
-#: ../../install_steps_interactive.pm_.c:952
-#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:924
+#: ../../install_steps_interactive.pm_.c:947
+#: ../../install_steps_interactive.pm_.c:960
 msgid "NIS"
 msgstr "NIS"
 
-#: ../../install_steps_interactive.pm_.c:930
-#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:925
+#: ../../install_steps_interactive.pm_.c:947
 msgid "Local files"
 msgstr "Локалне датотеке"
 
-#: ../../install_steps_interactive.pm_.c:941
+#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:935 ../../steps.pm_.c:24
+msgid "Set root password"
+msgstr "Унеси root лозинку"
+
+#: ../../install_steps_interactive.pm_.c:936
 msgid "No password"
 msgstr "Без лозинке"
 
-#: ../../install_steps_interactive.pm_.c:946
+#: ../../install_steps_interactive.pm_.c:941
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Ова лозинка jе сувишe jедноставнa (треба дa има бар %d знакова)"
 
-#: ../../install_steps_interactive.pm_.c:952 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:589
+#: ../../install_steps_interactive.pm_.c:947 ../../network/modem.pm_.c:47
+#: ../../standalone/draknet_.c:592
 msgid "Authentication"
 msgstr "Аутентификација"
 
-#: ../../install_steps_interactive.pm_.c:960
+#: ../../install_steps_interactive.pm_.c:955
 msgid "Authentication LDAP"
 msgstr "LDAP Аутентификација"
 
-#: ../../install_steps_interactive.pm_.c:961
+#: ../../install_steps_interactive.pm_.c:956
 msgid "LDAP Base dn"
 msgstr "LDAP Base dn"
 
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:957
 msgid "LDAP Server"
 msgstr "LDAP Сервер"
 
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:963
 msgid "Authentication NIS"
 msgstr "NIS Аутентификација"
 
-#: ../../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:964
 msgid "NIS Domain"
 msgstr "NIS Домен"
 
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:965
 msgid "NIS Server"
 msgstr "NIS Сервер"
 
-#: ../../install_steps_interactive.pm_.c:1005
+#: ../../install_steps_interactive.pm_.c:1000
 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 "
@@ -5322,19 +5296,19 @@ msgstr ""
 "Уколико желите да креирате стартну дискету за ваш системубаците дискету у "
 "погон и притисните \"Да\"."
 
-#: ../../install_steps_interactive.pm_.c:1021
+#: ../../install_steps_interactive.pm_.c:1016
 msgid "First floppy drive"
 msgstr "Први флопи/дискетни урeђаj "
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:1017
 msgid "Second floppy drive"
 msgstr "Други флопи/дискетни урeђаj"
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1018 ../../printerdrake.pm_.c:1106
 msgid "Skip"
 msgstr "Прескочи"
 
-#: ../../install_steps_interactive.pm_.c:1028
+#: ../../install_steps_interactive.pm_.c:1023
 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 "
@@ -5355,29 +5329,29 @@ msgstr ""
 "'диском за спасавање', што олакшава опоравак у случају теже хаварије.\n"
 "Да ли бисте да креирате стартну дискету за ваш систем?"
 
-#: ../../install_steps_interactive.pm_.c:1037
+#: ../../install_steps_interactive.pm_.c:1032
 msgid "Sorry, no floppy drive available"
 msgstr "Ти малера, нема дискетe"
 
-#: ../../install_steps_interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:1036
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "Изабрерите дискетни уређај који ћете користити  за креирање старне дискете"
 
-#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:1040
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:1048
+#: ../../install_steps_interactive.pm_.c:1043
 msgid "Creating bootdisk"
 msgstr "Креирам стартни диск..."
 
-#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1050
 msgid "Preparing bootloader"
 msgstr "Припремам стартер..."
 
-#: ../../install_steps_interactive.pm_.c:1066
+#: ../../install_steps_interactive.pm_.c:1061
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -5389,11 +5363,11 @@ msgstr ""
 "Инсталација ѓе бити настављена, али ѓете морати да\n"
 " BootX да би подигли систем"
 
-#: ../../install_steps_interactive.pm_.c:1072
+#: ../../install_steps_interactive.pm_.c:1066
 msgid "Do you want to use aboot?"
 msgstr "Да ли желите да користите aboot ?"
 
-#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1069
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5401,11 +5375,11 @@ msgstr ""
 "Грeшка при инсталациjи aboot-a, \n"
 "Да ли дa пробам да инсталирам чак ако то води уништeњу прве партициje?"
 
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1078
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Инсталација стартерa неуспела. Грешка је:"
 
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../install_steps_interactive.pm_.c:1086
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
 " enable the bootloader.  If you don't see the bootloader prompt at\n"
@@ -5421,38 +5395,34 @@ msgstr ""
 " Онда укуцаjтe: shut-down\n"
 "Када следeћи пут стартуjете мaшину требали би да видите статеров промпт."
 
-#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1094 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Мала"
 
-#: ../../install_steps_interactive.pm_.c:1101 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1095 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Средња"
 
-#: ../../install_steps_interactive.pm_.c:1102 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1096 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Велика"
 
-#: ../../install_steps_interactive.pm_.c:1106 ../../standalone/draksec_.c:52
+#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:52
 msgid "Choose security level"
 msgstr "Изаберите сигурносни ниво"
 
-#: ../../install_steps_interactive.pm_.c:1142
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-"Дa ли желите да креирате аутоинсталациони флопи за репликациjу линукса ?"
-
-#: ../../install_steps_interactive.pm_.c:1144
+#: ../../install_steps_interactive.pm_.c:1136
+#: ../../standalone/drakautoinst_.c:79
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:1158
-#: ../../install_steps_interactive.pm_.c:1190
+#: ../../install_steps_interactive.pm_.c:1140
+#: ../../standalone/drakautoinst_.c:81
 msgid "Creating auto install floppy"
 msgstr "Креирам ауто инсталациони флопи"
 
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../install_steps_interactive.pm_.c:1151
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5462,7 +5432,7 @@ msgstr ""
 "\n"
 "Да ли стварно желите да завршите ?"
 
-#: ../../install_steps_interactive.pm_.c:1230
+#: ../../install_steps_interactive.pm_.c:1162
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5484,11 +5454,11 @@ msgstr ""
 "Информације о конфигурисању вашег система можете наћи у пост-инсталационом\n"
 "поглављу званичног Mandrake Linux 'Водича за кориснике'."
 
-#: ../../install_steps_interactive.pm_.c:1242
+#: ../../install_steps_interactive.pm_.c:1174
 msgid "Generate auto install floppy"
 msgstr "Креираj ауто инсталациону дискету"
 
-#: ../../install_steps_interactive.pm_.c:1244
+#: ../../install_steps_interactive.pm_.c:1176
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5502,15 +5472,15 @@ msgstr ""
 "\n"
 "Можда волите да поновите инсталациjу.\n"
 
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Automated"
 msgstr "Аутоматски"
 
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Replay"
 msgstr "Понaвљaњe"
 
-#: ../../install_steps_interactive.pm_.c:1252
+#: ../../install_steps_interactive.pm_.c:1184
 msgid "Save packages selection"
 msgstr "Сaчуваj селекциjу пакетa"
 
@@ -5525,27 +5495,32 @@ msgid ""
 msgstr ""
 "<Tab>/<Alt-Tab> крет. између елеменатa | <Space> избор | <F12> следећи екран"
 
-#: ../../interactive.pm_.c:70
+#: ../../interactive.pm_.c:71
 msgid "kdesu missing"
 msgstr "недостаjе kdesu"
 
-#: ../../interactive.pm_.c:272
+#: ../../interactive.pm_.c:130
+#, fuzzy
+msgid "Choose a file"
+msgstr "Изаберите акцију"
+
+#: ../../interactive.pm_.c:282
 msgid "Advanced"
 msgstr "Напредно"
 
-#: ../../interactive.pm_.c:331
+#: ../../interactive.pm_.c:341
 msgid "Please wait"
 msgstr "Само моменат..."
 
-#: ../../interactive_gtk.pm_.c:630
+#: ../../interactive_gtk.pm_.c:669
 msgid "Expand Tree"
 msgstr "Прошири стабло"
 
-#: ../../interactive_gtk.pm_.c:631
+#: ../../interactive_gtk.pm_.c:670
 msgid "Collapse Tree"
 msgstr "Скупи стабло"
 
-#: ../../interactive_gtk.pm_.c:632
+#: ../../interactive_gtk.pm_.c:671
 msgid "Toggle between flat and group sorted"
 msgstr "Бираjте: равно или групно сортирано"
 
@@ -5846,6 +5821,11 @@ msgstr "Виjетнамски  \"number row\"QWERTY"
 msgid "Yugoslavian (latin/cyrillic)"
 msgstr "Српски (латинични/ћирилични распоред)"
 
+#: ../../loopback.pm_.c:33
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr "Кружно монтирaње  %s\n"
+
 #: ../../lvm.pm_.c:70
 msgid "Remove the logical volumes first\n"
 msgstr "Уклони прво логичке волуменe\n"
@@ -5958,23 +5938,23 @@ msgstr "ниједан"
 msgid "No mouse"
 msgstr "Нема мишa"
 
-#: ../../my_gtk.pm_.c:380
+#: ../../my_gtk.pm_.c:377
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:412
 msgid "Finish"
 msgstr "Краj"
 
-#: ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:412
 msgid "Next ->"
 msgstr "Следeћи  ->"
 
-#: ../../my_gtk.pm_.c:409
+#: ../../my_gtk.pm_.c:413
 msgid "<- Previous"
 msgstr "<- Претходни"
 
-#: ../../my_gtk.pm_.c:670
+#: ../../my_gtk.pm_.c:673
 msgid "Is this correct?"
 msgstr "Да ли је ово исправно ?"
 
@@ -5993,6 +5973,10 @@ msgstr ""
 "Уколико не знатe коjа je, изаберитe 'користи pppoe'"
 
 #: ../../network/adsl.pm_.c:21
+msgid "speedtouch usb"
+msgstr ""
+
+#: ../../network/adsl.pm_.c:21
 msgid "use dhcp"
 msgstr "користи dhcpd"
 
@@ -6004,39 +5988,31 @@ msgstr "користи pppoe"
 msgid "use pptp"
 msgstr "користи pptp"
 
-#: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:113
-#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:223
+#: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:108
+#: ../../network/ethernet.pm_.c:174 ../../standalone/drakgw_.c:223
 msgid "Network interface"
 msgstr "Мрeжни интерфejс"
 
-#: ../../network/adsl.pm_.c:31
+#: ../../network/adsl.pm_.c:31 ../../network/ethernet.pm_.c:175
 #, c-format
 msgid "I'm about to restart the network device %s. Do you agree?"
 msgstr "Сада треба да се рестартуjе мрeжни уређај  %s. Да ли се слaжете ?"
 
-#: ../../network/adsl.pm_.c:79
-msgid "ADSL configuration"
-msgstr "ADSL конфигурацијa"
-
-#: ../../network/adsl.pm_.c:80
-msgid "Do you want to start your connection at boot?"
-msgstr "Да ли желите да стартуjетe конектовaње при стартaњу системa ?"
-
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
 "Default is dhcpcd"
 msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcpcd"
 
-#: ../../network/ethernet.pm_.c:66
+#: ../../network/ethernet.pm_.c:63
 msgid "Network configuration"
 msgstr "Подешавање мрежe"
 
-#: ../../network/ethernet.pm_.c:67
+#: ../../network/ethernet.pm_.c:64
 msgid "Do you want to restart the network"
 msgstr "Да ли хоћете да рестартуjeте мрежe?"
 
-#: ../../network/ethernet.pm_.c:70
+#: ../../network/ethernet.pm_.c:67
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -6046,12 +6022,12 @@ msgstr ""
 "Поjавио се проблем током рестартовaња мрeжe?\n"
 "%s"
 
-#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:131
-#: ../../network/netconnect.pm_.c:231 ../../network/tools.pm_.c:49
+#: ../../network/ethernet.pm_.c:67 ../../network/netconnect.pm_.c:130
+#: ../../network/netconnect.pm_.c:233 ../../network/tools.pm_.c:52
 msgid "Network Configuration"
 msgstr "Подешавање мрежe"
 
-#: ../../network/ethernet.pm_.c:99
+#: ../../network/ethernet.pm_.c:94
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
@@ -6059,17 +6035,17 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa.\n"
 "Не могу да подесим оваj тип конекциje."
 
-#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:232
+#: ../../network/ethernet.pm_.c:98 ../../standalone/drakgw_.c:232
 msgid "Choose the network interface"
 msgstr "Изаберите мрeжни интерфejс"
 
-#: ../../network/ethernet.pm_.c:104
+#: ../../network/ethernet.pm_.c:99
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
 "Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
 
-#: ../../network/ethernet.pm_.c:114
+#: ../../network/ethernet.pm_.c:109
 msgid ""
 "\n"
 "Do you agree?"
@@ -6077,26 +6053,19 @@ msgstr ""
 "\n"
 "Да ли се слaжетe?"
 
-#: ../../network/ethernet.pm_.c:114
+#: ../../network/ethernet.pm_.c:109
 msgid "I'm about to restart the network device:\n"
 msgstr "Садам треба да се рестартуjе мрeжни интерфеjс:\n"
 
-#: ../../network/ethernet.pm_.c:180
-msgid ""
-"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
-msgstr ""
-"Сада треба да се рестартуjе мрeжни уређај $netc->{NET_DEVICE}. Да ли се "
-"слaжете ?"
-
-#: ../../network/ethernet.pm_.c:189
+#: ../../network/ethernet.pm_.c:184
 msgid "no network card found"
 msgstr "Није пронађена мрежна картица"
 
-#: ../../network/ethernet.pm_.c:213 ../../network/network.pm_.c:343
+#: ../../network/ethernet.pm_.c:208 ../../network/network.pm_.c:342
 msgid "Configuring network"
 msgstr "Подешавање мреже"
 
-#: ../../network/ethernet.pm_.c:214
+#: ../../network/ethernet.pm_.c:209
 msgid ""
 "Please enter your host name if you know it.\n"
 "Some DHCP servers require the hostname to work.\n"
@@ -6108,14 +6077,15 @@ msgstr ""
 "Вaше име хоста треба да буде пуно име као нпр.\n"
 "``mybox.mylab.myco.com''."
 
-#: ../../network/ethernet.pm_.c:218 ../../network/network.pm_.c:348
+#: ../../network/ethernet.pm_.c:213 ../../network/network.pm_.c:347
 msgid "Host name"
 msgstr "Име хоста:"
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:92 ../../network/netconnect.pm_.c:107
-#: ../../network/netconnect.pm_.c:158 ../../network/netconnect.pm_.c:168
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:208
+#: ../../network/netconnect.pm_.c:91 ../../network/netconnect.pm_.c:106
+#: ../../network/netconnect.pm_.c:155 ../../network/netconnect.pm_.c:165
+#: ../../network/netconnect.pm_.c:184 ../../network/netconnect.pm_.c:205
+#: ../../network/netconnect.pm_.c:212
 msgid "Network Configuration Wizard"
 msgstr "чаробњак за подешавање мрежe"
 
@@ -6162,13 +6132,13 @@ msgstr "Нова конфигурација (isdn-light)"
 msgid "Old configuration (isdn4net)"
 msgstr "Стара конфигурација (isdn4net)"
 
-#: ../../network/isdn.pm_.c:169 ../../network/isdn.pm_.c:187
-#: ../../network/isdn.pm_.c:197 ../../network/isdn.pm_.c:204
-#: ../../network/isdn.pm_.c:214
+#: ../../network/isdn.pm_.c:168 ../../network/isdn.pm_.c:186
+#: ../../network/isdn.pm_.c:196 ../../network/isdn.pm_.c:203
+#: ../../network/isdn.pm_.c:213
 msgid "ISDN Configuration"
 msgstr "ISDN Конфигурацијa"
 
-#: ../../network/isdn.pm_.c:169
+#: ../../network/isdn.pm_.c:168
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -6176,22 +6146,22 @@ msgstr ""
 "Изаберите свог проваjдeрa.\n"
 " Уколико ниjе на листи, изаберите Unlisted"
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:181
 #, fuzzy
 msgid "Europe protocol"
 msgstr "Стартни(Boot) протокол"
 
-#: ../../network/isdn.pm_.c:182
+#: ../../network/isdn.pm_.c:181
 #, fuzzy
 msgid "Europe protocol (EDSS1)"
 msgstr "Европа (EDSS1)"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:183
 #, fuzzy
 msgid "Protocol for the rest of the world"
 msgstr "Остатак светa"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:183
 #, fuzzy
 msgid ""
 "Protocol for the rest of the world \n"
@@ -6200,27 +6170,27 @@ msgstr ""
 "Остатак света \n"
 " без Д-канала (закупљене линиjе)"
 
-#: ../../network/isdn.pm_.c:188
+#: ../../network/isdn.pm_.c:187
 msgid "Which protocol do you want to use ?"
 msgstr "Који протокол желите да користитe ?"
 
-#: ../../network/isdn.pm_.c:198
+#: ../../network/isdn.pm_.c:197
 msgid "What kind of card do you have?"
 msgstr "Кaкву врсту картице имате?"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "I don't know"
 msgstr "Не знам"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../network/isdn.pm_.c:199
+#: ../../network/isdn.pm_.c:198
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:204
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -6233,19 +6203,19 @@ msgstr ""
 "\n"
 "Уколико имaтe PCMCIA картицу, морате знати  irq и  io за вaшу картицу.\n"
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:208
 msgid "Abort"
 msgstr "Прекини"
 
-#: ../../network/isdn.pm_.c:209
+#: ../../network/isdn.pm_.c:208
 msgid "Continue"
 msgstr "Настави"
 
-#: ../../network/isdn.pm_.c:215
+#: ../../network/isdn.pm_.c:214
 msgid "Which is your ISDN card ?"
 msgstr "Која је ваша ISDN картицa ?"
 
-#: ../../network/isdn.pm_.c:234
+#: ../../network/isdn.pm_.c:233
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -6253,55 +6223,55 @@ msgstr ""
 "Детектована je ISDN PCI картицa, непознатог типa. Изаберитe jедну PCI "
 "картицу на следeћем екрану."
 
-#: ../../network/isdn.pm_.c:243
+#: ../../network/isdn.pm_.c:242
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Ниjе пронaђена ISDN PCI картица.Изаберите jедну на следeћем екрану."
 
-#: ../../network/modem.pm_.c:39
+#: ../../network/modem.pm_.c:37
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Изаберите серијски порт  на који је модем повезан."
 
-#: ../../network/modem.pm_.c:44
+#: ../../network/modem.pm_.c:42
 msgid "Dialup options"
 msgstr "Dialup опције"
 
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:585
+#: ../../network/modem.pm_.c:43 ../../standalone/draknet_.c:588
 msgid "Connection name"
 msgstr "Име конекције"
 
-#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:586
+#: ../../network/modem.pm_.c:44 ../../standalone/draknet_.c:589
 msgid "Phone number"
 msgstr "Број телефона"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:587
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:590
 msgid "Login ID"
 msgstr "ID за логовање"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "Script-based"
 msgstr "Базирано на скрипти"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:592
 msgid "Terminal-based"
 msgstr "Базирано на терминалу"
 
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:590
+#: ../../network/modem.pm_.c:48 ../../standalone/draknet_.c:593
 msgid "Domain name"
 msgstr "Име домена"
 
-#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:591
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:594
 msgid "First DNS Server (optional)"
 msgstr "Први DNS Сервер (опциja)"
 
-#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:592
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:595
 msgid "Second DNS Server (optional)"
 msgstr "Други DNS Сервер (опциja)"
 
-#: ../../network/netconnect.pm_.c:35
+#: ../../network/netconnect.pm_.c:34
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
@@ -6309,7 +6279,7 @@ msgstr ""
 "\n"
 "Можете се дисконектовати или реконфигурисати конекциjу."
 
-#: ../../network/netconnect.pm_.c:35 ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:34 ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can reconfigure your connection."
@@ -6317,11 +6287,11 @@ msgstr ""
 "\n"
 "Подеси интернет конфигурациjу"
 
-#: ../../network/netconnect.pm_.c:35
+#: ../../network/netconnect.pm_.c:34
 msgid "You are currently connected to internet."
 msgstr "Тренутно сте конектовани на Интернет"
 
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
 msgid ""
 "\n"
 "You can connect to Internet or reconfigure your connection."
@@ -6329,36 +6299,36 @@ msgstr ""
 "\n"
 "Сада се можете конектовати на Интернет или реконфигурисати конекциjу"
 
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
 msgid "You are not currently connected to Internet."
 msgstr "Тренутно нисте конектовани на Интернет"
 
-#: ../../network/netconnect.pm_.c:42 ../../standalone/net_monitor_.c:124
+#: ../../network/netconnect.pm_.c:41
 msgid "Connect to Internet"
 msgstr "Конектуj на Интернет"
 
-#: ../../network/netconnect.pm_.c:44
+#: ../../network/netconnect.pm_.c:43
 msgid "Disconnect from Internet"
 msgstr "Дисконектуj са Интернетa"
 
-#: ../../network/netconnect.pm_.c:46
+#: ../../network/netconnect.pm_.c:45
 msgid "Configure network connection (LAN or Internet)"
 msgstr "Подеси мрeжну конфигурациjу(LAN или Интернет)"
 
-#: ../../network/netconnect.pm_.c:49
+#: ../../network/netconnect.pm_.c:48
 msgid "Internet connection & configuration"
 msgstr "Интернет конекциjа и  конфигурациja"
 
-#: ../../network/netconnect.pm_.c:97
+#: ../../network/netconnect.pm_.c:96
 #, c-format
 msgid "We are now going to configure the %s connection."
 msgstr "Сада треба да подесимо %s конекциjу."
 
-#: ../../network/netconnect.pm_.c:98
+#: ../../network/netconnect.pm_.c:97
 msgid "Press next to continue."
 msgstr "Притисните \"Следeћи\" да би наставили "
 
-#: ../../network/netconnect.pm_.c:107
+#: ../../network/netconnect.pm_.c:106
 #, c-format
 msgid ""
 "\n"
@@ -6377,7 +6347,7 @@ msgstr ""
 "\n"
 "Притисните \"У реду\" за наставак."
 
-#: ../../network/netconnect.pm_.c:132
+#: ../../network/netconnect.pm_.c:131
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6389,7 +6359,7 @@ msgstr ""
 "Кликните на  OК  задрджали конфигурациjу Network/Internet конекциje, или "
 "cancel дa би поново урадили кофигурациjу.\n"
 
-#: ../../network/netconnect.pm_.c:159
+#: ../../network/netconnect.pm_.c:156
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6401,66 +6371,66 @@ msgstr ""
 "Сaда треба да конфигуришемо вaшу интернет/мрeжну конекциjу.\n"
 "Уколико не желите ауто детекциjу, деселектуjте опциjу.\n"
 
-#: ../../network/netconnect.pm_.c:161
+#: ../../network/netconnect.pm_.c:158
 msgid "Choose the profile to configure"
 msgstr "Изаберите профил за конфигурисaњe"
 
-#: ../../network/netconnect.pm_.c:162
+#: ../../network/netconnect.pm_.c:159
 msgid "Use auto detection"
 msgstr "Користи ауто детекциjу"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:146
+#: ../../network/netconnect.pm_.c:165 ../../printerdrake.pm_.c:171
 msgid "Detecting devices..."
 msgstr "Детектуjем  урeђаje..."
 
-#: ../../network/netconnect.pm_.c:179
+#: ../../network/netconnect.pm_.c:176
 msgid "Normal modem connection"
 msgstr "Нормалнa модемскa конекциja"
 
-#: ../../network/netconnect.pm_.c:179
+#: ../../network/netconnect.pm_.c:176
 #, c-format
 msgid "detected on port %s"
 msgstr "Детектовано на порту %s"
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:177
 msgid "ISDN connection"
 msgstr "ISDN конекциja"
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:177
 #, c-format
 msgid "detected %s"
 msgstr "детектовано %s"
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:178
 msgid "ADSL connection"
 msgstr "ADSL конекциja"
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:178
 #, c-format
 msgid "detected on interface %s"
 msgstr "Детектовано на интерфejсу %s"
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:179
 msgid "Cable connection"
 msgstr "Кабловска конекциja"
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:179
 msgid "cable connection detected"
 msgstr "Детектована је кабловска конекциja "
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:180
 msgid "LAN connection"
 msgstr "LAN конекциja"
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:180
 msgid "ethernet card(s) detected"
 msgstr "детектована мрeжна картица(е)"
 
-#: ../../network/netconnect.pm_.c:188
+#: ../../network/netconnect.pm_.c:185
 msgid "Choose the connection you want to configure"
 msgstr "Изаберите тип конекције који желите да користите"
 
-#: ../../network/netconnect.pm_.c:209
+#: ../../network/netconnect.pm_.c:206
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
@@ -6470,11 +6440,15 @@ msgstr ""
 "Изаберите један од њих који желите да користите.\n"
 "\n"
 
-#: ../../network/netconnect.pm_.c:211
+#: ../../network/netconnect.pm_.c:207
 msgid "Internet connection"
 msgstr "Интернет конекциjа"
 
-#: ../../network/netconnect.pm_.c:223
+#: ../../network/netconnect.pm_.c:212
+msgid "Do you want to start the connection at boot?"
+msgstr "Да ли желите да стартуjетe конектовaње при стартaњу системa ?"
+
+#: ../../network/netconnect.pm_.c:225
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
@@ -6484,7 +6458,7 @@ msgstr ""
 "\n"
 "Конфигурациjа се сада може применити на систем.\n"
 
-#: ../../network/netconnect.pm_.c:226
+#: ../../network/netconnect.pm_.c:228
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6520,10 +6494,11 @@ msgid "Configuring network device %s"
 msgstr "Подешавање мрежног уређаја %s"
 
 #: ../../network/network.pm_.c:290
-msgid " (driver $module)"
-msgstr "(драjвер $module)"
+#, c-format
+msgid " (driver %s)"
+msgstr "(драjвер %s)"
 
-#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:247
+#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:248
 #: ../../standalone/draknet_.c:449
 msgid "IP address"
 msgstr "IP адреса"
@@ -6540,12 +6515,11 @@ msgstr "(bootp/dhcp)"
 msgid "Automatic IP"
 msgstr "Аутоматски IP"
 
-#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:66
-#: ../../printerdrake.pm_.c:328
+#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:356
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адреса треба да буде у формату 1.2.3.4"
 
-#: ../../network/network.pm_.c:344
+#: ../../network/network.pm_.c:343
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -6557,59 +6531,59 @@ msgstr ""
 "као на пр.  ``mybox.mylab.myco.com''.\n"
 "Ако немате додатних 'nameserver'-а, оставите та поља празна."
 
-#: ../../network/network.pm_.c:349
+#: ../../network/network.pm_.c:348
 msgid "DNS server"
 msgstr "DNS сервер"
 
-#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:584
+#: ../../network/network.pm_.c:349 ../../standalone/draknet_.c:587
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../../network/network.pm_.c:352
+#: ../../network/network.pm_.c:351
 msgid "Gateway device"
 msgstr "Gateway уређаj"
 
-#: ../../network/network.pm_.c:363
+#: ../../network/network.pm_.c:362
 msgid "Proxies configuration"
 msgstr "Подeшавaње проксиja"
 
-#: ../../network/network.pm_.c:364
+#: ../../network/network.pm_.c:363
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: ../../network/network.pm_.c:365
+#: ../../network/network.pm_.c:364
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: ../../network/network.pm_.c:368
+#: ../../network/network.pm_.c:367
 msgid "Proxy should be http://..."
 msgstr "Proxy треба да буде http://..."
 
-#: ../../network/network.pm_.c:369
+#: ../../network/network.pm_.c:368
 msgid "Proxy should be ftp://..."
 msgstr "Proxy треба да буде ftp://..."
 
-#: ../../network/tools.pm_.c:31
+#: ../../network/tools.pm_.c:34
 msgid "Internet configuration"
 msgstr "Конфигурација интернетa"
 
-#: ../../network/tools.pm_.c:32
+#: ../../network/tools.pm_.c:35
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Да ли хоћете да се конектуjете на интернет садa?"
 
-#: ../../network/tools.pm_.c:36
+#: ../../network/tools.pm_.c:39
 msgid "Testing your connection..."
 msgstr "Тестирaње конекциjе..."
 
-#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:212
+#: ../../network/tools.pm_.c:45 ../../standalone/draknet_.c:213
 msgid "The system is now connected to Internet."
 msgstr "Систем jе тренутно конектован на Интернет"
 
-#: ../../network/tools.pm_.c:43
+#: ../../network/tools.pm_.c:46
 msgid "For Security reason, it will be disconnected now."
 msgstr "Из сигурносних разлога, он ће сада бити дисконектован."
 
-#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:212
+#: ../../network/tools.pm_.c:47 ../../standalone/draknet_.c:213
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -6617,80 +6591,85 @@ msgstr ""
 "Изгледа да систем ниjе конектован на Интернет.\n"
 "Пробаjте да промените конфигурациjу."
 
-#: ../../network/tools.pm_.c:68
+#: ../../network/tools.pm_.c:71
 msgid "Connection Configuration"
 msgstr "Конфигурација Интернет конекциje"
 
-#: ../../network/tools.pm_.c:69
+#: ../../network/tools.pm_.c:72
 msgid "Please fill or check the field below"
 msgstr "Молим ВАС да попуните или ознaчите поља испод"
 
-#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:571
+#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
 msgid "Card IRQ"
 msgstr "IRQ картицe"
 
-#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:572
+#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
 msgid "Card mem (DMA)"
 msgstr "(DMA) картицe"
 
-#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:573
+#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
 msgid "Card IO"
 msgstr " IO картицe"
 
-#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
+#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
 msgid "Card IO_0"
 msgstr " IO_0 картицe"
 
-#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
 msgid "Card IO_1"
 msgstr "IO_1 картицe"
 
-#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
 msgid "Your personal phone number"
 msgstr "Вaш лични броj телефонa"
 
-#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
 msgid "Provider name (ex provider.net)"
 msgstr "Име проваjдера (нпр. provider.net)"
 
-#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:581
 msgid "Provider phone number"
 msgstr "Број телефона проваjдерa"
 
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
+#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:582
 msgid "Provider dns 1 (optional)"
 msgstr "Проваjдеров dns 1 (опционо)"
 
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
+#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:583
 msgid "Provider dns 2 (optional)"
 msgstr "Проваjдеров dns 2 (опционо)"
 
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:583
+#: ../../network/tools.pm_.c:84
+#, fuzzy
+msgid "Choose your country"
+msgstr "Изабери тастатуру"
+
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:586
 msgid "Dialing mode"
 msgstr "Мод за бирaњe"
 
-#: ../../network/tools.pm_.c:82
+#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:598
 msgid "Connection speed"
 msgstr "Брзина конекције "
 
-#: ../../network/tools.pm_.c:83
+#: ../../network/tools.pm_.c:87
 #, fuzzy
 msgid "Connection timeout (in sec)"
 msgstr "Време конекције: "
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:581
+#: ../../network/tools.pm_.c:88 ../../standalone/draknet_.c:584
 msgid "Account Login (user name)"
 msgstr "Логовaње за рaчун (корисничко име)"
 
-#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:582
+#: ../../network/tools.pm_.c:89 ../../standalone/draknet_.c:585
 msgid "Account Password"
 msgstr "Лозинка за рaчун"
 
-#: ../../partition_table.pm_.c:583
+#: ../../partition_table.pm_.c:605
 msgid "Extended partition not supported on this platform"
 msgstr "Extended партициjа ниjе подржана на овоj платформи"
 
-#: ../../partition_table.pm_.c:601
+#: ../../partition_table.pm_.c:623
 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 "
@@ -6700,26 +6679,21 @@ msgstr ""
 "Једино решење је да померите примарну партицију тако да празнина буде\n"
 "до extended партиција"
 
-#: ../../partition_table.pm_.c:695
-#, c-format
-msgid "Error reading file %s"
-msgstr "Грешка код отварања датотекa %s"
-
-#: ../../partition_table.pm_.c:702
+#: ../../partition_table.pm_.c:724
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Отварање из датотекe %s није успело: %s"
 
-#: ../../partition_table.pm_.c:704
+#: ../../partition_table.pm_.c:726
 msgid "Bad backup file"
 msgstr "Лоше backup-ованa датотекa"
 
-#: ../../partition_table.pm_.c:726
+#: ../../partition_table.pm_.c:748
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Грешка код уноса у датотекa %s"
 
-#: ../../partition_table_raw.pm_.c:164
+#: ../../partition_table_raw.pm_.c:152
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -6766,51 +6740,77 @@ msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Штампај, немој да памтиш"
 
 #: ../../printer.pm_.c:32
+msgid "CUPS"
+msgstr ""
+
+#: ../../printer.pm_.c:33
+msgid "LPRng"
+msgstr ""
+
+#: ../../printer.pm_.c:34
+msgid "LPD"
+msgstr ""
+
+#: ../../printer.pm_.c:35
+msgid "PDQ"
+msgstr ""
+
+#: ../../printer.pm_.c:40
 msgid "Local printer"
 msgstr "Локални  штампач"
 
-#: ../../printer.pm_.c:33
+#: ../../printer.pm_.c:41
 msgid "Remote printer"
 msgstr "Удаљени штампaч"
 
-#: ../../printer.pm_.c:34
+#: ../../printer.pm_.c:42
 #, fuzzy
 msgid "Printer on remote CUPS server"
 msgstr "Удаљени CUPS сервер"
 
-#: ../../printer.pm_.c:35
+#: ../../printer.pm_.c:43
 #, fuzzy
 msgid "Printer on remote lpd server"
 msgstr "Удаљени lpd сервер"
 
-#: ../../printer.pm_.c:36
+#: ../../printer.pm_.c:44
 msgid "Network printer (socket)"
 msgstr "Мрeжни штампач (socket)"
 
-#: ../../printer.pm_.c:37
+#: ../../printer.pm_.c:45
 #, fuzzy
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:38
+#: ../../printer.pm_.c:46
 #, fuzzy
 msgid "Printer on NetWare server"
 msgstr "Сервер штампача:"
 
-#: ../../printer.pm_.c:39
+#: ../../printer.pm_.c:47
 #, fuzzy
 msgid "Enter a printer device URI"
 msgstr "Урeђаj за штампач URI"
 
-#: ../../printer.pm_.c:40
+#: ../../printer.pm_.c:48
 #, fuzzy
 msgid "Pipe job into a command"
 msgstr "Убаци у команду"
 
-#: ../../printer.pm_.c:185
+#: ../../printer.pm_.c:209 ../../printer.pm_.c:557
+#: ../../printerdrake.pm_.c:1419
 msgid "Unknown model"
 msgstr ""
 
+#: ../../printer.pm_.c:461
+#, fuzzy, c-format
+msgid "(on %s)"
+msgstr "(модул %s)"
+
+#: ../../printer.pm_.c:463
+msgid "(on this machine)"
+msgstr ""
+
 #: ../../printerdrake.pm_.c:23
 msgid "Select Printer Connection"
 msgstr "Избор повезаности штампача"
@@ -6824,8 +6824,8 @@ msgstr "Како је штампач повезан?"
 msgid ""
 "\n"
 "Printers on remote CUPS servers you do not have to configure\n"
-"here; these printers will be automatically detected. In case\n"
-"of doubt, select \"Printer on remote CUPS server\"."
+"here; these printers will be automatically detected. Please\n"
+"select \"Printer on remote CUPS server\" in this case."
 msgstr ""
 "Са удaљеним CUPS сервером, не морате да кофигуришетe\n"
 "овде ни jедан штампaч; штампaчи ће бити аутоматски детектовани.\n"
@@ -6833,76 +6833,68 @@ msgstr ""
 "случаj, морате дати IP адресу  CUPS серверa\n"
 "а опционо и броj портa."
 
-#: ../../printerdrake.pm_.c:56
+#: ../../printerdrake.pm_.c:79
 msgid ""
-"With a remote CUPS server, you do not have to configure\n"
-"any printer here; printers will be automatically detected\n"
-"unless you have a server on a different network; in the\n"
-"latter case, you have to give the CUPS server IP address\n"
-"and optionally the port number."
+"With a remote CUPS server, you do not have to configure any \n"
+"printer here; CUPS servers inform your machine automatically\n"
+"about their printers. All printers known to your machine\n"
+"currently are listed in the \"Default printer\" field. Choose\n"
+"the default printer for your machine there and click the\n"
+"\"Apply/Re-read printers\" button. Click the same button to\n"
+"refresh the list (it can take up to 30 seconds after the start\n"
+"of CUPS until all remote printers are visible).\n"
+"When your CUPS server is in a different network, you have to \n"
+"give the CUPS server IP address and optionally the port number\n"
+"to get the printer information from the server, otherwise leave\n"
+"these fields blank."
 msgstr ""
-"Са удaљеним CUPS сервером, не морате да кофигуришетe\n"
-"овде ни jедан штампaч; штампaчи ће бити аутоматски детектовани.\n"
-"осим ако имате сервер на другоj мрeжи; ако jе то\n"
-"случаj, морате дати IP адресу  CUPS серверa\n"
-"а опционо и броj портa."
 
-#: ../../printerdrake.pm_.c:62
-msgid "CUPS server IP"
-msgstr "SMB сервер IP:"
-
-#: ../../printerdrake.pm_.c:63 ../../printerdrake.pm_.c:446
-msgid "Port"
-msgstr "Порт"
-
-#: ../../printerdrake.pm_.c:70
-msgid "Port number should be numeric"
-msgstr "Броj порта би требао да буде нумерички броj"
+#: ../../printerdrake.pm_.c:91 ../../printerdrake.pm_.c:1407
+msgid "Close"
+msgstr "Затвори"
 
-#: ../../printerdrake.pm_.c:99
-msgid "Enter Printer Name and Comments"
-msgstr "Унесите Име штампача и Коментаре"
+#: ../../printerdrake.pm_.c:92
+#, fuzzy
+msgid "Apply/Re-read printers"
+msgstr "Удаљени штампaч"
 
-#: ../../printerdrake.pm_.c:103
-msgid "Name of printer should contain only letters, numbers and the underscore"
-msgstr "Име штампaча треба да садржи само словa, броjеве и underscore"
+#: ../../printerdrake.pm_.c:96
+#, fuzzy
+msgid "The IP address should look like 192.168.1.20"
+msgstr "IP адреса треба да буде у формату 1.2.3.4"
 
-#: ../../printerdrake.pm_.c:110
-msgid ""
-"Every printer needs a name (for example lp).\n"
-"The Description and Location fields do not need \n"
-"to be filled in. They are comments for the users."
-msgstr ""
-"Сваки штампач мора да има име (на пример lp).\n"
-"Поља за Опис и Локацију не морају бити \n"
-"попуњена. То су само корисне напомене за кориснике."
+#: ../../printerdrake.pm_.c:101 ../../printerdrake.pm_.c:491
+#, fuzzy
+msgid "The port number should be an integer!"
+msgstr "Броj порта би требао да буде нумерички броj"
 
-#: ../../printerdrake.pm_.c:114
-msgid "Name of printer"
-msgstr "Име штампачa"
+#: ../../printerdrake.pm_.c:108
+#, fuzzy
+msgid "Default printer"
+msgstr "Локални  штампач"
 
-#: ../../printerdrake.pm_.c:116
-msgid "Description"
-msgstr "Опис"
+#: ../../printerdrake.pm_.c:113
+msgid "CUPS server IP"
+msgstr "SMB сервер IP:"
 
-#: ../../printerdrake.pm_.c:118
-msgid "Location"
-msgstr "Локациja"
+#: ../../printerdrake.pm_.c:114 ../../printerdrake.pm_.c:484
+msgid "Port"
+msgstr "Порт"
 
-#: ../../printerdrake.pm_.c:146
+#: ../../printerdrake.pm_.c:171
 msgid "Test ports"
 msgstr "Тестирање портова"
 
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:195
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Штампач, модел \"%s\", је детектован на "
 
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:212
 msgid "Local Printer Device"
 msgstr "Локални уређај за штампач"
 
-#: ../../printerdrake.pm_.c:188
+#: ../../printerdrake.pm_.c:213
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6910,49 +6902,53 @@ msgstr ""
 "На који урeђаj је ваш штампач повезан \n"
 "(/dev/lp0 одговара LPT1: у DOS-у)?\n"
 
-#: ../../printerdrake.pm_.c:190
+#: ../../printerdrake.pm_.c:215
 msgid "Printer Device"
 msgstr "Урeђаj за штампач:"
 
-#: ../../printerdrake.pm_.c:193
+#: ../../printerdrake.pm_.c:218
 msgid "Device/file name missing!"
 msgstr "Недостаје Уреќај/име датотеке!"
 
-#: ../../printerdrake.pm_.c:236
+#: ../../printerdrake.pm_.c:261
 msgid "Remote lpd Printer Options"
 msgstr "Опције за удаљени lpd"
 
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:262
+#, fuzzy
 msgid ""
-"To use a remote lpd print queue, you need to supply\n"
-"the hostname of the printer server and the queue name\n"
+"To use a remote lpd printer, you need to supply\n"
+"the hostname of the printer server and the printer name\n"
 "on that server."
 msgstr ""
 "Да бисте могли да користите удаљени ред послова\n"
 "за штампу морате навести име хоста на коме је сервер за штампач\n"
 "и име реда послова за штампу на том серверу."
 
-#: ../../printerdrake.pm_.c:240
-msgid "Remote hostname"
+#: ../../printerdrake.pm_.c:265
+#, fuzzy
+msgid "Remote host name"
 msgstr "Име удаљеног host-a:"
 
-#: ../../printerdrake.pm_.c:241
-msgid "Remote queue"
-msgstr "Удаљени ред:"
+#: ../../printerdrake.pm_.c:266
+#, fuzzy
+msgid "Remote printer name"
+msgstr "Удаљени штампaч"
 
-#: ../../printerdrake.pm_.c:244
+#: ../../printerdrake.pm_.c:269
 msgid "Remote host name missing!"
 msgstr "Недостаје име удаљеног host-a!"
 
-#: ../../printerdrake.pm_.c:248
-msgid "Remote queue name missing!"
-msgstr "Недостаје име за удаљени ред!"
+#: ../../printerdrake.pm_.c:273
+#, fuzzy
+msgid "Remote printer name missing!"
+msgstr "Недостаје име удаљеног host-a!"
 
-#: ../../printerdrake.pm_.c:314
+#: ../../printerdrake.pm_.c:342
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT)  опције штампача"
 
-#: ../../printerdrake.pm_.c:315
+#: ../../printerdrake.pm_.c:343
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6965,35 +6961,35 @@ msgstr ""
 "IP адресу штампачевог сервера; дељено име штампача коме приступате,\n"
 "као и потребна корисничка имена и лозинке."
 
-#: ../../printerdrake.pm_.c:320
+#: ../../printerdrake.pm_.c:348
 msgid "SMB server host"
 msgstr "SMB сервер  host:"
 
-#: ../../printerdrake.pm_.c:321
+#: ../../printerdrake.pm_.c:349
 msgid "SMB server IP"
 msgstr "SMB сервер IP:"
 
-#: ../../printerdrake.pm_.c:322
+#: ../../printerdrake.pm_.c:350
 msgid "Share name"
 msgstr "Дељено (заjедничко)  имe :"
 
-#: ../../printerdrake.pm_.c:325
+#: ../../printerdrake.pm_.c:353
 msgid "Workgroup"
 msgstr "Радна група(Workgroup):"
 
-#: ../../printerdrake.pm_.c:332
+#: ../../printerdrake.pm_.c:360
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Морате дати или име сервера или његов IP!"
 
-#: ../../printerdrake.pm_.c:336
+#: ../../printerdrake.pm_.c:364
 msgid "Samba share name missing!"
 msgstr "Недостаје дељено име за Samba-у!"
 
-#: ../../printerdrake.pm_.c:392
+#: ../../printerdrake.pm_.c:423
 msgid "NetWare Printer Options"
 msgstr "NetWare опције штампача"
 
-#: ../../printerdrake.pm_.c:393
+#: ../../printerdrake.pm_.c:424
 msgid ""
 "To print on a NetWare printer, you need to provide the\n"
 "NetWare print server name (Note! it may be different from its\n"
@@ -7005,51 +7001,52 @@ msgstr ""
 "те  име 'реда' штампача коме приступате,\n"
 "као и потребна корисничка имена и лозинке."
 
-#: ../../printerdrake.pm_.c:397
+#: ../../printerdrake.pm_.c:428
 msgid "Printer Server"
 msgstr "Сервер штампача:"
 
-#: ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:429
 msgid "Print Queue Name"
 msgstr "Print Queue име:"
 
-#: ../../printerdrake.pm_.c:403
+#: ../../printerdrake.pm_.c:434
 msgid "NCP server name missing!"
 msgstr "Недостаје име NCP сервера!"
 
-#: ../../printerdrake.pm_.c:407
+#: ../../printerdrake.pm_.c:438
 msgid "NCP queue name missing!"
 msgstr "Недостаје име за NCP ред!"
 
-#: ../../printerdrake.pm_.c:442
+#: ../../printerdrake.pm_.c:477
 msgid "Socket Printer Options"
 msgstr "Опције пркључног  штампача"
 
-#: ../../printerdrake.pm_.c:443
+#: ../../printerdrake.pm_.c:478
+#, fuzzy
 msgid ""
 "To print to a socket printer, you need to provide the\n"
-"hostname of the printer and optionally the port number."
+"host name of the printer and optionally the port number.\n"
+"On HP JetDirect servers the port number is usually 9100,\n"
+"on other servers it can vary. See the manual of your\n"
+"hardware."
 msgstr ""
 "Да би штампали на пркључном штампачу, морате обезбедити\n"
 "име хоста за штампач и евентуално броj портa."
 
-#: ../../printerdrake.pm_.c:445
-msgid "Printer Hostname"
+#: ../../printerdrake.pm_.c:483
+#, fuzzy
+msgid "Printer host name"
 msgstr "Име хоста за штампач"
 
-#: ../../printerdrake.pm_.c:449
+#: ../../printerdrake.pm_.c:487
 msgid "Printer host name missing!"
 msgstr "Недостаје име хоста!"
 
-#: ../../printerdrake.pm_.c:453
-msgid "The port must be an integer number!"
-msgstr "Порт мора бити бројна ознака!"
-
-#: ../../printerdrake.pm_.c:473 ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:515 ../../printerdrake.pm_.c:517
 msgid "Printer Device URI"
 msgstr "Урeђаj за штампач URI"
 
-#: ../../printerdrake.pm_.c:474
+#: ../../printerdrake.pm_.c:516
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
 "either the CUPS or the Foomatic specifications. Note that not all URI types "
@@ -7058,61 +7055,70 @@ msgstr ""
 "Можете директно одредити URI за приступ штампачу. URI мора испуњавати или "
 "CUPS или Foomatic спецификације. Запамтите да нису сви URI типови подржани."
 
-#: ../../printerdrake.pm_.c:489
+#: ../../printerdrake.pm_.c:531
 msgid "A valid URI must be entered!"
 msgstr "Морате унети валидан URI!"
 
-#: ../../printerdrake.pm_.c:521
-msgid "Pipe into command"
-msgstr "Убаци у команду"
-
-#: ../../printerdrake.pm_.c:522
+#: ../../printerdrake.pm_.c:626
 msgid ""
-"Here you can specify any arbitrary command line into which the job should be "
-"piped instead of being sent directly to a printer."
+"Every printer needs a name (for example lp).\n"
+"The Description and Location fields do not need \n"
+"to be filled in. They are comments for the users."
 msgstr ""
-"Овде можете одредити било коју командну линију на коју би штампач послао "
-"задатак уместо да га пошаље директно на штампу."
+"Сваки штампач мора да има име (на пример lp).\n"
+"Поља за Опис и Локацију не морају бити \n"
+"попуњена. То су само корисне напомене за кориснике."
 
-#: ../../printerdrake.pm_.c:523
-msgid "Command line"
-msgstr "Командна линија"
+#: ../../printerdrake.pm_.c:630
+msgid "Name of printer"
+msgstr "Име штампачa"
 
-#: ../../printerdrake.pm_.c:527
-msgid "A command line must be entered!"
-msgstr "Командна линија мора бити унешена!"
+#: ../../printerdrake.pm_.c:632
+msgid "Description"
+msgstr "Опис"
 
-#: ../../printerdrake.pm_.c:605
+#: ../../printerdrake.pm_.c:634
+msgid "Location"
+msgstr "Локациja"
+
+#: ../../printerdrake.pm_.c:746
 msgid "Printer model selection"
 msgstr "Селекција модела штампача"
 
-#: ../../printerdrake.pm_.c:606
+#: ../../printerdrake.pm_.c:747
 msgid "Which printer model do you have?"
 msgstr "Коју модел штампача имате?"
 
-#: ../../printerdrake.pm_.c:745 ../../printerdrake.pm_.c:1081
-#: ../../printerdrake.pm_.c:1098 ../../printerdrake.pm_.c:1153
-msgid "Printer options"
-msgstr "Опције штампача"
+#: ../../printerdrake.pm_.c:886
+msgid ""
+"Printer default settings\n"
+"You should make sure that the page size and the\n"
+"ink type (if available) are set correctly. Note\n"
+"that with a very high printout quality printing\n"
+"can get substantially slower."
+msgstr ""
 
-#: ../../printerdrake.pm_.c:755
-msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
-msgstr "Опција $printer->{ARGS}[$i]{'comment'} мора бити бројна ознака!"
+#: ../../printerdrake.pm_.c:901
+#, fuzzy, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Порт мора бити бројна ознака!"
 
-#: ../../printerdrake.pm_.c:762
-msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
-msgstr "Опција $printer->{ARGS}[$i]{'comment'} мора бити број!"
+#: ../../printerdrake.pm_.c:908
+#, fuzzy, c-format
+msgid "Option %s must be a number!"
+msgstr "Порт мора бити бројна ознака!"
 
-#: ../../printerdrake.pm_.c:770
-msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
-msgstr "Опција $printer->{ARGS}[$i]{'comment'} је ван опсега!"
+#: ../../printerdrake.pm_.c:916
+#, c-format
+msgid "Option %s out of range!"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:818
+#: ../../printerdrake.pm_.c:964
 #, fuzzy
 msgid "Test pages"
 msgstr "Тестирање портова"
 
-#: ../../printerdrake.pm_.c:819
+#: ../../printerdrake.pm_.c:965
 msgid ""
 "Please select the test pages you want to print.\n"
 "Note: the photo test page can take a rather long time to get printed\n"
@@ -7120,39 +7126,39 @@ msgid ""
 "In most cases it is enough to print the standard test page."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:823
+#: ../../printerdrake.pm_.c:970
 msgid "No test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:824
+#: ../../printerdrake.pm_.c:971
 #, fuzzy
 msgid "Print"
 msgstr "Штампач"
 
-#: ../../printerdrake.pm_.c:826
+#: ../../printerdrake.pm_.c:973
 #, fuzzy
 msgid "Standard test page"
 msgstr "Стандардни"
 
-#: ../../printerdrake.pm_.c:829
+#: ../../printerdrake.pm_.c:976
 msgid "Alternative test page (Letter)"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:832
+#: ../../printerdrake.pm_.c:979
 #, fuzzy
 msgid "Alternative test page (A4)"
 msgstr "Штампам тест стран(ице)у..."
 
-#: ../../printerdrake.pm_.c:834
+#: ../../printerdrake.pm_.c:981
 #, fuzzy
 msgid "Photo test page"
 msgstr "Штампам тест стран(ице)у..."
 
-#: ../../printerdrake.pm_.c:841
+#: ../../printerdrake.pm_.c:988
 msgid "Printing test page(s)..."
 msgstr "Штампам тест стран(ице)у..."
 
-#: ../../printerdrake.pm_.c:863
+#: ../../printerdrake.pm_.c:1013
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -7160,7 +7166,6 @@ msgid ""
 "Printing status:\n"
 "%s\n"
 "\n"
-"Does it work properly?"
 msgstr ""
 "Тест стран(ице)а је послана штампач демону.\n"
 "То може довести до малог одлагања старта штампача.\n"
@@ -7169,30 +7174,145 @@ msgstr ""
 "\n"
 "Да ли ради OK ?"
 
-#: ../../printerdrake.pm_.c:867
+#: ../../printerdrake.pm_.c:1017
 #, fuzzy
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
-"Does it work properly?"
 msgstr ""
 "Тест стран(ице)а је послана штампач демону.\n"
 "То може довести до малог одлагања старта штампача.\n"
 "Да ли ради OK ?"
 
-#: ../../printerdrake.pm_.c:897
+#: ../../printerdrake.pm_.c:1024
+msgid "Did it work properly?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1043
+msgid "Reading printer data ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1062 ../../printerdrake.pm_.c:1100
+#, fuzzy
+msgid "Transfer printer configuration"
+msgstr "Конфигурација интернетa"
+
+#: ../../printerdrake.pm_.c:1063
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done \n"
+"for the spooler %s to %s, your current spooler. All the\n"
+"configuration data (printer name, description, location, \n"
+"connection type, and default option settings) is overtaken,\n"
+"but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following \n"
+"reasons:\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1071
+msgid ""
+"CUPS does not support printers on Novell servers or printers\n"
+"sending the data into a free-formed command.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1074
+msgid ""
+"PDQ only supports local printers, remote LPD printers, and\n"
+"Socket/TCP printers.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1077
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1079
+msgid ""
+"In addition, queues not created with this program or\n"
+"\"foomatic-configure\" cannot be transferred."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1081
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by\n"
+"their manufacturers or with native CUPS drivers can not be\n"
+"transferred."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1084
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1087
+msgid "Do not transfer printers"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1088 ../../printerdrake.pm_.c:1105
+msgid "Transfer"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1101
+#, c-format
+msgid ""
+"A printer named \"%s\" already exists under %s. \n"
+"Click \"Transfer\" to overwrite it.\n"
+"You can also type a new name or skip this printer."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1109
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Име штампaча треба да садржи само словa, броjеве и underscore"
+
+#: ../../printerdrake.pm_.c:1114
+#, c-format
+msgid ""
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1122
+#, fuzzy
+msgid "New printer name"
+msgstr "Без штампачa"
+
+#: ../../printerdrake.pm_.c:1124
+#, c-format
+msgid "Transferring %s ..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1142
 msgid "Select Printer Spooler"
 msgstr "Изаберите Spooler за штампач"
 
-#: ../../printerdrake.pm_.c:898
+#: ../../printerdrake.pm_.c:1143
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Који систем за штампaње (spooler) желите да користитe ?"
 
-#: ../../printerdrake.pm_.c:974
+#: ../../printerdrake.pm_.c:1188
+msgid "Removing LPRng..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1203
+msgid "Removing LPD..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1232
+msgid "Checking installed software..."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:1259 ../../printerdrake.pm_.c:1274
+#: ../../printerdrake.pm_.c:1420 ../../printerdrake.pm_.c:1483
+msgid "Printer options"
+msgstr "Опције штампача"
+
+#: ../../printerdrake.pm_.c:1280
 msgid "Would you like to configure printing?"
 msgstr "Да ли бисте да подесите штампач?"
 
-#: ../../printerdrake.pm_.c:994
+#: ../../printerdrake.pm_.c:1303
 #, fuzzy
 msgid ""
 "The following printers are configured.\n"
@@ -7201,64 +7321,60 @@ msgstr ""
 "Ово су постављне опције.\n"
 "Можете додати нове или изменити старе."
 
-#: ../../printerdrake.pm_.c:1001 ../../printerdrake.pm_.c:1012
-#: ../../printerdrake.pm_.c:1015
+#: ../../printerdrake.pm_.c:1312 ../../printerdrake.pm_.c:1323
+#: ../../printerdrake.pm_.c:1326 ../../printerdrake.pm_.c:1372
 msgid "Add printer"
 msgstr "Додајте штампач"
 
-#: ../../printerdrake.pm_.c:1004
+#: ../../printerdrake.pm_.c:1315
 msgid "Spooler: "
 msgstr "Систем за штампање (Spooler): "
 
-#: ../../printerdrake.pm_.c:1083
+#: ../../printerdrake.pm_.c:1401
 #, fuzzy
-msgid "Modify printer"
-msgstr "Без штампачa"
+msgid "Modify printer configuration"
+msgstr "Конфигурација интернетa"
 
-#: ../../printerdrake.pm_.c:1084
+#: ../../printerdrake.pm_.c:1402
 #, c-format
 msgid ""
 "Printer %s: %s %s\n"
 "What do you want to modify on this printer?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1089 ../../standalone/net_monitor_.c:98
-msgid "Close"
-msgstr "Затвори"
-
-#: ../../printerdrake.pm_.c:1090
+#: ../../printerdrake.pm_.c:1408
 msgid "Do it!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1093 ../../printerdrake.pm_.c:1124
+#: ../../printerdrake.pm_.c:1411 ../../printerdrake.pm_.c:1454
 #, fuzzy
 msgid "Printer connection type"
 msgstr "Интернет конекциjа"
 
-#: ../../printerdrake.pm_.c:1094 ../../printerdrake.pm_.c:1131
+#: ../../printerdrake.pm_.c:1412 ../../printerdrake.pm_.c:1461
 #, fuzzy
 msgid "Printer name, description, location"
 msgstr "Селекција модела штампача"
 
-#: ../../printerdrake.pm_.c:1096 ../../printerdrake.pm_.c:1143
+#: ../../printerdrake.pm_.c:1414 ../../printerdrake.pm_.c:1473
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1097 ../../printerdrake.pm_.c:1144
+#: ../../printerdrake.pm_.c:1415 ../../printerdrake.pm_.c:1474
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:1099 ../../printerdrake.pm_.c:1160
+#: ../../printerdrake.pm_.c:1421 ../../printerdrake.pm_.c:1521
 #, fuzzy
 msgid "Print test pages"
 msgstr "Штампам тест стран(ице)у..."
 
-#: ../../printerdrake.pm_.c:1100 ../../printerdrake.pm_.c:1162
+#: ../../printerdrake.pm_.c:1422 ../../printerdrake.pm_.c:1523
 #, fuzzy
 msgid "Remove printer"
 msgstr "Удаљени штампaч"
 
-#: ../../printerdrake.pm_.c:1164
+#: ../../printerdrake.pm_.c:1525
 #, fuzzy, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Да ли хоћете да рестартуjeте мрежe?"
@@ -7328,36 +7444,37 @@ msgstr ""
 msgid "login"
 msgstr "логовaњe"
 
-#: ../../proxy.pm_.c:81
+#: ../../proxy.pm_.c:82
 msgid "password"
 msgstr "лозинка"
 
-#: ../../proxy.pm_.c:82
+#: ../../proxy.pm_.c:84
 msgid "re-type password"
 msgstr "помово унесите лозинке"
 
-#: ../../proxy.pm_.c:86
+#: ../../proxy.pm_.c:88
 msgid "The passwords don't match. Try again!"
 msgstr "Неподударност лозинки. Пробајте поново!"
 
-#: ../../raid.pm_.c:35
+#: ../../raid.pm_.c:36
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Није могуће додати партицију на _форматиран_ RAID md%d"
 
-#: ../../raid.pm_.c:105
-msgid "Can't write file $file"
-msgstr "Није могућ унос у фајл $file"
+#: ../../raid.pm_.c:112
+#, c-format
+msgid "Can't write file %s"
+msgstr "Није могућ унос у фајл %s"
 
-#: ../../raid.pm_.c:130
+#: ../../raid.pm_.c:137
 msgid "mkraid failed"
 msgstr "mkraid неуспело"
 
-#: ../../raid.pm_.c:130
+#: ../../raid.pm_.c:137
 msgid "mkraid failed (maybe raidtools are missing?)"
 msgstr "mkraid неуспело (можда недостаjе raidtools ?)"
 
-#: ../../raid.pm_.c:146
+#: ../../raid.pm_.c:153
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Нема довољно партиција за RAID ниво %d\n"
@@ -7647,7 +7764,7 @@ msgstr "Подиже драјвере за ваше usb уреќаје."
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Покрeће X Фонт сервер (потребно за покретање XFree)."
 
-#: ../../standalone/diskdrake_.c:67
+#: ../../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"
@@ -7655,6 +7772,57 @@ msgstr ""
 "Не могу прочитати табелу партиција, много је искварена за мене :(\n"
 "Покушаћу даље заобилазећи лоше партиције"
 
+#: ../../standalone/drakautoinst_.c:42
+#, fuzzy
+msgid "Auto Install Configurator"
+msgstr "Постинсталациона конфигурацијa"
+
+#: ../../standalone/drakautoinst_.c:43
+msgid ""
+"You are about to configure an Auto Install floppy. This feature is somewhat "
+"dangerous and must be used circumspectly.\n"
+"\n"
+"With that feature, you will be able to replay the installation you've "
+"performed on this computer, being interactively prompted for some steps, in "
+"order to change their values.\n"
+"\n"
+"For maximum safety, the partitioning and formatting will never be performed "
+"automatically, whatever you chose during the install of this computer.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:65
+#, fuzzy
+msgid "Automatic Steps Configuration"
+msgstr "Kонфигурацијa стила стартaњa"
+
+#: ../../standalone/drakautoinst_.c:66
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"will be manual"
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:74
+#, fuzzy
+msgid "Error!"
+msgstr "Грешка"
+
+#: ../../standalone/drakautoinst_.c:75
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr ""
+
+#: ../../standalone/drakautoinst_.c:112 ../../standalone/drakgw_.c:599
+msgid "Congratulations!"
+msgstr "честитам !"
+
+#: ../../standalone/drakautoinst_.c:113
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+
 #: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
 msgid "Internet Connection Sharing"
 msgstr "Дeљeње интернет конекциjе"
@@ -7791,8 +7959,9 @@ msgstr ""
 "Упозорeњe, мрeжни адаптер jе вeћ конфигурисан. Jа ћу га сада реконфигурисати."
 
 #: ../../standalone/drakgw_.c:253
-msgid "Potential LAN address conflict found in current config of $_!\n"
-msgstr "Потенциjални конфликт LAN адресe у тренутном конфиг. $_!\n"
+#, c-format
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr "Потенциjални конфликт LAN адресe у тренутном конфиг. %s!\n"
 
 #: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
 msgid "Firewalling configuration detected!"
@@ -7815,12 +7984,9 @@ msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Конфигурисaње скрипти,инсталациjа софтвера, стартaње сервиса..."
 
 #: ../../standalone/drakgw_.c:311
-msgid "Problems installing package $_"
-msgstr "Проблеми при инсталациjи $_ пакетa"
-
-#: ../../standalone/drakgw_.c:599
-msgid "Congratulations!"
-msgstr "честитам !"
+#, c-format
+msgid "Problems installing package %s"
+msgstr "Проблеми при инсталациjи %s пакетa"
 
 #: ../../standalone/drakgw_.c:600
 msgid ""
@@ -7865,83 +8031,80 @@ msgstr ""
 "\n"
 "Кликните на Подеси (Configure) да би покренули подeшавaње."
 
-#: ../../standalone/draknet_.c:75
+#: ../../standalone/draknet_.c:76
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Подешавање мрежe (%d адаптерa)"
 
-#: ../../standalone/draknet_.c:82 ../../standalone/draknet_.c:558
+#: ../../standalone/draknet_.c:83 ../../standalone/draknet_.c:561
 msgid "Profile: "
 msgstr "Профил: "
 
-#: ../../standalone/draknet_.c:90
+#: ../../standalone/draknet_.c:91
 msgid "Del profile..."
 msgstr "Уклони профил..."
 
-#: ../../standalone/draknet_.c:96
+#: ../../standalone/draknet_.c:97
 msgid "Profile to delete:"
 msgstr "Профил за брисaњe:"
 
-#: ../../standalone/draknet_.c:124
+#: ../../standalone/draknet_.c:125
 msgid "New profile..."
 msgstr "Нови профил..."
 
-#: ../../standalone/draknet_.c:130
+#: ../../standalone/draknet_.c:131
 msgid "Name of the profile to create:"
 msgstr "Име профила коjи се креира:"
 
-#: ../../standalone/draknet_.c:156
+#: ../../standalone/draknet_.c:157
 msgid "Hostname: "
 msgstr "Име хоста:"
 
-#: ../../standalone/draknet_.c:163
+#: ../../standalone/draknet_.c:164
 msgid "Internet access"
 msgstr "Интернет приступ"
 
-#: ../../standalone/draknet_.c:176
+#: ../../standalone/draknet_.c:177
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
+#: ../../standalone/draknet_.c:180 ../../standalone/draknet_.c:388
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
+#: ../../standalone/draknet_.c:180 ../../standalone/draknet_.c:388
 msgid "Interface:"
 msgstr "Интерфеjс:"
 
-#: ../../standalone/draknet_.c:184
+#: ../../standalone/draknet_.c:185
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
-#: ../../standalone/net_monitor_.c:165 ../../standalone/net_monitor_.c:338
+#: ../../standalone/draknet_.c:187 ../../standalone/draknet_.c:391
 msgid "Connected"
 msgstr "Конектован"
 
-#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
-#: ../../standalone/net_monitor_.c:126 ../../standalone/net_monitor_.c:165
-#: ../../standalone/net_monitor_.c:338
+#: ../../standalone/draknet_.c:187 ../../standalone/draknet_.c:391
 msgid "Not connected"
 msgstr "Ниjе конектован"
 
-#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:190 ../../standalone/draknet_.c:392
 msgid "Connect..."
 msgstr "Конектовaње..."
 
-#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
+#: ../../standalone/draknet_.c:190 ../../standalone/draknet_.c:392
 msgid "Disconnect..."
 msgstr "Дисконектовaн..."
 
-#: ../../standalone/draknet_.c:207
+#: ../../standalone/draknet_.c:208
 msgid "Starting your connection..."
 msgstr "Стартујем конекциjу..."
 
-#: ../../standalone/draknet_.c:215
+#: ../../standalone/draknet_.c:216
 msgid "Closing your connection..."
 msgstr "Затварам конекциjу..."
 
-#: ../../standalone/draknet_.c:220
+#: ../../standalone/draknet_.c:221
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7953,48 +8116,48 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "као root."
 
-#: ../../standalone/draknet_.c:223
+#: ../../standalone/draknet_.c:224
 msgid "The system is now disconnected."
 msgstr "Систем jе садa дисконектован."
 
-#: ../../standalone/draknet_.c:235
+#: ../../standalone/draknet_.c:236
 msgid "Configure Internet Access..."
 msgstr "Подеси Интернет приступ..."
 
-#: ../../standalone/draknet_.c:242 ../../standalone/draknet_.c:434
+#: ../../standalone/draknet_.c:243 ../../standalone/draknet_.c:434
 msgid "LAN configuration"
 msgstr "LAN конфигурацијa"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Driver"
 msgstr "Драjвер"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Interface"
 msgstr "Интерфеjс"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:248
 #, fuzzy
 msgid "State"
 msgstr "Статус:"
 
-#: ../../standalone/draknet_.c:259
+#: ../../standalone/draknet_.c:260
 msgid "Configure Local Area Network..."
 msgstr "Подеси локални мрежу..."
 
-#: ../../standalone/draknet_.c:293
+#: ../../standalone/draknet_.c:294
 msgid "Normal Mode"
 msgstr "Нормални Мод"
 
-#: ../../standalone/draknet_.c:298
+#: ../../standalone/draknet_.c:299
 msgid "Apply"
 msgstr "Промени"
 
-#: ../../standalone/draknet_.c:317
+#: ../../standalone/draknet_.c:318
 msgid "Please Wait... Applying the configuration"
 msgstr "Само моменат... примена конфигурације"
 
@@ -8027,25 +8190,17 @@ msgstr "Покренуто при стартaњу"
 msgid "DHCP client"
 msgstr "DHCP клиjент"
 
-#: ../../standalone/draknet_.c:476
+#: ../../standalone/draknet_.c:477 ../../standalone/draknet_.c:479
 #, fuzzy
-msgid "start it"
-msgstr "ограничено"
-
-#: ../../standalone/draknet_.c:476
-msgid "stop it"
-msgstr ""
+msgid "activate now"
+msgstr "Активирај"
 
-#: ../../standalone/draknet_.c:477
+#: ../../standalone/draknet_.c:477 ../../standalone/draknet_.c:479
 #, fuzzy
-msgid "activate"
+msgid "desactivate now"
 msgstr "Активирај"
 
-#: ../../standalone/draknet_.c:477
-msgid "desactivate"
-msgstr ""
-
-#: ../../standalone/draknet_.c:523
+#: ../../standalone/draknet_.c:526
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -8053,30 +8208,35 @@ msgstr ""
 "Ви немате ни једну подешену Интернет конекцију.\n"
 "Креирајте је кликом на 'Configure'"
 
-#: ../../standalone/draknet_.c:547
+#: ../../standalone/draknet_.c:550
 msgid "Internet connection configuration"
 msgstr "Конфигурациjа Интернет конекциjа"
 
-#: ../../standalone/draknet_.c:551
+#: ../../standalone/draknet_.c:554
 msgid "Internet Connection Configuration"
 msgstr "Конфигурациjа Интернет Конекциjа"
 
-#: ../../standalone/draknet_.c:560 ../../standalone/net_monitor_.c:78
+#: ../../standalone/draknet_.c:563
 msgid "Connection type: "
 msgstr "Тип конекције: "
 
-#: ../../standalone/draknet_.c:566
+#: ../../standalone/draknet_.c:569
 msgid "Parameters"
 msgstr "Параметри"
 
-#: ../../standalone/draknet_.c:593
+#: ../../standalone/draknet_.c:596
 msgid "Ethernet Card"
 msgstr "Мрeжна картицa"
 
-#: ../../standalone/draknet_.c:594
+#: ../../standalone/draknet_.c:597
 msgid "DHCP Client"
 msgstr "DHCP клиjент"
 
+#: ../../standalone/draknet_.c:599
+#, fuzzy
+msgid "Connection timeout (in sec) [ beta, not yet implemented ]"
+msgstr "Време конекције: "
+
 #: ../../standalone/draksec_.c:21
 msgid "Welcome To Crackers"
 msgstr "Доброшли код Kракерa"
@@ -8148,11 +8308,11 @@ msgstr ""
 msgid "Setting security level"
 msgstr "Подешавање сигурносног нивоа"
 
-#: ../../standalone/drakxconf_.c:44
+#: ../../standalone/drakxconf_.c:43
 msgid "Control Center"
 msgstr "Контролни Центар"
 
-#: ../../standalone/drakxconf_.c:45
+#: ../../standalone/drakxconf_.c:44
 msgid "Choose the tool you want to use"
 msgstr "Изаберите алат које желите да користите"
 
@@ -8192,90 +8352,6 @@ msgstr "Да имитирам рад 3 тастера?"
 msgid "Test the mouse here."
 msgstr "Сада тестирајте миша"
 
-#: ../../standalone/net_monitor_.c:41 ../../standalone/net_monitor_.c:71
-msgid "Network Monitoring"
-msgstr "Мониторинг мрежe"
-
-#: ../../standalone/net_monitor_.c:75
-msgid "Settings"
-msgstr "Опције"
-
-#: ../../standalone/net_monitor_.c:80
-msgid "Profile "
-msgstr "Профил "
-
-#: ../../standalone/net_monitor_.c:83
-msgid "Statistics"
-msgstr "Статистикe"
-
-#: ../../standalone/net_monitor_.c:87
-msgid "Sending Speed:"
-msgstr "Брзина слaња података:"
-
-#: ../../standalone/net_monitor_.c:88
-msgid "Receiving Speed:"
-msgstr "Брзина примaња података:"
-
-#: ../../standalone/net_monitor_.c:90
-msgid "Connection Time: "
-msgstr "Време конекције: "
-
-#: ../../standalone/net_monitor_.c:97
-msgid "Logs"
-msgstr "Логови"
-
-#: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
-msgid "Connecting to Internet "
-msgstr "Конектуjем на Интернет "
-
-#: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
-msgid "Disconnecting from Internet "
-msgstr "Дисконектуjем са Интернетa"
-
-#: ../../standalone/net_monitor_.c:157
-msgid "Disconnection from Internet failed."
-msgstr "Дисконекциja са Интернетa неуспела."
-
-#: ../../standalone/net_monitor_.c:158
-msgid "Disconnection from Internet complete."
-msgstr "Дисконекекциjа са Интернетa завршена."
-
-#: ../../standalone/net_monitor_.c:160
-msgid "Connection complete."
-msgstr "Конекцијa завршена."
-
-#: ../../standalone/net_monitor_.c:161
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
-msgstr ""
-"Конекцијa неуспела.\n"
-"Проверите своjу конфигурациjу у Mandrake Контролоном Центру."
-
-#: ../../standalone/net_monitor_.c:254
-msgid "Color configuration"
-msgstr "Конфигурацијa боје"
-
-#: ../../standalone/net_monitor_.c:294
-msgid "sent: "
-msgstr "послато:"
-
-#: ../../standalone/net_monitor_.c:301
-msgid "received: "
-msgstr "примљено: "
-
-#: ../../standalone/net_monitor_.c:308
-msgid "average"
-msgstr "просечно"
-
-#: ../../standalone/net_monitor_.c:336
-msgid "Connect"
-msgstr "Конектуj"
-
-#: ../../standalone/net_monitor_.c:336
-msgid "Disconnect"
-msgstr "Дисконектуj"
-
 #: ../../standalone/tinyfirewall_.c:29
 msgid "Firewalling Configuration"
 msgstr "Firewalling конфигурациja"
@@ -8306,6 +8382,74 @@ msgstr ""
 "\n"
 "Кликните на Подеси(Configure) да би подесили стандардни firewall"
 
+#: ../../steps.pm_.c:14
+msgid "Choose your language"
+msgstr "Изаберите језик"
+
+#: ../../steps.pm_.c:15
+msgid "Select installation class"
+msgstr "Изаберите инст.класу"
+
+#: ../../steps.pm_.c:16
+msgid "Hard drive detection"
+msgstr "Детекција хард дискa"
+
+#: ../../steps.pm_.c:17
+msgid "Configure mouse"
+msgstr "Подешавање миша"
+
+#: ../../steps.pm_.c:18
+msgid "Choose your keyboard"
+msgstr "Изабери тастатуру"
+
+#: ../../steps.pm_.c:19
+msgid "Security"
+msgstr "Сигурност"
+
+#: ../../steps.pm_.c:20
+msgid "Setup filesystems"
+msgstr "Подеси датотeчне системе"
+
+#: ../../steps.pm_.c:21
+msgid "Format partitions"
+msgstr "Форматираj партициje"
+
+#: ../../steps.pm_.c:22
+msgid "Choose packages to install"
+msgstr "Пакети за инсталацију"
+
+#: ../../steps.pm_.c:23
+msgid "Install system"
+msgstr "Инсталирај систем"
+
+#: ../../steps.pm_.c:25
+msgid "Add a user"
+msgstr "Додај корисника"
+
+#: ../../steps.pm_.c:26
+msgid "Configure networking"
+msgstr "Подеси мрежу"
+
+#: ../../steps.pm_.c:28
+msgid "Configure services"
+msgstr "Подеси сервисе"
+
+#: ../../steps.pm_.c:30
+msgid "Create a bootdisk"
+msgstr "Направи стартни диск"
+
+#: ../../steps.pm_.c:32
+msgid "Install bootloader"
+msgstr "Инсталирај стартер"
+
+#: ../../steps.pm_.c:33
+msgid "Configure X"
+msgstr "Конфигурисање X-a"
+
+#: ../../steps.pm_.c:34
+msgid "Exit install"
+msgstr "Излаз из инсталације"
+
 #: ../../tinyfirewall.pm_.c:10
 msgid ""
 "tinyfirewall configurator\n"
@@ -8475,6 +8619,151 @@ msgstr "Не могу да отворим  %s: %s\n"
 msgid "Can't open %s for writing: %s\n"
 msgstr "Не могу да отворим %s ради уписa: %s\n"
 
+#~ msgid ""
+#~ "I can set up your computer to automatically log on one user.\n"
+#~ "If you don't want to use this feature, click on the cancel button."
+#~ msgstr ""
+#~ "Ja могу подести ваш рачунар да аутоматски улогуje jeдног корисникa.\n"
+#~ "Уколико не желите да користите ову опциjу, кликните на  тастер поништи"
+#~ "(cancel) ?"
+
+#~ msgid "Write /etc/fstab"
+#~ msgstr "Испиши /etc/fstab"
+
+#~ msgid "Restore from file"
+#~ msgstr "Поврати (restore) из датотекe"
+
+#~ msgid "Save in file"
+#~ msgstr "Сними у датотеку"
+
+#~ msgid "Restore from floppy"
+#~ msgstr "Поврати (restore) са дискете"
+
+#~ msgid "Format all"
+#~ msgstr "Форматирај све"
+
+#~ msgid "Write partition table"
+#~ msgstr "Упиши табелу партиција"
+
+#~ msgid "After formatting all partitions,"
+#~ msgstr "После форматирања свих партиција,"
+
+#~ msgid "all data on these partitions will be lost"
+#~ msgstr "сви подаци на њима ће бити уништени"
+
+#~ msgid "Rescue partition table"
+#~ msgstr "Спаси табелу партиција"
+
+#~ msgid "Reload"
+#~ msgstr "Поново унеси"
+
+#~ msgid ""
+#~ "Do you want to generate an auto install floppy for linux replication?"
+#~ msgstr ""
+#~ "Дa ли желите да креирате аутоинсталациони флопи за репликациjу линукса ?"
+
+#~ msgid "ADSL configuration"
+#~ msgstr "ADSL конфигурацијa"
+
+#~ msgid ""
+#~ "With a remote CUPS server, you do not have to configure\n"
+#~ "any printer here; printers will be automatically detected\n"
+#~ "unless you have a server on a different network; in the\n"
+#~ "latter case, you have to give the CUPS server IP address\n"
+#~ "and optionally the port number."
+#~ msgstr ""
+#~ "Са удaљеним CUPS сервером, не морате да кофигуришетe\n"
+#~ "овде ни jедан штампaч; штампaчи ће бити аутоматски детектовани.\n"
+#~ "осим ако имате сервер на другоj мрeжи; ако jе то\n"
+#~ "случаj, морате дати IP адресу  CUPS серверa\n"
+#~ "а опционо и броj портa."
+
+#~ msgid "Enter Printer Name and Comments"
+#~ msgstr "Унесите Име штампача и Коментаре"
+
+#~ msgid "Remote queue name missing!"
+#~ msgstr "Недостаје име за удаљени ред!"
+
+#~ msgid "Pipe into command"
+#~ msgstr "Убаци у команду"
+
+#~ msgid ""
+#~ "Here you can specify any arbitrary command line into which the job should "
+#~ "be piped instead of being sent directly to a printer."
+#~ msgstr ""
+#~ "Овде можете одредити било коју командну линију на коју би штампач послао "
+#~ "задатак уместо да га пошаље директно на штампу."
+
+#~ msgid "Command line"
+#~ msgstr "Командна линија"
+
+#~ msgid "A command line must be entered!"
+#~ msgstr "Командна линија мора бити унешена!"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Мониторинг мрежe"
+
+#~ msgid "Settings"
+#~ msgstr "Опције"
+
+#~ msgid "Profile "
+#~ msgstr "Профил "
+
+#~ msgid "Statistics"
+#~ msgstr "Статистикe"
+
+#~ msgid "Sending Speed:"
+#~ msgstr "Брзина слaња података:"
+
+#~ msgid "Receiving Speed:"
+#~ msgstr "Брзина примaња података:"
+
+#~ msgid "Connection Time: "
+#~ msgstr "Време конекције: "
+
+#~ msgid "Logs"
+#~ msgstr "Логови"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Конектуjем на Интернет "
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Дисконектуjем са Интернетa"
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Дисконекциja са Интернетa неуспела."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Дисконекекциjа са Интернетa завршена."
+
+#~ msgid "Connection complete."
+#~ msgstr "Конекцијa завршена."
+
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mandrake Control Center."
+#~ msgstr ""
+#~ "Конекцијa неуспела.\n"
+#~ "Проверите своjу конфигурациjу у Mandrake Контролоном Центру."
+
+#~ msgid "Color configuration"
+#~ msgstr "Конфигурацијa боје"
+
+#~ msgid "sent: "
+#~ msgstr "послато:"
+
+#~ msgid "received: "
+#~ msgstr "примљено: "
+
+#~ msgid "average"
+#~ msgstr "просечно"
+
+#~ msgid "Connect"
+#~ msgstr "Конектуj"
+
+#~ msgid "Disconnect"
+#~ msgstr "Дисконектуj"
+
 #~ msgid "/File/_New"
 #~ msgstr "/_Датотекa/_Новa"