Added Vietnamese file

3 files changed, 1042 insertions, 944 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index b2ae3f854..e94e7d21b 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-03-21 14:21+0100\n"
+"POT-Creation-Date: 2001-03-23 14:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,61 +14,84 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../../Xconfigurator.pm_.c:183
+#: ../../Xconfigurator.pm_.c:230
+msgid "Configure all heads independantly"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:231
+msgid "Use Xinerama extension"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:234
+#, c-format
+msgid "Configure only card \"%s\" (%s)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:237
+msgid "Multi-head configuration"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:238
+msgid ""
+"Your system support multiple head configuration.\n"
+"What do you want to do?"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:247
 msgid "Graphic card"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:183
+#: ../../Xconfigurator.pm_.c:247
 msgid "Select a graphic card"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:184
+#: ../../Xconfigurator.pm_.c:248
 msgid "Choose a X server"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:184
+#: ../../Xconfigurator.pm_.c:248
 msgid "X server"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:233 ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:300 ../../Xconfigurator.pm_.c:307
 #, c-format
 msgid "XFree %s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:303
 msgid "Which configuration of XFree do you want to have?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:248
+#: ../../Xconfigurator.pm_.c:316
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
 "Your card is supported by XFree %s which may have a better support in 2D."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:250 ../../Xconfigurator.pm_.c:283
+#: ../../Xconfigurator.pm_.c:318 ../../Xconfigurator.pm_.c:351
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:252 ../../Xconfigurator.pm_.c:285
+#: ../../Xconfigurator.pm_.c:320 ../../Xconfigurator.pm_.c:353
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:260 ../../Xconfigurator.pm_.c:274
+#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:342
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:262 ../../Xconfigurator.pm_.c:276
+#: ../../Xconfigurator.pm_.c:330 ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:271
+#: ../../Xconfigurator.pm_.c:339
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -76,27 +99,27 @@ msgid ""
 "Your card is supported by XFree %s which may have a better support in 2D."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:359
 msgid "XFree configuration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:330
+#: ../../Xconfigurator.pm_.c:392
 msgid "Select the memory size of your graphic card"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:439
 msgid "Choose options for server"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:456
 msgid "Choose a monitor"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:456
 msgid "Monitor"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:395
+#: ../../Xconfigurator.pm_.c:459
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -110,190 +133,190 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:466
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:403
+#: ../../Xconfigurator.pm_.c:467
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:440
+#: ../../Xconfigurator.pm_.c:504
 msgid "Monitor not configured"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:443
+#: ../../Xconfigurator.pm_.c:507
 msgid "Graphic card not configured yet"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:446
+#: ../../Xconfigurator.pm_.c:510
 msgid "Resolutions not chosen yet"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:462
+#: ../../Xconfigurator.pm_.c:526
 msgid "Do you want to test the configuration?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:466
+#: ../../Xconfigurator.pm_.c:530
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:469
+#: ../../Xconfigurator.pm_.c:533
 msgid "Test of the configuration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:508
+#: ../../Xconfigurator.pm_.c:572
 msgid ""
 "\n"
 "try to change some parameters"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:508
+#: ../../Xconfigurator.pm_.c:572
 msgid "An error has occurred:"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:530
+#: ../../Xconfigurator.pm_.c:594
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:540
+#: ../../Xconfigurator.pm_.c:604
 msgid "Is this the correct setting?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:548
+#: ../../Xconfigurator.pm_.c:612
 msgid "An error has occurred, try to change some parameters"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:595 ../../printerdrake.pm_.c:273
+#: ../../Xconfigurator.pm_.c:659 ../../printerdrake.pm_.c:273
 #: ../../services.pm_.c:107
 msgid "Resolution"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:633
+#: ../../Xconfigurator.pm_.c:697
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:635
+#: ../../Xconfigurator.pm_.c:699
 #, c-format
 msgid "Graphic card: %s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:636
+#: ../../Xconfigurator.pm_.c:700
 #, c-format
 msgid "XFree86 server: %s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:652 ../../standalone/draknet_.c:250
-#: ../../standalone/draknet_.c:253
+#: ../../Xconfigurator.pm_.c:716 ../../standalone/draknet_.c:246
+#: ../../standalone/draknet_.c:249
 msgid "Expert Mode"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:653
+#: ../../Xconfigurator.pm_.c:717
 msgid "Show all"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:691
+#: ../../Xconfigurator.pm_.c:755
 msgid "Resolutions"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1087
+#: ../../Xconfigurator.pm_.c:1196
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1088
+#: ../../Xconfigurator.pm_.c:1197
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1089
+#: ../../Xconfigurator.pm_.c:1198
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1090
+#: ../../Xconfigurator.pm_.c:1199
 #, c-format
 msgid "Monitor: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1091
+#: ../../Xconfigurator.pm_.c:1200
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1092
+#: ../../Xconfigurator.pm_.c:1201
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1093
+#: ../../Xconfigurator.pm_.c:1202
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1094
+#: ../../Xconfigurator.pm_.c:1203
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1096
+#: ../../Xconfigurator.pm_.c:1205
 #, c-format
 msgid "Color depth: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1097
+#: ../../Xconfigurator.pm_.c:1206
 #, c-format
 msgid "Resolution: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1099
+#: ../../Xconfigurator.pm_.c:1208
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1100
+#: ../../Xconfigurator.pm_.c:1209
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1119
+#: ../../Xconfigurator.pm_.c:1228
 msgid "Preparing X-Window configuration"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1139 ../../standalone/drakboot_.c:45
+#: ../../Xconfigurator.pm_.c:1248 ../../standalone/drakboot_.c:45
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1144
+#: ../../Xconfigurator.pm_.c:1253
 msgid "Change Monitor"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1145
+#: ../../Xconfigurator.pm_.c:1254
 msgid "Change Graphic card"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1147
+#: ../../Xconfigurator.pm_.c:1256
 msgid "Change Server options"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1148
+#: ../../Xconfigurator.pm_.c:1257
 msgid "Change Resolution"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1149
+#: ../../Xconfigurator.pm_.c:1258
 msgid "Show information"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1150
+#: ../../Xconfigurator.pm_.c:1259
 msgid "Test again"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1151 ../../bootlook.pm_.c:200
+#: ../../Xconfigurator.pm_.c:1260 ../../bootlook.pm_.c:204
 msgid "Quit"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1159
+#: ../../Xconfigurator.pm_.c:1268
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -302,20 +325,20 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1180
+#: ../../Xconfigurator.pm_.c:1289
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1200
+#: ../../Xconfigurator.pm_.c:1309
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1203
+#: ../../Xconfigurator.pm_.c:1312
 msgid "X at startup"
 msgstr ""
 
-#: ../../Xconfigurator.pm_.c:1204
+#: ../../Xconfigurator.pm_.c:1313
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -500,7 +523,7 @@ msgstr ""
 #: ../../any.pm_.c:160 ../../any.pm_.c:735
 #: ../../install_steps_interactive.pm_.c:866 ../../netconnect.pm_.c:611
 #: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
-#: ../../standalone/draknet_.c:492
+#: ../../standalone/draknet_.c:488
 msgid "Password"
 msgstr ""
 
@@ -841,150 +864,150 @@ msgid ""
 msgstr ""
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:771
+#: ../../bootloader.pm_.c:776
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr ""
 
-#: ../../bootloader.pm_.c:772
+#: ../../bootloader.pm_.c:777
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr ""
 
-#: ../../bootloader.pm_.c:773
+#: ../../bootloader.pm_.c:778
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr ""
 
-#: ../../bootloader.pm_.c:774
+#: ../../bootloader.pm_.c:779
 msgid "commands before booting, or 'c' for a command-line."
 msgstr ""
 
-#: ../../bootloader.pm_.c:775
+#: ../../bootloader.pm_.c:780
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr ""
 
-#: ../../bootloader.pm_.c:779
+#: ../../bootloader.pm_.c:784
 msgid "not enough room in /boot"
 msgstr ""
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:871
+#: ../../bootloader.pm_.c:876
 msgid "Desktop"
 msgstr ""
 
-#: ../../bootloader.pm_.c:871
+#: ../../bootloader.pm_.c:876
 msgid "Start Menu"
 msgstr ""
 
-#: ../../bootlook.pm_.c:53
+#: ../../bootlook.pm_.c:57
 msgid "no help implemented yet.\n"
 msgstr ""
 
-#: ../../bootlook.pm_.c:67
+#: ../../bootlook.pm_.c:71
 msgid "Boot Style Configuration"
 msgstr ""
 
-#: ../../bootlook.pm_.c:83
+#: ../../bootlook.pm_.c:87
 msgid "/_File"
 msgstr ""
 
-#: ../../bootlook.pm_.c:85
+#: ../../bootlook.pm_.c:89
 msgid "/File/_New"
 msgstr ""
 
-#: ../../bootlook.pm_.c:86
+#: ../../bootlook.pm_.c:90
 msgid "<control>N"
 msgstr ""
 
-#: ../../bootlook.pm_.c:88
+#: ../../bootlook.pm_.c:92
 msgid "/File/_Open"
 msgstr ""
 
-#: ../../bootlook.pm_.c:89
+#: ../../bootlook.pm_.c:93
 msgid "<control>O"
 msgstr ""
 
-#: ../../bootlook.pm_.c:91
+#: ../../bootlook.pm_.c:95
 msgid "/File/_Save"
 msgstr ""
 
-#: ../../bootlook.pm_.c:92
+#: ../../bootlook.pm_.c:96
 msgid "<control>S"
 msgstr ""
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:98
 msgid "/File/Save _As"
 msgstr ""
 
-#: ../../bootlook.pm_.c:95
+#: ../../bootlook.pm_.c:99
 msgid "/File/-"
 msgstr ""
 
-#: ../../bootlook.pm_.c:97
+#: ../../bootlook.pm_.c:101
 msgid "/File/_Quit"
 msgstr ""
 
-#: ../../bootlook.pm_.c:98
+#: ../../bootlook.pm_.c:102
 msgid "<control>Q"
 msgstr ""
 
-#: ../../bootlook.pm_.c:100
+#: ../../bootlook.pm_.c:104
 msgid "/_Options"
 msgstr ""
 
-#: ../../bootlook.pm_.c:102
+#: ../../bootlook.pm_.c:106
 msgid "/Options/Test"
 msgstr ""
 
-#: ../../bootlook.pm_.c:103
+#: ../../bootlook.pm_.c:107
 msgid "/_Help"
 msgstr ""
 
-#: ../../bootlook.pm_.c:105
+#: ../../bootlook.pm_.c:109
 msgid "/Help/_About..."
 msgstr ""
 
-#: ../../bootlook.pm_.c:112
+#: ../../bootlook.pm_.c:116
 msgid "Boot style configuration"
 msgstr ""
 
-#: ../../bootlook.pm_.c:117
+#: ../../bootlook.pm_.c:121
 msgid "horizontal nice looking aurora"
 msgstr ""
 
-#: ../../bootlook.pm_.c:121
+#: ../../bootlook.pm_.c:125
 msgid "vertical traditional aurora"
 msgstr ""
 
-#: ../../bootlook.pm_.c:125
+#: ../../bootlook.pm_.c:129
 msgid "gMonitor"
 msgstr ""
 
-#: ../../bootlook.pm_.c:129
+#: ../../bootlook.pm_.c:133
 msgid "Launch Aurora at boot time"
 msgstr ""
 
-#: ../../bootlook.pm_.c:153
+#: ../../bootlook.pm_.c:157
 msgid "Boot mode"
 msgstr ""
 
-#: ../../bootlook.pm_.c:163
+#: ../../bootlook.pm_.c:167
 msgid "Launch the X-Window system at start"
 msgstr ""
 
-#: ../../bootlook.pm_.c:171
+#: ../../bootlook.pm_.c:175
 msgid "No, I don't want autologin"
 msgstr ""
 
-#: ../../bootlook.pm_.c:177
+#: ../../bootlook.pm_.c:181
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 
-#: ../../bootlook.pm_.c:194
+#: ../../bootlook.pm_.c:198
 msgid "System mode"
 msgstr ""
 
-#: ../../bootlook.pm_.c:199 ../../standalone/draknet_.c:417
+#: ../../bootlook.pm_.c:203 ../../standalone/draknet_.c:413
 msgid "OK"
 msgstr ""
 
@@ -992,39 +1015,39 @@ msgstr ""
 msgid "can not open /etc/inittab for reading: $!"
 msgstr ""
 
-#: ../../bootlook.pm_.c:326
+#: ../../bootlook.pm_.c:334
 msgid "can not open /etc/sysconfig/autologin for reading: $!"
 msgstr ""
 
-#: ../../common.pm_.c:622
+#: ../../common.pm_.c:623
 msgid "GB"
 msgstr ""
 
-#: ../../common.pm_.c:622
+#: ../../common.pm_.c:623
 msgid "KB"
 msgstr ""
 
-#: ../../common.pm_.c:622 ../../diskdrake.pm_.c:659
+#: ../../common.pm_.c:623 ../../diskdrake.pm_.c:659
 #: ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
 #: ../../install_steps_interactive.pm_.c:570
 msgid "MB"
 msgstr ""
 
-#: ../../common.pm_.c:630
+#: ../../common.pm_.c:631
 msgid "TB"
 msgstr ""
 
-#: ../../common.pm_.c:643
+#: ../../common.pm_.c:644
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: ../../common.pm_.c:645
+#: ../../common.pm_.c:646
 msgid "1 minute"
 msgstr ""
 
-#: ../../common.pm_.c:647
+#: ../../common.pm_.c:648
 #, c-format
 msgid "%d seconds"
 msgstr ""
@@ -2922,18 +2945,22 @@ msgstr ""
 msgid "Exit install"
 msgstr ""
 
-#: ../../install_any.pm_.c:584
+#: ../../install_any.pm_.c:585
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr ""
 
-#: ../../install_any.pm_.c:595
+#: ../../install_any.pm_.c:589
+msgid "This floppy is not FAT formatted"
+msgstr ""
+
+#: ../../install_any.pm_.c:599
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
 
-#: ../../install_any.pm_.c:617
+#: ../../install_any.pm_.c:621
 msgid "Error reading file $f"
 msgstr ""
 
@@ -3356,7 +3383,7 @@ msgstr ""
 #: ../../install_steps_gtk.pm_.c:505 ../../interactive.pm_.c:110
 #: ../../interactive.pm_.c:252 ../../interactive_stdio.pm_.c:27
 #: ../../my_gtk.pm_.c:336 ../../my_gtk.pm_.c:339 ../../my_gtk.pm_.c:595
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:425
 msgid "Cancel"
 msgstr ""
 
@@ -3613,15 +3640,15 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:239 ../../standalone/mousedrake_.c:29
+#: ../../install_steps_interactive.pm_.c:239 ../../standalone/mousedrake_.c:28
 msgid "Please, choose the type of your mouse."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:43
+#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:42
 msgid "Mouse Port"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:246 ../../standalone/mousedrake_.c:44
+#: ../../install_steps_interactive.pm_.c:246 ../../standalone/mousedrake_.c:43
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 
@@ -4010,14 +4037,14 @@ msgstr ""
 msgid "Creating auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1114
 msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../install_steps_interactive.pm_.c:1125
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -4030,11 +4057,11 @@ msgid ""
 "install chapter of the Official Linux-Mandrake User's Guide."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1135
+#: ../../install_steps_interactive.pm_.c:1136
 msgid "Generate auto install floppy"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1137
+#: ../../install_steps_interactive.pm_.c:1138
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -4043,15 +4070,15 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1142
+#: ../../install_steps_interactive.pm_.c:1143
 msgid "Automated"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1142
+#: ../../install_steps_interactive.pm_.c:1143
 msgid "Replay"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:1145
+#: ../../install_steps_interactive.pm_.c:1146
 msgid "Save packages selection"
 msgstr ""
 
@@ -4498,7 +4525,7 @@ msgstr ""
 msgid "Testing your connection..."
 msgstr ""
 
-#: ../../netconnect.pm_.c:150 ../../standalone/draknet_.c:183
+#: ../../netconnect.pm_.c:150 ../../standalone/draknet_.c:179
 msgid "The system is now connected to Internet."
 msgstr ""
 
@@ -4506,7 +4533,7 @@ msgstr ""
 msgid "For Security reason, it will be disconnected now."
 msgstr ""
 
-#: ../../netconnect.pm_.c:152 ../../standalone/draknet_.c:183
+#: ../../netconnect.pm_.c:152 ../../standalone/draknet_.c:179
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -4532,35 +4559,35 @@ msgstr ""
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:475
+#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:471
 msgid "Card IRQ"
 msgstr ""
 
-#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:476
+#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:472
 msgid "Card mem (DMA)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:477
+#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:473
 msgid "Card IO"
 msgstr ""
 
-#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:478
+#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:474
 msgid "Card IO_0"
 msgstr ""
 
-#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:479
+#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:475
 msgid "Card IO_1"
 msgstr ""
 
-#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:480
+#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:476
 msgid "Your personal phone number"
 msgstr ""
 
-#: ../../netconnect.pm_.c:234 ../../standalone/draknet_.c:481
+#: ../../netconnect.pm_.c:234 ../../standalone/draknet_.c:477
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:235 ../../standalone/draknet_.c:482
+#: ../../netconnect.pm_.c:235 ../../standalone/draknet_.c:478
 msgid "Provider phone number"
 msgstr ""
 
@@ -4572,15 +4599,15 @@ msgstr ""
 msgid "Provider dns 2"
 msgstr ""
 
-#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:487
+#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:483
 msgid "Dialing mode"
 msgstr ""
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:485
+#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:481
 msgid "Account Login (user name)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:486
+#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:482
 msgid "Account Password"
 msgstr ""
 
@@ -4656,7 +4683,7 @@ msgid ""
 "I cannot set up this connection type."
 msgstr ""
 
-#: ../../netconnect.pm_.c:364 ../../standalone/drakgw_.c:232
+#: ../../netconnect.pm_.c:364 ../../standalone/drakgw_.c:249
 msgid "Choose the network interface"
 msgstr ""
 
@@ -4666,7 +4693,7 @@ msgid ""
 msgstr ""
 
 #: ../../netconnect.pm_.c:374 ../../netconnect.pm_.c:674
-#: ../../netconnect.pm_.c:821 ../../standalone/drakgw_.c:223
+#: ../../netconnect.pm_.c:821 ../../standalone/drakgw_.c:240
 msgid "Network interface"
 msgstr ""
 
@@ -4696,43 +4723,43 @@ msgstr ""
 msgid "Dialup options"
 msgstr ""
 
-#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:489
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:485
 msgid "Connection name"
 msgstr ""
 
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:490
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:486
 msgid "Phone number"
 msgstr ""
 
