updated pot file

3 files changed, 1787 insertions, 1488 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index e73da5811..ed5c47ae8 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-08 19:27+0200\n"
+"POT-Creation-Date: 2001-08-10 18:42+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"
@@ -211,8 +211,8 @@ msgstr ""
 msgid "XFree86 server: %s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:293
-#: ../../standalone/draknet_.c:296
+#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:290
+#: ../../standalone/draknet_.c:293
 msgid "Expert Mode"
 msgstr ""
 
@@ -316,7 +316,7 @@ msgstr ""
 msgid "Test again"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1419 ../../bootlook.pm_.c:237
+#: ../../Xconfigurator.pm_.c:1419 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr ""
 
@@ -533,14 +533,14 @@ msgid "Delay before booting default image"
 msgstr ""
 
 #: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:967 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:198 ../../printerdrake.pm_.c:274
-#: ../../standalone/draknet_.c:582
+#: ../../install_steps_interactive.pm_.c:949 ../../network/modem.pm_.c:48
+#: ../../printerdrake.pm_.c:324 ../../printerdrake.pm_.c:400
+#: ../../standalone/draknet_.c:588
 msgid "Password"
 msgstr ""
 
 #: ../../any.pm_.c:161 ../../any.pm_.c:739
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:950
 msgid "Password (again)"
 msgstr ""
 
@@ -575,12 +575,12 @@ msgid ""
 msgstr ""
 
 #: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:944
 msgid "Please try again"
 msgstr ""
 
 #: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:944
 msgid "The passwords do not match"
 msgstr ""
 
@@ -619,9 +619,9 @@ msgid "Add"
 msgstr ""
 
 #: ../../any.pm_.c:220 ../../any.pm_.c:726 ../../diskdrake.pm_.c:47
-#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:763
-#: ../../printerdrake.pm_.c:764 ../../printerdrake.pm_.c:792
-#: ../../printerdrake.pm_.c:813
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:975
+#: ../../printerdrake.pm_.c:976 ../../printerdrake.pm_.c:1007
+#: ../../printerdrake.pm_.c:1032
 msgid "Done"
 msgstr ""
 
@@ -723,11 +723,11 @@ msgstr ""
 msgid "Do you have any %s interfaces?"
 msgstr ""
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:659
+#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
 msgid "No"
 msgstr ""
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:659
+#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
 msgid "Yes"
 msgstr ""
 
@@ -838,8 +838,8 @@ msgstr ""
 msgid "Real name"
 msgstr ""
 
-#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:197
-#: ../../printerdrake.pm_.c:273
+#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:323
+#: ../../printerdrake.pm_.c:399
 msgid "User name"
 msgstr ""
 
@@ -931,158 +931,106 @@ msgstr ""
 msgid "no help implemented yet.\n"
 msgstr ""
 
-#: ../../bootlook.pm_.c:61
+#: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
 msgstr ""
 
-#: ../../bootlook.pm_.c:78
+#: ../../bootlook.pm_.c:79
 msgid "/_File"
 msgstr ""
 
 #: ../../bootlook.pm_.c:80
-msgid "/File/_New"
-msgstr ""
-
-#: ../../bootlook.pm_.c:81
-msgid "<control>N"
-msgstr ""
-
-#: ../../bootlook.pm_.c:83
-msgid "/File/_Open"
-msgstr ""
-
-#: ../../bootlook.pm_.c:84
-msgid "<control>O"
-msgstr ""
-
-#: ../../bootlook.pm_.c:86
-msgid "/File/_Save"
-msgstr ""
-
-#: ../../bootlook.pm_.c:87
-msgid "<control>S"
+msgid "/File/_Quit"
 msgstr ""
 
-#: ../../bootlook.pm_.c:89
-msgid "/File/Save _As"
+#: ../../bootlook.pm_.c:80
+msgid "<control>Q"
 msgstr ""
 
-#: ../../bootlook.pm_.c:90
-msgid "/File/-"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
 msgstr ""
 
 #: ../../bootlook.pm_.c:92
-msgid "/File/_Quit"
+msgid "NewStyle Monitor"
 msgstr ""
 
 #: ../../bootlook.pm_.c:93
-msgid "<control>Q"
-msgstr ""
-
-#: ../../bootlook.pm_.c:95
-msgid "/_Options"
+msgid "Traditional Monitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:97
-msgid "/Options/Test"
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:98
-msgid "/_Help"
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
 msgstr ""
 
 #: ../../bootlook.pm_.c:100
-msgid "/Help/_About..."
-msgstr ""
-
-#: ../../bootlook.pm_.c:110 ../../standalone/drakgw_.c:635
-#: ../../standalone/draknet_.c:275 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
+msgid "Lilo/grub mode"
 msgstr ""
 
-#: ../../bootlook.pm_.c:113
+#: ../../bootlook.pm_.c:102
 #, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
 "Click on Configure to launch the setup wizard."
 msgstr ""
 
-#: ../../bootlook.pm_.c:120
-msgid "Lilo/grub mode"
-msgstr ""
-
-#: ../../bootlook.pm_.c:130
-msgid "NewStyle Categorizing Monitor"
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:272 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
 msgstr ""
 
-#: ../../bootlook.pm_.c:133
-msgid "NewStyle Monitor"
+#: ../../bootlook.pm_.c:108
+msgid "Boot mode"
 msgstr ""
 
 #: ../../bootlook.pm_.c:136
-msgid "Traditional Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:139
-msgid "Traditional Gtk+ Monitor"
-msgstr ""
-
-#: ../../bootlook.pm_.c:143
-msgid "Launch Aurora at boot time"
-msgstr ""
-
-#: ../../bootlook.pm_.c:168
-msgid "Boot mode"
+msgid "System mode"
 msgstr ""
 
-#: ../../bootlook.pm_.c:178
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr ""
 
-#: ../../bootlook.pm_.c:186
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr ""
 
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 
-#: ../../bootlook.pm_.c:209
-msgid "System mode"
-msgstr ""
-
-#: ../../bootlook.pm_.c:227
-msgid "Default Runlevel"
-msgstr ""
-
-#: ../../bootlook.pm_.c:235 ../../standalone/draknet_.c:100
-#: ../../standalone/draknet_.c:132 ../../standalone/draknet_.c:196
-#: ../../standalone/draknet_.c:315 ../../standalone/draknet_.c:409
-#: ../../standalone/draknet_.c:486 ../../standalone/draknet_.c:522
-#: ../../standalone/draknet_.c:630 ../../standalone/net_monitor_.c:260
+#: ../../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
 msgid "OK"
 msgstr ""
 
-#: ../../bootlook.pm_.c:237 ../../install_steps_gtk.pm_.c:504
+#: ../../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:400 ../../my_gtk.pm_.c:403 ../../my_gtk.pm_.c:660
-#: ../../standalone/drakgw_.c:640 ../../standalone/draknet_.c:107
-#: ../../standalone/draknet_.c:139 ../../standalone/draknet_.c:308
-#: ../../standalone/draknet_.c:498 ../../standalone/draknet_.c:644
+#: ../../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
 msgid "Cancel"
 msgstr ""
 
-#: ../../bootlook.pm_.c:314
+#: ../../bootlook.pm_.c:225
 msgid "can not open /etc/inittab for reading: $!"
 msgstr ""
 
-#: ../../bootlook.pm_.c:368
+#: ../../bootlook.pm_.c:279
 msgid "can not open /etc/sysconfig/autologin for reading: $!"
 msgstr ""
 
-#: ../../bootlook.pm_.c:434 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:345 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
@@ -2992,8 +2940,8 @@ msgstr ""
 msgid "Install system"
 msgstr ""
 
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:957
-#: ../../install_steps_interactive.pm_.c:958
+#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:940
 msgid "Set root password"
 msgstr ""
 
@@ -3005,7 +2953,7 @@ msgstr ""
 msgid "Configure networking"
 msgstr ""
 
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:880
+#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:876
 msgid "Summary"
 msgstr ""
 
@@ -3071,8 +3019,8 @@ msgstr ""
 #: ../../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:399
-#: ../../my_gtk.pm_.c:660 ../../my_gtk.pm_.c:683
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:670 ../../my_gtk.pm_.c:693
 msgid "Ok"
 msgstr ""
 
@@ -3705,7 +3653,7 @@ msgid ""
 msgstr ""
 
 #: ../../install_steps_interactive.pm_.c:183
-#: ../../install_steps_interactive.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:880
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr ""
@@ -4019,8 +3967,7 @@ msgstr ""
 msgid "NTP Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:868 ../../printer.pm_.c:34
-#: ../../printerdrake.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:868 ../../printerdrake.pm_.c:55
 msgid "Remote CUPS server"
 msgstr ""
 
@@ -4028,90 +3975,86 @@ msgstr ""
 msgid "No printer"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:879
 msgid "Mouse"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:885
+#: ../../install_steps_interactive.pm_.c:881
 msgid "Timezone"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:886 ../../printerdrake.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:882 ../../printerdrake.pm_.c:973
 msgid "Printer"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:888
+#: ../../install_steps_interactive.pm_.c:884
 msgid "ISDN card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:891
+#: ../../install_steps_interactive.pm_.c:887
 msgid "Sound card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:894
+#: ../../install_steps_interactive.pm_.c:890
 msgid "TV card"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:925
-msgid "Which printing system do you want to use?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:946
-#: ../../install_steps_interactive.pm_.c:970
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:956
 msgid "LDAP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:947
-#: ../../install_steps_interactive.pm_.c:970
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:929
+#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:965
 msgid "NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:948
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:930
+#: ../../install_steps_interactive.pm_.c:952
 msgid "Local files"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:959
+#: ../../install_steps_interactive.pm_.c:941
 msgid "No password"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:964
+#: ../../install_steps_interactive.pm_.c:946
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:970 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:583
+#: ../../install_steps_interactive.pm_.c:952 ../../network/modem.pm_.c:49
+#: ../../standalone/draknet_.c:589
 msgid "Authentication"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:978
+#: ../../install_steps_interactive.pm_.c:960
 msgid "Authentication LDAP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:961
 msgid "LDAP Base dn"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:962
 msgid "LDAP Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:986
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Authentication NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:969
 msgid "NIS Domain"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:988
+#: ../../install_steps_interactive.pm_.c:970
 msgid "NIS Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1005
 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 "
@@ -4129,19 +4072,19 @@ msgid ""
 "drive and press \"Ok\"."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1039
+#: ../../install_steps_interactive.pm_.c:1021
 msgid "First floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1040
+#: ../../install_steps_interactive.pm_.c:1022
 msgid "Second floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:1023
 msgid "Skip"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1028
 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 "
@@ -4155,28 +4098,28 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1059
+#: ../../install_steps_interactive.pm_.c:1041
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1063
+#: ../../install_steps_interactive.pm_.c:1045
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1066
+#: ../../install_steps_interactive.pm_.c:1048
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1073
+#: ../../install_steps_interactive.pm_.c:1055
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1066
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -4184,21 +4127,21 @@ msgid ""
 " need to use BootX to boot your machine"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1072
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1075
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1102
+#: ../../install_steps_interactive.pm_.c:1084
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../install_steps_interactive.pm_.c:1092
 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"
@@ -4208,44 +4151,44 @@ msgid ""
 "At your next boot you should see the bootloader prompt."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1118 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1119 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1101 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1120 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1102 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1124 ../../standalone/draksec_.c:52
+#: ../../install_steps_interactive.pm_.c:1106 ../../standalone/draksec_.c:52
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1160
+#: ../../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:1162
+#: ../../install_steps_interactive.pm_.c:1144
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1176
-#: ../../install_steps_interactive.pm_.c:1208
+#: ../../install_steps_interactive.pm_.c:1158
+#: ../../install_steps_interactive.pm_.c:1190
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1237
+#: ../../install_steps_interactive.pm_.c:1219
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1248
+#: ../../install_steps_interactive.pm_.c:1230
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -4258,11 +4201,11 @@ msgid ""
 "install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1260
+#: ../../install_steps_interactive.pm_.c:1242
 msgid "Generate auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1262
+#: ../../install_steps_interactive.pm_.c:1244
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -4271,15 +4214,15 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1267
+#: ../../install_steps_interactive.pm_.c:1249
 msgid "Automated"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1267
+#: ../../install_steps_interactive.pm_.c:1249
 msgid "Replay"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1270
+#: ../../install_steps_interactive.pm_.c:1252
 msgid "Save packages selection"
 msgstr ""
 
@@ -4726,23 +4669,23 @@ msgstr ""
 msgid "No mouse"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:370
+#: ../../my_gtk.pm_.c:380
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:399
+#: ../../my_gtk.pm_.c:408
 msgid "Finish"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:399
+#: ../../my_gtk.pm_.c:408
 msgid "Next ->"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:400
+#: ../../my_gtk.pm_.c:409
 msgid "<- Previous"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:660
+#: ../../my_gtk.pm_.c:670
 msgid "Is this correct?"
 msgstr ""
 
@@ -4770,7 +4713,7 @@ msgid "use pptp"
 msgstr ""
 
 #: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:113
-#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:224
+#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:223
 msgid "Network interface"
 msgstr ""
 
@@ -4809,8 +4752,8 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:132
-#: ../../network/netconnect.pm_.c:232 ../../network/tools.pm_.c:49
+#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:131
+#: ../../network/netconnect.pm_.c:231 ../../network/tools.pm_.c:49
 msgid "Network Configuration"
 msgstr ""
 
@@ -4820,7 +4763,7 @@ msgid ""
 "I cannot set up this connection type."
 msgstr ""
 
-#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:233
+#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:232
 msgid "Choose the network interface"
 msgstr ""
 
@@ -4866,8 +4809,8 @@ 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:159 ../../network/netconnect.pm_.c:169
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:209
+#: ../../network/netconnect.pm_.c:158 ../../network/netconnect.pm_.c:168
+#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:208
 msgid "Network Configuration Wizard"
 msgstr ""
 
@@ -4887,75 +4830,74 @@ msgstr ""
 msgid ""
 "Which ISDN configuration do you prefer?\n"
 "\n"
-"* The Old configuration uses isdn4net. It contains powerfull tools, but is "
-"tricky to configure for a newbie, and not standard.\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
 "\n"
-"* The New configuration is easier to understand, more standard, but with "
-"less tools.\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
 "\n"
 "We recommand the light configuration.\n"
-"\n"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:53
+#: ../../network/isdn.pm_.c:54
 msgid "New configuration (isdn-light)"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:53
+#: ../../network/isdn.pm_.c:54
 msgid "Old configuration (isdn4net)"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:166 ../../network/isdn.pm_.c:183
-#: ../../network/isdn.pm_.c:193 ../../network/isdn.pm_.c:200
-#: ../../network/isdn.pm_.c:210
+#: ../../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
 msgid "ISDN Configuration"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:166
+#: ../../network/isdn.pm_.c:169
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:178
-msgid "Europe"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:178
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+msgid "Europe protocol (EDSS1)"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:180
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:180
+#: ../../network/isdn.pm_.c:184
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:194
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:201
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -4963,25 +4905,25 @@ msgid ""
 "If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:211
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:230
+#: ../../network/isdn.pm_.c:234
 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:239
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
@@ -4993,39 +4935,39 @@ msgstr ""
 msgid "Dialup options"
 msgstr ""
 
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:579
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:585
 msgid "Connection name"
 msgstr ""
 
-#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:580
+#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:586
 msgid "Phone number"
 msgstr ""
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:581
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:587
 msgid "Login ID"
 msgstr ""
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "PAP"
 msgstr ""
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "Script-based"
 msgstr ""
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "Terminal-based"
 msgstr ""
 
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:584
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:590
 msgid "Domain name"
 msgstr ""
 
-#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:585
+#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:591
 msgid "First DNS Server (optional)"
 msgstr ""
 
-#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:586
+#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:592
 msgid "Second DNS Server (optional)"
 msgstr ""
 
@@ -5089,10 +5031,10 @@ msgid ""
 "We are now going to configure the %s connection.\n"
 "\n"
 "\n"
-"Press next to begin."
+"Press OK to continue."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:133
+#: ../../network/netconnect.pm_.c:132
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -5100,7 +5042,7 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:160
+#: ../../network/netconnect.pm_.c:159
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -5108,84 +5050,84 @@ msgid ""
 "If you don't want to use the auto detection, deselect the checkbox.\n"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:162
+#: ../../network/netconnect.pm_.c:161
 msgid "Choose the profile to configure"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:163
+#: ../../network/netconnect.pm_.c:162
 msgid "Use auto detection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:169 ../../printerdrake.pm_.c:20
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:146
 msgid "Detecting devices..."
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:179
 msgid "Normal modem connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:179
 #, c-format
 msgid "detected on port %s"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:180
 msgid "ISDN connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:180
 #, c-format
 msgid "detected %s"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:181
 msgid "ADSL connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:181
 #, c-format
 msgid "detected on interface %s"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:182
 msgid "Cable connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:182
 msgid "cable connection detected"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:183
 msgid "LAN connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:183
 msgid "ethernet card(s) detected"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:189
+#: ../../network/netconnect.pm_.c:188
 msgid "Choose the connection you want to configure"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:210
+#: ../../network/netconnect.pm_.c:209
 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:212
+#: ../../network/netconnect.pm_.c:211
 msgid "Internet connection"
 msgstr ""
 
-#: ../../network/netconnect.pm_.c:224
+#: ../../network/netconnect.pm_.c:223
 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:227
+#: ../../network/netconnect.pm_.c:226
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -5215,12 +5157,12 @@ msgstr ""
 msgid " (driver $module)"
 msgstr ""
 
-#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:243
-#: ../../standalone/draknet_.c:440
+#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:449
 msgid "IP address"
 msgstr ""
 
-#: ../../network/network.pm_.c:293 ../../standalone/draknet_.c:441
+#: ../../network/network.pm_.c:293 ../../standalone/draknet_.c:450
 msgid "Netmask"
 msgstr ""
 
@@ -5232,8 +5174,8 @@ msgstr ""
 msgid "Automatic IP"
 msgstr ""
 
-#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:202
-#: ../../printerdrake.pm_.c:895
+#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:328
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
@@ -5249,7 +5191,7 @@ msgstr ""
 msgid "DNS server"
 msgstr ""
 
-#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:578
+#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:584
 msgid "Gateway"
 msgstr ""
 
@@ -5289,7 +5231,7 @@ msgstr ""
 msgid "Testing your connection..."
 msgstr ""
 
-#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:208
+#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:212
 msgid "The system is now connected to Internet."
 msgstr ""
 
@@ -5297,7 +5239,7 @@ msgstr ""
 msgid "For Security reason, it will be disconnected now."
 msgstr ""
 
-#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:208
+#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:212
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -5311,47 +5253,47 @@ msgstr ""
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:565
+#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:571
 msgid "Card IRQ"
 msgstr ""
 
-#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:566
+#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:572
 msgid "Card mem (DMA)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:567
+#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:573
 msgid "Card IO"
 msgstr ""
 
-#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:568
+#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
 msgid "Card IO_0"
 msgstr ""
 
-#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:569
+#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
 msgid "Card IO_1"
 msgstr ""
 
-#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:570
+#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
 msgid "Your personal phone number"
 msgstr ""
 
-#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:571
+#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:572
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
 msgid "Provider phone number"
 msgstr ""
 
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:573
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
 msgid "Provider dns 1 (optional)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:574
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
 msgid "Provider dns 2 (optional)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:577
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:583
 msgid "Dialing mode"
 msgstr ""
 
@@ -5359,11 +5301,15 @@ msgstr ""
 msgid "Connection speed"
 msgstr ""
 
-#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:575
+#: ../../network/tools.pm_.c:83
+msgid "Connection timeout (in sec)"
+msgstr ""
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:581
 msgid "Account Login (user name)"
 msgstr ""
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:576
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:582
 msgid "Account Password"
 msgstr ""
 
@@ -5448,8 +5394,12 @@ msgstr ""
 msgid "Remote printer"
 msgstr ""
 
+#: ../../printer.pm_.c:34
+msgid "Printer on remote CUPS server"
+msgstr ""
+
 #: ../../printer.pm_.c:35
-msgid "Remote lpd server"
+msgid "Printer on remote lpd server"
 msgstr ""
 
 #: ../../printer.pm_.c:36
@@ -5457,81 +5407,148 @@ msgid "Network printer (socket)"
 msgstr ""
 
 #: ../../printer.pm_.c:37
-msgid "SMB/Windows 95/98/NT"
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr ""
 
 #: ../../printer.pm_.c:38
-msgid "NetWare"
+msgid "Printer on NetWare server"
 msgstr ""
 
-#: ../../printer.pm_.c:39 ../../printerdrake.pm_.c:348
-#: ../../printerdrake.pm_.c:350
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:39
+msgid "Enter a printer device URI"
 msgstr ""
 
-#: ../../printer.pm_.c:40 ../../printerdrake.pm_.c:396
-msgid "Pipe into command"
+#: ../../printer.pm_.c:40
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:185
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:23
+msgid "Select Printer Connection"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:24
+msgid "How is the printer connected?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:26
+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 ""
+
+#: ../../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."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:62
+msgid "CUPS server IP"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:63 ../../printerdrake.pm_.c:446
+msgid "Port"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:70
+msgid "Port number should be numeric"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:99
+msgid "Enter Printer Name and Comments"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:103
+msgid "Name of printer should contain only letters, numbers and the underscore"
+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"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:20
+#: ../../printerdrake.pm_.c:118
+msgid "Location"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:146
 msgid "Test ports"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:170
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:61
+#: ../../printerdrake.pm_.c:187
 msgid "Local Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:188
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:64
+#: ../../printerdrake.pm_.c:190
 msgid "Printer Device"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:193
 msgid "Device/file name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:110
+#: ../../printerdrake.pm_.c:236
 msgid "Remote lpd Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:111
+#: ../../printerdrake.pm_.c:237
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
 "the hostname of the printer server and the queue name\n"
 "on that server."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:114
+#: ../../printerdrake.pm_.c:240
 msgid "Remote hostname"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:115
+#: ../../printerdrake.pm_.c:241
 msgid "Remote queue"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:118
+#: ../../printerdrake.pm_.c:244
 msgid "Remote host name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:248
 msgid "Remote queue name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:188
+#: ../../printerdrake.pm_.c:314
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:189
+#: ../../printerdrake.pm_.c:315
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -5540,35 +5557,35 @@ msgid ""
 "applicable user name, password, and workgroup information."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:194
+#: ../../printerdrake.pm_.c:320
 msgid "SMB server host"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:195
+#: ../../printerdrake.pm_.c:321
 msgid "SMB server IP"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:196
+#: ../../printerdrake.pm_.c:322
 msgid "Share name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:199
+#: ../../printerdrake.pm_.c:325
 msgid "Workgroup"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:206
+#: ../../printerdrake.pm_.c:332
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:210
+#: ../../printerdrake.pm_.c:336
 msgid "Samba share name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:392
 msgid "NetWare Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:393
 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"
@@ -5576,109 +5593,146 @@ msgid ""
 "wish to access and any applicable user name and password."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:397
 msgid "Printer Server"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:398
 msgid "Print Queue Name"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:403
 msgid "NCP server name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:281
+#: ../../printerdrake.pm_.c:407
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:442
 msgid "Socket Printer Options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:317
+#: ../../printerdrake.pm_.c:443
 msgid ""
 "To print to a socket printer, you need to provide the\n"
 "hostname of the printer and optionally the port number."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:319
+#: ../../printerdrake.pm_.c:445
 msgid "Printer Hostname"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:320 ../../printerdrake.pm_.c:892
-msgid "Port"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:323
+#: ../../printerdrake.pm_.c:449
 msgid "Printer host name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:327
+#: ../../printerdrake.pm_.c:453
 msgid "The port must be an integer number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:349
+#: ../../printerdrake.pm_.c:473 ../../printerdrake.pm_.c:475
+msgid "Printer Device URI"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:474
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
-"either the CUPS or the Foomatic specifications. Not that not all URI types "
+"either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:364
+#: ../../printerdrake.pm_.c:489
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:397
+#: ../../printerdrake.pm_.c:521
+msgid "Pipe into command"
+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."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:523
 msgid "Command line"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:402
+#: ../../printerdrake.pm_.c:527
 msgid "A command line must be entered!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:474
+#: ../../printerdrake.pm_.c:605
 msgid "Printer model selection"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:606
 msgid "Which printer model do you have?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:595
+#: ../../printerdrake.pm_.c:745 ../../printerdrake.pm_.c:1081
+#: ../../printerdrake.pm_.c:1098 ../../printerdrake.pm_.c:1153
 msgid "Printer options"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:605
+#: ../../printerdrake.pm_.c:755
 msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:612
+#: ../../printerdrake.pm_.c:762
 msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:620
+#: ../../printerdrake.pm_.c:770
 msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:660
-msgid "Do you want to print a test page?"
+#: ../../printerdrake.pm_.c:818
+msgid "Test pages"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:819
+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"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:823
+msgid "No test pages"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:824
+msgid "Print"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:826
+msgid "Standard test page"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:829
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:832
+msgid "Alternative test page (A4)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:834
+msgid "Photo test page"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:663
+#: ../../printerdrake.pm_.c:841
 msgid "Printing test page(s)..."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:670
+#: ../../printerdrake.pm_.c:863
 #, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
+"Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 "Printing status:\n"
 "%s\n"
@@ -5686,94 +5740,86 @@ msgid ""
 "Does it work properly?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:674
+#: ../../printerdrake.pm_.c:867
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
+"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:689
+#: ../../printerdrake.pm_.c:897
 msgid "Select Printer Spooler"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:690
+#: ../../printerdrake.pm_.c:898
 msgid "Which printing system (spooler) do you want to use?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:762
+#: ../../printerdrake.pm_.c:974
 msgid "Would you like to configure printing?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:779
+#: ../../printerdrake.pm_.c:994
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The following printers are configured.\n"
+"You can add some more or modify the existing ones."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:786 ../../printerdrake.pm_.c:794
-#: ../../printerdrake.pm_.c:797
+#: ../../printerdrake.pm_.c:1001 ../../printerdrake.pm_.c:1012
+#: ../../printerdrake.pm_.c:1015
 msgid "Add printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:789
+#: ../../printerdrake.pm_.c:1004
 msgid "Spooler: "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:851
-msgid "Select Printer Connection"
-msgstr ""
-
-#: ../../printerdrake.pm_.c:852
-msgid "How is the printer connected?"
+#: ../../printerdrake.pm_.c:1083
+msgid "Modify printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:885
+#: ../../printerdrake.pm_.c:1084
+#, c-format
 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."
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:891
-msgid "CUPS server IP"
+#: ../../printerdrake.pm_.c:1089 ../../standalone/net_monitor_.c:98
+msgid "Close"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:899
-msgid "Port number should be numeric"
+#: ../../printerdrake.pm_.c:1090
+msgid "Do it!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:922
-msgid "Enter Printer Name and Comments"
+#: ../../printerdrake.pm_.c:1093 ../../printerdrake.pm_.c:1124
+msgid "Printer connection type"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:923
-msgid "Remove queue"
+#: ../../printerdrake.pm_.c:1094 ../../printerdrake.pm_.c:1131
+msgid "Printer name, description, location"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:926
-msgid "Name of printer should contain only letters, numbers and the underscore"
+#: ../../printerdrake.pm_.c:1096 ../../printerdrake.pm_.c:1143
+msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:933
-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."
+#: ../../printerdrake.pm_.c:1097 ../../printerdrake.pm_.c:1144
+msgid "Printer manufacturer, model"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:937
-msgid "Name of printer"
+#: ../../printerdrake.pm_.c:1099 ../../printerdrake.pm_.c:1160
+msgid "Print test pages"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:939
-msgid "Description"
+#: ../../printerdrake.pm_.c:1100 ../../printerdrake.pm_.c:1162
+msgid "Remove printer"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:941
-msgid "Location"
+#: ../../printerdrake.pm_.c:1164
+#, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
 msgstr ""
 
 #: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
@@ -6088,15 +6134,15 @@ msgid ""
 "I'll try to go on blanking bad partitions"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:38 ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:118
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:120
+#: ../../standalone/drakgw_.c:119
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -6104,31 +6150,31 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:124
+#: ../../standalone/drakgw_.c:123
 msgid "disable"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
 msgid "dismiss"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
 msgid "reconfigure"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:127
+#: ../../standalone/drakgw_.c:126
 msgid "Disabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:134
 msgid "Internet connection sharing is now disabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:143
 msgid "Internet Connection Sharing currently disabled"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:145
+#: ../../standalone/drakgw_.c:144
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -6136,27 +6182,19 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:148
 msgid "enable"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:155
 msgid "Enabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:161
+#: ../../standalone/drakgw_.c:160
 msgid "Internet connection sharing is now enabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:169
-msgid "Config file content could not be interpreted."
-msgstr ""
-
-#: ../../standalone/drakgw_.c:169
-msgid "Unrecognized config file"
-msgstr ""
-
-#: ../../standalone/drakgw_.c:182
+#: ../../standalone/drakgw_.c:181
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -6166,27 +6204,27 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:207
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:209
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:216
 msgid "No network adapter on your system!"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:218
+#: ../../standalone/drakgw_.c:217
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:224
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -6196,71 +6234,71 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:234
+#: ../../standalone/drakgw_.c:233
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:243
+#: ../../standalone/drakgw_.c:242
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:254
+#: ../../standalone/drakgw_.c:253
 msgid "Potential LAN address conflict found in current config of $_!\n"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
 msgid "Firewalling configuration detected!"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:276
 msgid "Configuring..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:278
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:308
+#: ../../standalone/drakgw_.c:311
 msgid "Problems installing package $_"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:599
 msgid "Congratulations!"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:592
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
 "Area Network, using automatic network configuration (DHCP)."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:611
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:616
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:623
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -6270,83 +6308,83 @@ msgid ""
 "Click on Configure to launch the setup wizard."
 msgstr ""
 
-#: ../../standalone/draknet_.c:71
+#: ../../standalone/draknet_.c:75
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr ""
 
-#: ../../standalone/draknet_.c:78 ../../standalone/draknet_.c:552
+#: ../../standalone/draknet_.c:82 ../../standalone/draknet_.c:558
 msgid "Profile: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:86
+#: ../../standalone/draknet_.c:90
 msgid "Del profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:92
+#: ../../standalone/draknet_.c:96
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:120
+#: ../../standalone/draknet_.c:124
 msgid "New profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:126
+#: ../../standalone/draknet_.c:130
 msgid "Name of the profile to create:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:152
+#: ../../standalone/draknet_.c:156
 msgid "Hostname: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:159
+#: ../../standalone/draknet_.c:163
 msgid "Internet access"
 msgstr ""
 
-#: ../../standalone/draknet_.c:172
+#: ../../standalone/draknet_.c:176
 msgid "Type:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:175 ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
 msgid "Gateway:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:175 ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
 msgid "Interface:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:180
+#: ../../standalone/draknet_.c:184
 msgid "Status:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:182 ../../standalone/draknet_.c:370
+#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
 #: ../../standalone/net_monitor_.c:165 ../../standalone/net_monitor_.c:338
 msgid "Connected"
 msgstr ""
 
-#: ../../standalone/draknet_.c:182 ../../standalone/draknet_.c:370
+#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
 #: ../../standalone/net_monitor_.c:126 ../../standalone/net_monitor_.c:165
 #: ../../standalone/net_monitor_.c:338
 msgid "Not connected"
 msgstr ""
 
-#: ../../standalone/draknet_.c:185 ../../standalone/draknet_.c:371
+#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
 msgid "Connect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:185 ../../standalone/draknet_.c:371
+#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
 msgid "Disconnect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:203
+#: ../../standalone/draknet_.c:207
 msgid "Starting your connection..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:211
+#: ../../standalone/draknet_.c:215
 msgid "Closing your connection..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:216
+#: ../../standalone/draknet_.c:220
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -6354,112 +6392,120 @@ msgid ""
 "in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:223
 msgid "The system is now disconnected."
 msgstr ""
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:235
 msgid "Configure Internet Access..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:238 ../../standalone/draknet_.c:424
+#: ../../standalone/draknet_.c:242 ../../standalone/draknet_.c:434
 msgid "LAN configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:243
-msgid "Adapter"
-msgstr ""
-
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Driver"
 msgstr ""
 
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Interface"
 msgstr ""
 
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Protocol"
 msgstr ""
 
-#: ../../standalone/draknet_.c:262
+#: ../../standalone/draknet_.c:247
+msgid "State"
+msgstr ""
+
+#: ../../standalone/draknet_.c:259
 msgid "Configure Local Area Network..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:296
+#: ../../standalone/draknet_.c:293
 msgid "Normal Mode"
 msgstr ""
 
-#: ../../standalone/draknet_.c:301
+#: ../../standalone/draknet_.c:298
 msgid "Apply"
 msgstr ""
 
-#: ../../standalone/draknet_.c:320
+#: ../../standalone/draknet_.c:317
 msgid "Please Wait... Applying the configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:404
+#: ../../standalone/draknet_.c:416
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:428
+#: ../../standalone/draknet_.c:438
 msgid "LAN Configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:436
+#: ../../standalone/draknet_.c:445
 #, c-format
 msgid "Adapter %s: %s"
 msgstr ""
 
-#: ../../standalone/draknet_.c:442
+#: ../../standalone/draknet_.c:451
 msgid "Boot Protocol"
 msgstr ""
 
-#: ../../standalone/draknet_.c:443
+#: ../../standalone/draknet_.c:452
 msgid "Started on boot"
 msgstr ""
 
-#: ../../standalone/draknet_.c:444
+#: ../../standalone/draknet_.c:453
 msgid "DHCP client"
 msgstr ""
 
-#: ../../standalone/draknet_.c:479 ../../standalone/draknet_.c:483
-msgid "Disable network"
+#: ../../standalone/draknet_.c:476
+msgid "start it"
 msgstr ""
 
-#: ../../standalone/draknet_.c:479 ../../standalone/draknet_.c:483
-msgid "Enable network"
+#: ../../standalone/draknet_.c:476
+msgid "stop it"
 msgstr ""
 
-#: ../../standalone/draknet_.c:517
+#: ../../standalone/draknet_.c:477
+msgid "activate"
+msgstr ""
+
+#: ../../standalone/draknet_.c:477
+msgid "desactivate"
+msgstr ""
+
+#: ../../standalone/draknet_.c:523
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:547
 msgid "Internet connection configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:545
+#: ../../standalone/draknet_.c:551
 msgid "Internet Connection Configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:554 ../../standalone/net_monitor_.c:78
+#: ../../standalone/draknet_.c:560 ../../standalone/net_monitor_.c:78
 msgid "Connection type: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:560
+#: ../../standalone/draknet_.c:566
 msgid "Parameters"
 msgstr ""
 
-#: ../../standalone/draknet_.c:587
+#: ../../standalone/draknet_.c:593
 msgid "Ethernet Card"
 msgstr ""
 
-#: ../../standalone/draknet_.c:588
+#: ../../standalone/draknet_.c:594
 msgid "DHCP Client"
 msgstr ""
 
@@ -6592,10 +6638,6 @@ msgstr ""
 msgid "Logs"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:98
-msgid "Close"
-msgstr ""
-
 #: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
 msgid "Connecting to Internet "
 msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index c2d1485c3..15f081c13 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-08-08 19:27+0200\n"
+"POT-Creation-Date: 2001-08-10 18:42+0200\n"
 "PO-Revision-Date: 2001-03-13 13:19CET\n"
 "Last-Translator: Andreas Bergstrјm <abergstr@halden.net>\n"
 "Language-Team: Norsk\n"
@@ -237,8 +237,8 @@ msgstr "Grafikk-kort: %s"
 msgid "XFree86 server: %s"
 msgstr "XFree86-tjener: %s"
 
-#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:293
-#: ../../standalone/draknet_.c:296
+#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:290
+#: ../../standalone/draknet_.c:293
 msgid "Expert Mode"
 msgstr "Ekspertmodus"
 
@@ -342,7 +342,7 @@ msgstr "Vis informasjon"
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../../Xconfigurator.pm_.c:1419 ../../bootlook.pm_.c:237
+#: ../../Xconfigurator.pm_.c:1419 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -568,14 +568,14 @@ 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:967 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:198 ../../printerdrake.pm_.c:274
-#: ../../standalone/draknet_.c:582
+#: ../../install_steps_interactive.pm_.c:949 ../../network/modem.pm_.c:48
+#: ../../printerdrake.pm_.c:324 ../../printerdrake.pm_.c:400
+#: ../../standalone/draknet_.c:588
 msgid "Password"
 msgstr "Passord"
 
 #: ../../any.pm_.c:161 ../../any.pm_.c:739
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:950
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
@@ -611,12 +611,12 @@ msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
 #: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:944
 msgid "Please try again"
 msgstr "Vennligst prјv igjen"
 
 #: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:944
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
@@ -657,9 +657,9 @@ 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:763
-#: ../../printerdrake.pm_.c:764 ../../printerdrake.pm_.c:792
-#: ../../printerdrake.pm_.c:813
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:975
+#: ../../printerdrake.pm_.c:976 ../../printerdrake.pm_.c:1007
+#: ../../printerdrake.pm_.c:1032
 msgid "Done"
 msgstr "Ferdig"
 
@@ -761,11 +761,11 @@ msgstr "Har du enda ett?"
 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:659
+#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
 msgid "No"
 msgstr "Nei"
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:659
+#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
 msgid "Yes"
 msgstr "Ja"
 
@@ -890,8 +890,8 @@ msgstr "Godta bruker"
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:197
-#: ../../printerdrake.pm_.c:273
+#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:323
+#: ../../printerdrake.pm_.c:399
 msgid "User name"
 msgstr "Brukernavn"
 
@@ -1035,162 +1035,108 @@ msgstr "Startmeny"
 msgid "no help implemented yet.\n"
 msgstr "ingen hjelp implementert ennх.\n"
 
-#: ../../bootlook.pm_.c:61
+#: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
 msgstr "Oppstartsstilkonfigurasjon"
 
-#: ../../bootlook.pm_.c:78
+#: ../../bootlook.pm_.c:79
 msgid "/_File"
 msgstr "/_Fil"
 
 #: ../../bootlook.pm_.c:80
-msgid "/File/_New"
-msgstr "/File/_Ny"
-
-#: ../../bootlook.pm_.c:81
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:83
-msgid "/File/_Open"
-msgstr "/File/_Хpne"
-
-#: ../../bootlook.pm_.c:84
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:86
-msgid "/File/_Save"
-msgstr "/File/_Lagre"
-
-#: ../../bootlook.pm_.c:87
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:89
-msgid "/File/Save _As"
-msgstr "/File/Lagre _som"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/-"
-msgstr "/Fil/-"
-
-#: ../../bootlook.pm_.c:92
 msgid "/File/_Quit"
 msgstr "/Fil/_Avslutt"
 
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:95
-msgid "/_Options"
-msgstr "/_Valg"
-
-#: ../../bootlook.pm_.c:97
-msgid "/Options/Test"
-msgstr "/Valg/Test"
-
-# #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
-#: ../../bootlook.pm_.c:98
-msgid "/_Help"
-msgstr "/_Hjelp"
-
-#: ../../bootlook.pm_.c:100
-msgid "/Help/_About..."
-msgstr "/Hjelp/_Om..."
-
-#: ../../bootlook.pm_.c:110 ../../standalone/drakgw_.c:635
-#: ../../standalone/draknet_.c:275 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Konfigurer"
-
-#: ../../bootlook.pm_.c:113
-#, c-format
-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"
-"Klikk pх Konfigurer for х starte oppsett-hjelperen."
-
-#: ../../bootlook.pm_.c:120
-msgid "Lilo/grub mode"
-msgstr "Lilo/grub modus"
-
-#: ../../bootlook.pm_.c:130
+#: ../../bootlook.pm_.c:91
 msgid "NewStyle Categorizing Monitor"
 msgstr "NewStyle Categorizing Monitor"
 
-#: ../../bootlook.pm_.c:133
+#: ../../bootlook.pm_.c:92
 msgid "NewStyle Monitor"
 msgstr "NewStyle Monitor"
 
-#: ../../bootlook.pm_.c:136
+#: ../../bootlook.pm_.c:93
 msgid "Traditional Monitor"
 msgstr "Tradisjonell monitor"
 
-#: ../../bootlook.pm_.c:139
+#: ../../bootlook.pm_.c:94
 msgid "Traditional Gtk+ Monitor"
 msgstr "Tradisjonell Gtk+ monitor"
 
-#: ../../bootlook.pm_.c:143
+#: ../../bootlook.pm_.c:95
 msgid "Launch Aurora at boot time"
 msgstr "Start Aurora ved oppstart"
 
-#: ../../bootlook.pm_.c:168
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/grub modus"
+
+#: ../../bootlook.pm_.c:102
+#, c-format
+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"
+"Klikk pх Konfigurer for х starte oppsett-hjelperen."
+
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:272 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Konfigurer"
+
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Oppstartsmodus"
 
-#: ../../bootlook.pm_.c:178
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Systemmodus"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Start W-Windowsystemet ved oppstart"
 
-#: ../../bootlook.pm_.c:186
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Nei, jeg vil ikke ha autologin"
 
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Ja, jeg vil ha autologin med denne (bruker; skrivebord)"
 