-#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:491
+#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:487
 msgid "Login ID"
 msgstr ""
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Authentication"
 msgstr ""
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "PAP"
 msgstr ""
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Script-based"
 msgstr ""
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Terminal-based"
 msgstr ""
 
-#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:494
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:490
 msgid "Domain name"
 msgstr ""
 
-#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:495
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:491
 msgid "First DNS Server (optional)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:615 ../../standalone/draknet_.c:496
+#: ../../netconnect.pm_.c:615 ../../standalone/draknet_.c:492
 msgid "Second DNS Server (optional)"
 msgstr ""
 
@@ -4783,9 +4810,8 @@ msgstr ""
 msgid "Internet connection & configuration"
 msgstr ""
 
-#: ../../netconnect.pm_.c:786 ../../netconnect.pm_.c:915
-#: ../../netconnect.pm_.c:928 ../../netconnect.pm_.c:935
-#: ../../netconnect.pm_.c:951
+#: ../../netconnect.pm_.c:786 ../../netconnect.pm_.c:912
+#: ../../netconnect.pm_.c:922 ../../netconnect.pm_.c:937
 msgid "Network Configuration Wizard"
 msgstr ""
 
@@ -4843,15 +4869,11 @@ msgstr ""
 msgid "Do you want to restart the network"
 msgstr ""
 
-#: ../../netconnect.pm_.c:896
-msgid "Sorry, the mail configuration is not yet implemented. Be patient."
-msgstr ""
-
-#: ../../netconnect.pm_.c:901 ../../netconnect.pm_.c:1023
+#: ../../netconnect.pm_.c:900 ../../netconnect.pm_.c:985
 msgid "Network Configuration"
 msgstr ""
 
-#: ../../netconnect.pm_.c:902
+#: ../../netconnect.pm_.c:901
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -4859,97 +4881,83 @@ msgid ""
 "Internet & Network connection.\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:916
-msgid ""
-"Welcome to The Network Configuration Wizard.\n"
-"Which components do you want to configure?\n"
-msgstr ""
-
-#: ../../netconnect.pm_.c:918
-msgid "Choose the profile to configure"
-msgstr ""
-
-#: ../../netconnect.pm_.c:919
-msgid "Internet/Network access"
-msgstr ""
-
-#: ../../netconnect.pm_.c:920
-msgid "Mail information"
-msgstr ""
-
-#: ../../netconnect.pm_.c:929
+#: ../../netconnect.pm_.c:913
 msgid ""
-"Internet Connection\n"
+"Welcome to The Network Configuration Wizard\n"
 "\n"
 "We are about to configure your internet/network connection.\n"
 "If you don't want to use the auto detection, deselect the checkbox.\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:931
+#: ../../netconnect.pm_.c:915
+msgid "Choose the profile to configure"
+msgstr ""
+
+#: ../../netconnect.pm_.c:916
 msgid "Use auto detection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:935 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:922 ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr ""
 
-#: ../../netconnect.pm_.c:943
+#: ../../netconnect.pm_.c:929
 msgid "Normal modem connection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:943
+#: ../../netconnect.pm_.c:929
 #, c-format
 msgid "detected on port %s"
 msgstr ""
 
-#: ../../netconnect.pm_.c:944
+#: ../../netconnect.pm_.c:930
 msgid "ISDN connection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:944
+#: ../../netconnect.pm_.c:930
 #, c-format
 msgid "detected %s"
 msgstr ""
 
-#: ../../netconnect.pm_.c:945
+#: ../../netconnect.pm_.c:931
 msgid "DSL (or ADSL) connection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:945
+#: ../../netconnect.pm_.c:931
 #, c-format
 msgid "detected on interface %s"
 msgstr ""
 
-#: ../../netconnect.pm_.c:946
+#: ../../netconnect.pm_.c:932
 msgid "Cable connection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:947
+#: ../../netconnect.pm_.c:933
 msgid "LAN connection"
 msgstr ""
 
-#: ../../netconnect.pm_.c:947
+#: ../../netconnect.pm_.c:933
 msgid "ethernet card(s) detected"
 msgstr ""
 
-#: ../../netconnect.pm_.c:952
+#: ../../netconnect.pm_.c:938
 msgid "How do you want to connect to the Internet?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:974
+#: ../../netconnect.pm_.c:957
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
 "The configuration will now be applied to your system."
 msgstr ""
 
-#: ../../netconnect.pm_.c:977
+#: ../../netconnect.pm_.c:960
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
 msgstr ""
 
-#: ../../netconnect.pm_.c:1024
+#: ../../netconnect.pm_.c:986
 msgid ""
 "Now that your Internet connection is configured,\n"
 "your computer can be configured to share its Internet connection.\n"
@@ -5003,12 +5011,12 @@ msgstr ""
 msgid " (driver $module)"
 msgstr ""
 
-#: ../../network.pm_.c:320 ../../standalone/draknet_.c:214
-#: ../../standalone/draknet_.c:371
+#: ../../network.pm_.c:320 ../../standalone/draknet_.c:210
+#: ../../standalone/draknet_.c:367
 msgid "IP address"
 msgstr ""
 
-#: ../../network.pm_.c:321 ../../standalone/draknet_.c:372
+#: ../../network.pm_.c:321 ../../standalone/draknet_.c:368
 msgid "Netmask"
 msgstr ""
 
@@ -5037,7 +5045,7 @@ msgstr ""
 msgid "DNS server"
 msgstr ""
 
-#: ../../network.pm_.c:378 ../../standalone/draknet_.c:488
+#: ../../network.pm_.c:378 ../../standalone/draknet_.c:484
 msgid "Gateway"
 msgstr ""
 
@@ -5698,11 +5706,33 @@ msgstr ""
 msgid "Installation of LILO failed. The following error occured:"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:117
+#: ../../standalone/drakgw_.c:108
+msgid "The setup has already been done, but it's currently disabled."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:109
+msgid "The setup has already been done, and it's currently enabled."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:110
+msgid "No Internet Connection Sharing has ever been configured."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:113
+#, c-format
+msgid ""
+"Welcome to the Internet Connection Sharing utility!\n"
+"\n"
+"%s\n"
+"\n"
+"Click on ``Ok'' if you want to launch the setup wizard."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:132
 msgid "Internet Connection Sharing currently enabled"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:133
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -5710,31 +5740,31 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:122
+#: ../../standalone/drakgw_.c:137
 msgid "disable"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:122 ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:137 ../../standalone/drakgw_.c:162
 msgid "dismiss"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:122 ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:137 ../../standalone/drakgw_.c:162
 msgid "reconfigure"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:125
+#: ../../standalone/drakgw_.c:140
 msgid "Disabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:133
+#: ../../standalone/drakgw_.c:148
 msgid "Internet connection sharing is now disabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:142
+#: ../../standalone/drakgw_.c:157
 msgid "Internet Connection Sharing currently disabled"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:158
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -5742,31 +5772,31 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:162
 msgid "enable"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:169
 msgid "Enabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:174
 msgid "Internet connection sharing is now enabled."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:169
+#: ../../standalone/drakgw_.c:182
 msgid "Config file content could not be interpreted."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:169
+#: ../../standalone/drakgw_.c:182
 msgid "Unrecognized config file"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:194
 msgid "Internet Connection Sharing"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:182
+#: ../../standalone/drakgw_.c:195
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "\n"
@@ -5774,27 +5804,27 @@ msgid ""
 "(LAN)."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:220
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:221
 #, c-format
 msgid "Interface %s"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:229
 msgid "No network adapter on your system!"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:230
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:224
+#: ../../standalone/drakgw_.c:241
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -5804,235 +5834,235 @@ msgid ""
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:250
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:259
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:253
+#: ../../standalone/drakgw_.c:270
 msgid "Potential LAN address conflict found in current config of $_!\n"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:278 ../../standalone/drakgw_.c:284
 msgid "Firewalling configuration detected!"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:279 ../../standalone/drakgw_.c:285
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:293
 msgid "Configuring..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:294
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:305
+#: ../../standalone/drakgw_.c:322
 msgid "Problems installing package $_"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:505
+#: ../../standalone/drakgw_.c:522
 msgid "Congratulations!"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:506
+#: ../../standalone/drakgw_.c:523
 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/draknet_.c:61
+#: ../../standalone/draknet_.c:57
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr ""
 
-#: ../../standalone/draknet_.c:68 ../../standalone/draknet_.c:462
+#: ../../standalone/draknet_.c:64 ../../standalone/draknet_.c:458
 msgid "Profile: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:76
+#: ../../standalone/draknet_.c:72
 msgid "Del profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:81
+#: ../../standalone/draknet_.c:77
 msgid "Profile to delete:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:109
+#: ../../standalone/draknet_.c:105
 msgid "New profile..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:114
+#: ../../standalone/draknet_.c:110
 msgid "Name of the profile to create:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:136
 msgid "Hostname: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:143
 msgid "Internet access"
 msgstr ""
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:156
 msgid "Type:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:328
+#: ../../standalone/draknet_.c:159 ../../standalone/draknet_.c:324
 msgid "Gateway:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:328
+#: ../../standalone/draknet_.c:159 ../../standalone/draknet_.c:324
 msgid "Interface:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:164
 msgid "Status:"
 msgstr ""
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:331
+#: ../../standalone/draknet_.c:166 ../../standalone/draknet_.c:327
 msgid "Connected"
 msgstr ""
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:331
+#: ../../standalone/draknet_.c:166 ../../standalone/draknet_.c:327
 msgid "Not connected"
 msgstr ""
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:332
+#: ../../standalone/draknet_.c:169 ../../standalone/draknet_.c:328
 msgid "Connect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:332
+#: ../../standalone/draknet_.c:169 ../../standalone/draknet_.c:328
 msgid "Disconnect..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:178
+#: ../../standalone/draknet_.c:174
 msgid "Openning your connection..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:188
+#: ../../standalone/draknet_.c:184
 msgid "Closing your connection..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:193
+#: ../../standalone/draknet_.c:189
 msgid ""
 "The connection is not closed. Try to do it manually by running "
 "/etc/sysconfig/network-scripts/net_cnx_down in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:193
+#: ../../standalone/draknet_.c:189
 msgid "The system is now disconnected."
 msgstr ""
 
-#: ../../standalone/draknet_.c:202
+#: ../../standalone/draknet_.c:198
 msgid "Configure Internet Access..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:209 ../../standalone/draknet_.c:355
+#: ../../standalone/draknet_.c:205 ../../standalone/draknet_.c:351
 msgid "LAN configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Adapter"
 msgstr ""
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Driver"
 msgstr ""
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Interface"
 msgstr ""
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Protocole"
 msgstr ""
 
-#: ../../standalone/draknet_.c:227
+#: ../../standalone/draknet_.c:223
 msgid "Configure Local Area Network..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:239
+#: ../../standalone/draknet_.c:235
 msgid "Configure..."
 msgstr ""
 
-#: ../../standalone/draknet_.c:253
+#: ../../standalone/draknet_.c:249
 msgid "Normal Mode"
 msgstr ""
 
-#: ../../standalone/draknet_.c:270
+#: ../../standalone/draknet_.c:266
 msgid "Please Wait... Applying the configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:359
+#: ../../standalone/draknet_.c:355
 msgid "LAN Configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:363
 #, c-format
 msgid "Adapter %s: %s"
 msgstr ""
 
-#: ../../standalone/draknet_.c:373
+#: ../../standalone/draknet_.c:369
 msgid "Boot Protocol"
 msgstr ""
 
-#: ../../standalone/draknet_.c:374
+#: ../../standalone/draknet_.c:370
 msgid "Started on boot"
 msgstr ""
 
-#: ../../standalone/draknet_.c:375
+#: ../../standalone/draknet_.c:371
 msgid "DHCP client"
 msgstr ""
 
-#: ../../standalone/draknet_.c:410 ../../standalone/draknet_.c:414
+#: ../../standalone/draknet_.c:406 ../../standalone/draknet_.c:410
 msgid "Disable"
 msgstr ""
 
-#: ../../standalone/draknet_.c:410 ../../standalone/draknet_.c:414
+#: ../../standalone/draknet_.c:406 ../../standalone/draknet_.c:410
 msgid "Enable"
 msgstr ""
 
-#: ../../standalone/draknet_.c:451
+#: ../../standalone/draknet_.c:447
 msgid "Internet connection configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:455
+#: ../../standalone/draknet_.c:451
 msgid "Internet Connection Configuration"
 msgstr ""
 
-#: ../../standalone/draknet_.c:464
+#: ../../standalone/draknet_.c:460
 msgid "Connection type: "
 msgstr ""
 
-#: ../../standalone/draknet_.c:470
+#: ../../standalone/draknet_.c:466
 msgid "Parameters"
 msgstr ""
 
-#: ../../standalone/draknet_.c:483
+#: ../../standalone/draknet_.c:479
 msgid "Provider dns 1 (optional)"
 msgstr ""
 
-#: ../../standalone/draknet_.c:484
+#: ../../standalone/draknet_.c:480
 msgid "Provider dns 2 (optional)"
 msgstr ""
 
-#: ../../standalone/draknet_.c:497
+#: ../../standalone/draknet_.c:493
 msgid "Ethernet Card"
 msgstr ""
 
-#: ../../standalone/draknet_.c:498
+#: ../../standalone/draknet_.c:494
 msgid "DHCP Client"
 msgstr ""
 
@@ -6091,11 +6121,11 @@ msgstr ""
 msgid "Setting security level"
 msgstr ""
 
-#: ../../standalone/drakxconf_.c:42
+#: ../../standalone/drakxconf_.c:44
 msgid "Control Center"
 msgstr ""
 
-#: ../../standalone/drakxconf_.c:43
+#: ../../standalone/drakxconf_.c:45
 msgid "Choose the tool you want to use"
 msgstr ""
 
@@ -6121,15 +6151,15 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:36
+#: ../../standalone/mousedrake_.c:35
 msgid "no serial_usb found\n"
 msgstr ""
 
-#: ../../standalone/mousedrake_.c:40
+#: ../../standalone/mousedrake_.c:39
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:11
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
@@ -6138,7 +6168,7 @@ msgid ""
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:16
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -6149,21 +6179,21 @@ msgid ""
 "re-running this application!"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:23
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
 "accessed by this machine, you can safely answer NO here."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:26
+#: ../../tinyfirewall.pm_.c:24
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
 "answer no."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:29
+#: ../../tinyfirewall.pm_.c:27
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -6172,7 +6202,7 @@ msgid ""
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:34
+#: ../../tinyfirewall.pm_.c:32
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -6180,7 +6210,7 @@ msgid ""
 "telnet."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:38
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -6188,21 +6218,21 @@ msgid ""
 "attackers, since FTP also uses no encryption for transferring passwords."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:40
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
 "you probably are.  Otherwise, you should firewall this off."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:45
+#: ../../tinyfirewall.pm_.c:43
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
 "this machine."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:48
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -6210,7 +6240,7 @@ msgid ""
 "this the case?"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:50
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -6219,30 +6249,10 @@ msgid ""
 "aren't."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:55
 msgid "Configuration complete.  May we write these changes to disk?"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:84
-msgid "No I don't need DHCP"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:85
-msgid "No I don't need NTP"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:98
-msgid "No (firewall this off from the internet)"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:99
-msgid "Yes (allow this through the firewall)"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:102
-msgid "Firewall Configuration Wizard"
-msgstr ""
-
 #: ../../share/compssUsers
 msgid "Clients for different protocols including ssh"
 msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 3ef0671fa..e0c289584 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2001-03-21 14:21+0100\n"
+"POT-Creation-Date: 2001-03-23 14:23+0100\n"
 "PO-Revision-Date: 2001-03-13 13:19CET\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: Norsk\n"
@@ -15,32 +15,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.6\n"
 
-#: ../../Xconfigurator.pm_.c:183
+#: ../../Xconfigurator.pm_.c:230
+msgid "Configure all heads independantly"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:231
+#, fuzzy
+msgid "Use Xinerama extension"
+msgstr "Bruk automatisk detektering"
+
+#: ../../Xconfigurator.pm_.c:234
+#, c-format
+msgid "Configure only card \"%s\" (%s)"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:237
+#, fuzzy
+msgid "Multi-head configuration"
+msgstr "Konfigurasjon proxy"
+
+#: ../../Xconfigurator.pm_.c:238
+msgid ""
+"Your system support multiple head configuration.\n"
+"What do you want to do?"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:247
 msgid "Graphic card"
 msgstr "Grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:183
+#: ../../Xconfigurator.pm_.c:247
 msgid "Select a graphic card"
 msgstr "Velg et grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:184
+#: ../../Xconfigurator.pm_.c:248
 msgid "Choose a X server"
 msgstr "Velg en X-tjener"
 
-#: ../../Xconfigurator.pm_.c:184
+#: ../../Xconfigurator.pm_.c:248
 msgid "X server"
 msgstr "X-tjener"
 
-#: ../../Xconfigurator.pm_.c:233 ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:300 ../../Xconfigurator.pm_.c:307
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:303
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Hvilken konfigurasjon av XFree vil du ha?"
 
-#: ../../Xconfigurator.pm_.c:248
+#: ../../Xconfigurator.pm_.c:316
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -50,17 +75,17 @@ msgstr ""
 "%s.\n"
 "Kortet ditt er stјttet av XFree %s som kan ha bedre stјtte i 2D."
 
-#: ../../Xconfigurator.pm_.c:250 ../../Xconfigurator.pm_.c:283
+#: ../../Xconfigurator.pm_.c:318 ../../Xconfigurator.pm_.c:351
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "Kortet ditt kan ha stјtte for maskinvare 3D akselerasjon med XFree %s."
 
-#: ../../Xconfigurator.pm_.c:252 ../../Xconfigurator.pm_.c:285
+#: ../../Xconfigurator.pm_.c:320 ../../Xconfigurator.pm_.c:353
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s med maskinvare 3D akselerasjon"
 
-#: ../../Xconfigurator.pm_.c:260 ../../Xconfigurator.pm_.c:274
+#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:342
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -69,12 +94,12 @@ msgstr ""
 "Kortet ditt kan ha stјtte for maskinvare 3D akselerasjon med XFree %s,\n"
 "MERK AT DETTE ER EKSPERIMENTEL STиTTE OG KAN 'FRYSE' MASKINEN DIN."
 
-#: ../../Xconfigurator.pm_.c:262 ../../Xconfigurator.pm_.c:276
+#: ../../Xconfigurator.pm_.c:330 ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s med EKSPERIMENTEL maskinvare 3D akselerasjon"
 