-#: ../../bootlook.pm_.c:209
-msgid "System mode"
-msgstr "Systemmodus"
-
-#
-#: ../../bootlook.pm_.c:227
-msgid "Default Runlevel"
-msgstr "Standard runlevel"
-
-#: ../../bootlook.pm_.c:235 ../../standalone/draknet_.c:100
-#: ../../standalone/draknet_.c:132 ../../standalone/draknet_.c:196
-#: ../../standalone/draknet_.c:315 ../../standalone/draknet_.c:409
-#: ../../standalone/draknet_.c:486 ../../standalone/draknet_.c:522
-#: ../../standalone/draknet_.c:630 ../../standalone/net_monitor_.c:260
+#: ../../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
 msgid "OK"
 msgstr "OK"
 
-#: ../../bootlook.pm_.c:237 ../../install_steps_gtk.pm_.c:504
+#: ../../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:400 ../../my_gtk.pm_.c:403 ../../my_gtk.pm_.c:660
-#: ../../standalone/drakgw_.c:640 ../../standalone/draknet_.c:107
-#: ../../standalone/draknet_.c:139 ../../standalone/draknet_.c:308
-#: ../../standalone/draknet_.c:498 ../../standalone/draknet_.c:644
+#: ../../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
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../../bootlook.pm_.c:314
+#: ../../bootlook.pm_.c:225
 msgid "can not open /etc/inittab for reading: $!"
 msgstr "kan ikke хpne /etc/inittab for lesing: $!"
 
-#: ../../bootlook.pm_.c:368
+#: ../../bootlook.pm_.c:279
 msgid "can not open /etc/sysconfig/autologin for reading: $!"
 msgstr "kan ikke хpne /etc/sysconfig/autologin for lesing: $!"
 
-#: ../../bootlook.pm_.c:434 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:345 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Installasjon av LILO mislykket. Fјlgende feil oppsto:"
 
@@ -4005,8 +3951,8 @@ msgstr "Velg pakker for installering"
 msgid "Install system"
 msgstr "Installer systemet"
 
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:957
-#: ../../install_steps_interactive.pm_.c:958
+#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:940
 msgid "Set root password"
 msgstr "Sett root-passord"
 
@@ -4018,7 +3964,7 @@ msgstr "Legg til en bruker"
 msgid "Configure networking"
 msgstr "Konfigurer nettverk"
 
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:880
+#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:876
 msgid "Summary"
 msgstr "Oppsummering"
 
@@ -4095,8 +4041,8 @@ msgstr "Feil ved lesing av fil $f"
 #: ../../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:399
-#: ../../my_gtk.pm_.c:660 ../../my_gtk.pm_.c:683
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:670 ../../my_gtk.pm_.c:693
 msgid "Ok"
 msgstr "Ok"
 
@@ -4933,7 +4879,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:884
+#: ../../install_steps_interactive.pm_.c:880
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -5310,8 +5256,7 @@ msgstr "Automatisk tidssynkronisering (ved hjelp av NTP)"
 msgid "NTP Server"
 msgstr "NTP-tjener"
 
-#: ../../install_steps_interactive.pm_.c:868 ../../printer.pm_.c:34
-#: ../../printerdrake.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:868 ../../printerdrake.pm_.c:55
 msgid "Remote CUPS server"
 msgstr "Fjern-CUPS tjener"
 
@@ -5319,95 +5264,91 @@ msgstr "Fjern-CUPS tjener"
 msgid "No printer"
 msgstr "Ingen skriver"
 
-#: ../../install_steps_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:879
 msgid "Mouse"
 msgstr "Mus"
 
-#: ../../install_steps_interactive.pm_.c:885
+#: ../../install_steps_interactive.pm_.c:881
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../../install_steps_interactive.pm_.c:886 ../../printerdrake.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:882 ../../printerdrake.pm_.c:973
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../../install_steps_interactive.pm_.c:888
+#: ../../install_steps_interactive.pm_.c:884
 msgid "ISDN card"
 msgstr "ISDN-kort"
 
-#: ../../install_steps_interactive.pm_.c:891
+#: ../../install_steps_interactive.pm_.c:887
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: ../../install_steps_interactive.pm_.c:894
+#: ../../install_steps_interactive.pm_.c:890
 msgid "TV card"
 msgstr "TV-kort"
 
-#: ../../install_steps_interactive.pm_.c:925
-msgid "Which printing system do you want to use?"
-msgstr "Hvilket utskriftsystem јnsker du х bruke?"
-
-#: ../../install_steps_interactive.pm_.c:946
-#: ../../install_steps_interactive.pm_.c:970
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:956
 msgid "LDAP"
 msgstr "LDAP"
 
 #
-#: ../../install_steps_interactive.pm_.c:947
-#: ../../install_steps_interactive.pm_.c:970
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:929
+#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:965
 msgid "NIS"
 msgstr "NIS"
 
 #
-#: ../../install_steps_interactive.pm_.c:948
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:930
+#: ../../install_steps_interactive.pm_.c:952
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../../install_steps_interactive.pm_.c:959
+#: ../../install_steps_interactive.pm_.c:941
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../../install_steps_interactive.pm_.c:964
+#: ../../install_steps_interactive.pm_.c:946
 #, 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:970 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:583
+#: ../../install_steps_interactive.pm_.c:952 ../../network/modem.pm_.c:49
+#: ../../standalone/draknet_.c:589
 msgid "Authentication"
 msgstr "Autentifikasjon"
 
 #
-#: ../../install_steps_interactive.pm_.c:978
+#: ../../install_steps_interactive.pm_.c:960
 msgid "Authentication LDAP"
 msgstr "Autentisering LDAP"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:961
 msgid "LDAP Base dn"
 msgstr "LDAP grunnleggende dn"
 
 #
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:962
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
 
 #
-#: ../../install_steps_interactive.pm_.c:986
+#: ../../install_steps_interactive.pm_.c:968
 msgid "Authentication NIS"
 msgstr "Autentisering NIS"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:969
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../../install_steps_interactive.pm_.c:988
+#: ../../install_steps_interactive.pm_.c:970
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1005
 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 "
@@ -5438,19 +5379,19 @@ msgstr ""
 "en diskett\n"
 "i den fјrste stasjonen og trykk \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:1039
+#: ../../install_steps_interactive.pm_.c:1021
 msgid "First floppy drive"
 msgstr "Fјrste diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:1040
+#: ../../install_steps_interactive.pm_.c:1022
 msgid "Second floppy drive"
 msgstr "Andre diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:1023
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1028
 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 "
@@ -5475,28 +5416,28 @@ msgstr ""
 "etter systemsvikt. иnsker du х opprette en oppstartsdiskett for systemet "
 "ditt?"
 
-#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../../install_steps_interactive.pm_.c:1059
+#: ../../install_steps_interactive.pm_.c:1041
 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:1063
+#: ../../install_steps_interactive.pm_.c:1045
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:1066
+#: ../../install_steps_interactive.pm_.c:1048
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_steps_interactive.pm_.c:1073
+#: ../../install_steps_interactive.pm_.c:1055
 msgid "Preparing bootloader"
 msgstr "Klargjјr oppstartslaster"
 
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1066
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -5508,11 +5449,11 @@ msgstr ""
 "Installasjonen vil fortsette, men du mх\n"
 "bruke BootX for х starte din maskin."
 
-#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1072
 msgid "Do you want to use aboot?"
 msgstr "иnsker du х bruke aboot?"
 
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1075
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5520,11 +5461,11 @@ msgstr ""
 "Feil ved installasjon av aboot, \n"
 "prјve х installere selv om det јdelegger den fјrste partisjonen?"
 
-#: ../../install_steps_interactive.pm_.c:1102
+#: ../../install_steps_interactive.pm_.c:1084
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Installasjon av oppstartslaster mislykket. Fјlgende feil oppsto:"
 
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../install_steps_interactive.pm_.c:1092
 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"
@@ -5540,38 +5481,38 @@ msgstr ""
 " Skriv sх: shut-down\n"
 "Ved neste oppstart burde du se oppstartlasteren."
 
-#: ../../install_steps_interactive.pm_.c:1118 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Lav"
 
-#: ../../install_steps_interactive.pm_.c:1119 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1101 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:1120 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1102 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Hјy"
 
-#: ../../install_steps_interactive.pm_.c:1124 ../../standalone/draksec_.c:52
+#: ../../install_steps_interactive.pm_.c:1106 ../../standalone/draksec_.c:52
 msgid "Choose security level"
 msgstr "Velg sikkerhetsnivх"
 
-#: ../../install_steps_interactive.pm_.c:1160
+#: ../../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:1162
+#: ../../install_steps_interactive.pm_.c:1144
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:1176
-#: ../../install_steps_interactive.pm_.c:1208
+#: ../../install_steps_interactive.pm_.c:1158
+#: ../../install_steps_interactive.pm_.c:1190
 msgid "Creating auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1237
+#: ../../install_steps_interactive.pm_.c:1219
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5581,7 +5522,7 @@ msgstr ""
 "\n"
 "иnsker du virkelig х avslutte nх?"
 
-#: ../../install_steps_interactive.pm_.c:1248
+#: ../../install_steps_interactive.pm_.c:1230
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5603,11 +5544,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:1260
+#: ../../install_steps_interactive.pm_.c:1242
 msgid "Generate auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1262
+#: ../../install_steps_interactive.pm_.c:1244
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5621,15 +5562,15 @@ msgstr ""
 "\n"
 "Du kanskje јnske х kjјre installasjonen omigjen.\n"
 
-#: ../../install_steps_interactive.pm_.c:1267
+#: ../../install_steps_interactive.pm_.c:1249
 msgid "Automated"
 msgstr "Automatisert"
 
-#: ../../install_steps_interactive.pm_.c:1267
+#: ../../install_steps_interactive.pm_.c:1249
 msgid "Replay"
 msgstr "Gjјr igjen"
 
-#: ../../install_steps_interactive.pm_.c:1270
+#: ../../install_steps_interactive.pm_.c:1252
 msgid "Save packages selection"
 msgstr "Lagre pakkevalg"
 
@@ -6080,23 +6021,23 @@ msgstr "ingen"
 msgid "No mouse"
 msgstr "Ingen mus"
 
-#: ../../my_gtk.pm_.c:370
+#: ../../my_gtk.pm_.c:380
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:399
+#: ../../my_gtk.pm_.c:408
 msgid "Finish"
 msgstr "Avslutt"
 
-#: ../../my_gtk.pm_.c:399
+#: ../../my_gtk.pm_.c:408
 msgid "Next ->"
 msgstr "Neste ->"
 
-#: ../../my_gtk.pm_.c:400
+#: ../../my_gtk.pm_.c:409
 msgid "<- Previous"
 msgstr "<- Forrige"
 
-#: ../../my_gtk.pm_.c:660
+#: ../../my_gtk.pm_.c:670
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
@@ -6127,7 +6068,7 @@ msgid "use pptp"
 msgstr "bruk pptp"
 
 #: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:113
-#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:224
+#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:223
 msgid "Network interface"
 msgstr "Nettverksgrensesnitt"
 
@@ -6171,8 +6112,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:132
-#: ../../network/netconnect.pm_.c:232 ../../network/tools.pm_.c:49
+#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:131
+#: ../../network/netconnect.pm_.c:231 ../../network/tools.pm_.c:49
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
@@ -6184,7 +6125,7 @@ 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:233
+#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:232
 msgid "Choose the network interface"
 msgstr "Velg nettverksgrensesnitt"
 
@@ -6240,8 +6181,8 @@ 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:159 ../../network/netconnect.pm_.c:169
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:209
+#: ../../network/netconnect.pm_.c:158 ../../network/netconnect.pm_.c:168
+#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:208
 msgid "Network Configuration Wizard"
 msgstr "Nettverkskonfigurasjonveiviser"
 
@@ -6258,17 +6199,17 @@ 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"
-"* The Old configuration uses isdn4net. It contains powerfull tools, but is "
-"tricky to configure for a newbie, and not standard.\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
 "\n"
-"* The New configuration is easier to understand, more standard, but with "
-"less tools.\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
 "\n"
 "We recommand the light configuration.\n"
-"\n"
 msgstr ""
 "Hvilken ISDN konfigurering foretrekker du?\n"
 "\n"
@@ -6283,22 +6224,22 @@ msgstr ""
 "\n"
 
 #
-#: ../../network/isdn.pm_.c:53
+#: ../../network/isdn.pm_.c:54
 msgid "New configuration (isdn-light)"
 msgstr "Ny konfigurasjon (isdn-light)"
 
 #
-#: ../../network/isdn.pm_.c:53
+#: ../../network/isdn.pm_.c:54
 msgid "Old configuration (isdn4net)"
 msgstr "Gamle konfigurasjonen (isdn4net)"
 
-#: ../../network/isdn.pm_.c:166 ../../network/isdn.pm_.c:183
-#: ../../network/isdn.pm_.c:193 ../../network/isdn.pm_.c:200
-#: ../../network/isdn.pm_.c:210
+#: ../../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
 msgid "ISDN Configuration"
 msgstr "ISDN-konfigurasjon"
 
-#: ../../network/isdn.pm_.c:166
+#: ../../network/isdn.pm_.c:169
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -6306,47 +6247,51 @@ msgstr ""
 "Velg din tilbyder.\n"
 " Hvis denne ikke er i listen, velg ikke i listen"
 
-#: ../../network/isdn.pm_.c:178
-msgid "Europe"
-msgstr "Europa"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Oppstartsprotokoll"
 
-#: ../../network/isdn.pm_.c:178
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Europa (EDSS1)"
 
-#: ../../network/isdn.pm_.c:180
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "Resten av verden"
 
-#: ../../network/isdn.pm_.c:180
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "Resten av verden \n"
 " ingen D-kanal (leid linje)"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Hvilken protokoll јnsker du х bruke?"
 
-#: ../../network/isdn.pm_.c:194
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Hva slags kort har du?"
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Jeg vet ikke"
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../network/isdn.pm_.c:201
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -6358,19 +6303,19 @@ msgstr ""
 "\n"
 "Hvis du har et PCMCIA kort mх du vite irq og io for kortet.\n"
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Avbryt"
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../../network/isdn.pm_.c:211
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Hvilket er ditt ISDN-kort?"
 
-#: ../../network/isdn.pm_.c:230
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -6378,7 +6323,7 @@ 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:239
+#: ../../network/isdn.pm_.c:243
 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."
 
@@ -6390,39 +6335,39 @@ msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
 msgid "Dialup options"
 msgstr "Opsjoner oppringt"
 
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:579
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:585
 msgid "Connection name"
 msgstr "Navn tilknytning"
 
-#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:580
+#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:586
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:581
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:587
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "Script-based"
 msgstr "Scriptbasert"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:584
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:590
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:585
+#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:591
 msgid "First DNS Server (optional)"
 msgstr "Fјrste DNS-tjener (valgfri)"
 
-#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:586
+#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:592
 msgid "Second DNS Server (optional)"
 msgstr "Andre DNS-tjener (valgfri)"
 
@@ -6486,7 +6431,7 @@ msgid "Press next to continue."
 msgstr ""
 
 #: ../../network/netconnect.pm_.c:107
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "\n"
@@ -6494,10 +6439,12 @@ msgid ""
 "We are now going to configure the %s connection.\n"
 "\n"
 "\n"
-"Press next to begin."
+"Press OK to continue."
 msgstr ""
+"\n"
+"Du kan koble ned eller rekonfigurere tilkoblingen din."
 
-#: ../../network/netconnect.pm_.c:133
+#: ../../network/netconnect.pm_.c:132
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6509,7 +6456,7 @@ msgstr ""
 "Trykk OK for х beholde din eksisterende konfigurasjon, eller avbryt for х "
 "rekonfigurere din internett og nettverkskonfigurasjon.\n"
 
-#: ../../network/netconnect.pm_.c:160
+#: ../../network/netconnect.pm_.c:159
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6522,81 +6469,81 @@ msgstr ""
 "Hvis du ikke јnsker х bruke automatisk oppdagelse, fjern krysset\n"
 "i boksen.\n"
 
-#: ../../network/netconnect.pm_.c:162
+#: ../../network/netconnect.pm_.c:161
 msgid "Choose the profile to configure"
 msgstr "Velg profilen som skal konfigureres"
 
-#: ../../network/netconnect.pm_.c:163
+#: ../../network/netconnect.pm_.c:162
 msgid "Use auto detection"
 msgstr "Bruk automatisk detektering"
 
-#: ../../network/netconnect.pm_.c:169 ../../printerdrake.pm_.c:20
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:146
 msgid "Detecting devices..."
 msgstr "Finner enheter..."
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:179
 msgid "Normal modem connection"
 msgstr "Normal modemtilkobling"
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:179
 #, c-format
 msgid "detected on port %s"
 msgstr "oppdaget pх port %s"
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:180
 msgid "ISDN connection"
 msgstr "ISDN-tilkobling"
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:180
 #, c-format
 msgid "detected %s"
 msgstr "oppdaget %s"
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:181
 #, fuzzy
 msgid "ADSL connection"
 msgstr "Lokalt nettverksoppkobling"
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:181
 #, c-format
 msgid "detected on interface %s"
 msgstr "oppdaget pх grensesnitt %s"
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:182
 msgid "Cable connection"
 msgstr "Kabeltilkobling"
 
 #
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:182
 msgid "cable connection detected"
 msgstr "Kabeltilkobling detektert"
 
-#: ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:183
 msgid "LAN connection"
 msgstr "Lokalt nettverksoppkobling"
 
-#: ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:183
 msgid "ethernet card(s) detected"
 msgstr "oppdaget ethernettkort"
 
-#: ../../network/netconnect.pm_.c:189
+#: ../../network/netconnect.pm_.c:188
 #, fuzzy
 msgid "Choose the connection you want to configure"
 msgstr "Velg verktјyet du јnsker х bruke"
 
-#: ../../network/netconnect.pm_.c:210
+#: ../../network/netconnect.pm_.c:209
 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:212
+#: ../../network/netconnect.pm_.c:211
 #, fuzzy
 msgid "Internet connection"
 msgstr "Deling av Internett tilkobling"
 
-#: ../../network/netconnect.pm_.c:224
+#: ../../network/netconnect.pm_.c:223
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
@@ -6606,7 +6553,7 @@ msgstr ""
 "\n"
 "Konfigurasjonen vil nх bli aktivert.\n"
 
-#: ../../network/netconnect.pm_.c:227
+#: ../../network/netconnect.pm_.c:226
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6645,12 +6592,12 @@ msgstr "Konfigurerer nettverksenhet %s"
 msgid " (driver $module)"
 msgstr " (driver $module)"
 
-#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:243
-#: ../../standalone/draknet_.c:440
+#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:449
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: ../../network/network.pm_.c:293 ../../standalone/draknet_.c:441
+#: ../../network/network.pm_.c:293 ../../standalone/draknet_.c:450
 msgid "Netmask"
 msgstr "Nettmaske"
 
@@ -6662,8 +6609,8 @@ msgstr "(bootp/dhcp)"
 msgid "Automatic IP"
 msgstr "Automatisk IP"
 
-#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:202
-#: ../../printerdrake.pm_.c:895
+#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:328
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bјr vцre i format 1.2.3.4"
 
@@ -6683,7 +6630,7 @@ msgstr ""
 msgid "DNS server"
 msgstr "DNS-tjener"
 
-#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:578
+#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:584
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -6723,7 +6670,7 @@ msgstr "Vil du prјve х koble opp mot Internett nх?"
 msgid "Testing your connection..."
 msgstr "Tester tilkoblingen din..."
 
-#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:208
+#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:212
 msgid "The system is now connected to Internet."
 msgstr "Systemet er nх koblet opp mot Internett."
 
@@ -6731,7 +6678,7 @@ msgstr "Systemet er nх koblet opp mot Internett."
 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:208
+#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:212
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -6747,47 +6694,47 @@ msgstr "Konfigurasjon tilknytning."
 msgid "Please fill or check the field below"
 msgstr "Vennnligst fyll eller merk feltet under"
 
-#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:565
+#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:571
 msgid "Card IRQ"
 msgstr "Kort IRQ"
 
-#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:566
+#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:572
 msgid "Card mem (DMA)"
 msgstr "Kort mem (DMA)"
 
-#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:567
+#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:573
 msgid "Card IO"
 msgstr "Kort IO"
 
-#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:568
+#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
 msgid "Card IO_0"
 msgstr "Kort IO_0"
 
-#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:569
+#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:570
+#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
 msgid "Your personal phone number"
 msgstr "Ditt telefonnummer"
 
-#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:571
+#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
 msgid "Provider name (ex provider.net)"
 msgstr "Navn tilbyder (f.eks. tilbyder.net)"
 
-#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:572
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:573
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
 msgid "Provider dns 1 (optional)"
 msgstr "Tilbyder dns 1 (valgfri)"
 
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:574
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
 msgid "Provider dns 2 (optional)"
 msgstr "Tilbyder dns 2 (valgfri)"
 
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:577
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:583
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
@@ -6796,11 +6743,16 @@ msgstr "Oppringningsmodus"
 msgid "Connection speed"
 msgstr "Oppkoblingstype:"
 
-#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:575
+#: ../../network/tools.pm_.c:83
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Oppkoblingstype:"
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:581
 msgid "Account Login (user name)"
 msgstr "Logg inn (brukernavn)"
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:576
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:582
 msgid "Account Password"
 msgstr "Passord"
 
@@ -6891,8 +6843,14 @@ msgstr "Lokal skriver"
 msgid "Remote printer"
 msgstr "Fjern-skriver"
 
+#: ../../printer.pm_.c:34
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Fjern-CUPS tjener"
+
 #: ../../printer.pm_.c:35
-msgid "Remote lpd server"
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Fjern-lpd tjener"
 
 #: ../../printer.pm_.c:36
@@ -6900,36 +6858,115 @@ msgid "Network printer (socket)"
 msgstr "Nettverksskriver (socket)"
 
 #: ../../printer.pm_.c:37
-msgid "SMB/Windows 95/98/NT"
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
 #: ../../printer.pm_.c:38
-msgid "NetWare"
-msgstr "NetWare"
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Skrivertjener"
 
-#: ../../printer.pm_.c:39 ../../printerdrake.pm_.c:348
-#: ../../printerdrake.pm_.c:350
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:39
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "Skriverenhet URI"
 
-#: ../../printer.pm_.c:40 ../../printerdrake.pm_.c:396
-msgid "Pipe into command"
+#: ../../printer.pm_.c:40
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:185
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:23
+msgid "Select Printer Connection"
+msgstr "Velg skrivertilkobling"
+
+#: ../../printerdrake.pm_.c:24
+msgid "How is the printer connected?"
+msgstr "Hvordan er skriveren tilkoblet?"
+
+#: ../../printerdrake.pm_.c:26
+#, fuzzy
+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."
+msgstr ""
+"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."
+
+#: ../../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:70
+msgid "Port number should be numeric"
+msgstr "Portnummer burde vцre mumerisk"
+
+#: ../../printerdrake.pm_.c:99
+msgid "Enter Printer Name and Comments"
+msgstr ""
+
+#: ../../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: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:20
+#: ../../printerdrake.pm_.c:114
+msgid "Name of printer"
+msgstr "Navn pх skriver"
+
+#: ../../printerdrake.pm_.c:116
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../../printerdrake.pm_.c:118
+msgid "Location"
+msgstr "Lokasjon"
+
+#: ../../printerdrake.pm_.c:146
 msgid "Test ports"
 msgstr "Test porter"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:170
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "En skriver, modell \"%s\", ble funnet pх "
 
-#: ../../printerdrake.pm_.c:61
+#: ../../printerdrake.pm_.c:187
 msgid "Local Printer Device"
 msgstr "Lokal skriverenhet"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:188
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6937,19 +6974,19 @@ msgstr ""
 "Hvilken enhet er skriveren din koblet til \n"
 "(merk at /dev/lp0 er det samme som LPT1:)?\n"
 
-#: ../../printerdrake.pm_.c:64
+#: ../../printerdrake.pm_.c:190
 msgid "Printer Device"
 msgstr "Skriverenhet"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:193
 msgid "Device/file name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:110
+#: ../../printerdrake.pm_.c:236
 msgid "Remote lpd Printer Options"
 msgstr "Opsjoner for fjern-lpd skriver"
 
-#: ../../printerdrake.pm_.c:111
+#: ../../printerdrake.pm_.c:237
 #, fuzzy
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
@@ -6960,29 +6997,29 @@ msgstr ""
 "til skrivertjeneren og kјnavnet til den tjeneren som\n"
 "jobbene skal plasseres i."
 
-#: ../../printerdrake.pm_.c:114
+#: ../../printerdrake.pm_.c:240
 msgid "Remote hostname"
 msgstr "Fjern-vertnavn"
 
-#: ../../printerdrake.pm_.c:115
+#: ../../printerdrake.pm_.c:241
 msgid "Remote queue"
 msgstr "Fjern-kј"
 
-#: ../../printerdrake.pm_.c:118
+#: ../../printerdrake.pm_.c:244
 #, fuzzy
 msgid "Remote host name missing!"
 msgstr "Fjern-vertnavn"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:248
 #, fuzzy
 msgid "Remote queue name missing!"
 msgstr "Fjern-kј"
 
-#: ../../printerdrake.pm_.c:188
+#: ../../printerdrake.pm_.c:314
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Opsjoner for SMB (Windows 9x/NT) skriver"
 
-#: ../../printerdrake.pm_.c:189
+#: ../../printerdrake.pm_.c:315
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6996,35 +7033,35 @@ msgstr ""
 "navnet til skriveren du јnsker tilgang til og anvendelige brukernavn,\n"
 "passord og arbeidsgruppeinformasjon."
 
-#: ../../printerdrake.pm_.c:194
+#: ../../printerdrake.pm_.c:320
 msgid "SMB server host"
 msgstr "SMB-tjener vert"
 
-#: ../../printerdrake.pm_.c:195
+#: ../../printerdrake.pm_.c:321
 msgid "SMB server IP"
 msgstr "SMB-tjener IP"
 
-#: ../../printerdrake.pm_.c:196
+#: ../../printerdrake.pm_.c:322
 msgid "Share name"
 msgstr "Navn deling"
 
-#: ../../printerdrake.pm_.c:199
+#: ../../printerdrake.pm_.c:325
 msgid "Workgroup"
 msgstr "Arbeidsgruppe"
 
-#: ../../printerdrake.pm_.c:206
+#: ../../printerdrake.pm_.c:332
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:210
+#: ../../printerdrake.pm_.c:336
 msgid "Samba share name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:392
 msgid "NetWare Printer Options"
 msgstr "NetWare skriveropsjoner"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:393
 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"
@@ -7036,27 +7073,27 @@ msgstr ""
 "vertsnavn!) sх vel som navnet pх skriverkјen til skriveren du јnsker\n"
 "adgang til og anvendelige brukernavn og passord."
 
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:397
 msgid "Printer Server"
 msgstr "Skrivertjener"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:398
 msgid "Print Queue Name"
 msgstr "Skriverkј-navn"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:403
 msgid "NCP server name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:281
+#: ../../printerdrake.pm_.c:407
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:442
 msgid "Socket Printer Options"
 msgstr "Opsjoner for lokal skriver"
 
-#: ../../printerdrake.pm_.c:317
+#: ../../printerdrake.pm_.c:443
 msgid ""
 "To print to a socket printer, you need to provide the\n"
 "hostname of the printer and optionally the port number."
@@ -7064,88 +7101,130 @@ msgstr ""
 "For х skrive til en socket skriver, trenger du х gi meg\n"
 "vertsnavnet til skriveren, og eventuelt portnummeret."
 
-#: ../../printerdrake.pm_.c:319
+#: ../../printerdrake.pm_.c:445
 msgid "Printer Hostname"
 msgstr "Skriverens vertsnavn"
 
-#: ../../printerdrake.pm_.c:320 ../../printerdrake.pm_.c:892
-msgid "Port"
-msgstr "Port"
-
-#: ../../printerdrake.pm_.c:323
+#: ../../printerdrake.pm_.c:449
 #, fuzzy
 msgid "Printer host name missing!"
 msgstr "Skriverens vertsnavn"
 
-#: ../../printerdrake.pm_.c:327
+#: ../../printerdrake.pm_.c:453
 msgid "The port must be an integer number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:349
+#: ../../printerdrake.pm_.c:473 ../../printerdrake.pm_.c:475
+msgid "Printer Device URI"
+msgstr "Skriverenhet URI"
+
+#: ../../printerdrake.pm_.c:474
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
-"either the CUPS or the Foomatic specifications. Not that not all URI types "
+"either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:364
+#: ../../printerdrake.pm_.c:489
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:397
+#: ../../printerdrake.pm_.c:521
+msgid "Pipe into command"
+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."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:523
 #, fuzzy
 msgid "Command line"
 msgstr "Domenenavn"
 
-#: ../../printerdrake.pm_.c:402
+#: ../../printerdrake.pm_.c:527
 msgid "A command line must be entered!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:474
+#: ../../printerdrake.pm_.c:605
 #, fuzzy
 msgid "Printer model selection"
 msgstr "Skrivertilkobling"
 
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:606
 #, fuzzy
 msgid "Which printer model do you have?"
 msgstr "Hva slags type skriver har du?"
 
-#: ../../printerdrake.pm_.c:595
+#: ../../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:605
+#: ../../printerdrake.pm_.c:755
 msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:612
+#: ../../printerdrake.pm_.c:762
 msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:620
+#: ../../printerdrake.pm_.c:770
 msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:660
+#: ../../printerdrake.pm_.c:818
 #, fuzzy
-msgid "Do you want to print a test page?"
-msgstr "Vil du teste utskrift?"
+msgid "Test pages"
+msgstr "Test porter"
 
-#: ../../printerdrake.pm_.c:663
+#: ../../printerdrake.pm_.c:819
+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"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:823
+#, fuzzy
+msgid "No test pages"
+msgstr "Ja, skriv begge testsidene"
+
+#: ../../printerdrake.pm_.c:824
+#, fuzzy
+msgid "Print"
+msgstr "Skriver"
+
+#: ../../printerdrake.pm_.c:826
+#, fuzzy
+msgid "Standard test page"
+msgstr "Standard verktјy"
+
+#: ../../printerdrake.pm_.c:829
+msgid "Alternative test page (Letter)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:832
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Skriver ut testside(r)..."
+
+#: ../../printerdrake.pm_.c:834
+#, fuzzy
+msgid "Photo test page"
+msgstr "Skriver ut testside(r)..."
+
+#: ../../printerdrake.pm_.c:841
 msgid "Printing test page(s)..."
 msgstr "Skriver ut testside(r)..."
 
-#: ../../printerdrake.pm_.c:670
-#, c-format
+#: ../../printerdrake.pm_.c:863
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
+"Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 "Printing status:\n"
 "%s\n"
@@ -7159,9 +7238,10 @@ msgstr ""
 "\n"
 "Virker det ordentlig?"
 
-#: ../../printerdrake.pm_.c:674
+#: ../../printerdrake.pm_.c:867
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
+"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 ""
@@ -7169,99 +7249,92 @@ msgstr ""
 "Det kan ta litt tid fјr skriveren starter.\n"
 "Virker det ordentlig?"
 
-#: ../../printerdrake.pm_.c:689
+#: ../../printerdrake.pm_.c:897
 #, fuzzy
 msgid "Select Printer Spooler"
 msgstr "Velg skrivertilkobling"
 
-#: ../../printerdrake.pm_.c:690
+#: ../../printerdrake.pm_.c:898
 #, fuzzy
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Hvilket utskriftsystem јnsker du х bruke?"
 
-#: ../../printerdrake.pm_.c:762
+#: ../../printerdrake.pm_.c:974
 #, fuzzy
 msgid "Would you like to configure printing?"
 msgstr "иnsker du х konfigurere en skriver?"
 
-#: ../../printerdrake.pm_.c:779
+#: ../../printerdrake.pm_.c:994
+#, fuzzy
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The following printers are configured.\n"
+"You can add some more or modify the existing ones."
 msgstr ""
 "Her er fјlgende skriverkј.\n"
 "Du kan legge til flere eller endre de eksisterende."
 
-#: ../../printerdrake.pm_.c:786 ../../printerdrake.pm_.c:794
-#: ../../printerdrake.pm_.c:797
+#: ../../printerdrake.pm_.c:1001 ../../printerdrake.pm_.c:1012
+#: ../../printerdrake.pm_.c:1015
 #, fuzzy
 msgid "Add printer"
 msgstr "Ingen skriver"
 
-#: ../../printerdrake.pm_.c:789
+#: ../../printerdrake.pm_.c:1004
 msgid "Spooler: "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:851
-msgid "Select Printer Connection"
-msgstr "Velg skrivertilkobling"
-
-#: ../../printerdrake.pm_.c:852
-msgid "How is the printer connected?"
-msgstr "Hvordan er skriveren tilkoblet?"
+#: ../../printerdrake.pm_.c:1083
+#, fuzzy
+msgid "Modify printer"
+msgstr "Ingen skriver"
 
-#: ../../printerdrake.pm_.c:885
+#: ../../printerdrake.pm_.c:1084
+#, c-format
 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."
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
 msgstr ""
-"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."
 
-#: ../../printerdrake.pm_.c:891
-msgid "CUPS server IP"
-msgstr "CUPS tjener IP"
-
-#: ../../printerdrake.pm_.c:899
-msgid "Port number should be numeric"
-msgstr "Portnummer burde vцre mumerisk"
+#: ../../printerdrake.pm_.c:1089 ../../standalone/net_monitor_.c:98
+msgid "Close"
+msgstr "Lukk"
 
-#: ../../printerdrake.pm_.c:922
-msgid "Enter Printer Name and Comments"
+#: ../../printerdrake.pm_.c:1090
+msgid "Do it!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:923
-msgid "Remove queue"
-msgstr "Fjern kј"
+#: ../../printerdrake.pm_.c:1093 ../../printerdrake.pm_.c:1124
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Deling av Internett tilkobling"
 
-#: ../../printerdrake.pm_.c:926
-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:1094 ../../printerdrake.pm_.c:1131
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Skrivertilkobling"
 
-#: ../../printerdrake.pm_.c:933
-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."
+#: ../../printerdrake.pm_.c:1096 ../../printerdrake.pm_.c:1143
+msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:937
-msgid "Name of printer"
-msgstr "Navn pх skriver"
+#: ../../printerdrake.pm_.c:1097 ../../printerdrake.pm_.c:1144
+msgid "Printer manufacturer, model"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:939
-msgid "Description"
-msgstr "Beskrivelse"
+#: ../../printerdrake.pm_.c:1099 ../../printerdrake.pm_.c:1160
+#, fuzzy
+msgid "Print test pages"
+msgstr "Skriver ut testside(r)..."
 
-#: ../../printerdrake.pm_.c:941
-msgid "Location"
-msgstr "Lokasjon"
+#: ../../printerdrake.pm_.c:1100 ../../printerdrake.pm_.c:1162
+#, fuzzy
+msgid "Remove printer"
+msgstr "Fjern-skriver"
+
+#: ../../printerdrake.pm_.c:1164
+#, 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
@@ -7672,15 +7745,15 @@ 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/drakgw_.c:38 ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
 msgid "Internet Connection Sharing"
 msgstr "Deling av Internett tilkobling"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:118
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Deling av Internett tilkobling er slхtt pх"
 
-#: ../../standalone/drakgw_.c:120
+#: ../../standalone/drakgw_.c:119
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -7692,31 +7765,31 @@ msgstr ""
 "\n"
 "Hva vil du gjјre?"
 
-#: ../../standalone/drakgw_.c:124
+#: ../../standalone/drakgw_.c:123
 msgid "disable"
 msgstr "slх av"
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
 msgid "dismiss"
 msgstr "avvis"
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
 msgid "reconfigure"
 msgstr "Konfigurer pх nytt"
 
-#: ../../standalone/drakgw_.c:127
+#: ../../standalone/drakgw_.c:126
 msgid "Disabling servers..."
 msgstr "Slхr av tjenere..."
 
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:134
 msgid "Internet connection sharing is now disabled."
 msgstr "Deling av Internett tilkobling er slхtt av"
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:143
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Deling av Internett tilkobling er slхtt av"
 
-#: ../../standalone/drakgw_.c:145
+#: ../../standalone/drakgw_.c:144
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -7728,27 +7801,19 @@ msgstr ""
 "\n"
 "Hva vil du gjјre?"
 
-#: ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:148
 msgid "enable"
 msgstr "slх pх"
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:155
 msgid "Enabling servers..."
 msgstr "Slхr pх tjenere..."
 
-#: ../../standalone/drakgw_.c:161
+#: ../../standalone/drakgw_.c:160
 msgid "Internet connection sharing is now enabled."
 msgstr "Deling av Internett tilkobling er nх slхtt pх."
 
-#: ../../standalone/drakgw_.c:169
-msgid "Config file content could not be interpreted."
-msgstr "Innhold i konfig-fil kunne ikke bli tolket."
-
-#: ../../standalone/drakgw_.c:169
-msgid "Unrecognized config file"
-msgstr "Ukjent konfigurasjonsfil"
-
-#: ../../standalone/drakgw_.c:182
+#: ../../standalone/drakgw_.c:181
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -7765,21 +7830,21 @@ msgstr ""
 "Merk: du trenger et dedikert nettverksadapter for х sette opp et lokalt "
 "nettverk (LAN)."
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:207
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Grensesnitt %s (bruker modul %s)"
 
-#: ../../standalone/drakgw_.c:209
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s"
 msgstr "Grensesnitt %s"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:216
 msgid "No network adapter on your system!"
 msgstr "Ikke noe nettverksadapter i systemet ditt!"
 
-#: ../../standalone/drakgw_.c:218
+#: ../../standalone/drakgw_.c:217
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7787,7 +7852,7 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt. "
 "Vennligst kjјr verktјyet for maskinvarekonfigurasjon."
 
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:224
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7802,7 +7867,7 @@ msgstr ""
 "\n"
 "Jeg er i ferd med х sette opp ditt lokale nettverk (LAN) med dette adapteret."
 
-#: ../../standalone/drakgw_.c:234
+#: ../../standalone/drakgw_.c:233
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7810,22 +7875,22 @@ msgstr ""
 "Vennligst velg hvilket nettverksadapter som skal kobles til ditt lokale "
 "nettverk (LAN)."
 
-#: ../../standalone/drakgw_.c:243
+#: ../../standalone/drakgw_.c:242
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Advarsel, nettverksadapteret er allerede konfigurert. Jeg vil konfigurere "
 "det pх nytt."
 
-#: ../../standalone/drakgw_.c:254
+#: ../../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"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
 msgid "Firewalling configuration detected!"
 msgstr "Brannmurkonfigurasjon oppdaget!"
 
-#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7833,23 +7898,23 @@ msgstr ""
 "Advarsel! En eksisterende brannmurkonfigurasjon har blitt oppdaget. Du "
 "trenger muligens х konfigurere noe manuelt etter installasjon."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:276
 msgid "Configuring..."
 msgstr "Konfigurerer..."
 
-#: ../../standalone/drakgw_.c:278
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigurerer script, installerer programvare, starter tjenere..."
 
-#: ../../standalone/drakgw_.c:308
+#: ../../standalone/drakgw_.c:311
 msgid "Problems installing package $_"
 msgstr "Problemer ved installering av pakke $_"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:599
 msgid "Congratulations!"
 msgstr "Gratulerer!"
 
-#: ../../standalone/drakgw_.c:592
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7859,23 +7924,23 @@ msgstr ""
 "Du kan nх dele Internett-tilkobling med andre maskiner pх ditt lokale "
 "nettverk ved х bruke automatisk nettverkskonfigurasjon (DHCP)."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Oppsett har allerede blitt gjort, men er for јyeblikket slхtt av."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Oppsett har allerede blitt gjort, og er for јyeblikket slхtt pх."
 
-#: ../../standalone/drakgw_.c:611
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Deling av Internett tilkobling har aldri blitt konfigurert."
 
-#: ../../standalone/drakgw_.c:616
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Internett deling av tilkobling konfigurasjon"
 
-#: ../../standalone/drakgw_.c:623
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7890,83 +7955,83 @@ msgstr ""
 "\n"
 "Klikk pх Konfigurer for х starte oppsett-hjelperen."
 