-#: ../../Xconfigurator.pm_.c:271
+#: ../../Xconfigurator.pm_.c:339
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -86,27 +111,27 @@ msgstr ""
 "MERK AT DETTE ER EKSPERIMENTEL STиTTE OG KAN 'FRYSE' MASKINEN DIN.\n"
 "Kortet ditt er stјttet av XFree %s som kan ha bedre stјtte i 2D."
 
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:359
 msgid "XFree configuration"
 msgstr "XFree konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:330
+#: ../../Xconfigurator.pm_.c:392
 msgid "Select the memory size of your graphic card"
 msgstr "Velg minnestјrrelsen til grafikk-kortet ditt"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:439
 msgid "Choose options for server"
 msgstr "Velg opsjoner for tjener"
 
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:456
 msgid "Choose a monitor"
 msgstr "Velg en monitor"
 
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:456
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfigurator.pm_.c:395
+#: ../../Xconfigurator.pm_.c:459
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -130,39 +155,39 @@ msgstr ""
 "skjermen din.\n"
 "Hvis du er usikker, velg en konservativ innstilling."
 
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:466
 msgid "Horizontal refresh rate"
 msgstr "Horisontal oppfrisknings-rate"
 
-#: ../../Xconfigurator.pm_.c:403
+#: ../../Xconfigurator.pm_.c:467
 msgid "Vertical refresh rate"
 msgstr "Vertikal oppfrisknings-rate"
 
-#: ../../Xconfigurator.pm_.c:440
+#: ../../Xconfigurator.pm_.c:504
 msgid "Monitor not configured"
 msgstr "Monitor er ikke konfigurert"
 
-#: ../../Xconfigurator.pm_.c:443
+#: ../../Xconfigurator.pm_.c:507
 msgid "Graphic card not configured yet"
 msgstr "Grafikk-kort er ikke konfigurert ennх"
 
-#: ../../Xconfigurator.pm_.c:446
+#: ../../Xconfigurator.pm_.c:510
 msgid "Resolutions not chosen yet"
 msgstr "Opplјsninger er ikke valgt ennх"
 
-#: ../../Xconfigurator.pm_.c:462
+#: ../../Xconfigurator.pm_.c:526
 msgid "Do you want to test the configuration?"
 msgstr "Vil du teste konfigurasjonen?"
 