-#: ../../standalone/draknet_.c:71
+#: ../../standalone/draknet_.c:75
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Nettverkskonfigurasjon (%d adaptere"
 
-#: ../../standalone/draknet_.c:78 ../../standalone/draknet_.c:552
+#: ../../standalone/draknet_.c:82 ../../standalone/draknet_.c:558
 msgid "Profile: "
 msgstr "Profil: "
 
-#: ../../standalone/draknet_.c:86
+#: ../../standalone/draknet_.c:90
 msgid "Del profile..."
 msgstr "Slett profil..."
 
-#: ../../standalone/draknet_.c:92
+#: ../../standalone/draknet_.c:96
 msgid "Profile to delete:"
 msgstr "Profil som skal slettes:"
 
-#: ../../standalone/draknet_.c:120
+#: ../../standalone/draknet_.c:124
 msgid "New profile..."
 msgstr "Ny profil...."
 
-#: ../../standalone/draknet_.c:126
+#: ../../standalone/draknet_.c:130
 msgid "Name of the profile to create:"
 msgstr "Navnet pх profilen som skal lages:"
 
-#: ../../standalone/draknet_.c:152
+#: ../../standalone/draknet_.c:156
 msgid "Hostname: "
 msgstr "Vertsnavn: "
 
-#: ../../standalone/draknet_.c:159
+#: ../../standalone/draknet_.c:163
 msgid "Internet access"
 msgstr "Internett-tilgang"
 
-#: ../../standalone/draknet_.c:172
+#: ../../standalone/draknet_.c:176
 msgid "Type:"
 msgstr "Type:"
 
-#: ../../standalone/draknet_.c:175 ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:175 ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../../standalone/draknet_.c:180
+#: ../../standalone/draknet_.c:184
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../standalone/draknet_.c:182 ../../standalone/draknet_.c:370
+#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
 #: ../../standalone/net_monitor_.c:165 ../../standalone/net_monitor_.c:338
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../../standalone/draknet_.c:182 ../../standalone/draknet_.c:370
+#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
 #: ../../standalone/net_monitor_.c:126 ../../standalone/net_monitor_.c:165
 #: ../../standalone/net_monitor_.c:338
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: ../../standalone/draknet_.c:185 ../../standalone/draknet_.c:371
+#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
 msgid "Connect..."
 msgstr "Koble til..."
 
-#: ../../standalone/draknet_.c:185 ../../standalone/draknet_.c:371
+#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
 msgid "Disconnect..."
 msgstr "Koble fra..."
 
-#: ../../standalone/draknet_.c:203
+#: ../../standalone/draknet_.c:207
 msgid "Starting your connection..."
 msgstr "Starter tilkoblingen din..."
 
-#: ../../standalone/draknet_.c:211
+#: ../../standalone/draknet_.c:215
 msgid "Closing your connection..."
 msgstr "Lukker tilkoblingen din..."
 
-#: ../../standalone/draknet_.c:216
+#: ../../standalone/draknet_.c:220
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7978,51 +8043,52 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "i root."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:223
 msgid "The system is now disconnected."
 msgstr "Systemet er nх nedkoblet."
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:235
 msgid "Configure Internet Access..."
 msgstr "Konfigurer internetttilgang...."
 
-#: ../../standalone/draknet_.c:238 ../../standalone/draknet_.c:424
+#: ../../standalone/draknet_.c:242 ../../standalone/draknet_.c:434
 msgid "LAN configuration"
 msgstr "LAN-konfigurasjon"
 
-#: ../../standalone/draknet_.c:243
-msgid "Adapter"
-msgstr "Adapter"
-
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Interface"
 msgstr "rensesnitt"
 
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../../standalone/draknet_.c:262
+#: ../../standalone/draknet_.c:247
+#, fuzzy
+msgid "State"
+msgstr "Status:"
+
+#: ../../standalone/draknet_.c:259
 msgid "Configure Local Area Network..."
 msgstr "Konfigurer lokalt nettverk"
 
-#: ../../standalone/draknet_.c:296
+#: ../../standalone/draknet_.c:293
 msgid "Normal Mode"
 msgstr "Normalt modus"
 
-#: ../../standalone/draknet_.c:301
+#: ../../standalone/draknet_.c:298
 msgid "Apply"
 msgstr "Bruk"
 
-#: ../../standalone/draknet_.c:320
+#: ../../standalone/draknet_.c:317
 msgid "Please Wait... Applying the configuration"
 msgstr "Vennligst vent . . . Setter konfigurasjonen pх plass"
 
-#: ../../standalone/draknet_.c:404
+#: ../../standalone/draknet_.c:416
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
@@ -8030,38 +8096,46 @@ msgstr ""
 "Du har ingen konfigurerte grensesnitt.\n"
 "Konfigurer disse fјrst ved х klikke pх 'Konfigurer'"
 
-#: ../../standalone/draknet_.c:428
+#: ../../standalone/draknet_.c:438
 msgid "LAN Configuration"
 msgstr "LAN-konfigurasjon"
 
-#: ../../standalone/draknet_.c:436
+#: ../../standalone/draknet_.c:445
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: ../../standalone/draknet_.c:442
+#: ../../standalone/draknet_.c:451
 msgid "Boot Protocol"
 msgstr "Oppstartsprotokoll"
 
-#: ../../standalone/draknet_.c:443
+#: ../../standalone/draknet_.c:452
 msgid "Started on boot"
 msgstr "Startet ved oppstart"
 
-#: ../../standalone/draknet_.c:444
+#: ../../standalone/draknet_.c:453
 msgid "DHCP client"
 msgstr "DHCP-klient"
 
-#: ../../standalone/draknet_.c:479 ../../standalone/draknet_.c:483
+#: ../../standalone/draknet_.c:476
 #, fuzzy
-msgid "Disable network"
-msgstr "Slх av"
+msgid "start it"
+msgstr "begrense"
+
+#: ../../standalone/draknet_.c:476
+msgid "stop it"
+msgstr ""
 
-#: ../../standalone/draknet_.c:479 ../../standalone/draknet_.c:483
+#: ../../standalone/draknet_.c:477
 #, fuzzy
-msgid "Enable network"
-msgstr "Slх pх"
+msgid "activate"
+msgstr "Aktiv"
 
-#: ../../standalone/draknet_.c:517
+#: ../../standalone/draknet_.c:477
+msgid "desactivate"
+msgstr ""
+
+#: ../../standalone/draknet_.c:523
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -8069,27 +8143,27 @@ msgstr ""
 "Du har ingen internett-tilkobling.\n"
 "Opprett en fјrst ved х klikke pх 'Konfigurer'"
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:547
 msgid "Internet connection configuration"
 msgstr "Internett tilkobling konfigurasjon"
 
-#: ../../standalone/draknet_.c:545
+#: ../../standalone/draknet_.c:551
 msgid "Internet Connection Configuration"
 msgstr "Internett tilkobling konfigurasjon"
 
-#: ../../standalone/draknet_.c:554 ../../standalone/net_monitor_.c:78
+#: ../../standalone/draknet_.c:560 ../../standalone/net_monitor_.c:78
 msgid "Connection type: "
 msgstr "Oppkoblingstype:"
 
-#: ../../standalone/draknet_.c:560
+#: ../../standalone/draknet_.c:566
 msgid "Parameters"
 msgstr "Parametere"
 
-#: ../../standalone/draknet_.c:587
+#: ../../standalone/draknet_.c:593
 msgid "Ethernet Card"
 msgstr "Ethernettkort"
 
-#: ../../standalone/draknet_.c:588
+#: ../../standalone/draknet_.c:594
 msgid "DHCP Client"
 msgstr "DHCP-klient"
 
@@ -8240,10 +8314,6 @@ msgstr "Oppkoblingstype:"
 msgid "Logs"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:98
-msgid "Close"
-msgstr "Lukk"
-
 #: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
 msgid "Connecting to Internet "
 msgstr "Kobler opp mot Internett "
@@ -8493,6 +8563,80 @@ 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 "
@@ -8520,9 +8664,6 @@ msgstr "Kan ikke хpne %s for skriving: %s\n"
 #~ msgid "Yes, print PostScript test page"
 #~ msgstr "Ja, skriv PostScript testside"
 
-#~ msgid "Yes, print both test pages"
-#~ msgstr "Ja, skriv begge testsidene"
-
 #~ msgid "Configure Printer"
 #~ msgstr "Konfigurer skriver"
 
@@ -8572,15 +8713,6 @@ msgstr "Kan ikke хpne %s for skriving: %s\n"
 #~ msgstr "Velg tilkobling fjern-skriver"
 
 #~ msgid ""
-#~ "With a remote CUPS server, you do not have to configure\n"
-#~ "any printer here; printers will be automatically detected.\n"
-#~ "In case of doubt, select \"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\"."
-
-#~ 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"
@@ -8875,9 +9007,6 @@ msgstr "Kan ikke хpne %s for skriving: %s\n"
 #~ msgid "Configure..."
 #~ msgstr "Konfigurer..."
 
-#~ msgid "Standard tools"
-#~ msgstr "Standard verktјy"
-
 #~ msgid "Configuration de Lilo/Grub"
 #~ msgstr "Konfigurasjon Lilo/Grub"
 
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 6d5eeea81..f8984abc4 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-08 19:27+0200\n"
+"POT-Creation-Date: 2001-08-10 18:42+0200\n"
 "PO-Revision-Date: 2001-03-20 07:46+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -231,8 +231,8 @@ msgstr "Графичка картица: %s"
 msgid "XFree86 server: %s"
 msgstr "XFree86 сервер: %s"
 
-#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:293
-#: ../../standalone/draknet_.c:296
+#: ../../Xconfigurator.pm_.c:768 ../../standalone/draknet_.c:290
+#: ../../standalone/draknet_.c:293
 msgid "Expert Mode"
 msgstr "Експертни мод"
 
@@ -336,7 +336,7 @@ msgstr "Прикажи информације"
 msgid "Test again"
 msgstr "Тестирај поново"
 
-#: ../../Xconfigurator.pm_.c:1419 ../../bootlook.pm_.c:237
+#: ../../Xconfigurator.pm_.c:1419 ../../bootlook.pm_.c:156
 msgid "Quit"
 msgstr "Крај"
 
@@ -562,14 +562,14 @@ msgid "Delay before booting default image"
 msgstr "Пауза пре стартања default image-а"
 
 #: ../../any.pm_.c:160 ../../any.pm_.c:738
-#: ../../install_steps_interactive.pm_.c:967 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:198 ../../printerdrake.pm_.c:274
-#: ../../standalone/draknet_.c:582
+#: ../../install_steps_interactive.pm_.c:949 ../../network/modem.pm_.c:48
+#: ../../printerdrake.pm_.c:324 ../../printerdrake.pm_.c:400
+#: ../../standalone/draknet_.c:588
 msgid "Password"
 msgstr "Лозинка"
 
 #: ../../any.pm_.c:161 ../../any.pm_.c:739
-#: ../../install_steps_interactive.pm_.c:968
+#: ../../install_steps_interactive.pm_.c:950
 msgid "Password (again)"
 msgstr "Лозинка (поновите)"
 
@@ -605,12 +605,12 @@ msgstr ""
 "Опција``Ограничена командна линика - опције'' је неупотребљива без лозинке"
 
 #: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:944
 msgid "Please try again"
 msgstr "Пробајте поново"
 
 #: ../../any.pm_.c:174 ../../any.pm_.c:715
-#: ../../install_steps_interactive.pm_.c:962
+#: ../../install_steps_interactive.pm_.c:944
 msgid "The passwords do not match"
 msgstr "Неподударност лозинки"
 
@@ -651,9 +651,9 @@ msgid "Add"
 msgstr "Додај"
 
 #: ../../any.pm_.c:220 ../../any.pm_.c:726 ../../diskdrake.pm_.c:47
-#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:763
-#: ../../printerdrake.pm_.c:764 ../../printerdrake.pm_.c:792
-#: ../../printerdrake.pm_.c:813
+#: ../../interactive_http.pm_.c:153 ../../printerdrake.pm_.c:975
+#: ../../printerdrake.pm_.c:976 ../../printerdrake.pm_.c:1007
+#: ../../printerdrake.pm_.c:1032
 msgid "Done"
 msgstr "Урађено"
 
@@ -756,11 +756,11 @@ msgstr "Да ли имате још један?"
 msgid "Do you have any %s interfaces?"
 msgstr "Имате ли још %s интерфејса?"
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:659
+#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
 msgid "No"
 msgstr "Не"
 
-#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:659
+#: ../../any.pm_.c:609 ../../interactive.pm_.c:109 ../../my_gtk.pm_.c:669
 msgid "Yes"
 msgstr "Да"
 
@@ -882,8 +882,8 @@ msgstr "Прихвати корисника"
 msgid "Real name"
 msgstr "Право име"
 
-#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:197
-#: ../../printerdrake.pm_.c:273
+#: ../../any.pm_.c:737 ../../printerdrake.pm_.c:323
+#: ../../printerdrake.pm_.c:399
 msgid "User name"
 msgstr "Корисничко име"
 
@@ -1022,76 +1022,47 @@ msgstr "Старт мени "
 msgid "no help implemented yet.\n"
 msgstr "помоћ jош ниjе имплементирана.\n"
 
-#: ../../bootlook.pm_.c:61
+#: ../../bootlook.pm_.c:62
 msgid "Boot Style Configuration"
 msgstr "Kонфигурацијa стила стартaњa"
 
-#: ../../bootlook.pm_.c:78
+#: ../../bootlook.pm_.c:79
 msgid "/_File"
 msgstr "/_Датотекa"
 
 #: ../../bootlook.pm_.c:80
-msgid "/File/_New"
-msgstr "/_Датотекa/_Новa"
-
-#: ../../bootlook.pm_.c:81
-msgid "<control>N"
-msgstr "<control>N"
-
-#: ../../bootlook.pm_.c:83
-msgid "/File/_Open"
-msgstr "/Датотекa/_Отвори"
-
-#: ../../bootlook.pm_.c:84
-msgid "<control>O"
-msgstr "<control>O"
-
-#: ../../bootlook.pm_.c:86
-msgid "/File/_Save"
-msgstr "/Датотекa/_Сaчуваj"
-
-#: ../../bootlook.pm_.c:87
-msgid "<control>S"
-msgstr "<control>S"
-
-#: ../../bootlook.pm_.c:89
-msgid "/File/Save _As"
-msgstr "/Датотекa/Сaчуваj_Као"
-
-#: ../../bootlook.pm_.c:90
-msgid "/File/-"
-msgstr "/Датотекa/-"
-
-#: ../../bootlook.pm_.c:92
 msgid "/File/_Quit"
 msgstr "/Датотекa/_Излаз"
 
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:80
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:95
-msgid "/_Options"
-msgstr "/_Опциje"
+#: ../../bootlook.pm_.c:91
+msgid "NewStyle Categorizing Monitor"
+msgstr "NewStyle Монитор за категоризациjу"
 
-#: ../../bootlook.pm_.c:97
-msgid "/Options/Test"
-msgstr "/Опциje/Тест"
+#: ../../bootlook.pm_.c:92
+msgid "NewStyle Monitor"
+msgstr "NewStyle Монитор"
 
-#: ../../bootlook.pm_.c:98
-msgid "/_Help"
-msgstr "_Помоћ"
+#: ../../bootlook.pm_.c:93
+msgid "Traditional Monitor"
+msgstr "Традиционални Монитор"
 
-#: ../../bootlook.pm_.c:100
-msgid "/Help/_About..."
-msgstr "/Помоћ/_О..."
+#: ../../bootlook.pm_.c:94
+msgid "Traditional Gtk+ Monitor"
+msgstr "Традиционални Gtk+ Монитор"
 
-#: ../../bootlook.pm_.c:110 ../../standalone/drakgw_.c:635
-#: ../../standalone/draknet_.c:275 ../../standalone/tinyfirewall_.c:57
-msgid "Configure"
-msgstr "Подеси"
+#: ../../bootlook.pm_.c:95
+msgid "Launch Aurora at boot time"
+msgstr "Покрени Аурору при стартaњe"
+
+#: ../../bootlook.pm_.c:100
+msgid "Lilo/grub mode"
+msgstr "Lilo/Grub мод"
 
-#: ../../bootlook.pm_.c:113
+#: ../../bootlook.pm_.c:102
 #, fuzzy, c-format
 msgid ""
 "You are currently using %s as Boot Manager.\n"
@@ -1102,83 +1073,59 @@ msgstr ""
 "\n"
 "Кликните на Подеси (Configure) да би покренули подeшавaње."
 
-#: ../../bootlook.pm_.c:120
-msgid "Lilo/grub mode"
-msgstr "Lilo/Grub мод"
-
-#: ../../bootlook.pm_.c:130
-msgid "NewStyle Categorizing Monitor"
-msgstr "NewStyle Монитор за категоризациjу"
-
-#: ../../bootlook.pm_.c:133
-msgid "NewStyle Monitor"
-msgstr "NewStyle Монитор"
-
-#: ../../bootlook.pm_.c:136
-msgid "Traditional Monitor"
-msgstr "Традиционални Монитор"
-
-#: ../../bootlook.pm_.c:139
-msgid "Traditional Gtk+ Monitor"
-msgstr "Традиционални Gtk+ Монитор"
-
-#: ../../bootlook.pm_.c:143
-msgid "Launch Aurora at boot time"
-msgstr "Покрени Аурору при стартaњe"
+#: ../../bootlook.pm_.c:104 ../../standalone/drakgw_.c:643
+#: ../../standalone/draknet_.c:272 ../../standalone/tinyfirewall_.c:57
+msgid "Configure"
+msgstr "Подеси"
 
-#: ../../bootlook.pm_.c:168
+#: ../../bootlook.pm_.c:108
 msgid "Boot mode"
 msgstr "Стартни мод"
 
-#: ../../bootlook.pm_.c:178
+#: ../../bootlook.pm_.c:136
+msgid "System mode"
+msgstr "Системски мод"
+
+#: ../../bootlook.pm_.c:138
 msgid "Launch the X-Window system at start"
 msgstr "Покрени X-Window систем при стратaњу"
 
-#: ../../bootlook.pm_.c:186
+#: ../../bootlook.pm_.c:143
 msgid "No, I don't want autologin"
 msgstr "Не, ja не желим аутологовaњe"
 
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:145
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Да, jа желим аутологовaњe са овим(корисник,десктоп)"
 
-#: ../../bootlook.pm_.c:209
-msgid "System mode"
-msgstr "Системски мод"
-
-#: ../../bootlook.pm_.c:227
-#, fuzzy
-msgid "Default Runlevel"
-msgstr "Подразумевано"
-
-#: ../../bootlook.pm_.c:235 ../../standalone/draknet_.c:100
-#: ../../standalone/draknet_.c:132 ../../standalone/draknet_.c:196
-#: ../../standalone/draknet_.c:315 ../../standalone/draknet_.c:409
-#: ../../standalone/draknet_.c:486 ../../standalone/draknet_.c:522
-#: ../../standalone/draknet_.c:630 ../../standalone/net_monitor_.c:260
+#: ../../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
 msgid "OK"
 msgstr "У реду"
 
-#: ../../bootlook.pm_.c:237 ../../install_steps_gtk.pm_.c:504
+#: ../../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:400 ../../my_gtk.pm_.c:403 ../../my_gtk.pm_.c:660
-#: ../../standalone/drakgw_.c:640 ../../standalone/draknet_.c:107
-#: ../../standalone/draknet_.c:139 ../../standalone/draknet_.c:308
-#: ../../standalone/draknet_.c:498 ../../standalone/draknet_.c:644
+#: ../../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
 msgid "Cancel"
 msgstr "Обустави"
 
-#: ../../bootlook.pm_.c:314
+#: ../../bootlook.pm_.c:225
 msgid "can not open /etc/inittab for reading: $!"
 msgstr "не могу отворити /etc/inittab за читaњe: $!"
 
-#: ../../bootlook.pm_.c:368
+#: ../../bootlook.pm_.c:279
 msgid "can not open /etc/sysconfig/autologin for reading: $!"
 msgstr "не могу отворити /etc/sysconfig/autologin за читaњe: $!"
 
-#: ../../bootlook.pm_.c:434 ../../standalone/drakboot_.c:47
+#: ../../bootlook.pm_.c:345 ../../standalone/drakboot_.c:47
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Инсталација LILO-а неуспела. Грешка је:"
 
@@ -3970,8 +3917,8 @@ msgstr "Пакети за инсталацију"
 msgid "Install system"
 msgstr "Инсталирај систем"
 
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:957
-#: ../../install_steps_interactive.pm_.c:958
+#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:939
+#: ../../install_steps_interactive.pm_.c:940
 msgid "Set root password"
 msgstr "Унеси root лозинку"
 
@@ -3983,7 +3930,7 @@ msgstr "Додај корисника"
 msgid "Configure networking"
 msgstr "Подеси мрежу"
 
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:880
+#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:876
 msgid "Summary"
 msgstr "Сaжетак"
 
@@ -4051,8 +3998,8 @@ msgstr "Грешка код отварања фајла $f"
 #: ../../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:399
-#: ../../my_gtk.pm_.c:660 ../../my_gtk.pm_.c:683
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:408
+#: ../../my_gtk.pm_.c:670 ../../my_gtk.pm_.c:693
 msgid "Ok"
 msgstr "У реду"
 
@@ -4889,7 +4836,7 @@ msgstr ""
 "MandrakeSoft S.A.  \n"
 
 #: ../../install_steps_interactive.pm_.c:183
-#: ../../install_steps_interactive.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:880
 #: ../../standalone/keyboarddrake_.c:28
 msgid "Keyboard"
 msgstr "Тастатурa"
@@ -5239,8 +5186,7 @@ msgstr ""
 msgid "NTP Server"
 msgstr "NIS Сервер"
 
-#: ../../install_steps_interactive.pm_.c:868 ../../printer.pm_.c:34
-#: ../../printerdrake.pm_.c:884
+#: ../../install_steps_interactive.pm_.c:868 ../../printerdrake.pm_.c:55
 msgid "Remote CUPS server"
 msgstr "Удаљени CUPS сервер"
 
@@ -5248,95 +5194,91 @@ msgstr "Удаљени CUPS сервер"
 msgid "No printer"
 msgstr "Без штампачa"
 
-#: ../../install_steps_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:879
 msgid "Mouse"
 msgstr "Миш"
 
-#: ../../install_steps_interactive.pm_.c:885
+#: ../../install_steps_interactive.pm_.c:881
 msgid "Timezone"
 msgstr "Временска зонa"
 
-#: ../../install_steps_interactive.pm_.c:886 ../../printerdrake.pm_.c:761
+#: ../../install_steps_interactive.pm_.c:882 ../../printerdrake.pm_.c:973
 msgid "Printer"
 msgstr "Штампач"
 
-#: ../../install_steps_interactive.pm_.c:888
+#: ../../install_steps_interactive.pm_.c:884
 msgid "ISDN card"
 msgstr "ISDN картицa"
 
-#: ../../install_steps_interactive.pm_.c:891
+#: ../../install_steps_interactive.pm_.c:887
 msgid "Sound card"
 msgstr "Звучна картицa"
 
-#: ../../install_steps_interactive.pm_.c:894
+#: ../../install_steps_interactive.pm_.c:890
 msgid "TV card"
 msgstr "TV катицa"
 
-#: ../../install_steps_interactive.pm_.c:925
-msgid "Which printing system do you want to use?"
-msgstr "Који систем за штампaње желите да користитe ?"
-
-#: ../../install_steps_interactive.pm_.c:946
-#: ../../install_steps_interactive.pm_.c:970
-#: ../../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:928
+#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:956
 msgid "LDAP"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:947
-#: ../../install_steps_interactive.pm_.c:970
-#: ../../install_steps_interactive.pm_.c:983
+#: ../../install_steps_interactive.pm_.c:929
+#: ../../install_steps_interactive.pm_.c:952
+#: ../../install_steps_interactive.pm_.c:965
 #, fuzzy
 msgid "NIS"
 msgstr "Користи NIS"
 
-#: ../../install_steps_interactive.pm_.c:948
-#: ../../install_steps_interactive.pm_.c:970
+#: ../../install_steps_interactive.pm_.c:930
+#: ../../install_steps_interactive.pm_.c:952
 #, fuzzy
 msgid "Local files"
 msgstr "Локални  штампач"
 
-#: ../../install_steps_interactive.pm_.c:959
+#: ../../install_steps_interactive.pm_.c:941
 msgid "No password"
 msgstr "Без лозинке"
 
-#: ../../install_steps_interactive.pm_.c:964
+#: ../../install_steps_interactive.pm_.c:946
 #, 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:970 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:583
+#: ../../install_steps_interactive.pm_.c:952 ../../network/modem.pm_.c:49
+#: ../../standalone/draknet_.c:589
 msgid "Authentication"
 msgstr "Аутентификација"
 
-#: ../../install_steps_interactive.pm_.c:978
+#: ../../install_steps_interactive.pm_.c:960
 #, fuzzy
 msgid "Authentication LDAP"
 msgstr "Аутентификација"
 
-#: ../../install_steps_interactive.pm_.c:979
+#: ../../install_steps_interactive.pm_.c:961
 msgid "LDAP Base dn"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:962
 #, fuzzy
 msgid "LDAP Server"
 msgstr "NIS Сервер"
 
-#: ../../install_steps_interactive.pm_.c:986
+#: ../../install_steps_interactive.pm_.c:968
 #, fuzzy
 msgid "Authentication NIS"
 msgstr "Аутентификација NIS"
 
-#: ../../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:969
 msgid "NIS Domain"
 msgstr "NIS Домен"
 
-#: ../../install_steps_interactive.pm_.c:988
+#: ../../install_steps_interactive.pm_.c:970
 msgid "NIS Server"
 msgstr "NIS Сервер"
 
-#: ../../install_steps_interactive.pm_.c:1023
+#: ../../install_steps_interactive.pm_.c:1005
 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 "
@@ -5362,19 +5304,19 @@ msgstr ""
 "Уколико желите да креирате стартну дискету за ваш системубаците дискету у "
 "погон и притисните \"Да\"."
 
-#: ../../install_steps_interactive.pm_.c:1039
+#: ../../install_steps_interactive.pm_.c:1021
 msgid "First floppy drive"
 msgstr "Први флопи/дискетни урeђаj "
 
-#: ../../install_steps_interactive.pm_.c:1040
+#: ../../install_steps_interactive.pm_.c:1022
 msgid "Second floppy drive"
 msgstr "Други флопи/дискетни урeђаj"
 
-#: ../../install_steps_interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:1023
 msgid "Skip"
 msgstr "Прескочи"
 
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1028
 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 "
@@ -5395,29 +5337,29 @@ msgstr ""
 "'диском за спасавање', што олакшава опоравак у случају теже хаварије.\n"
 "Да ли бисте да креирате стартну дискету за ваш систем?"
 
-#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1037
 msgid "Sorry, no floppy drive available"
 msgstr "Ти малера, нема дискетe"
 
-#: ../../install_steps_interactive.pm_.c:1059
+#: ../../install_steps_interactive.pm_.c:1041
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "Изабрерите дискетни уређај који ћете користити  за креирање старне дискете"
 
-#: ../../install_steps_interactive.pm_.c:1063
+#: ../../install_steps_interactive.pm_.c:1045
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:1066
+#: ../../install_steps_interactive.pm_.c:1048
 msgid "Creating bootdisk"
 msgstr "Креирам стартни диск..."
 
-#: ../../install_steps_interactive.pm_.c:1073
+#: ../../install_steps_interactive.pm_.c:1055
 msgid "Preparing bootloader"
 msgstr "Припремам стартер..."
 
-#: ../../install_steps_interactive.pm_.c:1084
+#: ../../install_steps_interactive.pm_.c:1066
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
 " machine, the yaboot bootloader will not work for you.\n"
@@ -5425,11 +5367,11 @@ msgid ""
 " need to use BootX to boot your machine"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1072
 msgid "Do you want to use aboot?"
 msgstr "Да ли желите да користите aboot ?"
 
-#: ../../install_steps_interactive.pm_.c:1093
+#: ../../install_steps_interactive.pm_.c:1075
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -5437,11 +5379,11 @@ msgstr ""
 "Грeшка при инсталациjи aboot-a, \n"
 "Да ли дa пробам да инсталирам чак ако то води уништeњу прве партициje?"
 
-#: ../../install_steps_interactive.pm_.c:1102
+#: ../../install_steps_interactive.pm_.c:1084
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Инсталација стартерa неуспела. Грешка је:"
 
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../install_steps_interactive.pm_.c:1092
 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"
@@ -5457,38 +5399,38 @@ msgstr ""
 " Онда укуцаjтe: shut-down\n"
 "Када следeћи пут стартуjете мaшину требали би да видите статеров промпт."
 
-#: ../../install_steps_interactive.pm_.c:1118 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:1100 ../../standalone/draksec_.c:23
 msgid "Low"
 msgstr "Мала"
 
-#: ../../install_steps_interactive.pm_.c:1119 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:1101 ../../standalone/draksec_.c:24
 msgid "Medium"
 msgstr "Средња"
 
-#: ../../install_steps_interactive.pm_.c:1120 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:1102 ../../standalone/draksec_.c:25
 msgid "High"
 msgstr "Велика"
 
-#: ../../install_steps_interactive.pm_.c:1124 ../../standalone/draksec_.c:52
+#: ../../install_steps_interactive.pm_.c:1106 ../../standalone/draksec_.c:52
 msgid "Choose security level"
 msgstr "Изаберите сигурносни ниво"
 
-#: ../../install_steps_interactive.pm_.c:1160
+#: ../../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:1162
+#: ../../install_steps_interactive.pm_.c:1144
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:1176
-#: ../../install_steps_interactive.pm_.c:1208
+#: ../../install_steps_interactive.pm_.c:1158
+#: ../../install_steps_interactive.pm_.c:1190
 msgid "Creating auto install floppy"
 msgstr "Креирам ауто инсталациони флопи"
 
-#: ../../install_steps_interactive.pm_.c:1237
+#: ../../install_steps_interactive.pm_.c:1219
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5498,7 +5440,7 @@ msgstr ""
 "\n"
 "Да ли стварно желите да завршите ?"
 
-#: ../../install_steps_interactive.pm_.c:1248
+#: ../../install_steps_interactive.pm_.c:1230
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5520,11 +5462,11 @@ msgstr ""
 "Информације о конфигурисању вашег система можете наћи у пост-инсталационом\n"
 "поглављу званичног Mandrake Linux 'Водича за кориснике'."
 
-#: ../../install_steps_interactive.pm_.c:1260
+#: ../../install_steps_interactive.pm_.c:1242
 msgid "Generate auto install floppy"
 msgstr "Креираj ауто инсталациону дискету"
 
-#: ../../install_steps_interactive.pm_.c:1262
+#: ../../install_steps_interactive.pm_.c:1244
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5538,15 +5480,15 @@ msgstr ""
 "\n"
 "Можда волите да поновите инсталациjу.\n"
 
-#: ../../install_steps_interactive.pm_.c:1267
+#: ../../install_steps_interactive.pm_.c:1249
 msgid "Automated"
 msgstr "Аутоматски"
 
-#: ../../install_steps_interactive.pm_.c:1267
+#: ../../install_steps_interactive.pm_.c:1249
 msgid "Replay"
 msgstr "Понaвљaњe"
 
-#: ../../install_steps_interactive.pm_.c:1270
+#: ../../install_steps_interactive.pm_.c:1252
 msgid "Save packages selection"
 msgstr "Сaчуваj селекциjу пакетa"
 
@@ -5997,23 +5939,23 @@ msgstr "ниједан"
 msgid "No mouse"
 msgstr "Нема мишa"
 
-#: ../../my_gtk.pm_.c:370
+#: ../../my_gtk.pm_.c:380
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
-#: ../../my_gtk.pm_.c:399
+#: ../../my_gtk.pm_.c:408
 msgid "Finish"
 msgstr "Краj"
 
-#: ../../my_gtk.pm_.c:399
+#: ../../my_gtk.pm_.c:408
 msgid "Next ->"
 msgstr "Следeћи  ->"
 
-#: ../../my_gtk.pm_.c:400
+#: ../../my_gtk.pm_.c:409
 msgid "<- Previous"
 msgstr "<- Претходни"
 
-#: ../../my_gtk.pm_.c:660
+#: ../../my_gtk.pm_.c:670
 msgid "Is this correct?"
 msgstr "Да ли је ово исправно ?"
 
@@ -6044,7 +5986,7 @@ msgid "use pptp"
 msgstr "користи pptp"
 
 #: ../../network/adsl.pm_.c:30 ../../network/ethernet.pm_.c:113
-#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:224
+#: ../../network/ethernet.pm_.c:179 ../../standalone/drakgw_.c:223
 msgid "Network interface"
 msgstr "Мрeжни интерфejс"
 
@@ -6085,8 +6027,8 @@ msgstr ""
 "Поjавио се проблем током рестартовaња мрeжe?\n"
 "%s"
 
-#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:132
-#: ../../network/netconnect.pm_.c:232 ../../network/tools.pm_.c:49
+#: ../../network/ethernet.pm_.c:70 ../../network/netconnect.pm_.c:131
+#: ../../network/netconnect.pm_.c:231 ../../network/tools.pm_.c:49
 msgid "Network Configuration"
 msgstr "Подешавање мрежe"
 
@@ -6098,7 +6040,7 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa.\n"
 "Не могу да подесим оваj тип конекциje."
 
-#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:233
+#: ../../network/ethernet.pm_.c:103 ../../standalone/drakgw_.c:232
 msgid "Choose the network interface"
 msgstr "Изаберите мрeжни интерфejс"
 
@@ -6153,8 +6095,8 @@ 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:159 ../../network/netconnect.pm_.c:169
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:209
+#: ../../network/netconnect.pm_.c:158 ../../network/netconnect.pm_.c:168
+#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:208
 msgid "Network Configuration Wizard"
 msgstr "чаробњак за подешавање мрежe"
 
@@ -6174,33 +6116,32 @@ msgstr "Каква jе врста вaше ISDN кенекциjе ?"
 msgid ""
 "Which ISDN configuration do you prefer?\n"
 "\n"
-"* The Old configuration uses isdn4net. It contains powerfull tools, but is "
-"tricky to configure for a newbie, and not standard.\n"
+"* The Old configuration uses isdn4net. It contains powerfull\n"
+"  tools, but is tricky to configure, and not standard.\n"
 "\n"
-"* The New configuration is easier to understand, more standard, but with "
-"less tools.\n"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
 "\n"
 "We recommand the light configuration.\n"
-"\n"
 msgstr ""
 
-#: ../../network/isdn.pm_.c:53
+#: ../../network/isdn.pm_.c:54
 #, fuzzy
 msgid "New configuration (isdn-light)"
 msgstr "Детектована Firewalling конфигурациja"
 
-#: ../../network/isdn.pm_.c:53
+#: ../../network/isdn.pm_.c:54
 #, fuzzy
 msgid "Old configuration (isdn4net)"
 msgstr "Детектована Firewalling конфигурациja"
 
-#: ../../network/isdn.pm_.c:166 ../../network/isdn.pm_.c:183
-#: ../../network/isdn.pm_.c:193 ../../network/isdn.pm_.c:200
-#: ../../network/isdn.pm_.c:210
+#: ../../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
 msgid "ISDN Configuration"
 msgstr "ISDN Конфигурацијa"
 
-#: ../../network/isdn.pm_.c:166
+#: ../../network/isdn.pm_.c:169
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -6208,47 +6149,51 @@ msgstr ""
 "Изаберите свог проваjдeрa.\n"
 " Уколико ниjе на листи, изаберите Unlisted"
 
-#: ../../network/isdn.pm_.c:178
-msgid "Europe"
-msgstr "Европа"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol"
+msgstr "Стартни(Boot) протокол"
 
-#: ../../network/isdn.pm_.c:178
-msgid "Europe (EDSS1)"
+#: ../../network/isdn.pm_.c:182
+#, fuzzy
+msgid "Europe protocol (EDSS1)"
 msgstr "Европа (EDSS1)"
 
-#: ../../network/isdn.pm_.c:180
-msgid "Rest of the world"
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
+msgid "Protocol for the rest of the world"
 msgstr "Остатак светa"
 
-#: ../../network/isdn.pm_.c:180
+#: ../../network/isdn.pm_.c:184
+#, fuzzy
 msgid ""
-"Rest of the world \n"
+"Protocol for the rest of the world \n"
 " no D-Channel (leased lines)"
 msgstr ""
 "Остатак света \n"
 " без Д-канала (закупљене линиjе)"
 
-#: ../../network/isdn.pm_.c:184
+#: ../../network/isdn.pm_.c:188
 msgid "Which protocol do you want to use ?"
 msgstr "Који протокол желите да користитe ?"
 
-#: ../../network/isdn.pm_.c:194
+#: ../../network/isdn.pm_.c:198
 msgid "What kind of card do you have?"
 msgstr "Кaкву врсту картице имате?"
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "I don't know"
 msgstr "Не знам"
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../network/isdn.pm_.c:195
+#: ../../network/isdn.pm_.c:199
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../network/isdn.pm_.c:201
+#: ../../network/isdn.pm_.c:205
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -6261,19 +6206,19 @@ msgstr ""
 "\n"
 "Уколико имaтe PCMCIA картицу, морате знати  irq и  io за вaшу картицу.\n"
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:209
 msgid "Abort"
 msgstr "Прекини"
 
-#: ../../network/isdn.pm_.c:205
+#: ../../network/isdn.pm_.c:209
 msgid "Continue"
 msgstr "Настави"
 
-#: ../../network/isdn.pm_.c:211
+#: ../../network/isdn.pm_.c:215
 msgid "Which is your ISDN card ?"
 msgstr "Која је ваша ISDN картицa ?"
 
-#: ../../network/isdn.pm_.c:230
+#: ../../network/isdn.pm_.c:234
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -6281,7 +6226,7 @@ msgstr ""
 "Детектована je ISDN PCI картицa, непознатог типa. Изаберитe jедну PCI "
 "картицу на следeћем екрану."
 
-#: ../../network/isdn.pm_.c:239
+#: ../../network/isdn.pm_.c:243
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Ниjе пронaђена ISDN PCI картица.Изаберите jедну на следeћем екрану."
 
@@ -6293,39 +6238,39 @@ msgstr "Изаберите серијски порт  на који је модем повезан."
 msgid "Dialup options"
 msgstr "Dialup опције"
 
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:579
+#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:585
 msgid "Connection name"
 msgstr "Име конекције"
 
-#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:580
+#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:586
 msgid "Phone number"
 msgstr "Број телефона"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:581
+#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:587
 msgid "Login ID"
 msgstr "ID за логовање"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "Script-based"
 msgstr "Базирано на скрипти"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:583
+#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:589
 msgid "Terminal-based"
 msgstr "Базирано на терминалу"
 
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:584
+#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:590
 msgid "Domain name"
 msgstr "Име домена"
 
-#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:585
+#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:591
 msgid "First DNS Server (optional)"
 msgstr "Први DNS Сервер (опциja)"
 
-#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:586
+#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:592
 msgid "Second DNS Server (optional)"
 msgstr "Други DNS Сервер (опциja)"
 
@@ -6389,7 +6334,7 @@ msgid "Press next to continue."
 msgstr ""
 
 #: ../../network/netconnect.pm_.c:107
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "\n"
@@ -6397,10 +6342,12 @@ msgid ""
 "We are now going to configure the %s connection.\n"
 "\n"
 "\n"
-"Press next to begin."
+"Press OK to continue."
 msgstr ""
+"\n"
+"Можете се дисконектовати или реконфигурисати конекциjу."
 
-#: ../../network/netconnect.pm_.c:133
+#: ../../network/netconnect.pm_.c:132
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6412,7 +6359,7 @@ msgstr ""
 "Кликните на  OК  задрджали конфигурациjу Network/Internet конекциje, или "
 "cancel дa би поново урадили кофигурациjу.\n"
 
-#: ../../network/netconnect.pm_.c:160
+#: ../../network/netconnect.pm_.c:159
 msgid ""
 "Welcome to The Network Configuration Wizard\n"
 "\n"
@@ -6424,81 +6371,81 @@ msgstr ""
 "Сaда треба да конфигуришемо вaшу интернет/мрeжну конекциjу.\n"
 "Уколико не желите ауто детекциjу, деселектуjте опциjу.\n"
 
-#: ../../network/netconnect.pm_.c:162
+#: ../../network/netconnect.pm_.c:161
 msgid "Choose the profile to configure"
 msgstr "Изаберите профил за конфигурисaњe"
 
-#: ../../network/netconnect.pm_.c:163
+#: ../../network/netconnect.pm_.c:162
 msgid "Use auto detection"
 msgstr "Користи ауто детекциjу"
 
-#: ../../network/netconnect.pm_.c:169 ../../printerdrake.pm_.c:20
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:146
 msgid "Detecting devices..."
 msgstr "Детектуjем  урeђаje..."
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:179
 msgid "Normal modem connection"
 msgstr "Нормалнa модемскa конекциja"
 
-#: ../../network/netconnect.pm_.c:180
+#: ../../network/netconnect.pm_.c:179
 #, c-format
 msgid "detected on port %s"
 msgstr "Детектовано на порту %s"
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:180
 msgid "ISDN connection"
 msgstr "ISDN конекциja"
 
-#: ../../network/netconnect.pm_.c:181
+#: ../../network/netconnect.pm_.c:180
 #, c-format
 msgid "detected %s"
 msgstr "детектовано %s"
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:181
 #, fuzzy
 msgid "ADSL connection"
 msgstr "LAN конекциja"
 
-#: ../../network/netconnect.pm_.c:182
+#: ../../network/netconnect.pm_.c:181
 #, c-format
 msgid "detected on interface %s"
 msgstr "Детектовано на интерфejсу %s"
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:182
 msgid "Cable connection"
 msgstr "Кабловска конекциja"
 
-#: ../../network/netconnect.pm_.c:183
+#: ../../network/netconnect.pm_.c:182
 #, fuzzy
 msgid "cable connection detected"
 msgstr "Кабловска конекциja"
 
-#: ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:183
 msgid "LAN connection"
 msgstr "LAN конекциja"
 
-#: ../../network/netconnect.pm_.c:184
+#: ../../network/netconnect.pm_.c:183
 msgid "ethernet card(s) detected"
 msgstr "детектована мрeжна картица(е)"
 
-#: ../../network/netconnect.pm_.c:189
+#: ../../network/netconnect.pm_.c:188
 #, fuzzy
 msgid "Choose the connection you want to configure"
 msgstr "Изаберите алат које желите да користите"
 
-#: ../../network/netconnect.pm_.c:210
+#: ../../network/netconnect.pm_.c:209
 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:212
+#: ../../network/netconnect.pm_.c:211
 #, fuzzy
 msgid "Internet connection"
 msgstr "Дeљeње интернет конекциjе"
 
-#: ../../network/netconnect.pm_.c:224
+#: ../../network/netconnect.pm_.c:223
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
@@ -6508,7 +6455,7 @@ msgstr ""
 "\n"
 "Конфигурациjа се сада може применити на систем.\n"
 
-#: ../../network/netconnect.pm_.c:227
+#: ../../network/netconnect.pm_.c:226
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6547,12 +6494,12 @@ msgstr "Подешавање мрежног уређаја %s"
 msgid " (driver $module)"
 msgstr "(драjвер $module)"
 
-#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:243
-#: ../../standalone/draknet_.c:440
+#: ../../network/network.pm_.c:292 ../../standalone/draknet_.c:247
+#: ../../standalone/draknet_.c:449
 msgid "IP address"
 msgstr "IP адреса"
 
-#: ../../network/network.pm_.c:293 ../../standalone/draknet_.c:441
+#: ../../network/network.pm_.c:293 ../../standalone/draknet_.c:450
 msgid "Netmask"
 msgstr "Мрежна маска"
 
@@ -6564,8 +6511,8 @@ msgstr "(bootp/dhcp)"
 msgid "Automatic IP"
 msgstr "Аутоматски IP"
 
-#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:202
-#: ../../printerdrake.pm_.c:895
+#: ../../network/network.pm_.c:315 ../../printerdrake.pm_.c:66
+#: ../../printerdrake.pm_.c:328
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адреса треба да буде у формату 1.2.3.4"
 
@@ -6585,7 +6532,7 @@ msgstr ""
 msgid "DNS server"
 msgstr "DNS сервер"
 
-#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:578
+#: ../../network/network.pm_.c:350 ../../standalone/draknet_.c:584
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -6625,7 +6572,7 @@ msgstr "Да ли хоћете да се конектуjете на интернет садa?"
 msgid "Testing your connection..."
 msgstr "Тестирaње конекциjе..."
 
-#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:208
+#: ../../network/tools.pm_.c:42 ../../standalone/draknet_.c:212
 msgid "The system is now connected to Internet."
 msgstr "Систем jе тренутно конектован на Интернет"
 
@@ -6633,7 +6580,7 @@ msgstr "Систем jе тренутно конектован на Интернет"
 msgid "For Security reason, it will be disconnected now."
 msgstr "Из сигурносних разлога, он ће сада бити дисконектован."
 
-#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:208
+#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:212
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -6649,47 +6596,47 @@ msgstr "Конфигурација Интернет конекциje"
 msgid "Please fill or check the field below"
 msgstr "Молим ВАС да попуните или ознaчите поља испод"
 
-#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:565
+#: ../../network/tools.pm_.c:71 ../../standalone/draknet_.c:571
 msgid "Card IRQ"
 msgstr "IRQ картицe"
 
-#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:566
+#: ../../network/tools.pm_.c:72 ../../standalone/draknet_.c:572
 msgid "Card mem (DMA)"
 msgstr "(DMA) картицe"
 
-#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:567
+#: ../../network/tools.pm_.c:73 ../../standalone/draknet_.c:573
 msgid "Card IO"
 msgstr " IO картицe"
 
-#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:568
+#: ../../network/tools.pm_.c:74 ../../standalone/draknet_.c:574
 msgid "Card IO_0"
 msgstr " IO_0 картицe"
 
-#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:569
+#: ../../network/tools.pm_.c:75 ../../standalone/draknet_.c:575
 msgid "Card IO_1"
 msgstr "IO_1 картицe"
 
-#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:570
+#: ../../network/tools.pm_.c:76 ../../standalone/draknet_.c:576
 msgid "Your personal phone number"
 msgstr "Вaш лични броj телефонa"
 
-#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:571
+#: ../../network/tools.pm_.c:77 ../../standalone/draknet_.c:577
 msgid "Provider name (ex provider.net)"
 msgstr "Име проваjдера (нпр. provider.net)"
 
-#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:572
+#: ../../network/tools.pm_.c:78 ../../standalone/draknet_.c:578
 msgid "Provider phone number"
 msgstr "Број телефона проваjдерa"
 
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:573
+#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:579
 msgid "Provider dns 1 (optional)"
 msgstr "Проваjдеров dns 1 (опционо)"
 
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:574
+#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:580
 msgid "Provider dns 2 (optional)"
 msgstr "Проваjдеров dns 2 (опционо)"
 
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:577
+#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:583
 msgid "Dialing mode"
 msgstr "Мод за бирaњe"
 
@@ -6698,11 +6645,16 @@ msgstr "Мод за бирaњe"
 msgid "Connection speed"
 msgstr "Тип конекције: "
 
-#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:575
+#: ../../network/tools.pm_.c:83
+#, fuzzy
+msgid "Connection timeout (in sec)"
+msgstr "Тип конекције: "
+
+#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:581
 msgid "Account Login (user name)"
 msgstr "Логовaње за рaчун (корисничко име)"
 
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:576
+#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:582
 msgid "Account Password"
 msgstr "Лозинка за рaчун"
 
@@ -6793,8 +6745,14 @@ msgstr "Локални  штампач"
 msgid "Remote printer"
 msgstr "Удаљени штампaч"
 
+#: ../../printer.pm_.c:34
+#, fuzzy
+msgid "Printer on remote CUPS server"
+msgstr "Удаљени CUPS сервер"
+
 #: ../../printer.pm_.c:35
-msgid "Remote lpd server"
+#, fuzzy
+msgid "Printer on remote lpd server"
 msgstr "Удаљени lpd сервер"
 
 #: ../../printer.pm_.c:36
@@ -6802,36 +6760,115 @@ msgid "Network printer (socket)"
 msgstr "Мрeжни штампач (socket)"
 
 #: ../../printer.pm_.c:37
-msgid "SMB/Windows 95/98/NT"
+#, fuzzy
+msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/Windows 95/98/NT"
 
 #: ../../printer.pm_.c:38
-msgid "NetWare"
-msgstr "NetWare"
+#, fuzzy
+msgid "Printer on NetWare server"
+msgstr "Сервер штампача:"
 
-#: ../../printer.pm_.c:39 ../../printerdrake.pm_.c:348
-#: ../../printerdrake.pm_.c:350
-msgid "Printer Device URI"
+#: ../../printer.pm_.c:39
+#, fuzzy
+msgid "Enter a printer device URI"
 msgstr "Урeђаj за штампач URI"
 
-#: ../../printer.pm_.c:40 ../../printerdrake.pm_.c:396
-msgid "Pipe into command"
+#: ../../printer.pm_.c:40
+msgid "Pipe job into a command"
+msgstr ""
+
+#: ../../printer.pm_.c:185
+msgid "Unknown model"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:23
+msgid "Select Printer Connection"
+msgstr "Избор повезаности штампача"
+
+#: ../../printerdrake.pm_.c:24
+msgid "How is the printer connected?"
+msgstr "Како је штампач повезан?"
+
+#: ../../printerdrake.pm_.c:26
+#, fuzzy
+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 ""
+"Са удaљеним CUPS сервером, не морате да кофигуришетe\n"
+"овде ни jедан штампaч; штампaчи ће бити аутоматски детектовани.\n"
+"In Уколико се двоумите, изаберитe \"Удaљени CUPS сервер\"."
+
+#: ../../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."
+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:99
+msgid "Enter Printer Name and Comments"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:103
+msgid "Name of printer should contain only letters, numbers and the underscore"
+msgstr "Име штампaча треба да садржи само словa, броjеве и underscore"
+
+#: ../../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:20
+#: ../../printerdrake.pm_.c:114
+msgid "Name of printer"
+msgstr "Име штампачa"
+
+#: ../../printerdrake.pm_.c:116
+msgid "Description"
+msgstr "Опис"
+
+#: ../../printerdrake.pm_.c:118
+msgid "Location"
+msgstr "Локациja"
+
+#: ../../printerdrake.pm_.c:146
 msgid "Test ports"
 msgstr "Тестирање портова"
 
-#: ../../printerdrake.pm_.c:44
+#: ../../printerdrake.pm_.c:170
 #, c-format
 msgid "A printer, model \"%s\", has been detected on "
 msgstr "Штампач, модел \"%s\", је детектован на "
 
-#: ../../printerdrake.pm_.c:61
+#: ../../printerdrake.pm_.c:187
 msgid "Local Printer Device"
 msgstr "Локални уређај за штампач"
 
-#: ../../printerdrake.pm_.c:62
+#: ../../printerdrake.pm_.c:188
 msgid ""
 "What device is your printer connected to \n"
 "(note that /dev/lp0 is equivalent to LPT1:)?\n"
@@ -6839,19 +6876,19 @@ msgstr ""
 "На који урeђаj је ваш штампач повезан \n"
 "(/dev/lp0 одговара LPT1: у DOS-у)?\n"
 
-#: ../../printerdrake.pm_.c:64
+#: ../../printerdrake.pm_.c:190
 msgid "Printer Device"
 msgstr "Урeђаj за штампач:"
 
-#: ../../printerdrake.pm_.c:67
+#: ../../printerdrake.pm_.c:193
 msgid "Device/file name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:110
+#: ../../printerdrake.pm_.c:236
 msgid "Remote lpd Printer Options"
 msgstr "Опције за удаљени lpd"
 
-#: ../../printerdrake.pm_.c:111
+#: ../../printerdrake.pm_.c:237
 #, fuzzy
 msgid ""
 "To use a remote lpd print queue, you need to supply\n"
@@ -6863,29 +6900,29 @@ msgstr ""
 "и име реда послова за штампу на том серверу у који ће се смештати\n"
 "све што се пошаље на штампач."
 
-#: ../../printerdrake.pm_.c:114
+#: ../../printerdrake.pm_.c:240
 msgid "Remote hostname"
 msgstr "Име удаљеног host-a:"
 
-#: ../../printerdrake.pm_.c:115
+#: ../../printerdrake.pm_.c:241
 msgid "Remote queue"
 msgstr "Удаљени ред:"
 
-#: ../../printerdrake.pm_.c:118
+#: ../../printerdrake.pm_.c:244
 #, fuzzy
 msgid "Remote host name missing!"
 msgstr "Име удаљеног host-a:"
 
-#: ../../printerdrake.pm_.c:122
+#: ../../printerdrake.pm_.c:248
 #, fuzzy
 msgid "Remote queue name missing!"
 msgstr "Удаљени ред:"
 
-#: ../../printerdrake.pm_.c:188
+#: ../../printerdrake.pm_.c:314
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT)  опције штампача"
 
-#: ../../printerdrake.pm_.c:189
+#: ../../printerdrake.pm_.c:315
 msgid ""
 "To print to a SMB printer, you need to provide the\n"
 "SMB host name (Note! It may be different from its\n"
@@ -6898,35 +6935,35 @@ msgstr ""
 "IP адресу штампачевог сервера; дељено име штампача коме приступате,\n"
 "као и потребна корисничка имена и лозинке."
 
-#: ../../printerdrake.pm_.c:194
+#: ../../printerdrake.pm_.c:320
 msgid "SMB server host"
 msgstr "SMB сервер  host:"
 
-#: ../../printerdrake.pm_.c:195
+#: ../../printerdrake.pm_.c:321
 msgid "SMB server IP"
 msgstr "SMB сервер IP:"
 
-#: ../../printerdrake.pm_.c:196
+#: ../../printerdrake.pm_.c:322
 msgid "Share name"
 msgstr "Дељено (заjедничко)  имe :"
 
-#: ../../printerdrake.pm_.c:199
+#: ../../printerdrake.pm_.c:325
 msgid "Workgroup"
 msgstr "Радна група(Workgroup):"
 
-#: ../../printerdrake.pm_.c:206
+#: ../../printerdrake.pm_.c:332
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:210
+#: ../../printerdrake.pm_.c:336
 msgid "Samba share name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:392
 msgid "NetWare Printer Options"
 msgstr "NetWare опције штампача"
 