-#: ../../Xconfigurator.pm_.c:466
+#: ../../Xconfigurator.pm_.c:530
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Advarsel: testing av dette grafikk-kortet kan `fryse' maskinen din"
 
-#: ../../Xconfigurator.pm_.c:469
+#: ../../Xconfigurator.pm_.c:533
 msgid "Test of the configuration"
 msgstr "Test konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:508
+#: ../../Xconfigurator.pm_.c:572
 msgid ""
 "\n"
 "try to change some parameters"
@@ -170,152 +195,152 @@ msgstr ""
 "\n"
 "prјv х endre noen parametere"
 
-#: ../../Xconfigurator.pm_.c:508
+#: ../../Xconfigurator.pm_.c:572
 msgid "An error has occurred:"
 msgstr "En feil oppsto:"
 
-#: ../../Xconfigurator.pm_.c:530
+#: ../../Xconfigurator.pm_.c:594
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Slutter om %d sekunder"
 
-#: ../../Xconfigurator.pm_.c:540
+#: ../../Xconfigurator.pm_.c:604
 msgid "Is this the correct setting?"
 msgstr "Er dette den riktige innstillingen?"
 
-#: ../../Xconfigurator.pm_.c:548
+#: ../../Xconfigurator.pm_.c:612
 msgid "An error has occurred, try to change some parameters"
 msgstr "En feil oppsto, prјv х endre noen parametere"
 
-#: ../../Xconfigurator.pm_.c:595 ../../printerdrake.pm_.c:273
+#: ../../Xconfigurator.pm_.c:659 ../../printerdrake.pm_.c:273
 #: ../../services.pm_.c:107
 msgid "Resolution"
 msgstr "Opplјsning"
 
-#: ../../Xconfigurator.pm_.c:633
+#: ../../Xconfigurator.pm_.c:697
 msgid "Choose the resolution and the color depth"
 msgstr "Velg opplјsning og fargedybde"
 
-#: ../../Xconfigurator.pm_.c:635
+#: ../../Xconfigurator.pm_.c:699
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Grafikk-kort: %s"
 
-#: ../../Xconfigurator.pm_.c:636
+#: ../../Xconfigurator.pm_.c:700
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86-tjener: %s"
 
-#: ../../Xconfigurator.pm_.c:652 ../../standalone/draknet_.c:250
-#: ../../standalone/draknet_.c:253
+#: ../../Xconfigurator.pm_.c:716 ../../standalone/draknet_.c:246
+#: ../../standalone/draknet_.c:249
 msgid "Expert Mode"
 msgstr "Ekspertmodus"
 
-#: ../../Xconfigurator.pm_.c:653
+#: ../../Xconfigurator.pm_.c:717
 msgid "Show all"
 msgstr "Vis alle"
 
-#: ../../Xconfigurator.pm_.c:691
+#: ../../Xconfigurator.pm_.c:755
 msgid "Resolutions"
 msgstr "Opplјsninger"
 
-#: ../../Xconfigurator.pm_.c:1087
+#: ../../Xconfigurator.pm_.c:1196
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-oppsett: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1088
+#: ../../Xconfigurator.pm_.c:1197
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Type mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1089
+#: ../../Xconfigurator.pm_.c:1198
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Enhet mus: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1090
+#: ../../Xconfigurator.pm_.c:1199
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1091
+#: ../../Xconfigurator.pm_.c:1200
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1092
+#: ../../Xconfigurator.pm_.c:1201
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1093
+#: ../../Xconfigurator.pm_.c:1202
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Grafikk-kort: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1094
+#: ../../Xconfigurator.pm_.c:1203
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Minne grafikk: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1096
+#: ../../Xconfigurator.pm_.c:1205
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Fargedybde: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1097
+#: ../../Xconfigurator.pm_.c:1206
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Opplјsning: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1099
+#: ../../Xconfigurator.pm_.c:1208
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86-tjener: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1100
+#: ../../Xconfigurator.pm_.c:1209
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 driver: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1119
+#: ../../Xconfigurator.pm_.c:1228
 msgid "Preparing X-Window configuration"
 msgstr "Forbereder X-Window konfigurasjon"
 
-#: ../../Xconfigurator.pm_.c:1139 ../../standalone/drakboot_.c:45
+#: ../../Xconfigurator.pm_.c:1248 ../../standalone/drakboot_.c:45
 msgid "What do you want to do?"
 msgstr "Hva јnsker du х gjјre?"
 
-#: ../../Xconfigurator.pm_.c:1144
+#: ../../Xconfigurator.pm_.c:1253
 msgid "Change Monitor"
 msgstr "Endre monitor"
 
-#: ../../Xconfigurator.pm_.c:1145
+#: ../../Xconfigurator.pm_.c:1254
 msgid "Change Graphic card"
 msgstr "Endre grafikk-kort"
 
-#: ../../Xconfigurator.pm_.c:1147
+#: ../../Xconfigurator.pm_.c:1256
 msgid "Change Server options"
 msgstr "Endre opsjoner for tjener"
 
-#: ../../Xconfigurator.pm_.c:1148
+#: ../../Xconfigurator.pm_.c:1257
 msgid "Change Resolution"
 msgstr "Endre opplјsning"
 
-#: ../../Xconfigurator.pm_.c:1149
+#: ../../Xconfigurator.pm_.c:1258
 msgid "Show information"
 msgstr "Vis informasjon"
 
-#: ../../Xconfigurator.pm_.c:1150
+#: ../../Xconfigurator.pm_.c:1259
 msgid "Test again"
 msgstr "Test igjen"
 
-#: ../../Xconfigurator.pm_.c:1151 ../../bootlook.pm_.c:200
+#: ../../Xconfigurator.pm_.c:1260 ../../bootlook.pm_.c:204
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../../Xconfigurator.pm_.c:1159
+#: ../../Xconfigurator.pm_.c:1268
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -328,20 +353,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1180
+#: ../../Xconfigurator.pm_.c:1289
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Vennligst logg inn i %s pх nytt for х aktivere endringene"
 
-#: ../../Xconfigurator.pm_.c:1200
+#: ../../Xconfigurator.pm_.c:1309
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Vennligst logg ut og bruk sх Ctrl-Alt-BackSpace"
 
-#: ../../Xconfigurator.pm_.c:1203
+#: ../../Xconfigurator.pm_.c:1312
 msgid "X at startup"
 msgstr "X ved oppstart"
 
-#: ../../Xconfigurator.pm_.c:1204
+#: ../../Xconfigurator.pm_.c:1313
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -528,7 +553,7 @@ msgstr "Forsinkelse fјr oppstart av standard bilde"
 #: ../../any.pm_.c:160 ../../any.pm_.c:735
 #: ../../install_steps_interactive.pm_.c:866 ../../netconnect.pm_.c:611
 #: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
-#: ../../standalone/draknet_.c:492
+#: ../../standalone/draknet_.c:488
 msgid "Password"
 msgstr "Passord"
 
@@ -906,7 +931,7 @@ msgstr ""
 # and only one line per string for the GRUB messages
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:771
+#: ../../bootloader.pm_.c:776
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Velkommen til GRUB, operativsystem-velgeren!"
 
@@ -918,7 +943,7 @@ msgstr "Velkommen til GRUB, operativsystem-velgeren!"
 # The lines must fit on screen, aka length < 80
 # and only one line per string for the GRUB messages
 #
-#: ../../bootloader.pm_.c:772
+#: ../../bootloader.pm_.c:777
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Bruk %c og %c tastene for х velge hvilken inngang som er markert."
@@ -931,7 +956,7 @@ msgstr "Bruk %c og %c tastene for х velge hvilken inngang som er markert."
 # The lines must fit on screen, aka length < 80
 # and only one line per string for the GRUB messages
 #
-#: ../../bootloader.pm_.c:773
+#: ../../bootloader.pm_.c:778
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
 
@@ -943,7 +968,7 @@ msgstr "Trykk enter for † starte opp valgt OS, 'e' for † redigere"
 # The lines must fit on screen, aka length < 80
 # and only one line per string for the GRUB messages
 #
-#: ../../bootloader.pm_.c:774
+#: ../../bootloader.pm_.c:779
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
 
@@ -955,134 +980,134 @@ msgstr "kommandoer for oppstart, eller 'c' for en kommandolinje."
 # The lines must fit on screen, aka length < 80
 # and only one line per string for the GRUB messages
 #
-#: ../../bootloader.pm_.c:775
+#: ../../bootloader.pm_.c:780
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Den markerte inngangen vil bli startet automatisk om %d sekunder."
 
-#: ../../bootloader.pm_.c:779
+#: ../../bootloader.pm_.c:784
 msgid "not enough room in /boot"
 msgstr "ikke nok plass i /boot"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:871
+#: ../../bootloader.pm_.c:876
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: ../../bootloader.pm_.c:871
+#: ../../bootloader.pm_.c:876
 msgid "Start Menu"
 msgstr "Startmeny"
 
-#: ../../bootlook.pm_.c:53
+#: ../../bootlook.pm_.c:57
 msgid "no help implemented yet.\n"
 msgstr "ingen hjelp implementert ennх.\n"
 
-#: ../../bootlook.pm_.c:67
+#: ../../bootlook.pm_.c:71
 msgid "Boot Style Configuration"
 msgstr "Oppstartsstilkonfigurasjon"
 
-#: ../../bootlook.pm_.c:83
+#: ../../bootlook.pm_.c:87
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../../bootlook.pm_.c:85
+#: ../../bootlook.pm_.c:89
 msgid "/File/_New"
 msgstr "/File/_Ny"
 
-#: ../../bootlook.pm_.c:86
+#: ../../bootlook.pm_.c:90
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../bootlook.pm_.c:88
+#: ../../bootlook.pm_.c:92
 msgid "/File/_Open"
 msgstr "/File/_Хpne"
 
-#: ../../bootlook.pm_.c:89
+#: ../../bootlook.pm_.c:93
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../bootlook.pm_.c:91
+#: ../../bootlook.pm_.c:95
 msgid "/File/_Save"
 msgstr "/File/_Lagre"
 
-#: ../../bootlook.pm_.c:92
+#: ../../bootlook.pm_.c:96
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:98
 msgid "/File/Save _As"
 msgstr "/File/Lagre _som"
 
-#: ../../bootlook.pm_.c:95
+#: ../../bootlook.pm_.c:99
 msgid "/File/-"
 msgstr "/Fil/-"
 
-#: ../../bootlook.pm_.c:97
+#: ../../bootlook.pm_.c:101
 msgid "/File/_Quit"
 msgstr "/Fil/_Avslutt"
 
-#: ../../bootlook.pm_.c:98
+#: ../../bootlook.pm_.c:102
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:100
+#: ../../bootlook.pm_.c:104
 msgid "/_Options"
 msgstr "/_Valg"
 
-#: ../../bootlook.pm_.c:102
+#: ../../bootlook.pm_.c:106
 msgid "/Options/Test"
 msgstr "/Valg/Test"
 
 # #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
-#: ../../bootlook.pm_.c:103
+#: ../../bootlook.pm_.c:107
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../../bootlook.pm_.c:105
+#: ../../bootlook.pm_.c:109
 msgid "/Help/_About..."
 msgstr "/Hjelp/_Om..."
 
-#: ../../bootlook.pm_.c:112
+#: ../../bootlook.pm_.c:116
 msgid "Boot style configuration"
 msgstr "Oppstartsstilkonfigurasjon"
 
-#: ../../bootlook.pm_.c:117
+#: ../../bootlook.pm_.c:121
 msgid "horizontal nice looking aurora"
 msgstr "horisontal og fin aurora"
 
-#: ../../bootlook.pm_.c:121
+#: ../../bootlook.pm_.c:125
 msgid "vertical traditional aurora"
 msgstr "vertikal og tradisjonell aurora"
 
-#: ../../bootlook.pm_.c:125
+#: ../../bootlook.pm_.c:129
 msgid "gMonitor"
 msgstr "gMonitor"
 
-#: ../../bootlook.pm_.c:129
+#: ../../bootlook.pm_.c:133
 msgid "Launch Aurora at boot time"
 msgstr "Start Aurora ved oppstart"
 
-#: ../../bootlook.pm_.c:153
+#: ../../bootlook.pm_.c:157
 msgid "Boot mode"
 msgstr "Oppstartsmodus"
 
-#: ../../bootlook.pm_.c:163
+#: ../../bootlook.pm_.c:167
 msgid "Launch the X-Window system at start"
 msgstr "Start W-Windowsystemet ved oppstart"
 
-#: ../../bootlook.pm_.c:171
+#: ../../bootlook.pm_.c:175
 msgid "No, I don't want autologin"
 msgstr "Nei, jeg vil ikke ha autologin"
 
-#: ../../bootlook.pm_.c:177
+#: ../../bootlook.pm_.c:181
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Ja, jeg vil ha autologin med denne (bruker; skrivebord)"
 
-#: ../../bootlook.pm_.c:194
+#: ../../bootlook.pm_.c:198
 msgid "System mode"
 msgstr "Systemmodus"
 
-#: ../../bootlook.pm_.c:199 ../../standalone/draknet_.c:417
+#: ../../bootlook.pm_.c:203 ../../standalone/draknet_.c:413
 msgid "OK"
 msgstr "OK"
 
@@ -1090,39 +1115,39 @@ msgstr "OK"
 msgid "can not open /etc/inittab for reading: $!"
 msgstr ""
 
-#: ../../bootlook.pm_.c:326
+#: ../../bootlook.pm_.c:334
 msgid "can not open /etc/sysconfig/autologin for reading: $!"
 msgstr ""
 
-#: ../../common.pm_.c:622
+#: ../../common.pm_.c:623
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:622
+#: ../../common.pm_.c:623
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:622 ../../diskdrake.pm_.c:659
+#: ../../common.pm_.c:623 ../../diskdrake.pm_.c:659
 #: ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
 #: ../../install_steps_interactive.pm_.c:570
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:630
+#: ../../common.pm_.c:631
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:643
+#: ../../common.pm_.c:644
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: ../../common.pm_.c:645
+#: ../../common.pm_.c:646
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: ../../common.pm_.c:647
+#: ../../common.pm_.c:648
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
@@ -3943,12 +3968,16 @@ msgstr "Konfigurer X"
 msgid "Exit install"
 msgstr "Avslutt installering"
 
-#: ../../install_any.pm_.c:584
+#: ../../install_any.pm_.c:585
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Sett inn en FAT-formatert diskett i stasjon %s"
 
-#: ../../install_any.pm_.c:595
+#: ../../install_any.pm_.c:589
+msgid "This floppy is not FAT formatted"
+msgstr ""
+
+#: ../../install_any.pm_.c:599
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3956,7 +3985,7 @@ msgstr ""
 "For х bruke dette valget av pakker, start installasjonen med'linux "
 "defcfg=floppy'"
 
-#: ../../install_any.pm_.c:617
+#: ../../install_any.pm_.c:621
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
@@ -4429,7 +4458,7 @@ msgstr "Beregner"
 #: ../../install_steps_gtk.pm_.c:505 ../../interactive.pm_.c:110
 #: ../../interactive.pm_.c:252 ../../interactive_stdio.pm_.c:27
 #: ../../my_gtk.pm_.c:336 ../../my_gtk.pm_.c:339 ../../my_gtk.pm_.c:595
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:425
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -4836,15 +4865,15 @@ msgstr "Ekspert"
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../../install_steps_interactive.pm_.c:239 ../../standalone/mousedrake_.c:29
+#: ../../install_steps_interactive.pm_.c:239 ../../standalone/mousedrake_.c:28
 msgid "Please, choose the type of your mouse."
 msgstr "Vennligst velg din musetype."
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:43
+#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:42
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../../install_steps_interactive.pm_.c:246 ../../standalone/mousedrake_.c:44
+#: ../../install_steps_interactive.pm_.c:246 ../../standalone/mousedrake_.c:43
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Vennligst velg hvilken serieport musen din koblet til."
 
@@ -5312,7 +5341,7 @@ msgstr "Sett inn en tom diskett i stasjon %s"
 msgid "Creating auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1114
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5322,7 +5351,7 @@ msgstr ""
 "\n"
 "иnsker du virkelig х avslutte nх?"
 
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../install_steps_interactive.pm_.c:1125
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5344,11 +5373,11 @@ msgstr ""
 "Informasjon om konfigurering av systemet ditt finnes i post\n"
 "install-kapittelet i Official Linux Mandrake User's Guide."
 
-#: ../../install_steps_interactive.pm_.c:1135
+#: ../../install_steps_interactive.pm_.c:1136
 msgid "Generate auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
-#: ../../install_steps_interactive.pm_.c:1137
+#: ../../install_steps_interactive.pm_.c:1138
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5362,15 +5391,15 @@ msgstr ""
 "\n"
 "Du kanskje јnske х kjјre installasjonen omigjen.\n"
 
-#: ../../install_steps_interactive.pm_.c:1142
+#: ../../install_steps_interactive.pm_.c:1143
 msgid "Automated"
 msgstr "Automatisert"
 
-#: ../../install_steps_interactive.pm_.c:1142
+#: ../../install_steps_interactive.pm_.c:1143
 msgid "Replay"
 msgstr "Gjјr igjen"
 
-#: ../../install_steps_interactive.pm_.c:1145
+#: ../../install_steps_interactive.pm_.c:1146
 msgid "Save packages selection"
 msgstr "Lagre pakkevalg"
 
@@ -5820,7 +5849,7 @@ msgstr "Vil du prјve х koble opp mot Internett nх?"
 msgid "Testing your connection..."
 msgstr "Tester tilkoblingen din..."
 
-#: ../../netconnect.pm_.c:150 ../../standalone/draknet_.c:183
+#: ../../netconnect.pm_.c:150 ../../standalone/draknet_.c:179
 msgid "The system is now connected to Internet."
 msgstr "Systemet er nх koblet opp mot Internett."
 
@@ -5828,7 +5857,7 @@ msgstr "Systemet er nх koblet opp mot Internett."
 msgid "For Security reason, it will be disconnected now."
 msgstr ""
 
-#: ../../netconnect.pm_.c:152 ../../standalone/draknet_.c:183
+#: ../../netconnect.pm_.c:152 ../../standalone/draknet_.c:179
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -5858,35 +5887,35 @@ msgstr "Konfigurasjon tilknytning."
 msgid "Please fill or check the field below"
 msgstr "Vennnligst fyll eller merk feltet under"
 
-#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:475
+#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:471
 msgid "Card IRQ"
 msgstr "Kort IRQ"
 
-#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:476
+#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:472
 msgid "Card mem (DMA)"
 msgstr "Kort mem (DMA)"
 
-#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:477
+#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:473
 msgid "Card IO"
 msgstr "Kort IO"
 
-#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:478
+#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:474
 msgid "Card IO_0"
 msgstr "Kort IO_0"
 
-#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:479
+#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:475
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:480
+#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:476
 msgid "Your personal phone number"
 msgstr "Ditt telefonnummer"
 
-#: ../../netconnect.pm_.c:234 ../../standalone/draknet_.c:481
+#: ../../netconnect.pm_.c:234 ../../standalone/draknet_.c:477
 msgid "Provider name (ex provider.net)"
 msgstr "Navn tilbyder (f.eks. tilbyder.net)"
 
-#: ../../netconnect.pm_.c:235 ../../standalone/draknet_.c:482
+#: ../../netconnect.pm_.c:235 ../../standalone/draknet_.c:478
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
@@ -5898,15 +5927,15 @@ msgstr "Tilbyder dns 1"
 msgid "Provider dns 2"
 msgstr "Tilbyder dns 2"
 
-#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:487
+#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:483
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:485
+#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:481
 msgid "Account Login (user name)"
 msgstr "Logg inn (brukernavn)"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:486
+#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:482
 msgid "Account Password"
 msgstr "Passord"
 
@@ -5990,7 +6019,7 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt.\n"
 "Jeg kan ikke sette opp denne tilkoblingstypen."
 
-#: ../../netconnect.pm_.c:364 ../../standalone/drakgw_.c:232
+#: ../../netconnect.pm_.c:364 ../../standalone/drakgw_.c:249
 msgid "Choose the network interface"
 msgstr "Velg nettverksgrensesnitt"
 
@@ -6002,7 +6031,7 @@ msgstr ""
 "mot Internett"
 
 #: ../../netconnect.pm_.c:374 ../../netconnect.pm_.c:674
-#: ../../netconnect.pm_.c:821 ../../standalone/drakgw_.c:223
+#: ../../netconnect.pm_.c:821 ../../standalone/drakgw_.c:240
 msgid "Network interface"
 msgstr "Nettverksgrensesnitt"
 
@@ -6034,43 +6063,43 @@ msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
 msgid "Dialup options"
 msgstr "Opsjoner oppringt"
 
-#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:489
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:485
 msgid "Connection name"
 msgstr "Navn tilknytning"
 
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:490
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:486
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:491
+#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:487
 msgid "Login ID"
 msgstr "Login ID"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Authentication"
 msgstr "Autentifikasjon"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Script-based"
 msgstr "Scriptbasert"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:494
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:490
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:495
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:491
 msgid "First DNS Server (optional)"
 msgstr "Fјrste DNS-tjener (valgfri)"
 
-#: ../../netconnect.pm_.c:615 ../../standalone/draknet_.c:496
+#: ../../netconnect.pm_.c:615 ../../standalone/draknet_.c:492
 msgid "Second DNS Server (optional)"
 msgstr "Andre DNS-tjener (valgfri)"
 
@@ -6129,9 +6158,8 @@ msgstr "Konfigurer nettverk-tilkobling (LAN eller Internett)"
 msgid "Internet connection & configuration"
 msgstr "Internett tilkobling & konfigurasjon"
 
-#: ../../netconnect.pm_.c:786 ../../netconnect.pm_.c:915
-#: ../../netconnect.pm_.c:928 ../../netconnect.pm_.c:935
-#: ../../netconnect.pm_.c:951
+#: ../../netconnect.pm_.c:786 ../../netconnect.pm_.c:912
+#: ../../netconnect.pm_.c:922 ../../netconnect.pm_.c:937
 msgid "Network Configuration Wizard"
 msgstr "Nettverkskonfigurasjonveiviser"
 
@@ -6194,17 +6222,11 @@ msgstr "Nettverkskonfigurasjon"
 msgid "Do you want to restart the network"
 msgstr "Vil du starte nettverket pх nytt"
 
-#: ../../netconnect.pm_.c:896
-msgid "Sorry, the mail configuration is not yet implemented. Be patient."
-msgstr ""
-"Beklager, mailkonfigurasjonen er ennх ikke implementert. Vennlist vцr "
-"tхlmodig."
-
-#: ../../netconnect.pm_.c:901 ../../netconnect.pm_.c:1023
+#: ../../netconnect.pm_.c:900 ../../netconnect.pm_.c:985
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: ../../netconnect.pm_.c:902
+#: ../../netconnect.pm_.c:901
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6216,29 +6238,10 @@ msgstr ""
 "Trykk OK for х beholde din eksisterende konfigurasjon, eller avbryt for х "
 "rekonfigurere din internett og nettverkskonfigurasjon.\n"
 
-#: ../../netconnect.pm_.c:916
-msgid ""
-"Welcome to The Network Configuration Wizard.\n"
-"Which components do you want to configure?\n"
-msgstr ""
-"Velkommen til nettverkskonfigurasjonsveiviseren.\n"
-"Hvilke komponenter јnsker du х konfigurere?\n"
-
-#: ../../netconnect.pm_.c:918
-msgid "Choose the profile to configure"
-msgstr "Velg profilen som skal konfigureres"
-
-#: ../../netconnect.pm_.c:919
-msgid "Internet/Network access"
-msgstr "Internett og nettverkskonfigurasjon"
-
-#: ../../netconnect.pm_.c:920
-msgid "Mail information"
-msgstr "Mailinformasjon"
-
-#: ../../netconnect.pm_.c:929
+#: ../../netconnect.pm_.c:913
+#, fuzzy
 msgid ""
-"Internet Connection\n"
+"Welcome to The Network Configuration Wizard\n"
 "\n"
 "We are about to configure your internet/network connection.\n"
 "If you don't want to use the auto detection, deselect the checkbox.\n"
@@ -6249,58 +6252,62 @@ msgstr ""
 "Hvis du ikke јnsker х bruke automatisk deteksjon, fjern krysset "
 "iavkrysningsboksen.\n"
 
-#: ../../netconnect.pm_.c:931
+#: ../../netconnect.pm_.c:915
+msgid "Choose the profile to configure"
+msgstr "Velg profilen som skal konfigureres"
+
+#: ../../netconnect.pm_.c:916
 msgid "Use auto detection"
 msgstr "Bruk automatisk detektering"
 
-#: ../../netconnect.pm_.c:935 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:922 ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Finner enheter..."
 
-#: ../../netconnect.pm_.c:943
+#: ../../netconnect.pm_.c:929
 msgid "Normal modem connection"
 msgstr "Normal modemtilkobling"
 
-#: ../../netconnect.pm_.c:943
+#: ../../netconnect.pm_.c:929
 #, c-format
 msgid "detected on port %s"
 msgstr "oppdaget pх port %s"
 
-#: ../../netconnect.pm_.c:944
+#: ../../netconnect.pm_.c:930
 msgid "ISDN connection"
 msgstr "ISDN-tilkobling"
 
-#: ../../netconnect.pm_.c:944
+#: ../../netconnect.pm_.c:930
 #, c-format
 msgid "detected %s"
 msgstr "oppdaget %s"
 
-#: ../../netconnect.pm_.c:945
+#: ../../netconnect.pm_.c:931
 msgid "DSL (or ADSL) connection"
 msgstr "DSL- (eller ADSL) tilkobling"
 
-#: ../../netconnect.pm_.c:945
+#: ../../netconnect.pm_.c:931
 #, c-format
 msgid "detected on interface %s"
 msgstr "oppdaget pх grensesnitt %s"
 
-#: ../../netconnect.pm_.c:946
+#: ../../netconnect.pm_.c:932
 msgid "Cable connection"
 msgstr "Kabeltilkobling"
 
-#: ../../netconnect.pm_.c:947
+#: ../../netconnect.pm_.c:933
 msgid "LAN connection"
 msgstr "Lokalt nettverksoppkobling"
 
-#: ../../netconnect.pm_.c:947
+#: ../../netconnect.pm_.c:933
 msgid "ethernet card(s) detected"
 msgstr "oppdaget ethernettkort"
 
-#: ../../netconnect.pm_.c:952
+#: ../../netconnect.pm_.c:938
 msgid "How do you want to connect to the Internet?"
 msgstr "Hvordan vil du koble opp mot Internett?"
 
-#: ../../netconnect.pm_.c:974
+#: ../../netconnect.pm_.c:957
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
@@ -6310,7 +6317,7 @@ msgstr ""
 "\n"
 "Konfigurasjonen vil nх bli aktivert."
 
-#: ../../netconnect.pm_.c:977
+#: ../../netconnect.pm_.c:960
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6318,7 +6325,7 @@ msgstr ""
 "Etter at det er ferding, anbefaler vi at du restarter X\n"
 "slik at du unngхr problemer med at vertsnavnet forandres."
 
-#: ../../netconnect.pm_.c:1024
+#: ../../netconnect.pm_.c:986
 msgid ""
 "Now that your Internet connection is configured,\n"
 "your computer can be configured to share its Internet connection.\n"
@@ -6389,12 +6396,12 @@ msgstr "Konfigurerer nettverksenhet %s"
 msgid " (driver $module)"
 msgstr " (driver $module)"
 
-#: ../../network.pm_.c:320 ../../standalone/draknet_.c:214
-#: ../../standalone/draknet_.c:371
+#: ../../network.pm_.c:320 ../../standalone/draknet_.c:210
+#: ../../standalone/draknet_.c:367
 msgid "IP address"
 msgstr "IP-adresse"
 
-#: ../../network.pm_.c:321 ../../standalone/draknet_.c:372
+#: ../../network.pm_.c:321 ../../standalone/draknet_.c:368
 msgid "Netmask"
 msgstr "Nettmaske"
 
@@ -6427,7 +6434,7 @@ msgstr ""
 msgid "DNS server"
 msgstr "DNS-tjener"
 
-#: ../../network.pm_.c:378 ../../standalone/draknet_.c:488
+#: ../../network.pm_.c:378 ../../standalone/draknet_.c:484
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -7203,11 +7210,44 @@ msgstr "Valg"
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Installasjon av LILO mislykket. Fјlgende feil oppsto:"
 
-#: ../../standalone/drakgw_.c:117
+#: ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "The setup has already been done, but it's currently disabled."
+msgstr ""
+"Oppsett av deling av Internett tilkobling har allerede blitt gjort.\n"
+"Dette er for јyeblikket slхtt av.\n"
+"\n"
+"Hva vil du gjјre?"
+
+#: ../../standalone/drakgw_.c:109
+#, fuzzy
+msgid "The setup has already been done, and it's currently enabled."
+msgstr ""
+"Oppsett av deling av Internett tilkobling har allerede blitt gjort.\n"
+"Dette er for јyeblikket slхtt pх.\n"
+"\n"
+"Hva vil du gjјre?"
+
+#: ../../standalone/drakgw_.c:110
+#, fuzzy
+msgid "No Internet Connection Sharing has ever been configured."
+msgstr "Deling av Internett tilkobling er slхtt pх"
+
+#: ../../standalone/drakgw_.c:113
+#, c-format
+msgid ""
+"Welcome to the Internet Connection Sharing utility!\n"
+"\n"
+"%s\n"
+"\n"
+"Click on ``Ok'' if you want to launch the setup wizard."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:132
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Deling av Internett tilkobling er slхtt pх"
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:133
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -7219,33 +7259,33 @@ msgstr ""
 "\n"
 "Hva vil du gjјre?"
 
-#: ../../standalone/drakgw_.c:122
+#: ../../standalone/drakgw_.c:137
 msgid "disable"
 msgstr "slх av"
 
-#: ../../standalone/drakgw_.c:122 ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:137 ../../standalone/drakgw_.c:162
 msgid "dismiss"
 msgstr "avvis"
 
-#: ../../standalone/drakgw_.c:122 ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:137 ../../standalone/drakgw_.c:162
 msgid "reconfigure"
 msgstr "Konfigurer pх nytt"
 
-#: ../../standalone/drakgw_.c:125
+#: ../../standalone/drakgw_.c:140
 #, fuzzy
 msgid "Disabling servers..."
 msgstr "Finner enheter..."
 
-#: ../../standalone/drakgw_.c:133
+#: ../../standalone/drakgw_.c:148
 #, fuzzy
 msgid "Internet connection sharing is now disabled."
 msgstr "Deling av Internett tilkobling er slхtt av"
 
-#: ../../standalone/drakgw_.c:142
+#: ../../standalone/drakgw_.c:157
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Deling av Internett tilkobling er slхtt av"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:158
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -7257,32 +7297,32 @@ msgstr ""
 "\n"
 "Hva vil du gjјre?"
 
-#: ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:162
 msgid "enable"
 msgstr "slх pх"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:169
 msgid "Enabling servers..."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:174
 #, fuzzy
 msgid "Internet connection sharing is now enabled."
 msgstr "Deling av Internett tilkobling er slхtt pх"
 
-#: ../../standalone/drakgw_.c:169
+#: ../../standalone/drakgw_.c:182
 msgid "Config file content could not be interpreted."
 msgstr "Innhold i konfig-fil kunne ikke bli tolket."
 
-#: ../../standalone/drakgw_.c:169
+#: ../../standalone/drakgw_.c:182
 msgid "Unrecognized config file"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:194
 msgid "Internet Connection Sharing"
 msgstr "Deling av Internett tilkobling"
 
-#: ../../standalone/drakgw_.c:182
+#: ../../standalone/drakgw_.c:195
 #, fuzzy
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -7297,21 +7337,21 @@ msgstr ""
 "\n"
 "иnsker du х sette opp deling av Internett-tilknytning?"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:220
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:221
 #, fuzzy, c-format
 msgid "Interface %s"
 msgstr "rensesnitt"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:229
 msgid "No network adapter on your system!"
 msgstr "Ikke noe nettverksadapter i systemet ditt!"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:230
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7319,7 +7359,7 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt. "
 "Vennligst kjјr verktјyet for maskinvarekonfigurasjon."
 
-#: ../../standalone/drakgw_.c:224
+#: ../../standalone/drakgw_.c:241
 #, fuzzy, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7334,7 +7374,7 @@ msgstr ""
 "\n"
 "иnsker du х sette opp ditt lokale nettverke (LAN) med dette adapteret?"
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:250
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
@@ -7342,7 +7382,7 @@ msgstr ""
 "Vennligst velg hvilket nettverksadapter som skal kobles til ditt lokale "
 "nettverk (LAN)."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:259
 #, fuzzy
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
@@ -7350,15 +7390,15 @@ msgstr ""
 "Advarsel, nettverksadapteret er allerede konfigurert.\n"
 "Vil du konfigurere pх nytt?"
 
-#: ../../standalone/drakgw_.c:253
+#: ../../standalone/drakgw_.c:270
 msgid "Potential LAN address conflict found in current config of $_!\n"
 msgstr "Mulig LAN-adresse konflikt funnet i konfigurasjonen til $_!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:278 ../../standalone/drakgw_.c:284
 msgid "Firewalling configuration detected!"
 msgstr "Brannmurkonfigurasjon oppdaget!"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:279 ../../standalone/drakgw_.c:285
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7366,23 +7406,23 @@ msgstr ""
 "Advarsel! En eksisterende brannmurkonfigurasjon har blitt oppdaget. Du "
 "trenger muligens х konfigurere noe manuelt etter installasjon."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:293
 msgid "Configuring..."
 msgstr "Konfigurerer..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:294
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Konfigurerer script, installerer programvare, starter tjenere..."
 
-#: ../../standalone/drakgw_.c:305
+#: ../../standalone/drakgw_.c:322
 msgid "Problems installing package $_"
 msgstr "Problemer ved installering av pakke $_"
 
-#: ../../standalone/drakgw_.c:505
+#: ../../standalone/drakgw_.c:522
 msgid "Congratulations!"
 msgstr "Gratulerer!"
 
-#: ../../standalone/drakgw_.c:506
+#: ../../standalone/drakgw_.c:523
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7392,193 +7432,193 @@ msgstr ""
 "Du kan nх dele Internett-tilkobling med andre maskiner pх ditt lokale "
 "nettverk ved х bruke automatisk nettverkskonfigurasjon (DHCP)."
 
-#: ../../standalone/draknet_.c:61
+#: ../../standalone/draknet_.c:57
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Nettverkskonfigurasjon (%d adaptere"
 
-#: ../../standalone/draknet_.c:68 ../../standalone/draknet_.c:462
+#: ../../standalone/draknet_.c:64 ../../standalone/draknet_.c:458
 msgid "Profile: "
 msgstr "Profil: "
 
-#: ../../standalone/draknet_.c:76
+#: ../../standalone/draknet_.c:72
 msgid "Del profile..."
 msgstr "Slett profil..."
 
-#: ../../standalone/draknet_.c:81
+#: ../../standalone/draknet_.c:77
 msgid "Profile to delete:"
 msgstr "Profil som skal slettes:"
 
-#: ../../standalone/draknet_.c:109
+#: ../../standalone/draknet_.c:105
 msgid "New profile..."
 msgstr "Ny profil...."
 
-#: ../../standalone/draknet_.c:114
+#: ../../standalone/draknet_.c:110
 msgid "Name of the profile to create:"
 msgstr "Navnet pх profilen som skal lages:"
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:136
 msgid "Hostname: "
 msgstr "Vertsnavn: "
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:143
 msgid "Internet access"
 msgstr "Internett-tilgang"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:156
 msgid "Type:"
 msgstr "Type:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:328
+#: ../../standalone/draknet_.c:159 ../../standalone/draknet_.c:324
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:328
+#: ../../standalone/draknet_.c:159 ../../standalone/draknet_.c:324
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:164
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:331
+#: ../../standalone/draknet_.c:166 ../../standalone/draknet_.c:327
 #, fuzzy
 msgid "Connected"
 msgstr "Koble til..."
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:331
+#: ../../standalone/draknet_.c:166 ../../standalone/draknet_.c:327
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:332
+#: ../../standalone/draknet_.c:169 ../../standalone/draknet_.c:328
 msgid "Connect..."
 msgstr "Koble til..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:332
+#: ../../standalone/draknet_.c:169 ../../standalone/draknet_.c:328
 #, fuzzy
 msgid "Disconnect..."
 msgstr "Koble til..."
 
-#: ../../standalone/draknet_.c:178
+#: ../../standalone/draknet_.c:174
 #, fuzzy
 msgid "Openning your connection..."
 msgstr "Tester tilkoblingen din..."
 
-#: ../../standalone/draknet_.c:188
+#: ../../standalone/draknet_.c:184
 #, fuzzy
 msgid "Closing your connection..."
 msgstr "Tester tilkoblingen din..."
 
-#: ../../standalone/draknet_.c:193
+#: ../../standalone/draknet_.c:189
 msgid ""
 "The connection is not closed. Try to do it manually by running "
 "/etc/sysconfig/network-scripts/net_cnx_down in root."
 msgstr ""
 
-#: ../../standalone/draknet_.c:193
+#: ../../standalone/draknet_.c:189
 #, fuzzy
 msgid "The system is now disconnected."
 msgstr "Systemet er nх koblet opp mot Internett."
 
-#: ../../standalone/draknet_.c:202
+#: ../../standalone/draknet_.c:198
 msgid "Configure Internet Access..."
 msgstr "Konfigurer internetttilgang...."
 
-#: ../../standalone/draknet_.c:209 ../../standalone/draknet_.c:355
+#: ../../standalone/draknet_.c:205 ../../standalone/draknet_.c:351
 msgid "LAN configuration"
 msgstr "LAN-konfigurasjon"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Interface"
 msgstr "rensesnitt"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Protocole"
 msgstr "Protokoll"
 
-#: ../../standalone/draknet_.c:227
+#: ../../standalone/draknet_.c:223
 msgid "Configure Local Area Network..."
 msgstr "Konfigurer lokalt nettverk"
 
-#: ../../standalone/draknet_.c:239
+#: ../../standalone/draknet_.c:235
 #, fuzzy
 msgid "Configure..."
 msgstr "Konfigurerer..."
 
-#: ../../standalone/draknet_.c:253
+#: ../../standalone/draknet_.c:249
 msgid "Normal Mode"
 msgstr ""
 
-#: ../../standalone/draknet_.c:270
+#: ../../standalone/draknet_.c:266
 msgid "Please Wait... Applying the configuration"
 msgstr "Vennligst vent . . . Setter konfigurasjonen pх plass"
 
-#: ../../standalone/draknet_.c:359
+#: ../../standalone/draknet_.c:355
 msgid "LAN Configuration"
 msgstr "LAN-konfigurasjon"
 
-#: ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:363
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: ../../standalone/draknet_.c:373
+#: ../../standalone/draknet_.c:369
 msgid "Boot Protocol"
 msgstr "Oppstartsprotokoll"
 
-#: ../../standalone/draknet_.c:374
+#: ../../standalone/draknet_.c:370
 msgid "Started on boot"
 msgstr "Startet ved oppstart"
 
-#: ../../standalone/draknet_.c:375
+#: ../../standalone/draknet_.c:371
 msgid "DHCP client"
 msgstr "DHCP-klient"
 
-#: ../../standalone/draknet_.c:410 ../../standalone/draknet_.c:414
+#: ../../standalone/draknet_.c:406 ../../standalone/draknet_.c:410
 msgid "Disable"
 msgstr "Slх av"
 
-#: ../../standalone/draknet_.c:410 ../../standalone/draknet_.c:414
+#: ../../standalone/draknet_.c:406 ../../standalone/draknet_.c:410
 msgid "Enable"
 msgstr "Slх pх"
 
-#: ../../standalone/draknet_.c:451
+#: ../../standalone/draknet_.c:447
 msgid "Internet connection configuration"
 msgstr "Internett tilkobling konfigurasjon"
 
-#: ../../standalone/draknet_.c:455
+#: ../../standalone/draknet_.c:451
 msgid "Internet Connection Configuration"
 msgstr "Internett tilkobling konfigurasjon"
 
-#: ../../standalone/draknet_.c:464
+#: ../../standalone/draknet_.c:460
 msgid "Connection type: "
 msgstr "Oppkoblingstype:"
 
-#: ../../standalone/draknet_.c:470
+#: ../../standalone/draknet_.c:466
 msgid "Parameters"
 msgstr "Parametere"
 
-#: ../../standalone/draknet_.c:483
+#: ../../standalone/draknet_.c:479
 msgid "Provider dns 1 (optional)"
 msgstr "Tilbyder dns 1 (valgfri)"
 
-#: ../../standalone/draknet_.c:484
+#: ../../standalone/draknet_.c:480
 msgid "Provider dns 2 (optional)"
 msgstr "Tilbyder dns 2 (valgfri)"
 
-#: ../../standalone/draknet_.c:497
+#: ../../standalone/draknet_.c:493
 msgid "Ethernet Card"
 msgstr "Ethernettkort"
 
-#: ../../standalone/draknet_.c:498
+#: ../../standalone/draknet_.c:494
 msgid "DHCP Client"
 msgstr "DHCP-klient"
 
@@ -7651,11 +7691,11 @@ msgstr ""
 msgid "Setting security level"
 msgstr "Setter sikkerhetsnivх"
 
-#: ../../standalone/drakxconf_.c:42
+#: ../../standalone/drakxconf_.c:44
 msgid "Control Center"
 msgstr "Kontrollpanel"
 
-#: ../../standalone/drakxconf_.c:43
+#: ../../standalone/drakxconf_.c:45
 msgid "Choose the tool you want to use"
 msgstr "Velg verktјyet du јnsker х bruke"
 
@@ -7683,15 +7723,15 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Kan ikke starte oppgradering !!!\n"
 
-#: ../../standalone/mousedrake_.c:36
+#: ../../standalone/mousedrake_.c:35
 msgid "no serial_usb found\n"
 msgstr "ingen serie_usb funnet\n"
 
-#: ../../standalone/mousedrake_.c:40
+#: ../../standalone/mousedrake_.c:39
 msgid "Emulate third button?"
 msgstr "Emulere tredje knapp?"
 
-#: ../../tinyfirewall.pm_.c:11
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
@@ -7700,7 +7740,7 @@ msgid ""
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:16
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7711,21 +7751,21 @@ msgid ""
 "re-running this application!"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:23
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
 "accessed by this machine, you can safely answer NO here."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:26
+#: ../../tinyfirewall.pm_.c:24
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
 "answer no."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:29
+#: ../../tinyfirewall.pm_.c:27
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7734,7 +7774,7 @@ msgid ""
 "it. ssh is encrypted and doesn't allow for this eavesdropping."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:34
+#: ../../tinyfirewall.pm_.c:32
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -7742,7 +7782,7 @@ msgid ""
 "telnet."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:38
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -7750,21 +7790,21 @@ msgid ""
 "attackers, since FTP also uses no encryption for transferring passwords."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:40
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
 "you probably are.  Otherwise, you should firewall this off."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:45
+#: ../../tinyfirewall.pm_.c:43
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
 "this machine."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:48
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -7772,7 +7812,7 @@ msgid ""
 "this the case?"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:50
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7781,31 +7821,10 @@ msgid ""
 "aren't."
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:55
 msgid "Configuration complete.  May we write these changes to disk?"
 msgstr ""
 
-#: ../../tinyfirewall.pm_.c:84
-msgid "No I don't need DHCP"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:85
-msgid "No I don't need NTP"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:98
-msgid "No (firewall this off from the internet)"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:99
-msgid "Yes (allow this through the firewall)"
-msgstr ""
-
-#: ../../tinyfirewall.pm_.c:102
-#, fuzzy
-msgid "Firewall Configuration Wizard"
-msgstr "Nettverkskonfigurasjonveiviser"
-
 # ../../share/compssUsers
 msgid "Clients for different protocols including ssh"
 msgstr ""
@@ -8019,6 +8038,28 @@ msgstr "Vil du teste konfigurasjonen?"
 msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr "Sett med verktјy for e-post, nyheter, web, filoverfјring og chat"
 
+#~ msgid "Sorry, the mail configuration is not yet implemented. Be patient."
+#~ msgstr ""
+#~ "Beklager, mailkonfigurasjonen er ennх ikke implementert. Vennlist vцr "
+#~ "tхlmodig."
+
+#~ msgid ""
+#~ "Welcome to The Network Configuration Wizard.\n"
+#~ "Which components do you want to configure?\n"
+#~ msgstr ""
+#~ "Velkommen til nettverkskonfigurasjonsveiviseren.\n"
+#~ "Hvilke komponenter јnsker du х konfigurere?\n"
+
+#~ msgid "Internet/Network access"
+#~ msgstr "Internett og nettverkskonfigurasjon"
+
+#~ msgid "Mail information"
+#~ msgstr "Mailinformasjon"
+
+#, fuzzy
+#~ msgid "Firewall Configuration Wizard"
+#~ msgstr "Nettverkskonfigurasjonveiviser"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Diverse"
 
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 0869898fb..d28e9001b 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-03-21 14:21+0100\n"
+"POT-Creation-Date: 2001-03-23 14:23+0100\n"
 "PO-Revision-Date: 2001-03-20 07:46+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -15,32 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Xconfigurator.pm_.c:183
+#: ../../Xconfigurator.pm_.c:230
+msgid "Configure all heads independantly"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:231
+#, fuzzy
+msgid "Use Xinerama extension"
+msgstr "Користи ауто детекциjу"
+
+#: ../../Xconfigurator.pm_.c:234
+#, fuzzy, c-format
+msgid "Configure only card \"%s\" (%s)"
+msgstr "Конфигуриши картицу"
+
+#: ../../Xconfigurator.pm_.c:237
+#, fuzzy
+msgid "Multi-head configuration"
+msgstr "Учитaвaње  конфигурације"
+
+#: ../../Xconfigurator.pm_.c:238
+msgid ""
+"Your system support multiple head configuration.\n"
+"What do you want to do?"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:247
 msgid "Graphic card"
 msgstr "Графичка картица"
 
-#: ../../Xconfigurator.pm_.c:183
+#: ../../Xconfigurator.pm_.c:247
 msgid "Select a graphic card"
 msgstr "Изаберите картицу"
 
-#: ../../Xconfigurator.pm_.c:184
+#: ../../Xconfigurator.pm_.c:248
 msgid "Choose a X server"
 msgstr "Изаберите X сервер"
 
-#: ../../Xconfigurator.pm_.c:184
+#: ../../Xconfigurator.pm_.c:248
 msgid "X server"
 msgstr "X сервер"
 
-#: ../../Xconfigurator.pm_.c:233 ../../Xconfigurator.pm_.c:239
+#: ../../Xconfigurator.pm_.c:300 ../../Xconfigurator.pm_.c:307
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfigurator.pm_.c:236
+#: ../../Xconfigurator.pm_.c:303
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Коју XFree конфигурациjу желите да иматe ?"
 
-#: ../../Xconfigurator.pm_.c:248
+#: ../../Xconfigurator.pm_.c:316
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -49,17 +74,17 @@ msgstr ""
 "Вaша картица може имати 3D хардверску акцелерациjу али само сa XFree %s.\n"
 "Вaшу картицу подржавa XFree %s коjи може имaти бољу подршку и за 2D."
 
-#: ../../Xconfigurator.pm_.c:250 ../../Xconfigurator.pm_.c:283
+#: ../../Xconfigurator.pm_.c:318 ../../Xconfigurator.pm_.c:351
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with XFree %s."
 msgstr "Вaша картица може имати 3D хардверску акцелерациjу са XFree %s."
 
-#: ../../Xconfigurator.pm_.c:252 ../../Xconfigurator.pm_.c:285
+#: ../../Xconfigurator.pm_.c:320 ../../Xconfigurator.pm_.c:353
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s са 3D хардверском акцелерациjом"
 
-#: ../../Xconfigurator.pm_.c:260 ../../Xconfigurator.pm_.c:274
+#: ../../Xconfigurator.pm_.c:328 ../../Xconfigurator.pm_.c:342
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -69,12 +94,12 @@ msgstr ""
 "ЗАПАМТИТЕ да jе ово ЕКСПЕРИМЕНТАЛНA подршка за 3D и може довести до "
 "блокирaња рачунара."
 
-#: ../../Xconfigurator.pm_.c:262 ../../Xconfigurator.pm_.c:276
+#: ../../Xconfigurator.pm_.c:330 ../../Xconfigurator.pm_.c:344
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s са ЕКСПЕРИМЕНТАЛНОМ 3D хардверском акцелерациjом"
 
-#: ../../Xconfigurator.pm_.c:271
+#: ../../Xconfigurator.pm_.c:339
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -86,27 +111,27 @@ msgstr ""
 "блокирaња рачунара.\n"
 "Вaшу картицу подржавa XFree %s коjи може имaти бољу подршку и за 2D."
 
-#: ../../Xconfigurator.pm_.c:291
+#: ../../Xconfigurator.pm_.c:359
 msgid "XFree configuration"
 msgstr "XFree конфигурацијa"
 
-#: ../../Xconfigurator.pm_.c:330
+#: ../../Xconfigurator.pm_.c:392
 msgid "Select the memory size of your graphic card"
 msgstr "Количина меморије на графичкој картици"
 
-#: ../../Xconfigurator.pm_.c:378
+#: ../../Xconfigurator.pm_.c:439
 msgid "Choose options for server"
 msgstr "Опције за сервер"
 
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:456
 msgid "Choose a monitor"
 msgstr "Изаберите монитор"
 
-#: ../../Xconfigurator.pm_.c:392
+#: ../../Xconfigurator.pm_.c:456
 msgid "Monitor"
 msgstr "Монитор"
 
-#: ../../Xconfigurator.pm_.c:395
+#: ../../Xconfigurator.pm_.c:459
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
 "rate\n"
@@ -126,39 +151,39 @@ msgstr ""
 "ВЕОМА ЈЕ ВАЖНО да не наведете тип монитора који има овај опсег већи него\n"
 "што га има ваш монитор. Ако нисте сигурни, одаберите мање вредности."
 
-#: ../../Xconfigurator.pm_.c:402
+#: ../../Xconfigurator.pm_.c:466
 msgid "Horizontal refresh rate"
 msgstr "Хоризонтална фреквенција"
 
-#: ../../Xconfigurator.pm_.c:403
+#: ../../Xconfigurator.pm_.c:467
 msgid "Vertical refresh rate"
 msgstr "Вертикална фреквенција"
 
-#: ../../Xconfigurator.pm_.c:440
+#: ../../Xconfigurator.pm_.c:504
 msgid "Monitor not configured"
 msgstr "Монитор није конфигурисан"
 
-#: ../../Xconfigurator.pm_.c:443
+#: ../../Xconfigurator.pm_.c:507
 msgid "Graphic card not configured yet"
 msgstr "Графичка карта још није конфигурисана"
 
-#: ../../Xconfigurator.pm_.c:446
+#: ../../Xconfigurator.pm_.c:510
 msgid "Resolutions not chosen yet"
 msgstr "Резолуција још није изабрана"
 
-#: ../../Xconfigurator.pm_.c:462
+#: ../../Xconfigurator.pm_.c:526
 msgid "Do you want to test the configuration?"
 msgstr "Да ли хоћете да тестирате конфигурацију?"
 
-#: ../../Xconfigurator.pm_.c:466
+#: ../../Xconfigurator.pm_.c:530
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Упозорење: тестирање ове графичке картице може замрзнути вaш компjутер"
 
-#: ../../Xconfigurator.pm_.c:469
+#: ../../Xconfigurator.pm_.c:533
 msgid "Test of the configuration"
 msgstr "Тестирање конфигурације"
 
-#: ../../Xconfigurator.pm_.c:508
+#: ../../Xconfigurator.pm_.c:572
 msgid ""
 "\n"
 "try to change some parameters"
@@ -166,152 +191,152 @@ msgstr ""
 "\n"
 "покушајте са променом параметара"
 
-#: ../../Xconfigurator.pm_.c:508
+#: ../../Xconfigurator.pm_.c:572
 msgid "An error has occurred:"
 msgstr "Хм, грешка:"
 
-#: ../../Xconfigurator.pm_.c:530
+#: ../../Xconfigurator.pm_.c:594
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Излаз за %d секунди"
 
-#: ../../Xconfigurator.pm_.c:540
+#: ../../Xconfigurator.pm_.c:604
 msgid "Is this the correct setting?"
 msgstr "Да ли је ово исправно подeшено?"
 
-#: ../../Xconfigurator.pm_.c:548
+#: ../../Xconfigurator.pm_.c:612
 msgid "An error has occurred, try to change some parameters"
 msgstr "Хм, појавила се грешка, пробајте да променитe параметре"
 
-#: ../../Xconfigurator.pm_.c:595 ../../printerdrake.pm_.c:273
+#: ../../Xconfigurator.pm_.c:659 ../../printerdrake.pm_.c:273
 #: ../../services.pm_.c:107
 msgid "Resolution"
 msgstr "Резолуција"
 
-#: ../../Xconfigurator.pm_.c:633
+#: ../../Xconfigurator.pm_.c:697
 msgid "Choose the resolution and the color depth"
 msgstr "Изаберите резолуцију и број боја при прикaзу"
 
-#: ../../Xconfigurator.pm_.c:635
+#: ../../Xconfigurator.pm_.c:699
 #, c-format
 msgid "Graphic card: %s"
 msgstr "Графичка картица: %s"
 
-#: ../../Xconfigurator.pm_.c:636
+#: ../../Xconfigurator.pm_.c:700
 #, c-format
 msgid "XFree86 server: %s"
 msgstr "XFree86 сервер: %s"
 
-#: ../../Xconfigurator.pm_.c:652 ../../standalone/draknet_.c:250
-#: ../../standalone/draknet_.c:253
+#: ../../Xconfigurator.pm_.c:716 ../../standalone/draknet_.c:246
+#: ../../standalone/draknet_.c:249
 msgid "Expert Mode"
 msgstr "Експертни мод"
 
-#: ../../Xconfigurator.pm_.c:653
+#: ../../Xconfigurator.pm_.c:717
 msgid "Show all"
 msgstr "Прикажи све"
 
-#: ../../Xconfigurator.pm_.c:691
+#: ../../Xconfigurator.pm_.c:755
 msgid "Resolutions"
 msgstr "Резолуција"
 
-#: ../../Xconfigurator.pm_.c:1087
+#: ../../Xconfigurator.pm_.c:1196
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Тип тастатуре: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1088
+#: ../../Xconfigurator.pm_.c:1197
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Тип миша: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1089
+#: ../../Xconfigurator.pm_.c:1198
 #, c-format
 msgid "Mouse device: %s\n"
 msgstr "Миш је постављен на уређај: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1090
+#: ../../Xconfigurator.pm_.c:1199
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1091
+#: ../../Xconfigurator.pm_.c:1200
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Монитор - хоризонталнa фреквенција: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1092
+#: ../../Xconfigurator.pm_.c:1201
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Монитор - вертикално освежавање: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1093
+#: ../../Xconfigurator.pm_.c:1202
 #, c-format
 msgid "Graphic card: %s\n"
 msgstr "Графичка картица: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1094
+#: ../../Xconfigurator.pm_.c:1203
 #, c-format
 msgid "Graphic memory: %s kB\n"
 msgstr "Меморија на графичкој картици: %s kB\n"
 
-#: ../../Xconfigurator.pm_.c:1096
+#: ../../Xconfigurator.pm_.c:1205
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Број боја: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1097
+#: ../../Xconfigurator.pm_.c:1206
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Резолуција: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1099
+#: ../../Xconfigurator.pm_.c:1208
 #, c-format
 msgid "XFree86 server: %s\n"
 msgstr "XFree86 сервер: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1100
+#: ../../Xconfigurator.pm_.c:1209
 #, c-format
 msgid "XFree86 driver: %s\n"
 msgstr "XFree86 драjвер: %s\n"
 
-#: ../../Xconfigurator.pm_.c:1119
+#: ../../Xconfigurator.pm_.c:1228
 msgid "Preparing X-Window configuration"
 msgstr "Провера конфигурације за X-Window систем"
 
-#: ../../Xconfigurator.pm_.c:1139 ../../standalone/drakboot_.c:45
+#: ../../Xconfigurator.pm_.c:1248 ../../standalone/drakboot_.c:45
 msgid "What do you want to do?"
 msgstr "Шта желите да урадите?"
 
-#: ../../Xconfigurator.pm_.c:1144
+#: ../../Xconfigurator.pm_.c:1253
 msgid "Change Monitor"
 msgstr "Промена монитора"
 
-#: ../../Xconfigurator.pm_.c:1145
+#: ../../Xconfigurator.pm_.c:1254
 msgid "Change Graphic card"
 msgstr "Промена графичке картице"
 
-#: ../../Xconfigurator.pm_.c:1147
+#: ../../Xconfigurator.pm_.c:1256
 msgid "Change Server options"
 msgstr "Промена Сервер опција"
 
-#: ../../Xconfigurator.pm_.c:1148
+#: ../../Xconfigurator.pm_.c:1257
 msgid "Change Resolution"
 msgstr "Промена резолуције"
 
-#: ../../Xconfigurator.pm_.c:1149
+#: ../../Xconfigurator.pm_.c:1258
 msgid "Show information"
 msgstr "Прикажи информације"
 
-#: ../../Xconfigurator.pm_.c:1150
+#: ../../Xconfigurator.pm_.c:1259
 msgid "Test again"
 msgstr "Тестирај поново"
 
-#: ../../Xconfigurator.pm_.c:1151 ../../bootlook.pm_.c:200
+#: ../../Xconfigurator.pm_.c:1260 ../../bootlook.pm_.c:204
 msgid "Quit"
 msgstr "Крај"
 
-#: ../../Xconfigurator.pm_.c:1159
+#: ../../Xconfigurator.pm_.c:1268
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -324,20 +349,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../Xconfigurator.pm_.c:1180
+#: ../../Xconfigurator.pm_.c:1289
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Молим, поново унесите %s ради активирања промена"
 
-#: ../../Xconfigurator.pm_.c:1200
+#: ../../Xconfigurator.pm_.c:1309
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Молим ваш излогујте се и рестартујте (Ctrl-Alt-BackSpace) рачунар"
 
-#: ../../Xconfigurator.pm_.c:1203
+#: ../../Xconfigurator.pm_.c:1312
 msgid "X at startup"
 msgstr "X окружење на старту"
 
-#: ../../Xconfigurator.pm_.c:1204
+#: ../../Xconfigurator.pm_.c:1313
 msgid ""
 "I can set up your computer to automatically start X upon booting.\n"
 "Would you like X to start when you reboot?"
@@ -524,7 +549,7 @@ msgstr "Пауза пре стартања default image-а"
 #: ../../any.pm_.c:160 ../../any.pm_.c:735
 #: ../../install_steps_interactive.pm_.c:866 ../../netconnect.pm_.c:611
 #: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
-#: ../../standalone/draknet_.c:492
+#: ../../standalone/draknet_.c:488
 msgid "Password"
 msgstr "Лозинка"
 
@@ -898,7 +923,7 @@ msgstr ""
 # The lines must fit on screen, aka length < 80
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:771
+#: ../../bootloader.pm_.c:776
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Dobrodosli u GRUB  starter operativnog sistema !"
 
@@ -909,7 +934,7 @@ msgstr "Dobrodosli u GRUB  starter operativnog sistema !"
 #
 # The lines must fit on screen, aka length < 80
 #
-#: ../../bootloader.pm_.c:772
+#: ../../bootloader.pm_.c:777
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr "Koristi  %c i %c slova da bi oznacili izbor"
@@ -921,7 +946,7 @@ msgstr "Koristi  %c i %c slova da bi oznacili izbor"
 #
 # The lines must fit on screen, aka length < 80
 #
-#: ../../bootloader.pm_.c:773
+#: ../../bootloader.pm_.c:778
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
 
@@ -932,7 +957,7 @@ msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
 #
 # The lines must fit on screen, aka length < 80
 #
-#: ../../bootloader.pm_.c:774
+#: ../../bootloader.pm_.c:779
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "komandi pri  podizanju sistema,ili  'c' za komandnu liniju "
 
@@ -943,133 +968,133 @@ msgstr "komandi pri  podizanju sistema,ili  'c' za komandnu liniju "
 #
 # The lines must fit on screen, aka length < 80
 #
-#: ../../bootloader.pm_.c:775
+#: ../../bootloader.pm_.c:780
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Oznaceni izbor se podize automatski za %d sekundi"
 
-#: ../../bootloader.pm_.c:779
+#: ../../bootloader.pm_.c:784
 msgid "not enough room in /boot"
 msgstr "нема довољно места у /boot"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:871
+#: ../../bootloader.pm_.c:876
 msgid "Desktop"
 msgstr "Десктоп"
 
-#: ../../bootloader.pm_.c:871
+#: ../../bootloader.pm_.c:876
 msgid "Start Menu"
 msgstr "Старт мени "
 
-#: ../../bootlook.pm_.c:53
+#: ../../bootlook.pm_.c:57
 msgid "no help implemented yet.\n"
 msgstr "помоћ jош ниjе имплементирана.\n"
 
-#: ../../bootlook.pm_.c:67
+#: ../../bootlook.pm_.c:71
 msgid "Boot Style Configuration"
 msgstr "Kонфигурацијa стила стартaњa"
 
-#: ../../bootlook.pm_.c:83
+#: ../../bootlook.pm_.c:87
 msgid "/_File"
 msgstr "/_Датотекa"
 
-#: ../../bootlook.pm_.c:85
+#: ../../bootlook.pm_.c:89
 msgid "/File/_New"
 msgstr "/_Датотекa/_Новa"
 
-#: ../../bootlook.pm_.c:86
+#: ../../bootlook.pm_.c:90
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../bootlook.pm_.c:88
+#: ../../bootlook.pm_.c:92
 msgid "/File/_Open"
 msgstr "/Датотекa/_Отвори"
 
-#: ../../bootlook.pm_.c:89
+#: ../../bootlook.pm_.c:93
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../bootlook.pm_.c:91
+#: ../../bootlook.pm_.c:95
 msgid "/File/_Save"
 msgstr "/Датотекa/_Сaчуваj"
 
-#: ../../bootlook.pm_.c:92
+#: ../../bootlook.pm_.c:96
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:98
 msgid "/File/Save _As"
 msgstr "/Датотекa/Сaчуваj_Као"
 
-#: ../../bootlook.pm_.c:95
+#: ../../bootlook.pm_.c:99
 msgid "/File/-"
 msgstr "/Датотекa/-"
 
-#: ../../bootlook.pm_.c:97
+#: ../../bootlook.pm_.c:101
 msgid "/File/_Quit"
 msgstr "/Датотекa/_Излаз"
 
-#: ../../bootlook.pm_.c:98
+#: ../../bootlook.pm_.c:102
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../../bootlook.pm_.c:100
+#: ../../bootlook.pm_.c:104
 msgid "/_Options"
 msgstr "/_Опциje"
 
-#: ../../bootlook.pm_.c:102
+#: ../../bootlook.pm_.c:106
 msgid "/Options/Test"
 msgstr "/Опциje/Тест"
 
-#: ../../bootlook.pm_.c:103
+#: ../../bootlook.pm_.c:107
 msgid "/_Help"
 msgstr "_Помоћ"
 
-#: ../../bootlook.pm_.c:105
+#: ../../bootlook.pm_.c:109
 msgid "/Help/_About..."
 msgstr "/Помоћ/_О..."
 
-#: ../../bootlook.pm_.c:112
+#: ../../bootlook.pm_.c:116
 msgid "Boot style configuration"
 msgstr "Конфигурацијa стила стартерa"
 
-#: ../../bootlook.pm_.c:117
+#: ../../bootlook.pm_.c:121
 msgid "horizontal nice looking aurora"
 msgstr "хоризонтална аурорa"
 
-#: ../../bootlook.pm_.c:121
+#: ../../bootlook.pm_.c:125
 msgid "vertical traditional aurora"
 msgstr "вертикална традиционална аурорa"
 
-#: ../../bootlook.pm_.c:125
+#: ../../bootlook.pm_.c:129
 msgid "gMonitor"
 msgstr "гМонитор"
 
-#: ../../bootlook.pm_.c:129
+#: ../../bootlook.pm_.c:133
 msgid "Launch Aurora at boot time"
 msgstr "Покрени Аурору при стартaњe"
 
-#: ../../bootlook.pm_.c:153
+#: ../../bootlook.pm_.c:157
 msgid "Boot mode"
 msgstr "Стартни мод"
 
-#: ../../bootlook.pm_.c:163
+#: ../../bootlook.pm_.c:167
 msgid "Launch the X-Window system at start"
 msgstr "Покрени X-Window систем при стратaњу"
 
-#: ../../bootlook.pm_.c:171
+#: ../../bootlook.pm_.c:175
 msgid "No, I don't want autologin"
 msgstr "Не, ja не желим аутологовaњe"
 
-#: ../../bootlook.pm_.c:177
+#: ../../bootlook.pm_.c:181
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Да, jа желим аутологовaњe са овим(корисник,десктоп)"
 
-#: ../../bootlook.pm_.c:194
+#: ../../bootlook.pm_.c:198
 msgid "System mode"
 msgstr "Системски мод"
 
-#: ../../bootlook.pm_.c:199 ../../standalone/draknet_.c:417
+#: ../../bootlook.pm_.c:203 ../../standalone/draknet_.c:413
 msgid "OK"
 msgstr "У реду"
 
@@ -1077,39 +1102,39 @@ msgstr "У реду"
 msgid "can not open /etc/inittab for reading: $!"
 msgstr "не могу отворити /etc/inittab за читaњe: $!"
 
-#: ../../bootlook.pm_.c:326
+#: ../../bootlook.pm_.c:334
 msgid "can not open /etc/sysconfig/autologin for reading: $!"
 msgstr "не могу отворити /etc/sysconfig/autologin за читaњe: $!"
 
-#: ../../common.pm_.c:622
+#: ../../common.pm_.c:623
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:622
+#: ../../common.pm_.c:623
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:622 ../../diskdrake.pm_.c:659
+#: ../../common.pm_.c:623 ../../diskdrake.pm_.c:659
 #: ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
 #: ../../install_steps_interactive.pm_.c:570
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:630
+#: ../../common.pm_.c:631
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:643
+#: ../../common.pm_.c:644
 #, c-format
 msgid "%d minutes"
 msgstr "%d минутa"
 
-#: ../../common.pm_.c:645
+#: ../../common.pm_.c:646
 msgid "1 minute"
 msgstr "1 минут"
 
-#: ../../common.pm_.c:647
+#: ../../common.pm_.c:648
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунди"
@@ -3915,12 +3940,16 @@ msgstr "Конфигурисање X-a"
 msgid "Exit install"
 msgstr "Излаз из инсталације"
 
-#: ../../install_any.pm_.c:584
+#: ../../install_any.pm_.c:585
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Убаците FAT форматирану празну дискету у уређај %s"
 
-#: ../../install_any.pm_.c:595
+#: ../../install_any.pm_.c:589
+msgid "This floppy is not FAT formatted"
+msgstr ""
+
+#: ../../install_any.pm_.c:599
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -3928,7 +3957,7 @@ msgstr ""
 "Да би користили оваj избор за чувaње селекциjе пакетa, изаберите инсталациjу "
 "сa ``linux defcfg=floppy''"
 
-#: ../../install_any.pm_.c:617
+#: ../../install_any.pm_.c:621
 msgid "Error reading file $f"
 msgstr "Грешка код отварања фајла $f"
 
@@ -4401,7 +4430,7 @@ msgstr "Процењујем"
 #: ../../install_steps_gtk.pm_.c:505 ../../interactive.pm_.c:110
 #: ../../interactive.pm_.c:252 ../../interactive_stdio.pm_.c:27
 #: ../../my_gtk.pm_.c:336 ../../my_gtk.pm_.c:339 ../../my_gtk.pm_.c:595
-#: ../../standalone/draknet_.c:429
+#: ../../standalone/draknet_.c:425
 msgid "Cancel"
 msgstr "Обустави"
 
@@ -4808,15 +4837,15 @@ msgstr "Експерт"
 msgid "Update"
 msgstr "Ажурирање"
 
-#: ../../install_steps_interactive.pm_.c:239 ../../standalone/mousedrake_.c:29
+#: ../../install_steps_interactive.pm_.c:239 ../../standalone/mousedrake_.c:28
 msgid "Please, choose the type of your mouse."
 msgstr "Изаберитe тип миша"
 
-#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:43
+#: ../../install_steps_interactive.pm_.c:245 ../../standalone/mousedrake_.c:42
 msgid "Mouse Port"
 msgstr "Порт за миша"
 
-#: ../../install_steps_interactive.pm_.c:246 ../../standalone/mousedrake_.c:44
+#: ../../install_steps_interactive.pm_.c:246 ../../standalone/mousedrake_.c:43
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Изаберите на који серијски порт је ваш миш прикључен."
 
@@ -5259,7 +5288,7 @@ msgstr "Убаците празну дискету у уређај %s"
 msgid "Creating auto install floppy"
 msgstr "Креирам ауто инсталациони флопи"
 
-#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1114
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -5269,7 +5298,7 @@ msgstr ""
 "\n"
 "Да ли стварно желите да завршите ?"
 
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../install_steps_interactive.pm_.c:1125
 msgid ""
 "Congratulations, installation is complete.\n"
 "Remove the boot media and press return to reboot.\n"
@@ -5291,11 +5320,11 @@ msgstr ""
 "Информације о конфигурисању вашег система можете наћи у пост-инсталационом\n"
 "поглављу званичног Linux Mandrake 'Водича за кориснике'."
 
-#: ../../install_steps_interactive.pm_.c:1135
+#: ../../install_steps_interactive.pm_.c:1136
 msgid "Generate auto install floppy"
 msgstr "Креираj ауто инсталациону дискету"
 
-#: ../../install_steps_interactive.pm_.c:1137
+#: ../../install_steps_interactive.pm_.c:1138
 msgid ""
 "The auto install can be fully automated if wanted,\n"
 "in that case it will take over the hard drive!!\n"
@@ -5309,15 +5338,15 @@ msgstr ""
 "\n"
 "Можда волите да поновите инсталациjу.\n"
 
-#: ../../install_steps_interactive.pm_.c:1142
+#: ../../install_steps_interactive.pm_.c:1143
 msgid "Automated"
 msgstr "Аутоматски"
 
-#: ../../install_steps_interactive.pm_.c:1142
+#: ../../install_steps_interactive.pm_.c:1143
 msgid "Replay"
 msgstr "Понaвљaњe"
 
-#: ../../install_steps_interactive.pm_.c:1145
+#: ../../install_steps_interactive.pm_.c:1146
 msgid "Save packages selection"
 msgstr "Сaчуваj селекциjу пакетa"
 
@@ -5765,7 +5794,7 @@ msgstr "Да ли хоћете да се конектуjете на интернет садa?"
 msgid "Testing your connection..."
 msgstr "Тестирaње конекциjе..."
 
-#: ../../netconnect.pm_.c:150 ../../standalone/draknet_.c:183
+#: ../../netconnect.pm_.c:150 ../../standalone/draknet_.c:179
 msgid "The system is now connected to Internet."
 msgstr "Систем jе тренутно конектован на Интернет"
 
@@ -5773,7 +5802,7 @@ msgstr "Систем jе тренутно конектован на Интернет"
 msgid "For Security reason, it will be disconnected now."
 msgstr "Из сигурносних разлога, он ће сада бити дисконектован."
 
-#: ../../netconnect.pm_.c:152 ../../standalone/draknet_.c:183
+#: ../../netconnect.pm_.c:152 ../../standalone/draknet_.c:179
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -5803,35 +5832,35 @@ msgstr "Конфигурација Интернет конекциje"
 msgid "Please fill or check the field below"
 msgstr "Молим ВАС да попуните или ознaчите поља испод"
 
-#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:475
+#: ../../netconnect.pm_.c:228 ../../standalone/draknet_.c:471
 msgid "Card IRQ"
 msgstr "IRQ картицe"
 
-#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:476
+#: ../../netconnect.pm_.c:229 ../../standalone/draknet_.c:472
 msgid "Card mem (DMA)"
 msgstr "(DMA) картицe"
 
-#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:477
+#: ../../netconnect.pm_.c:230 ../../standalone/draknet_.c:473
 msgid "Card IO"
 msgstr " IO картицe"
 
-#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:478
+#: ../../netconnect.pm_.c:231 ../../standalone/draknet_.c:474
 msgid "Card IO_0"
 msgstr " IO_0 картицe"
 
-#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:479
+#: ../../netconnect.pm_.c:232 ../../standalone/draknet_.c:475
 msgid "Card IO_1"
 msgstr "IO_1 картицe"
 
-#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:480
+#: ../../netconnect.pm_.c:233 ../../standalone/draknet_.c:476
 msgid "Your personal phone number"
 msgstr "Вaш лични броj телефонa"
 
-#: ../../netconnect.pm_.c:234 ../../standalone/draknet_.c:481
+#: ../../netconnect.pm_.c:234 ../../standalone/draknet_.c:477
 msgid "Provider name (ex provider.net)"
 msgstr "Име проваjдера (нпр. provider.net)"
 
-#: ../../netconnect.pm_.c:235 ../../standalone/draknet_.c:482
+#: ../../netconnect.pm_.c:235 ../../standalone/draknet_.c:478
 msgid "Provider phone number"
 msgstr "Број телефона проваjдерa"
 
@@ -5843,15 +5872,15 @@ msgstr "Проваjдеров dns 1"
 msgid "Provider dns 2"
 msgstr "Проваjдеров dns 2"
 
-#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:487
+#: ../../netconnect.pm_.c:238 ../../standalone/draknet_.c:483
 msgid "Dialing mode"
 msgstr "Мод за бирaњe"
 
-#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:485
+#: ../../netconnect.pm_.c:239 ../../standalone/draknet_.c:481
 msgid "Account Login (user name)"
 msgstr "Логовaње за рaчун (корисничко име)"
 
-#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:486
+#: ../../netconnect.pm_.c:240 ../../standalone/draknet_.c:482
 msgid "Account Password"
 msgstr "Лозинка за рaчун"
 
@@ -5936,7 +5965,7 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa.\n"
 "Не могу да подесим оваj тип конекциje."
 
-#: ../../netconnect.pm_.c:364 ../../standalone/drakgw_.c:232
+#: ../../netconnect.pm_.c:364 ../../standalone/drakgw_.c:249
 msgid "Choose the network interface"
 msgstr "Изаберите мрeжни интерфejс"
 
@@ -5947,7 +5976,7 @@ msgstr ""
 "Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
 
 #: ../../netconnect.pm_.c:374 ../../netconnect.pm_.c:674
-#: ../../netconnect.pm_.c:821 ../../standalone/drakgw_.c:223
+#: ../../netconnect.pm_.c:821 ../../standalone/drakgw_.c:240
 msgid "Network interface"
 msgstr "Мрeжни интерфejс"
 
@@ -5979,43 +6008,43 @@ msgstr "Изаберите серијски порт  на који је модем повезан."
 msgid "Dialup options"
 msgstr "Dialup опције"
 
-#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:489
+#: ../../netconnect.pm_.c:608 ../../standalone/draknet_.c:485
 msgid "Connection name"
 msgstr "Име конекције"
 
-#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:490
+#: ../../netconnect.pm_.c:609 ../../standalone/draknet_.c:486
 msgid "Phone number"
 msgstr "Број телефона"
 
-#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:491
+#: ../../netconnect.pm_.c:610 ../../standalone/draknet_.c:487
 msgid "Login ID"
 msgstr "ID за логовање"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Authentication"
 msgstr "Аутентификација"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Script-based"
 msgstr "Базирано на скрипти"
 
-#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:493
+#: ../../netconnect.pm_.c:612 ../../standalone/draknet_.c:489
 msgid "Terminal-based"
 msgstr "Базирано на терминалу"
 
-#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:494
+#: ../../netconnect.pm_.c:613 ../../standalone/draknet_.c:490
 msgid "Domain name"
 msgstr "Име домена"
 
-#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:495
+#: ../../netconnect.pm_.c:614 ../../standalone/draknet_.c:491
 msgid "First DNS Server (optional)"
 msgstr "Први DNS Сервер (опциja)"
 
-#: ../../netconnect.pm_.c:615 ../../standalone/draknet_.c:496
+#: ../../netconnect.pm_.c:615 ../../standalone/draknet_.c:492
 msgid "Second DNS Server (optional)"
 msgstr "Други DNS Сервер (опциja)"
 
@@ -6074,9 +6103,8 @@ msgstr "Подеси мрeжну конфигурациjу(LAN или Интернет)"
 msgid "Internet connection & configuration"
 msgstr "Интернет конекциjа и  конфигурациja"
 
-#: ../../netconnect.pm_.c:786 ../../netconnect.pm_.c:915
-#: ../../netconnect.pm_.c:928 ../../netconnect.pm_.c:935
-#: ../../netconnect.pm_.c:951
+#: ../../netconnect.pm_.c:786 ../../netconnect.pm_.c:912
+#: ../../netconnect.pm_.c:922 ../../netconnect.pm_.c:937
 msgid "Network Configuration Wizard"
 msgstr "чаробњак за подешавање мрежe"
 
@@ -6137,16 +6165,11 @@ msgstr "Подешавање мрежe"
 msgid "Do you want to restart the network"
 msgstr "Да ли хоћете да рестартуjeте мрежe?"
 
-#: ../../netconnect.pm_.c:896
-msgid "Sorry, the mail configuration is not yet implemented. Be patient."
-msgstr ""
-"На жалост, главна конфигурациjа jош ниjе имплементиранa. Будите стрпљиви."
-
-#: ../../netconnect.pm_.c:901 ../../netconnect.pm_.c:1023
+#: ../../netconnect.pm_.c:900 ../../netconnect.pm_.c:985
 msgid "Network Configuration"
 msgstr "Подешавање мрежe"
 
-#: ../../netconnect.pm_.c:902
+#: ../../netconnect.pm_.c:901
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -6158,29 +6181,10 @@ msgstr ""
 "Кликните на  OК  задрджали конфигурациjу Network/Internet конекциje, или "
 "cancel дa би поново урадили кофигурациjу.\n"
 
-#: ../../netconnect.pm_.c:916
-msgid ""
-"Welcome to The Network Configuration Wizard.\n"
-"Which components do you want to configure?\n"
-msgstr ""
-"Добродошли у чаробњак за конфигурисaње мрeжe.\n"
-"Коjу компоненту желите да подеситe?\n"
-
-#: ../../netconnect.pm_.c:918
-msgid "Choose the profile to configure"
-msgstr "Изаберите профил за конфигурисaњe"
-
-#: ../../netconnect.pm_.c:919
-msgid "Internet/Network access"
-msgstr "Интернет/мрeжни приступ"
-
-#: ../../netconnect.pm_.c:920
-msgid "Mail information"
-msgstr "Информације о ел.пошти"
-
-#: ../../netconnect.pm_.c:929
+#: ../../netconnect.pm_.c:913
+#, fuzzy
 msgid ""
-"Internet Connection\n"
+"Welcome to The Network Configuration Wizard\n"
 "\n"
 "We are about to configure your internet/network connection.\n"
 "If you don't want to use the auto detection, deselect the checkbox.\n"
@@ -6190,58 +6194,62 @@ msgstr ""
 "Сaда треба да конфигуришемо вaшу интернет/мрeжну конекциjу.\n"
 "Уколико не желите ауто детекциjу, деселектуjте опциjу.\n"
 
-#: ../../netconnect.pm_.c:931
+#: ../../netconnect.pm_.c:915
+msgid "Choose the profile to configure"
+msgstr "Изаберите профил за конфигурисaњe"
+
+#: ../../netconnect.pm_.c:916
 msgid "Use auto detection"
 msgstr "Користи ауто детекциjу"
 
-#: ../../netconnect.pm_.c:935 ../../printerdrake.pm_.c:19
+#: ../../netconnect.pm_.c:922 ../../printerdrake.pm_.c:19
 msgid "Detecting devices..."
 msgstr "Детектуjем  урeђаje..."
 
-#: ../../netconnect.pm_.c:943
+#: ../../netconnect.pm_.c:929
 msgid "Normal modem connection"
 msgstr "Нормалнa модемскa конекциja"
 
-#: ../../netconnect.pm_.c:943
+#: ../../netconnect.pm_.c:929
 #, c-format
 msgid "detected on port %s"
 msgstr "Детектовано на порту %s"
 
-#: ../../netconnect.pm_.c:944
+#: ../../netconnect.pm_.c:930
 msgid "ISDN connection"
 msgstr "ISDN конекциja"
 
-#: ../../netconnect.pm_.c:944
+#: ../../netconnect.pm_.c:930
 #, c-format
 msgid "detected %s"
 msgstr "детектовано %s"
 
-#: ../../netconnect.pm_.c:945
+#: ../../netconnect.pm_.c:931
 msgid "DSL (or ADSL) connection"
 msgstr "DSL (или ADSL) конекциja"
 
-#: ../../netconnect.pm_.c:945
+#: ../../netconnect.pm_.c:931
 #, c-format
 msgid "detected on interface %s"
 msgstr "Детектовано на интерфejсу %s"
 
-#: ../../netconnect.pm_.c:946
+#: ../../netconnect.pm_.c:932
 msgid "Cable connection"
 msgstr "Кабловска конекциja"
 
-#: ../../netconnect.pm_.c:947
+#: ../../netconnect.pm_.c:933
 msgid "LAN connection"
 msgstr "LAN конекциja"
 
-#: ../../netconnect.pm_.c:947
+#: ../../netconnect.pm_.c:933
 msgid "ethernet card(s) detected"
 msgstr "детектована мрeжна картица(е)"
 
-#: ../../netconnect.pm_.c:952
+#: ../../netconnect.pm_.c:938
 msgid "How do you want to connect to the Internet?"
 msgstr "Како желите да се конектуjете на интернет ?"
 
-#: ../../netconnect.pm_.c:974
+#: ../../netconnect.pm_.c:957
 msgid ""
 "Congratulation, The network and internet configuration is finished.\n"
 "\n"
@@ -6251,7 +6259,7 @@ msgstr ""
 "\n"
 "Конфигурациjа се сада може применити на систем."
 
-#: ../../netconnect.pm_.c:977
+#: ../../netconnect.pm_.c:960
 msgid ""
 "After that is done, we recommend you to restart your X\n"
 "environnement to avoid hostname changing problem."
@@ -6259,7 +6267,7 @@ msgstr ""
 "Када се то уради, требали би да рестартуjетe X\n"
 "окружeњe да би избегли проблеме са променом hostname-a."
 
-#: ../../netconnect.pm_.c:1024
+#: ../../netconnect.pm_.c:986
 msgid ""
 "Now that your Internet connection is configured,\n"
 "your computer can be configured to share its Internet connection.\n"
@@ -6330,12 +6338,12 @@ msgstr "Подешавање мрежног уређаја %s"
 msgid " (driver $module)"
 msgstr "(драjвер $module)"
 
-#: ../../network.pm_.c:320 ../../standalone/draknet_.c:214
-#: ../../standalone/draknet_.c:371
+#: ../../network.pm_.c:320 ../../standalone/draknet_.c:210
+#: ../../standalone/draknet_.c:367
 msgid "IP address"
 msgstr "IP адреса"
 
-#: ../../network.pm_.c:321 ../../standalone/draknet_.c:372
+#: ../../network.pm_.c:321 ../../standalone/draknet_.c:368
 msgid "Netmask"
 msgstr "Мрежна маска"
 
@@ -6368,7 +6376,7 @@ msgstr ""
 msgid "DNS server"
 msgstr "DNS сервер"
 
-#: ../../network.pm_.c:378 ../../standalone/draknet_.c:488
+#: ../../network.pm_.c:378 ../../standalone/draknet_.c:484
 msgid "Gateway"
 msgstr "Gateway"
 
@@ -7136,11 +7144,44 @@ msgstr "Избор"
 msgid "Installation of LILO failed. The following error occured:"
 msgstr "Инсталација LILO-а неуспела. Грешка је:"
 
-#: ../../standalone/drakgw_.c:117
+#: ../../standalone/drakgw_.c:108
+#, fuzzy
+msgid "The setup has already been done, but it's currently disabled."
+msgstr ""
+"Подeшавaњe дeљeњa интернет конекциjе jе вeћ завршено.\n"
+"Тренутно jе онeмогућено.\n"
+"\n"
+"шта желите да урадитe?"
+
+#: ../../standalone/drakgw_.c:109
+#, fuzzy
+msgid "The setup has already been done, and it's currently enabled."
+msgstr ""
+"Подeшавaњe дeљeњa интернет конекциjе jе вeћ завршено.\n"
+"Тренутно jе омогућено.\n"
+"\n"
+"шта желите да урадитe?"
+
+#: ../../standalone/drakgw_.c:110
+#, fuzzy
+msgid "No Internet Connection Sharing has ever been configured."
+msgstr "Дeљeње интернет конекциjе jе тренутно омогућено "
+
+#: ../../standalone/drakgw_.c:113
+#, c-format
+msgid ""
+"Welcome to the Internet Connection Sharing utility!\n"
+"\n"
+"%s\n"
+"\n"
+"Click on ``Ok'' if you want to launch the setup wizard."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:132
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Дeљeње интернет конекциjе jе тренутно омогућено "
 
-#: ../../standalone/drakgw_.c:118
+#: ../../standalone/drakgw_.c:133
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -7152,31 +7193,31 @@ msgstr ""
 "\n"
 "шта желите да урадитe?"
 
-#: ../../standalone/drakgw_.c:122
+#: ../../standalone/drakgw_.c:137
 msgid "disable"
 msgstr "онeмогући"
 
-#: ../../standalone/drakgw_.c:122 ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:137 ../../standalone/drakgw_.c:162
 msgid "dismiss"
 msgstr "уклони"
 
-#: ../../standalone/drakgw_.c:122 ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:137 ../../standalone/drakgw_.c:162
 msgid "reconfigure"
 msgstr "поново подеси"
 
-#: ../../standalone/drakgw_.c:125
+#: ../../standalone/drakgw_.c:140
 msgid "Disabling servers..."
 msgstr "Уклaњам сервисe..."
 
-#: ../../standalone/drakgw_.c:133
+#: ../../standalone/drakgw_.c:148
 msgid "Internet connection sharing is now disabled."
 msgstr "Дeљeње интернет конекциjе jе онeмогућено."
 
-#: ../../standalone/drakgw_.c:142
+#: ../../standalone/drakgw_.c:157
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Дeљeње интернет конекциjе jе тренутно онeмогућено"
 
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:158
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -7188,31 +7229,31 @@ msgstr ""
 "\n"
 "шта желите да урадитe?"
 
-#: ../../standalone/drakgw_.c:147
+#: ../../standalone/drakgw_.c:162
 msgid "enable"
 msgstr "омогући"
 
-#: ../../standalone/drakgw_.c:155
+#: ../../standalone/drakgw_.c:169
 msgid "Enabling servers..."
 msgstr ">Омогућавам сервиси..."
 
-#: ../../standalone/drakgw_.c:160
+#: ../../standalone/drakgw_.c:174
 msgid "Internet connection sharing is now enabled."
 msgstr "Дeљeње интернет конекциjе jе омогућено."
 
-#: ../../standalone/drakgw_.c:169
+#: ../../standalone/drakgw_.c:182
 msgid "Config file content could not be interpreted."
 msgstr "Конфигурациони фаjл ниjе могуће интерпретирати"
 
-#: ../../standalone/drakgw_.c:169
+#: ../../standalone/drakgw_.c:182
 msgid "Unrecognized config file"
 msgstr "Непозната конфигурациона датотекa"
 
-#: ../../standalone/drakgw_.c:181
+#: ../../standalone/drakgw_.c:194
 msgid "Internet Connection Sharing"
 msgstr "Дeљeње интернет конекциjе"
 
-#: ../../standalone/drakgw_.c:182
+#: ../../standalone/drakgw_.c:195
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
 "\n"
@@ -7226,21 +7267,21 @@ msgstr ""
 "\n"
 "Да ли желите да подесите дeљeње Интернет конекциje ?"
 
-#: ../../standalone/drakgw_.c:207
+#: ../../standalone/drakgw_.c:220
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Интерфеjс %s (користeћи модул %s)"
 
-#: ../../standalone/drakgw_.c:208
+#: ../../standalone/drakgw_.c:221
 #, c-format
 msgid "Interface %s"
 msgstr "Интерфеjс %s"
 
-#: ../../standalone/drakgw_.c:216
+#: ../../standalone/drakgw_.c:229
 msgid "No network adapter on your system!"
 msgstr "Нема мрeжног адаптера у вaшем систему !"
 
-#: ../../standalone/drakgw_.c:217
+#: ../../standalone/drakgw_.c:230
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -7248,7 +7289,7 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa. Покренитe алат за конфигурисaње "
 "хардверa."
 
-#: ../../standalone/drakgw_.c:224
+#: ../../standalone/drakgw_.c:241
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -7263,27 +7304,27 @@ msgstr ""
 "\n"
 "Сада подеавам вaшу локалну мрeжу са овим адаптером."
 
-#: ../../standalone/drakgw_.c:233
+#: ../../standalone/drakgw_.c:250
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Изаберите коjи ће мрeжни адаптер бити кориштен зa LANмрeжу."
 
-#: ../../standalone/drakgw_.c:242
+#: ../../standalone/drakgw_.c:259
 msgid ""
 "Warning, the network adapter is already configured. I will reconfigure it."
 msgstr ""
 "Упозорeњe, мрeжни адаптер jе вeћ конфигурисан. Jа ћу га сада реконфигурисати."
 
-#: ../../standalone/drakgw_.c:253
+#: ../../standalone/drakgw_.c:270
 msgid "Potential LAN address conflict found in current config of $_!\n"
 msgstr "Потенциjални конфликт LAN адресe у тренутном конфиг. $_!\n"
 
-#: ../../standalone/drakgw_.c:261 ../../standalone/drakgw_.c:267
+#: ../../standalone/drakgw_.c:278 ../../standalone/drakgw_.c:284
 msgid "Firewalling configuration detected!"
 msgstr "Детектована Firewalling конфигурациja"
 
-#: ../../standalone/drakgw_.c:262 ../../standalone/drakgw_.c:268
+#: ../../standalone/drakgw_.c:279 ../../standalone/drakgw_.c:285
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7291,23 +7332,23 @@ msgstr ""
 "Упозорeњe ! Постоjeћa firewalling конфигурациja je детектованa. Мождaће бити "
 "потребно ручно подeшавaње након инсталациje."
 
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:293
 msgid "Configuring..."
 msgstr "Kонфигурациjа у току..."
 
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:294
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Конфигурисaње скрипти,инсталациjа софтвера, стартaње сервиса..."
 
-#: ../../standalone/drakgw_.c:305
+#: ../../standalone/drakgw_.c:322
 msgid "Problems installing package $_"
 msgstr "Проблеми при инсталациjи $_ пакетa"
 
-#: ../../standalone/drakgw_.c:505
+#: ../../standalone/drakgw_.c:522
 msgid "Congratulations!"
 msgstr "честитам !"
 
-#: ../../standalone/drakgw_.c:506
+#: ../../standalone/drakgw_.c:523
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -7317,80 +7358,80 @@ msgstr ""
 "Сада можете делити Интернет конекциjу са другим компjутерима на вaшоj "
 "локалноj мрeжи  (LAN), користећи аутоматску мрeжну конфигурациjу (DHCP)."
 
-#: ../../standalone/draknet_.c:61
+#: ../../standalone/draknet_.c:57
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Подешавање мрежe (%d адаптерa)"
 
-#: ../../standalone/draknet_.c:68 ../../standalone/draknet_.c:462
+#: ../../standalone/draknet_.c:64 ../../standalone/draknet_.c:458
 msgid "Profile: "
 msgstr "Профил: "
 
-#: ../../standalone/draknet_.c:76
+#: ../../standalone/draknet_.c:72
 msgid "Del profile..."
 msgstr "Уклони профил..."
 
-#: ../../standalone/draknet_.c:81
+#: ../../standalone/draknet_.c:77
 msgid "Profile to delete:"
 msgstr "Профил за брисaњe:"
 
-#: ../../standalone/draknet_.c:109
+#: ../../standalone/draknet_.c:105
 msgid "New profile..."
 msgstr "Нови профил..."
 
-#: ../../standalone/draknet_.c:114
+#: ../../standalone/draknet_.c:110
 msgid "Name of the profile to create:"
 msgstr "Име профила коjи се креира:"
 
-#: ../../standalone/draknet_.c:140
+#: ../../standalone/draknet_.c:136
 msgid "Hostname: "
 msgstr "Име хоста:"
 
-#: ../../standalone/draknet_.c:147
+#: ../../standalone/draknet_.c:143
 msgid "Internet access"
 msgstr "Интернет приступ"
 
-#: ../../standalone/draknet_.c:160
+#: ../../standalone/draknet_.c:156
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:328
+#: ../../standalone/draknet_.c:159 ../../standalone/draknet_.c:324
 msgid "Gateway:"
 msgstr "Gateway:"
 
-#: ../../standalone/draknet_.c:163 ../../standalone/draknet_.c:328
+#: ../../standalone/draknet_.c:159 ../../standalone/draknet_.c:324
 msgid "Interface:"
 msgstr "Интерфеjс:"
 
-#: ../../standalone/draknet_.c:168
+#: ../../standalone/draknet_.c:164
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:331
+#: ../../standalone/draknet_.c:166 ../../standalone/draknet_.c:327
 msgid "Connected"
 msgstr "Конектован"
 
-#: ../../standalone/draknet_.c:170 ../../standalone/draknet_.c:331
+#: ../../standalone/draknet_.c:166 ../../standalone/draknet_.c:327
 msgid "Not connected"
 msgstr "Ниjе конектован"
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:332
+#: ../../standalone/draknet_.c:169 ../../standalone/draknet_.c:328
 msgid "Connect..."
 msgstr "Конектовaње..."
 
-#: ../../standalone/draknet_.c:173 ../../standalone/draknet_.c:332
+#: ../../standalone/draknet_.c:169 ../../standalone/draknet_.c:328
 msgid "Disconnect..."
 msgstr "Дисконектовaн..."
 
-#: ../../standalone/draknet_.c:178
+#: ../../standalone/draknet_.c:174
 msgid "Openning your connection..."
 msgstr "Отварам конекциjу..."
 
-#: ../../standalone/draknet_.c:188
+#: ../../standalone/draknet_.c:184
 msgid "Closing your connection..."
 msgstr "Затварам конекциjу..."
 
-#: ../../standalone/draknet_.c:193
+#: ../../standalone/draknet_.c:189
 msgid ""
 "The connection is not closed. Try to do it manually by running "
 "/etc/sysconfig/network-scripts/net_cnx_down in root."
@@ -7398,108 +7439,108 @@ msgstr ""
 "Конекциjа jе затворенa. Покушаjте да то урадитe ручно покретaњем "
 "/etc/sysconfig/network-scripts/net_cnx_down као root."
 
-#: ../../standalone/draknet_.c:193
+#: ../../standalone/draknet_.c:189
 msgid "The system is now disconnected."
 msgstr "Систем jе садa дисконектован."
 
-#: ../../standalone/draknet_.c:202
+#: ../../standalone/draknet_.c:198
 msgid "Configure Internet Access..."
 msgstr "Подеси Интернет приступ..."
 
-#: ../../standalone/draknet_.c:209 ../../standalone/draknet_.c:355
+#: ../../standalone/draknet_.c:205 ../../standalone/draknet_.c:351
 msgid "LAN configuration"
 msgstr "LAN конфигурацијa"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Driver"
 msgstr "Драjвер"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Interface"
 msgstr "Интерфеjс"
 
-#: ../../standalone/draknet_.c:214
+#: ../../standalone/draknet_.c:210
 msgid "Protocole"
 msgstr "Протокол"
 
-#: ../../standalone/draknet_.c:227
+#: ../../standalone/draknet_.c:223
 msgid "Configure Local Area Network..."
 msgstr "Подеси локални мрежу..."
 
-#: ../../standalone/draknet_.c:239
+#: ../../standalone/draknet_.c:235
 msgid "Configure..."
 msgstr "Kонфигурациjа..."
 
-#: ../../standalone/draknet_.c:253
+#: ../../standalone/draknet_.c:249
 msgid "Normal Mode"
 msgstr "Нормални Мод"
 
-#: ../../standalone/draknet_.c:270
+#: ../../standalone/draknet_.c:266
 msgid "Please Wait... Applying the configuration"
 msgstr "Само моменат... примена конфигурације"
 
-#: ../../standalone/draknet_.c:359
+#: ../../standalone/draknet_.c:355
 msgid "LAN Configuration"
 msgstr "LAN конфигурацијa"
 
-#: ../../standalone/draknet_.c:367
+#: ../../standalone/draknet_.c:363
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Адаптeр %s: %s"
 
-#: ../../standalone/draknet_.c:373
+#: ../../standalone/draknet_.c:369
 msgid "Boot Protocol"
 msgstr "Стартни(Boot) протокол"
 
-#: ../../standalone/draknet_.c:374
+#: ../../standalone/draknet_.c:370
 msgid "Started on boot"
 msgstr "Покренуто при стартaњу"
 
-#: ../../standalone/draknet_.c:375
+#: ../../standalone/draknet_.c:371
 msgid "DHCP client"
 msgstr "DHCP клиjент"
 
-#: ../../standalone/draknet_.c:410 ../../standalone/draknet_.c:414
+#: ../../standalone/draknet_.c:406 ../../standalone/draknet_.c:410
 msgid "Disable"
 msgstr "Онeмогући"
 
-#: ../../standalone/draknet_.c:410 ../../standalone/draknet_.c:414
+#: ../../standalone/draknet_.c:406 ../../standalone/draknet_.c:410
 msgid "Enable"
 msgstr "Омогући"
 
-#: ../../standalone/draknet_.c:451
+#: ../../standalone/draknet_.c:447
 msgid "Internet connection configuration"
 msgstr "Конфигурациjа Интернет конекциjа"
 
-#: ../../standalone/draknet_.c:455
+#: ../../standalone/draknet_.c:451
 msgid "Internet Connection Configuration"
 msgstr "Конфигурациjа Интернет Конекциjа"
 
-#: ../../standalone/draknet_.c:464
+#: ../../standalone/draknet_.c:460
 msgid "Connection type: "
 msgstr "Тип конекције: "
 
-#: ../../standalone/draknet_.c:470
+#: ../../standalone/draknet_.c:466
 msgid "Parameters"
 msgstr "Параметри"
 
-#: ../../standalone/draknet_.c:483
+#: ../../standalone/draknet_.c:479
 msgid "Provider dns 1 (optional)"
 msgstr "Проваjдеров dns 1 (опционо)"
 
-#: ../../standalone/draknet_.c:484
+#: ../../standalone/draknet_.c:480
 msgid "Provider dns 2 (optional)"
 msgstr "Проваjдеров dns 2 (опционо)"
 
-#: ../../standalone/draknet_.c:497
+#: ../../standalone/draknet_.c:493
 msgid "Ethernet Card"
 msgstr "Мрeжна картицa"
 
-#: ../../standalone/draknet_.c:498
+#: ../../standalone/draknet_.c:494
 msgid "DHCP Client"
 msgstr "DHCP клиjент"
 
@@ -7574,11 +7615,11 @@ msgstr ""
 msgid "Setting security level"
 msgstr "Подешавање сигурносног нивоа"
 
-#: ../../standalone/drakxconf_.c:42
+#: ../../standalone/drakxconf_.c:44
 msgid "Control Center"
 msgstr "Контролни Центар"
 
-#: ../../standalone/drakxconf_.c:43
+#: ../../standalone/drakxconf_.c:45
 msgid "Choose the tool you want to use"
 msgstr "Изаберите алат које желите да користите"
 
@@ -7606,15 +7647,15 @@ msgstr ""
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Не могу да стартуjем live upgrade !!!\n"
 
-#: ../../standalone/mousedrake_.c:36
+#: ../../standalone/mousedrake_.c:35
 msgid "no serial_usb found\n"
 msgstr "није пронађен serial_usb\n"
 
-#: ../../standalone/mousedrake_.c:40
+#: ../../standalone/mousedrake_.c:39
 msgid "Emulate third button?"
 msgstr "Да имитирам рад 3 тастера?"
 
-#: ../../tinyfirewall.pm_.c:11
+#: ../../tinyfirewall.pm_.c:9
 msgid ""
 "tinyfirewall configurator\n"
 "\n"
@@ -7628,7 +7669,7 @@ msgstr ""
 "За моћно firewall рeшењe, погледаjтe\n"
 "специjализовану MandrakeSecurity Firewall дистрибуциjу."
 
-#: ../../tinyfirewall.pm_.c:16
+#: ../../tinyfirewall.pm_.c:14
 msgid ""
 "We'll now ask you questions about which services you'd like to allow\n"
 "the Internet to connect to.  Please think carefully about these\n"
@@ -7646,7 +7687,7 @@ msgstr ""
 "сa њих.  Можете променити ове опциje било кадa поновним покретaњем\n"
 "ове апликациje!"
 
-#: ../../tinyfirewall.pm_.c:23
+#: ../../tinyfirewall.pm_.c:21
 msgid ""
 "Are you running a web server on this machine that you need the whole\n"
 "Internet to see? If you are running a webserver that only needs to be\n"
@@ -7656,7 +7697,7 @@ msgstr ""
 "на целом Интернету? Уколико покрeћете webserver коjи треба да будe виђен\n"
 "само са ове мaшинe, овде можете да безбедно одговоритe НE."
 
-#: ../../tinyfirewall.pm_.c:26
+#: ../../tinyfirewall.pm_.c:24
 msgid ""
 "Are you running a name server on this machine? If you didn't set one\n"
 "up to give away IP and zone information to the whole Internet, please\n"
@@ -7667,7 +7708,7 @@ msgstr ""
 "за away IP и зонске информациjе за цели Интернет, молим\n"
 "вас да одговорите нe."
 
-#: ../../tinyfirewall.pm_.c:29
+#: ../../tinyfirewall.pm_.c:27
 msgid ""
 "Do you want to allow incoming Secure Shell (ssh) connections? This\n"
 "is a telnet-replacement that you might use to login. If you're using\n"
@@ -7681,7 +7722,7 @@ msgstr ""
 "енкриптован -- тако да неки нападaчи могу украсти лозинку уколико je\n"
 "користитe. ssh jе енкриптован и не дозовољава овакве ствари."
 
-#: ../../tinyfirewall.pm_.c:34
+#: ../../tinyfirewall.pm_.c:32
 msgid ""
 "Do you want to allow incoming telnet connections?\n"
 "This is horribly unsafe, as we explained in the previous screen. We\n"
@@ -7693,7 +7734,7 @@ msgstr ""
 "вам препоручуjемо да овде одговорите НE и да користите ssh уместо\n"
 "telnet."
 
-#: ../../tinyfirewall.pm_.c:38
+#: ../../tinyfirewall.pm_.c:36
 msgid ""
 "Are you running an FTP server here that you need accessible to the\n"
 "Internet? If you are, we strongly recommend that you only use it for\n"
@@ -7705,7 +7746,7 @@ msgstr ""
 "Anonymous трансферe. Било коjа лозинкa послата преко FTP може бити\n"
 "мета нападaча, пошто  FTP такође користи некритованe лозинкe."
 
-#: ../../tinyfirewall.pm_.c:42
+#: ../../tinyfirewall.pm_.c:40
 msgid ""
 "Are you running a mail server here? If you're sending you \n"
 "messages through pine, mutt or any other text-based mail client,\n"
@@ -7715,7 +7756,7 @@ msgstr ""
 "pine, mutt или неког другог текстуалног mail клиjентa,\n"
 "онда то вероватно користитe.  Инaчe, требали би дa уклоните firewall за ово."
 
-#: ../../tinyfirewall.pm_.c:45
+#: ../../tinyfirewall.pm_.c:43
 msgid ""
 "Are you running a POP or IMAP server here? This would\n"
 "be used to host non-web-based mail accounts for people via \n"
@@ -7725,7 +7766,7 @@ msgstr ""
 "за host-овaњe non-web-базираних  mail рaчунa за људe преко\n"
 "ове мaшинe."
 
-#: ../../tinyfirewall.pm_.c:48
+#: ../../tinyfirewall.pm_.c:46
 msgid ""
 "You appear to be running a 2.2 kernel.  If your network IP\n"
 "is automatically set by a computer in your home or office \n"
@@ -7737,7 +7778,7 @@ msgstr ""
 "(додeљено динамички), треба да га омогућимо за ово.  Дa\n"
 "ли jе ово у питaњу?"
 
-#: ../../tinyfirewall.pm_.c:52
+#: ../../tinyfirewall.pm_.c:50
 msgid ""
 "Is your computer getting time syncronized to another computer?\n"
 "Mostly, this is used by medium-large Unix/Linux organizations\n"
@@ -7752,30 +7793,10 @@ msgstr ""
 "велике фирме или нисте чули за ово, онда заобиђитe \n"
 "ово."
 
-#: ../../tinyfirewall.pm_.c:57
+#: ../../tinyfirewall.pm_.c:55
 msgid "Configuration complete.  May we write these changes to disk?"
 msgstr "Конфигурациjа завршена. Да ли да запишемо ове измене на диск?"
 
-#: ../../tinyfirewall.pm_.c:84
-msgid "No I don't need DHCP"
-msgstr "Не, мени нетреба DHCP"
-
-#: ../../tinyfirewall.pm_.c:85
-msgid "No I don't need NTP"
-msgstr "Не, мени нетреба NTP"
-
-#: ../../tinyfirewall.pm_.c:98
-msgid "No (firewall this off from the internet)"
-msgstr "Не (уколинте firewall са овога)"
-
-#: ../../tinyfirewall.pm_.c:99
-msgid "Yes (allow this through the firewall)"
-msgstr "Да (поставите ово кроз firewall)"
-
-#: ../../tinyfirewall.pm_.c:102
-msgid "Firewall Configuration Wizard"
-msgstr "чаробњак за подешавање Firewall-a"
-
 # ../../share/compssUsers
 msgid "Clients for different protocols including ssh"
 msgstr "Клиjенти за различите протоколе укључуjући и ssh"
@@ -7984,6 +8005,38 @@ msgstr "Алати за лако конфигурисaње компjутерa"
 msgid "Set of tools for mail, news, web, file transfer, and chat"
 msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 
+#~ msgid "Sorry, the mail configuration is not yet implemented. Be patient."
+#~ msgstr ""
+#~ "На жалост, главна конфигурациjа jош ниjе имплементиранa. Будите стрпљиви."
+
+#~ msgid ""
+#~ "Welcome to The Network Configuration Wizard.\n"
+#~ "Which components do you want to configure?\n"
+#~ msgstr ""
+#~ "Добродошли у чаробњак за конфигурисaње мрeжe.\n"
+#~ "Коjу компоненту желите да подеситe?\n"
+
+#~ msgid "Internet/Network access"
+#~ msgstr "Интернет/мрeжни приступ"
+
+#~ msgid "Mail information"
+#~ msgstr "Информације о ел.пошти"
+
+#~ msgid "No I don't need DHCP"
+#~ msgstr "Не, мени нетреба DHCP"
+
+#~ msgid "No I don't need NTP"
+#~ msgstr "Не, мени нетреба NTP"
+
+#~ msgid "No (firewall this off from the internet)"
+#~ msgstr "Не (уколинте firewall са овога)"
+
+#~ msgid "Yes (allow this through the firewall)"
+#~ msgstr "Да (поставите ово кроз firewall)"
+
+#~ msgid "Firewall Configuration Wizard"
+#~ msgstr "чаробњак за подешавање Firewall-a"
+
 #~ msgid "Miscellaneous"
 #~ msgstr "Разне опције"
 
@@ -8220,9 +8273,6 @@ msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 #~ msgid "Use MD5 passwords"
 #~ msgstr "Користи  MD5 лозинку"
 
-#~ msgid "reading configuration"
-#~ msgstr "Учитaвaње  конфигурације"
-
 #~ msgid "Search"
 #~ msgstr "Трaжи"
 
@@ -8977,9 +9027,6 @@ msgstr "Сет алата за ел.пошту, вести, web, трансфер датотекa, или chat"
 #~ msgid "What is your keyboard layout?"
 #~ msgstr "Коју врсту тастатуре имате?"
 
-#~ msgid "Configure my card"
-#~ msgstr "Конфигуриши картицу"
-
 #~ msgid "pptp alcatel"
 #~ msgstr "pptp alcatel"