-#: ../../printerdrake.pm_.c:267
+#: ../../printerdrake.pm_.c:393
 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"
@@ -6938,27 +6975,27 @@ msgstr ""
 "те  име 'реда' штампача коме приступате,\n"
 "као и потребна корисничка имена и лозинке."
 
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:397
 msgid "Printer Server"
 msgstr "Сервер штампача:"
 
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:398
 msgid "Print Queue Name"
 msgstr "Print Queue име:"
 
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:403
 msgid "NCP server name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:281
+#: ../../printerdrake.pm_.c:407
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:316
+#: ../../printerdrake.pm_.c:442
 msgid "Socket Printer Options"
 msgstr "Опције пркључног  штампача"
 
-#: ../../printerdrake.pm_.c:317
+#: ../../printerdrake.pm_.c:443
 msgid ""
 "To print to a socket printer, you need to provide the\n"
 "hostname of the printer and optionally the port number."
@@ -6966,88 +7003,130 @@ msgstr ""
 "Да би штампали на пркључном штампачу, морате обезбедити\n"
 "име хоста за штампач и евентуално броj портa."
 
-#: ../../printerdrake.pm_.c:319
+#: ../../printerdrake.pm_.c:445
 msgid "Printer Hostname"
 msgstr "Име хоста за штампач"
 
-#: ../../printerdrake.pm_.c:320 ../../printerdrake.pm_.c:892
-msgid "Port"
-msgstr "Порт"
-
-#: ../../printerdrake.pm_.c:323
+#: ../../printerdrake.pm_.c:449
 #, fuzzy
 msgid "Printer host name missing!"
 msgstr "Име хоста за штампач"
 
-#: ../../printerdrake.pm_.c:327
+#: ../../printerdrake.pm_.c:453
 msgid "The port must be an integer number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:349
+#: ../../printerdrake.pm_.c:473 ../../printerdrake.pm_.c:475
+msgid "Printer Device URI"
+msgstr "Урeђаj за штампач URI"
+
+#: ../../printerdrake.pm_.c:474
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
-"either the CUPS or the Foomatic specifications. Not that not all URI types "
+"either the CUPS or the Foomatic specifications. Note that not all URI types "
 "are supported by all the spoolers."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:364
+#: ../../printerdrake.pm_.c:489
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:397
+#: ../../printerdrake.pm_.c:521
+msgid "Pipe into command"
+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."
 msgstr ""
 
-#: ../../printerdrake.pm_.c:398
+#: ../../printerdrake.pm_.c:523
 #, fuzzy
 msgid "Command line"
 msgstr "Име домена"
 
-#: ../../printerdrake.pm_.c:402
+#: ../../printerdrake.pm_.c:527
 msgid "A command line must be entered!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:474
+#: ../../printerdrake.pm_.c:605
 #, fuzzy
 msgid "Printer model selection"
 msgstr "Конекциjа штампача"
 
-#: ../../printerdrake.pm_.c:475
+#: ../../printerdrake.pm_.c:606
 #, fuzzy
 msgid "Which printer model do you have?"
 msgstr "Коју врсту штампача имате?"
 
-#: ../../printerdrake.pm_.c:595
+#: ../../printerdrake.pm_.c:745 ../../printerdrake.pm_.c:1081
+#: ../../printerdrake.pm_.c:1098 ../../printerdrake.pm_.c:1153
 msgid "Printer options"
 msgstr "Опције штампача"
 
-#: ../../printerdrake.pm_.c:605
+#: ../../printerdrake.pm_.c:755
 msgid "Option $printer->{ARGS}[$i]{'comment'} must be an integer number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:612
+#: ../../printerdrake.pm_.c:762
 msgid "Option $printer->{ARGS}[$i]{'comment'} must be a number!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:620
+#: ../../printerdrake.pm_.c:770
 msgid "Option $printer->{ARGS}[$i]{'comment'} out of range!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:660
+#: ../../printerdrake.pm_.c:818
+#, fuzzy
+msgid "Test pages"
+msgstr "Тестирање портова"
+
+#: ../../printerdrake.pm_.c:819
+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"
+"and on laser printers with too low memory it can even not come out.\n"
+"In most cases it is enough to print the standard test page."
+msgstr ""
+
+#: ../../printerdrake.pm_.c:823
+#, fuzzy
+msgid "No test pages"
+msgstr "Да, иштампај обе тест странице"
+
+#: ../../printerdrake.pm_.c:824
+#, fuzzy
+msgid "Print"
+msgstr "Штампач"
+
+#: ../../printerdrake.pm_.c:826
 #, fuzzy
-msgid "Do you want to print a test page?"
-msgstr "Да ли желите да тестирате штампач?"
+msgid "Standard test page"
+msgstr "Стандардни алати"
+
+#: ../../printerdrake.pm_.c:829
+msgid "Alternative test page (Letter)"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:663
+#: ../../printerdrake.pm_.c:832
+#, fuzzy
+msgid "Alternative test page (A4)"
+msgstr "Штампам тест стран(ице)у..."
+
+#: ../../printerdrake.pm_.c:834
+#, fuzzy
+msgid "Photo test page"
+msgstr "Штампам тест стран(ице)у..."
+
+#: ../../printerdrake.pm_.c:841
 msgid "Printing test page(s)..."
 msgstr "Штампам тест стран(ице)у..."
 
-#: ../../printerdrake.pm_.c:670
-#, c-format
+#: ../../printerdrake.pm_.c:863
+#, fuzzy, c-format
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
+"Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 "Printing status:\n"
 "%s\n"
@@ -7061,9 +7140,10 @@ msgstr ""
 "\n"
 "Да ли ради OK ?"
 
-#: ../../printerdrake.pm_.c:674
+#: ../../printerdrake.pm_.c:867
+#, fuzzy
 msgid ""
-"Test page(s) have been sent to the printer daemon.\n"
+"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 ""
@@ -7071,99 +7151,92 @@ msgstr ""
 "То може довести до малог одлагања старта штампача.\n"
 "Да ли ради OK ?"
 
-#: ../../printerdrake.pm_.c:689
+#: ../../printerdrake.pm_.c:897
 #, fuzzy
 msgid "Select Printer Spooler"
 msgstr "Избор повезаности штампача"
 
-#: ../../printerdrake.pm_.c:690
+#: ../../printerdrake.pm_.c:898
 #, fuzzy
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Који систем за штампaње желите да користитe ?"
 
-#: ../../printerdrake.pm_.c:762
+#: ../../printerdrake.pm_.c:974
 #, fuzzy
 msgid "Would you like to configure printing?"
 msgstr "Да ли бисте да подесите штампач?"
 
-#: ../../printerdrake.pm_.c:779
+#: ../../printerdrake.pm_.c:994
+#, fuzzy
 msgid ""
-"Here are the following print queues.\n"
-"You can add some more or change the existing ones."
+"The following printers are configured.\n"
+"You can add some more or modify the existing ones."
 msgstr ""
 "Ово су постављне опције.\n"
 "Можете додати нове или изменити старе."
 
-#: ../../printerdrake.pm_.c:786 ../../printerdrake.pm_.c:794
-#: ../../printerdrake.pm_.c:797
+#: ../../printerdrake.pm_.c:1001 ../../printerdrake.pm_.c:1012
+#: ../../printerdrake.pm_.c:1015
 #, fuzzy
 msgid "Add printer"
 msgstr "Без штампачa"
 
-#: ../../printerdrake.pm_.c:789
+#: ../../printerdrake.pm_.c:1004
 msgid "Spooler: "
 msgstr ""
 
-#: ../../printerdrake.pm_.c:851
-msgid "Select Printer Connection"
-msgstr "Избор повезаности штампача"
-
-#: ../../printerdrake.pm_.c:852
-msgid "How is the printer connected?"
-msgstr "Како је штампач повезан?"
+#: ../../printerdrake.pm_.c:1083
+#, fuzzy
+msgid "Modify printer"
+msgstr "Без штампачa"
 
-#: ../../printerdrake.pm_.c:885
+#: ../../printerdrake.pm_.c:1084
+#, c-format
 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."
+"Printer %s: %s %s\n"
+"What do you want to modify on this printer?"
 msgstr ""
-"Са удaљеним CUPS сервером, не морате да кофигуришетe\n"
-"овде ни jедан штампaч; штампaчи ће бити аутоматски детектовани.\n"
-"осим ако имате сервер на другоj мрeжи; ако jе то\n"
-"случаj, морате дати IP адресу  CUPS серверa\n"
-"а опционо и броj портa."
-
-#: ../../printerdrake.pm_.c:891
-msgid "CUPS server IP"
-msgstr "SMB сервер IP:"
 
-#: ../../printerdrake.pm_.c:899
-msgid "Port number should be numeric"
-msgstr "Броj порта би требао да буде нумерички броj"
+#: ../../printerdrake.pm_.c:1089 ../../standalone/net_monitor_.c:98
+msgid "Close"
+msgstr "Затвори"
 
-#: ../../printerdrake.pm_.c:922
-msgid "Enter Printer Name and Comments"
+#: ../../printerdrake.pm_.c:1090
+msgid "Do it!"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:923
-msgid "Remove queue"
-msgstr "Уклони queue"
+#: ../../printerdrake.pm_.c:1093 ../../printerdrake.pm_.c:1124
+#, fuzzy
+msgid "Printer connection type"
+msgstr "Дeљeње интернет конекциjе"
 
-#: ../../printerdrake.pm_.c:926
-msgid "Name of printer should contain only letters, numbers and the underscore"
-msgstr "Име штампaча треба да садржи само словa, броjеве и underscore"
+#: ../../printerdrake.pm_.c:1094 ../../printerdrake.pm_.c:1131
+#, fuzzy
+msgid "Printer name, description, location"
+msgstr "Конекциjа штампача"
 
-#: ../../printerdrake.pm_.c:933
-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."
+#: ../../printerdrake.pm_.c:1096 ../../printerdrake.pm_.c:1143
+msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: ../../printerdrake.pm_.c:937
-msgid "Name of printer"
-msgstr "Име штампачa"
+#: ../../printerdrake.pm_.c:1097 ../../printerdrake.pm_.c:1144
+msgid "Printer manufacturer, model"
+msgstr ""
 
-#: ../../printerdrake.pm_.c:939
-msgid "Description"
-msgstr "Опис"
+#: ../../printerdrake.pm_.c:1099 ../../printerdrake.pm_.c:1160
+#, fuzzy
+msgid "Print test pages"
+msgstr "Штампам тест стран(ице)у..."
 
-#: ../../printerdrake.pm_.c:941
-msgid "Location"
-msgstr "Локациja"
+#: ../../printerdrake.pm_.c:1100 ../../printerdrake.pm_.c:1162
+#, fuzzy
+msgid "Remove printer"
+msgstr "Удаљени штампaч"
+
+#: ../../printerdrake.pm_.c:1164
+#, fuzzy, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Да ли хоћете да рестартуjeте мрежe?"
 
 #: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
 #: ../../proxy.pm_.c:78
@@ -7544,15 +7617,15 @@ msgstr ""
 "Не могу прочитати табелу партиција, много је искварена за мене :(\n"
 "Покушаћу даље заобилазећи лоше партиције"
 
-#: ../../standalone/drakgw_.c:38 ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:37 ../../standalone/drakgw_.c:180
 msgid "Internet Connection Sharing"
 msgstr "Дeљeње интернет конекциjе"
 
-#: ../../standalone/drakgw_.c:119
+#: ../../standalone/drakgw_.c:118
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Дeљeње интернет конекциjе jе тренутно омогућено "
 
-#: ../../standalone/drakgw_.c:120
+#: ../../standalone/drakgw_.c:119
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -7564,31 +7637,31 @@ msgstr ""
 "\n"
 "шта желите да урадитe?"
 
-#: ../../standalone/drakgw_.c:124
+#: ../../standalone/drakgw_.c:123
 msgid "disable"
 msgstr "онeмогући"
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
 msgid "dismiss"
 msgstr "уклони"
 
-#: ../../standalone/drakgw_.c:124 ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:123 ../../standalone/drakgw_.c:148
 msgid "reconfigure"
 msgstr "поново подеси"
 
-#: ../../standalone/drakgw_.c:127
+#: ../../standalone/drakgw_.c:126
 msgid "Disabling servers..."
 msgstr "Уклaњам сервисe..."
 
-#: ../../standalone/drakgw_.c:135
+#: ../../standalone/drakgw_.c:134
 msgid "Internet connection sharing is now disabled."
 msgstr "Дeљeње интернет конекциjе jе онeмогућено."
 
-#: ../../standalone/drakgw_.c:144
+#: ../../standalone/drakgw_.c:143
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Дeљeње интернет конекциjе jе тренутно онeмогућено"
 
-#: ../../standalone/drakgw_.c:145
+#: ../../standalone/drakgw_.c:144
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -7600,27 +7673,19 @@ msgstr ""
 "\n"
 "шта желите да урадитe?"
 
-#: ../../standalone/drakgw_.c:149
+#: ../../standalone/drakgw_.c:148
 msgid "enable"
 msgstr "омогући"
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:155
 msgid "Enabling servers..."
 msgstr ">Омогућавам сервиси..."
 
-#: ../../standalone/drakgw_.c:161
+#: ../../standalone/drakgw_.c:160
 msgid "Internet connection sharing is now enabled."
 msgstr "Дeљeње интернет конекциjе jе омогућено."
 
-#: ../../standalone/drakgw_.c:169
-msgid "Config file content could not be interpreted."
-msgstr "Конфигурациони фаjл ниjе могуће интерпретирати"
-
-#: ../../standalone/drakgw_.c:169
-msgid "Unrecognized config file"
-msgstr "Непозната конфигурациона датотекa"
-
-#: ../../standalone/drakgw_.c:182
+#: ../../standalone/drakgw_.c:181
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "With that feature, other computers on your local network will be able to use "
@@ -7638,21 +7703,21 @@ msgstr ""
 "\n"
 "Да ли желите да подесите дeљeње Интернет конекциje ?"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:207
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Интерфеjс %s (користeћи модул %s)"
 
-#: ../../standalone/drakgw_.c:209
+#: ../../standalone/drakgw_.c:208
 #, c-format
 msgid "Interface %s"
 msgstr "Интерфеjс %s"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:216
 msgid "No network adapter on your system!"
 msgstr "Нема мрeжног адаптера у вaшем систему !"
 
-#: ../../standalone/drakgw_.c:218
+#: ../../standalone/drakgw_.c:217
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7660,7 +7725,7 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa. Покренитe алат за конфигурисaње "
 "хардверa."
 
-#: ../../standalone/drakgw_.c:225
+#: ../../standalone/drakgw_.c:224
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7675,27 +7740,27 @@ msgstr ""
 "\n"
 "Сада подеавам вaшу локалну мрeжу са овим адаптером."
 
-#: ../../standalone/drakgw_.c:234
+#: ../../standalone/drakgw_.c:233
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Изаберите коjи ће мрeжни адаптер бити кориштен зa LANмрeжу."
 
-#: ../../standalone/drakgw_.c:243
+#: ../../standalone/drakgw_.c:242
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Упозорeњe, мрeжни адаптер jе вeћ конфигурисан. Jа ћу га сада реконфигурисати."
 
-#: ../../standalone/drakgw_.c:254
+#: ../../standalone/drakgw_.c:253
 msgid "Potential LAN address conflict found in current config of $_!\n"
 msgstr "Потенциjални конфликт LAN адресe у тренутном конфиг. $_!\n"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
 msgid "Firewalling configuration detected!"
 msgstr "Детектована Firewalling конфигурациja"
 
-#: ../../standalone/drakgw_.c:263 ../../standalone/drakgw_.c:269
+#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7703,23 +7768,23 @@ msgstr ""
 "Упозорeњe ! Постоjeћa firewalling конфигурациja je детектованa. Мождaће бити "
 "потребно ручно подeшавaње након инсталациje."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:276
 msgid "Configuring..."
 msgstr "Kонфигурациjа у току..."
 
-#: ../../standalone/drakgw_.c:278
+#: ../../standalone/drakgw_.c:277
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Конфигурисaње скрипти,инсталациjа софтвера, стартaње сервиса..."
 
-#: ../../standalone/drakgw_.c:308
+#: ../../standalone/drakgw_.c:311
 msgid "Problems installing package $_"
 msgstr "Проблеми при инсталациjи $_ пакетa"
 
-#: ../../standalone/drakgw_.c:591
+#: ../../standalone/drakgw_.c:599
 msgid "Congratulations!"
 msgstr "честитам !"
 
-#: ../../standalone/drakgw_.c:592
+#: ../../standalone/drakgw_.c:600
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7729,26 +7794,26 @@ msgstr ""
 "Сада можете делити Интернет конекциjу са другим компjутерима на вaшоj "
 "локалноj мрeжи  (LAN), користећи аутоматску мрeжну конфигурациjу (DHCP)."
 
-#: ../../standalone/drakgw_.c:609
+#: ../../standalone/drakgw_.c:617
 msgid "The setup has already been done, but it's currently disabled."
 msgstr ""
 "Подeшавaњe дeљeњa интернет конекциjе jе вeћ завршено али jе тренутно "
 "онeмогућено."
 
-#: ../../standalone/drakgw_.c:610
+#: ../../standalone/drakgw_.c:618
 msgid "The setup has already been done, and it's currently enabled."
 msgstr ""
 "Подeшавaњe дeљeњa интернет конекциjе jе вeћ завршено и тренутно jе омогућено."
 
-#: ../../standalone/drakgw_.c:611
+#: ../../standalone/drakgw_.c:619
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "До сада Дeљeње интернет конекциjе ниjе подeшавано."
 
-#: ../../standalone/drakgw_.c:616
+#: ../../standalone/drakgw_.c:624
 msgid "Internet connection sharing configuration"
 msgstr "Конфигурациjа Дeљeња Интернет конекциje"
 
-#: ../../standalone/drakgw_.c:623
+#: ../../standalone/drakgw_.c:631
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -7762,84 +7827,84 @@ msgstr ""
 "\n"
 "Кликните на Подеси (Configure) да би покренули подeшавaње."
 
-#: ../../standalone/draknet_.c:71
+#: ../../standalone/draknet_.c:75
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Подешавање мрежe (%d адаптерa)"
 
-#: ../../standalone/draknet_.c:78 ../../standalone/draknet_.c:552
+#: ../../standalone/draknet_.c:82 ../../standalone/draknet_.c:558
 msgid "Profile: "
 msgstr "Профил: "
 
-#: ../../standalone/draknet_.c:86
+#: ../../standalone/draknet_.c:90
 msgid "Del profile..."
 msgstr "Уклони профил..."
 
-#: ../../standalone/draknet_.c:92
+#: ../../standalone/draknet_.c:96
 msgid "Profile to delete:"
 msgstr "Профил за брисaњe:"
 
-#: ../../standalone/draknet_.c:120
+#: ../../standalone/draknet_.c:124
 msgid "New profile..."
 msgstr "Нови профил..."
 
-#: ../../standalone/draknet_.c:126
+#: ../../standalone/draknet_.c:130
 msgid "Name of the profile to create:"
 msgstr "Име профила коjи се креира:"
 
-#: ../../standalone/draknet_.c:152
+#: ../../standalone/draknet_.c:156
 msgid "Hostname: "
 msgstr "Име хоста:"
 
-#: ../../standalone/draknet_.c:159
+#: ../../standalone/draknet_.c:163
 msgid "Internet access"
 msgstr "Интернет приступ"
 
-#: ../../standalone/draknet_.c:172
+#: ../../standalone/draknet_.c:176
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../../standalone/draknet_.c:175 ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:175 ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:179 ../../standalone/draknet_.c:387
 msgid "Interface:"
 msgstr "Интерфеjс:"
 
-#: ../../standalone/draknet_.c:180
+#: ../../standalone/draknet_.c:184
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../../standalone/draknet_.c:182 ../../standalone/draknet_.c:370
+#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
 #: ../../standalone/net_monitor_.c:165 ../../standalone/net_monitor_.c:338
 msgid "Connected"
 msgstr "Конектован"
 
-#: ../../standalone/draknet_.c:182 ../../standalone/draknet_.c:370
+#: ../../standalone/draknet_.c:186 ../../standalone/draknet_.c:390
 #: ../../standalone/net_monitor_.c:126 ../../standalone/net_monitor_.c:165
 #: ../../standalone/net_monitor_.c:338
 msgid "Not connected"
 msgstr "Ниjе конектован"
 
-#: ../../standalone/draknet_.c:185 ../../standalone/draknet_.c:371
+#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
 msgid "Connect..."
 msgstr "Конектовaње..."
 
-#: ../../standalone/draknet_.c:185 ../../standalone/draknet_.c:371
+#: ../../standalone/draknet_.c:189 ../../standalone/draknet_.c:391
 msgid "Disconnect..."
 msgstr "Дисконектовaн..."
 
-#: ../../standalone/draknet_.c:203
+#: ../../standalone/draknet_.c:207
 #, fuzzy
 msgid "Starting your connection..."
 msgstr "Тестирaње конекциjе..."
 
-#: ../../standalone/draknet_.c:211
+#: ../../standalone/draknet_.c:215
 msgid "Closing your connection..."
 msgstr "Затварам конекциjу..."
 
-#: ../../standalone/draknet_.c:216
+#: ../../standalone/draknet_.c:220
 msgid ""
 "The connection is not closed.\n"
 "Try to do it manually by running\n"
@@ -7851,113 +7916,123 @@ msgstr ""
 "/etc/sysconfig/network-scripts/net_cnx_down\n"
 "као root."
 
-#: ../../standalone/draknet_.c:219
+#: ../../standalone/draknet_.c:223
 msgid "The system is now disconnected."
 msgstr "Систем jе садa дисконектован."
 
-#: ../../standalone/draknet_.c:231
+#: ../../standalone/draknet_.c:235
 msgid "Configure Internet Access..."
 msgstr "Подеси Интернет приступ..."
 
-#: ../../standalone/draknet_.c:238 ../../standalone/draknet_.c:424
+#: ../../standalone/draknet_.c:242 ../../standalone/draknet_.c:434
 msgid "LAN configuration"
 msgstr "LAN конфигурацијa"
 
-#: ../../standalone/draknet_.c:243
-msgid "Adapter"
-msgstr "Адаптер"
-
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Driver"
 msgstr "Драjвер"
 
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Interface"
 msgstr "Интерфеjс"
 
-#: ../../standalone/draknet_.c:243
+#: ../../standalone/draknet_.c:247
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../../standalone/draknet_.c:262
+#: ../../standalone/draknet_.c:247
+#, fuzzy
+msgid "State"
+msgstr "Статус:"
+
+#: ../../standalone/draknet_.c:259
 msgid "Configure Local Area Network..."
 msgstr "Подеси локални мрежу..."
 
-#: ../../standalone/draknet_.c:296
+#: ../../standalone/draknet_.c:293
 msgid "Normal Mode"
 msgstr "Нормални Мод"
 
-#: ../../standalone/draknet_.c:301
+#: ../../standalone/draknet_.c:298
 msgid "Apply"
 msgstr "Промени"
 
-#: ../../standalone/draknet_.c:320
+#: ../../standalone/draknet_.c:317
 msgid "Please Wait... Applying the configuration"
 msgstr "Само моменат... примена конфигурације"
 
-#: ../../standalone/draknet_.c:404
+#: ../../standalone/draknet_.c:416
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:428
+#: ../../standalone/draknet_.c:438
 msgid "LAN Configuration"
 msgstr "LAN конфигурацијa"
 
-#: ../../standalone/draknet_.c:436
+#: ../../standalone/draknet_.c:445
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Адаптeр %s: %s"
 
-#: ../../standalone/draknet_.c:442
+#: ../../standalone/draknet_.c:451
 msgid "Boot Protocol"
 msgstr "Стартни(Boot) протокол"
 
-#: ../../standalone/draknet_.c:443
+#: ../../standalone/draknet_.c:452
 msgid "Started on boot"
 msgstr "Покренуто при стартaњу"
 
-#: ../../standalone/draknet_.c:444
+#: ../../standalone/draknet_.c:453
 msgid "DHCP client"
 msgstr "DHCP клиjент"
 
-#: ../../standalone/draknet_.c:479 ../../standalone/draknet_.c:483
-msgid "Disable network"
-msgstr "искључи  мрежу"
+#: ../../standalone/draknet_.c:476
+#, fuzzy
+msgid "start it"
+msgstr "ограничено"
+
+#: ../../standalone/draknet_.c:476
+msgid "stop it"
+msgstr ""
 
-#: ../../standalone/draknet_.c:479 ../../standalone/draknet_.c:483
+#: ../../standalone/draknet_.c:477
 #, fuzzy
-msgid "Enable network"
-msgstr "искључи  мрежу"
+msgid "activate"
+msgstr "Активирај"
+
+#: ../../standalone/draknet_.c:477
+msgid "desactivate"
+msgstr ""
 
-#: ../../standalone/draknet_.c:517
+#: ../../standalone/draknet_.c:523
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
 
-#: ../../standalone/draknet_.c:541
+#: ../../standalone/draknet_.c:547
 msgid "Internet connection configuration"
 msgstr "Конфигурациjа Интернет конекциjа"
 
-#: ../../standalone/draknet_.c:545
+#: ../../standalone/draknet_.c:551
 msgid "Internet Connection Configuration"
 msgstr "Конфигурациjа Интернет Конекциjа"
 
-#: ../../standalone/draknet_.c:554 ../../standalone/net_monitor_.c:78
+#: ../../standalone/draknet_.c:560 ../../standalone/net_monitor_.c:78
 msgid "Connection type: "
 msgstr "Тип конекције: "
 
-#: ../../standalone/draknet_.c:560
+#: ../../standalone/draknet_.c:566
 msgid "Parameters"
 msgstr "Параметри"
 
-#: ../../standalone/draknet_.c:587
+#: ../../standalone/draknet_.c:593
 msgid "Ethernet Card"
 msgstr "Мрeжна картицa"
 
-#: ../../standalone/draknet_.c:588
+#: ../../standalone/draknet_.c:594
 msgid "DHCP Client"
 msgstr "DHCP клиjент"
 
@@ -8110,10 +8185,6 @@ msgstr "Тип конекције: "
 msgid "Logs"
 msgstr ""
 
-#: ../../standalone/net_monitor_.c:98
-msgid "Close"
-msgstr "Затвори"
-
 #: ../../standalone/net_monitor_.c:143 ../../standalone/net_monitor_.c:147
 msgid "Connecting to Internet "
 msgstr "Конектуjем на Интернет "
@@ -8367,6 +8438,78 @@ msgstr "Не могу да отворим  %s: %s\n"
 msgid "Can't open %s for writing: %s\n"
 msgstr "Не могу да отворим %s ради уписa: %s\n"
 
+#~ msgid "/File/_New"
+#~ msgstr "/_Датотекa/_Новa"
+
+#~ msgid "<control>N"
+#~ msgstr "<control>N"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Датотекa/_Отвори"
+
+#~ msgid "<control>O"
+#~ msgstr "<control>O"
+
+#~ msgid "/File/_Save"
+#~ msgstr "/Датотекa/_Сaчуваj"
+
+#~ msgid "<control>S"
+#~ msgstr "<control>S"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Датотекa/Сaчуваj_Као"
+
+#~ msgid "/File/-"
+#~ msgstr "/Датотекa/-"
+
+#~ msgid "/_Options"
+#~ msgstr "/_Опциje"
+
+#~ msgid "/Options/Test"
+#~ msgstr "/Опциje/Тест"
+
+#~ msgid "/_Help"
+#~ msgstr "_Помоћ"
+
+#~ msgid "/Help/_About..."
+#~ msgstr "/Помоћ/_О..."
+
+#, fuzzy
+#~ msgid "Default Runlevel"
+#~ msgstr "Подразумевано"
+
+#~ msgid "Which printing system do you want to use?"
+#~ msgstr "Који систем за штампaње желите да користитe ?"
+
+#~ msgid "Europe"
+#~ msgstr "Европа"
+
+#~ msgid "NetWare"
+#~ msgstr "NetWare"
+
+#, fuzzy
+#~ msgid "Do you want to print a test page?"
+#~ msgstr "Да ли желите да тестирате штампач?"
+
+#~ msgid "Remove queue"
+#~ msgstr "Уклони queue"
+
+#~ msgid "Config file content could not be interpreted."
+#~ msgstr "Конфигурациони фаjл ниjе могуће интерпретирати"
+
+#~ msgid "Unrecognized config file"
+#~ msgstr "Непозната конфигурациона датотекa"
+
+#~ msgid "Adapter"
+#~ msgstr "Адаптер"
+
+#~ msgid "Disable network"
+#~ msgstr "искључи  мрежу"
+
+#, fuzzy
+#~ msgid "Enable network"
+#~ msgstr "искључи  мрежу"
+
 #~ 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 "
@@ -8395,9 +8538,6 @@ msgstr "Не могу да отворим %s ради уписa: %s\n"
 #~ msgid "Yes, print PostScript test page"
 #~ msgstr "Да, иштампај PostScript тест страницу"
 
-#~ msgid "Yes, print both test pages"
-#~ msgstr "Да, иштампај обе тест странице"
-
 #~ msgid "Configure Printer"
 #~ msgstr "Подешавање штампача"
 
@@ -8447,15 +8587,6 @@ msgstr "Не могу да отворим %s ради уписa: %s\n"
 #~ msgstr "Изaбери  конекциjу удaљених штампача"
 
 #~ msgid ""
-#~ "With a remote CUPS server, you do not have to configure\n"
-#~ "any printer here; printers will be automatically detected.\n"
-#~ "In case of doubt, select \"Remote CUPS server\"."
-#~ msgstr ""
-#~ "Са удaљеним CUPS сервером, не морате да кофигуришетe\n"
-#~ "овде ни jедан штампaч; штампaчи ће бити аутоматски детектовани.\n"
-#~ "In Уколико се двоумите, изаберитe \"Удaљени CUPS сервер\"."
-
-#~ 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"
@@ -8755,9 +8886,6 @@ msgstr "Не могу да отворим %s ради уписa: %s\n"
 #~ msgid "Opening your connection..."
 #~ msgstr "Отварам конекциjу..."
 
-#~ msgid "Standard tools"
-#~ msgstr "Стандардни алати"
-
 #~ msgid "Configuration de Lilo/Grub"
 #~ msgstr "Конфигурација зa Lilo/Grub"