updated pot file

3 files changed, 2012 insertions, 1158 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 45e30e9a9..ac083fe37 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-27 14:34+0200\n"
+"POT-Creation-Date: 2000-09-28 14:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -449,7 +449,7 @@ msgstr ""
 msgid "LILO/grub Installation"
 msgstr ""
 
-#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:638
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:744
 msgid "None"
 msgstr ""
 
@@ -485,14 +485,15 @@ msgstr ""
 msgid "Delay before booting default image"
 msgstr ""
 
-#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:666
-#: ../../install_steps_interactive.pm_.c:717 ../../printerdrake.pm_.c:94
-#: ../../printerdrake.pm_.c:128 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:823 ../../netconnect.pm_.c:507
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr ""
 
-#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:667
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:824
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr ""
@@ -514,14 +515,14 @@ msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:676
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:837
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr ""
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:676
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:837
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr ""
@@ -538,8 +539,8 @@ msgid "Add"
 msgstr ""
 
 #: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:711 ../../printerdrake.pm_.c:353
-#: ../../standalone/adduserdrake_.c:36
+#: ../../install_steps_interactive.pm_.c:817 ../../netconnect.pm_.c:746
+#: ../../printerdrake.pm_.c:353 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr ""
 
@@ -595,8 +596,8 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
-#: ../../install_steps_interactive.pm_.c:664 ../../interactive.pm_.c:76
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:770 ../../interactive.pm_.c:76
 #: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
 #: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
@@ -632,12 +633,13 @@ msgid "Do you have any %s interfaces?"
 msgstr ""
 
 #: ../../any.pm_.c:502 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:77 ../../printerdrake.pm_.c:234
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:428
+#: ../../printerdrake.pm_.c:234
 msgid "No"
 msgstr ""
 
 #: ../../any.pm_.c:502 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:75
+#: ../../netconnect.pm_.c:76 ../../netconnect.pm_.c:426
 msgid "Yes"
 msgstr ""
 
@@ -942,7 +944,7 @@ msgstr ""
 
 #: ../../diskdrake.pm_.c:202 ../../install_steps.pm_.c:73
 #: ../../install_steps_interactive.pm_.c:38
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:341 ../../standalone/diskdrake_.c:60
 #: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr ""
@@ -1176,7 +1178,7 @@ msgstr ""
 msgid "Formatting loopback file %s"
 msgstr ""
 
-#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:325
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:428
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
@@ -1227,7 +1229,7 @@ msgid "Computing FAT filesystem bounds"
 msgstr ""
 
 #: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr ""
 
@@ -1246,7 +1248,7 @@ msgstr ""
 
 #: ../../diskdrake.pm_.c:601 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
-#: ../../install_steps_interactive.pm_.c:426
+#: ../../install_steps_interactive.pm_.c:531
 #: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr ""
@@ -1428,12 +1430,12 @@ msgid ""
 "installed or if you wish to use several operating systems.\n"
 "\n"
 "\n"
-"Please choose \"Rescue\" if you wish to rescue an already installed version "
+"Please choose \"Update\" if you wish to update an already installed version "
 "of Linux-Mandrake.\n"
 "\n"
 "\n"
 "Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or rescue your\n"
+"levels to install or update your\n"
 "Linux-Mandrake operating system:\n"
 "\n"
 "\t* Recommanded: if you have never installed a GNU/Linux operating system "
@@ -2424,7 +2426,7 @@ msgstr ""
 msgid "Choose your keyboard"
 msgstr ""
 
-#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:420
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:524
 msgid "Miscellaneous"
 msgstr ""
 
@@ -2460,8 +2462,8 @@ msgstr ""
 msgid "Configure printer"
 msgstr ""
 
-#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:665
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:771
 msgid "Set root password"
 msgstr ""
 
@@ -2493,15 +2495,15 @@ msgstr ""
 msgid "Error reading file $f"
 msgstr ""
 
-#: ../../install_gtk.pm_.c:428
+#: ../../install_gtk.pm_.c:427
 msgid "Please test the mouse"
 msgstr ""
 
-#: ../../install_gtk.pm_.c:429
+#: ../../install_gtk.pm_.c:428
 msgid "To activate the mouse,"
 msgstr ""
 
-#: ../../install_gtk.pm_.c:430
+#: ../../install_gtk.pm_.c:429
 msgid "MOVE YOUR WHEEL!"
 msgstr ""
 
@@ -2551,45 +2553,45 @@ msgid "Use the Windows partition for loopback"
 msgstr ""
 
 #: ../../install_interactive.pm_.c:90
-msgid "Which partition do you want to use to put Linux4Win?"
+msgid "Which partition do you want to use for Linux4Win?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:92
 msgid "Choose the sizes"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:93
 msgid "Root partition size in MB: "
 msgstr ""
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:94
 msgid "Swap partition size in MB: "
 msgstr ""
 
-#: ../../install_interactive.pm_.c:101
+#: ../../install_interactive.pm_.c:102
 msgid "Use the free space on the Windows partition"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:105
 msgid "Which partition do you want to resize?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Computing Windows filesystem bounds"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:108
+#: ../../install_interactive.pm_.c:109
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
 "the following error occured: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:112
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:113
 msgid ""
 "WARNING!\n"
 "\n"
@@ -2600,56 +2602,56 @@ msgid ""
 "When sure, press Ok."
 msgstr ""
 
-#: ../../install_interactive.pm_.c:121
+#: ../../install_interactive.pm_.c:122
 msgid "Which size do you want to keep for windows on"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:122
+#: ../../install_interactive.pm_.c:123
 #, c-format
 msgid "partition %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:129
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:143
+#: ../../install_interactive.pm_.c:144
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:150
 msgid "Erase entire disk"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:150
 msgid "Remove Windows(TM)"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:153
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:156
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:162
+#: ../../install_interactive.pm_.c:164
 msgid "Expert mode"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:162
+#: ../../install_interactive.pm_.c:164
 msgid "Use diskdrake"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:166
+#: ../../install_interactive.pm_.c:168
 msgid "Use fdisk"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:171
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -2657,19 +2659,23 @@ msgid ""
 msgstr ""
 
 #: ../../install_interactive.pm_.c:202
+msgid "I can't find any room for installing"
+msgstr ""
+
+#: ../../install_interactive.pm_.c:205
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:207
+#: ../../install_interactive.pm_.c:210
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:222
+#: ../../install_interactive.pm_.c:225
 msgid "Bringing up the network"
 msgstr ""
 
-#: ../../install_interactive.pm_.c:227
+#: ../../install_interactive.pm_.c:230
 msgid "Bringing down the network"
 msgstr ""
 
@@ -2715,69 +2721,69 @@ msgstr ""
 msgid "Total size: "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:352
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:353
 #: ../../standalone/rpmdrake_.c:136
 #, c-format
 msgid "Version: %s\n"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:353
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:354
 #: ../../standalone/rpmdrake_.c:137
 #, c-format
 msgid "Size: %d KB\n"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:259
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:260
 msgid "Choose the packages you want to install"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:262
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:263
 msgid "Info"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:267
-#: ../../install_steps_interactive.pm_.c:139 ../../standalone/rpmdrake_.c:161
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:268
+#: ../../install_steps_interactive.pm_.c:242 ../../standalone/rpmdrake_.c:161
 msgid "Install"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:465
-#: ../../install_steps_interactive.pm_.c:500
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:606
 msgid "Installing"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:472
 msgid "Please wait, "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:474
 msgid "Time remaining "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:474
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:475
 msgid "Total time "
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:483
-#: ../../install_steps_interactive.pm_.c:500
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:484
+#: ../../install_steps_interactive.pm_.c:606
 msgid "Preparing installation"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:499
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:500
 #, c-format
 msgid "Installing package %s"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:541
-#: ../../install_steps_gtk.pm_.c:545
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:546
 msgid "Go on anyway?"
 msgstr ""
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:541
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
 msgid "There was an error ordering packages:"
 msgstr ""
 
 #: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Use existing configuration for X11?"
 msgstr ""
 
@@ -2793,13 +2799,13 @@ msgstr ""
 msgid "Please, choose one of the following classes of installation:"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:214
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:216
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -2808,7 +2814,7 @@ msgid ""
 "a percentage of 100%% will install all selected packages."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:221
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -2818,101 +2824,101 @@ msgid ""
 "a percentage of %d%% will install as many packages as possible."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:227
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:271
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:331 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:350
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:351
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:354
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:362
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:381
+#: ../../install_steps_gtk.pm_.c:382
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:385
+#: ../../install_steps_gtk.pm_.c:386
 msgid "The following packages are going to be installed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:386
+#: ../../install_steps_gtk.pm_.c:387
 msgid "The following packages are going to be removed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:396
+#: ../../install_steps_gtk.pm_.c:397
 msgid "You can't select/unselect this package"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:415
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:421
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:424
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:468
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:480 ../../interactive.pm_.c:86
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
 #: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
 #: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
 #: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:494
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:525
+#: ../../install_steps_gtk.pm_.c:526
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -2922,7 +2928,7 @@ msgid ""
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 
-#: ../../install_steps_gtk.pm_.c:545
+#: ../../install_steps_gtk.pm_.c:546
 msgid "There was an error installing packages:"
 msgstr ""
 
@@ -2934,65 +2940,227 @@ msgstr ""
 msgid "Please, choose a language to use."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+" Introduction\n"
+"\n"
+"The operating system and the different components available in the "
+"Linux-Mandrake distribution \n"
+"shall be called the \"Software Products\" hereafter. The Software Products "
+"include, but are not \n"
+"restricted to, the set of programs, methods, rules and documentation related "
+"to the operating \n"
+"system and the different components of the Linux-Mandrake distribution.\n"
+"\n"
+"\n"
+"1. License Agreement\n"
+"\n"
+"Please read carefully this document. This document is a license agreement "
+"between you and  \n"
+"MandrakeSoft S.A., 42, rue d'Aboukir, 75002 Paris - France, which applies to "
+"the Software Products.\n"
+"By installing, duplicating or using the Software Products in any manner, you "
+"explicitly \n"
+"accept and fully agree to conform to the terms and conditions of this "
+"License. \n"
+"If you disagree with any portion of the License, you are not allowed to "
+"install, duplicate or use \n"
+"the Software Products. \n"
+"Any attempt to install, duplicate or use the Software Products in a manner "
+"which does not comply \n"
+"with the terms and conditions of this License is void and will terminate "
+"your rights under this \n"
+"License. Upon termination of the License,  you must immediately destroy all "
+"copies of the \n"
+"Software Products.\n"
+"\n"
+"\n"
+"2. The GPL License and Related Licenses\n"
+"\n"
+"The Software Products consist of components created by different persons or "
+"entities.  Most \n"
+"of these components are governed under the terms and conditions of the GNU "
+"General Public \n"
+"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
+"licenses allow you to use, \n"
+"duplicate, adapt or redistribute the components which they cover. Please "
+"read carefully the terms \n"
+"and conditions of the license agreement for each component before using any "
+"component. Any question \n"
+"on a component license should be addressed to the component author and not "
+"to MandrakeSoft.\n"
+"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"Documentation written \n"
+"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"documentation for \n"
+"further details.\n"
+"Some versions of the Software Products may contain components which are not "
+"governed by the GPL \n"
+"License or similar agreements. Each such component is then governed by the "
+"terms and conditions \n"
+"of its own specific license. Please read carefully and comply with such "
+"specific licenses before \n"
+"you install, use or redistribute the said components. Such licenses will in "
+"general prevent the \n"
+"transfer,  duplication (except for backup purposes), redistribution, reverse "
+"engineering, \n"
+"de-assembly, \n"
+"de-compilation or modification of the component. Any breach of agreement "
+"will immediately terminate \n"
+"your rights under the specific license. Unless the specific license terms "
+"grant you such rights, \n"
+"you usually cannot install the programs on more than one system, or adapt it "
+"to be used on a \n"
+"network. \n"
+"In doubt, please contact directly the distributor or editor of the "
+"component. Transfer to third \n"
+"parties or copying of such components including the documentation is usually "
+"forbidden.\n"
+"\n"
+"\n"
+"3. Intellectual Property Rights\n"
+"\n"
+"All rights to the components of the Software Products belong to their "
+"respective authors and are \n"
+"protected by intellectual property and copyright laws applicable to software "
+"programs.\n"
+"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Products, as a whole or in \n"
+"parts,\n"
+"by all means and for all purposes.\n"
+"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  All rights \n"
+"are \n"
+"reserved. The duplication is forbidden without prior written consent by "
+"MandrakeSoft S.A.\n"
+"\n"
+"\n"
+"4. Limited Warranty\n"
+"\n"
+"The Software Products and attached documentation are provided \"as is\", "
+"with no warranty, to the \n"
+"extent permitted by law. Should the Software Products be defective, "
+"MandrakeSoft S.A. will at its \n"
+"own will either replace the Software Products, or reimburse the paid fee.\n"
+"This limited warranty is void if you fail to comply to the recommendations, "
+"instructions and \n"
+"conditions \n"
+"of use listed in the documentation or license agreements of the Software "
+"Products.\n"
+"To the extent permitted by law, MandrakeSoft S.A. will in no circumstances "
+"be liable for any \n"
+"special, \n"
+"incidental, direct or indirect damages whatsoever (including without "
+"limitation damages for loss of \n"
+"business, interruption of business, financial loss, legal fees and penalties "
+"resulting from a court \n"
+"judgement, or any other consequential loss) arising out of  the use or "
+"inability to use the \n"
+"Software \n"
+"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
+"occurance of such \n"
+"damages.\n"
+"\n"
+"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
+"COUNTRIES\n"
+"\n"
+"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"in no circumstances, be \n"
+"liable for any special, incidental, direct or indirect damages whatsoever "
+"(including without \n"
+"limitation \n"
+"damages for loss of business, interruption of business, financial loss, "
+"legal fees and penalties \n"
+"resulting from a court judgement, or any other consequential loss) arising "
+"out of the possession \n"
+"and \n"
+"use of software components or arising out of  downloading software "
+"components from one of \n"
+"Linux-Mandrake \n"
+"sites  which are prohibited or restricted in some countries by local laws. "
+"This limited liability \n"
+"applies to, but is not restricted to, the strong cryptography components "
+"included in the Software \n"
+"Products.\n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgement, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, \n"
+"the dispute will be referred to the appropriate Courts of Law of Paris - "
+"France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.,  \n"
+"42, rue d'Aboukir, 75002 Paris - France\n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:173
 msgid "Accept"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:173
 msgid "Refuse"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:180
 #: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:80
+#: ../../install_steps_interactive.pm_.c:181
 #: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:91
+#: ../../install_steps_interactive.pm_.c:192
 msgid "You can choose other languages that will be available after install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:98
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:199
+#: ../../install_steps_interactive.pm_.c:533
 msgid "All"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:106
-#: ../../install_steps_interactive.pm_.c:150
+#: ../../install_steps_interactive.pm_.c:207
+#: ../../install_steps_interactive.pm_.c:253
 msgid "Install Class"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:106
+#: ../../install_steps_interactive.pm_.c:207
 msgid "Which installation class do you want?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:108
-msgid "Install/Rescue"
+#: ../../install_steps_interactive.pm_.c:209
+msgid "Install/Update"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:108
-msgid "Is this an install or a rescue?"
+#: ../../install_steps_interactive.pm_.c:209
+msgid "Is this an install or an update?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:117
+#: ../../install_steps_interactive.pm_.c:218
 msgid "Recommended"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:119
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:221
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Customized"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:120
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Expert"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:129
+#: ../../install_steps_interactive.pm_.c:232
 msgid ""
 "Are you sure you are an expert? \n"
 "You will be allowed to make powerful but dangerous things here.\n"
@@ -3001,67 +3169,67 @@ msgid ""
 "are you ready to answer that kind of questions?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:139
-msgid "Rescue"
+#: ../../install_steps_interactive.pm_.c:242
+msgid "Update"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:145
+#: ../../install_steps_interactive.pm_.c:248
 msgid "Workstation"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:146
+#: ../../install_steps_interactive.pm_.c:249
 msgid "Development"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:147
+#: ../../install_steps_interactive.pm_.c:250
 msgid "Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:151
+#: ../../install_steps_interactive.pm_.c:254
 msgid "What is your system used for?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:167 ../../standalone/mousedrake_.c:24
+#: ../../install_steps_interactive.pm_.c:270 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:174 ../../standalone/mousedrake_.c:40
+#: ../../install_steps_interactive.pm_.c:277 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:175
+#: ../../install_steps_interactive.pm_.c:278
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:194
+#: ../../install_steps_interactive.pm_.c:297
 msgid "Configuring PCMCIA cards..."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:194
+#: ../../install_steps_interactive.pm_.c:297
 msgid "PCMCIA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:301
 msgid "Configuring IDE"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:301
 msgid "IDE"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:211
+#: ../../install_steps_interactive.pm_.c:314
 msgid "no available partitions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:214
+#: ../../install_steps_interactive.pm_.c:317
 msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:325
 msgid "Choose the mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:239
+#: ../../install_steps_interactive.pm_.c:342
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -3072,115 +3240,115 @@ msgid ""
 "Do you agree to loose all the partitions?\n"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:355
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:260
+#: ../../install_steps_interactive.pm_.c:363
 msgid "Root Partition"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:364
 msgid "What is the root partition (/) of your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:378
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:299
+#: ../../install_steps_interactive.pm_.c:402
 msgid "Choose the partitions you want to format"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:309
+#: ../../install_steps_interactive.pm_.c:412
 msgid "Check bad blocks?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:423
 msgid "Formatting partitions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:324
+#: ../../install_steps_interactive.pm_.c:427
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:327
+#: ../../install_steps_interactive.pm_.c:430
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:333
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Looking for available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:339
+#: ../../install_steps_interactive.pm_.c:442
 msgid "Finding packages to upgrade"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:356
+#: ../../install_steps_interactive.pm_.c:459
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:378
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Complete (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:378
+#: ../../install_steps_interactive.pm_.c:481
 msgid "Custom"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:378
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:491
 msgid "Select the size you want to install"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:422
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:534
 msgid "Individual package selection"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:582
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
 "If only some CDs are missing, unselect them, then click Ok."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:587
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:615
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:518
+#: ../../install_steps_interactive.pm_.c:624
 msgid "Post-install configuration"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:543
+#: ../../install_steps_interactive.pm_.c:649
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3219,92 +3387,92 @@ msgid ""
 "USA"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:574
+#: ../../install_steps_interactive.pm_.c:680
 msgid "Choose a mirror from which to get the packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:688
 msgid "Contacting the mirror to get the list of available packages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Please choose the packages you want to install."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:597
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Which is your timezone?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_interactive.pm_.c:705
 msgid "Is your hardware clock set to GMT?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:637
+#: ../../install_steps_interactive.pm_.c:743
 msgid "Which printing system do you want to use?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:664
+#: ../../install_steps_interactive.pm_.c:770
 msgid "No password"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:775
 msgid "Use shadow file"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:775
 msgid "shadow"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:670
+#: ../../install_steps_interactive.pm_.c:776
 msgid "MD5"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:670
+#: ../../install_steps_interactive.pm_.c:776
 msgid "Use MD5 passwords"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:778
 msgid "Use NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:778
 msgid "yellow pages"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:678
+#: ../../install_steps_interactive.pm_.c:784
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:791
 msgid "Authentification NIS"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:792
 msgid "NIS Domain"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:792
 msgid "NIS Server"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:711
+#: ../../install_steps_interactive.pm_.c:817
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:711
+#: ../../install_steps_interactive.pm_.c:817
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:712
+#: ../../install_steps_interactive.pm_.c:818
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:712
+#: ../../install_steps_interactive.pm_.c:818
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3312,48 +3480,48 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:714
+#: ../../install_steps_interactive.pm_.c:820
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:715 ../../printerdrake.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:821 ../../printerdrake.pm_.c:93
 #: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:838
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:839
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:840
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:735
+#: ../../install_steps_interactive.pm_.c:841
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:759
+#: ../../install_steps_interactive.pm_.c:865
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3371,19 +3539,19 @@ msgid ""
 "drive and press \"Ok\"."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:775
+#: ../../install_steps_interactive.pm_.c:881
 msgid "First floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:882
 msgid "Second floppy drive"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:777
+#: ../../install_steps_interactive.pm_.c:883
 msgid "Skip"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:888
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3397,111 +3565,111 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:791
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Sorry, no floppy drive available"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../install_steps_interactive.pm_.c:900
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:800
+#: ../../install_steps_interactive.pm_.c:906
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:803
+#: ../../install_steps_interactive.pm_.c:909
 msgid "Creating bootdisk"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:810
+#: ../../install_steps_interactive.pm_.c:916
 msgid "Preparing bootloader"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:819
+#: ../../install_steps_interactive.pm_.c:925
 msgid "Do you want to use aboot?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:928
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:831
+#: ../../install_steps_interactive.pm_.c:937
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:845 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:846 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:847 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:848 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:849 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:955 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:850 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:956 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Miscellaneous questions"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:865
+#: ../../install_steps_interactive.pm_.c:971
 msgid "(may cause data corruption)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:865
+#: ../../install_steps_interactive.pm_.c:971
 msgid "Use hard drive optimisations?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:866 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:972 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:867
+#: ../../install_steps_interactive.pm_.c:973
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Removable media automounting"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:977
 msgid "Clean /tmp at each boot"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:874
+#: ../../install_steps_interactive.pm_.c:980
 msgid "Enable multi profiles"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:982
 msgid "Enable num lock at startup"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:985
 msgid "Give the ram size in MB"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:987
 msgid "Can't use supermount in high security level"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:989
 msgid ""
 "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
 "If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -3510,22 +3678,22 @@ msgid ""
 "You have been warned."
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:888
+#: ../../install_steps_interactive.pm_.c:994
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:1040
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:936
+#: ../../install_steps_interactive.pm_.c:1042
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:1057
 msgid "Creating auto install floppy"
 msgstr ""
 
@@ -3904,149 +4072,149 @@ msgstr ""
 msgid "Is this correct?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:80
+#: ../../netconnect.pm_.c:81
 msgid "Internet configuration"
 msgstr ""
 
-#: ../../netconnect.pm_.c:81
+#: ../../netconnect.pm_.c:82
 msgid "Do you want to try to connect to the internet now?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:116 ../../netconnect.pm_.c:190
-#: ../../netconnect.pm_.c:209 ../../netconnect.pm_.c:221
-#: ../../netconnect.pm_.c:233
+#: ../../netconnect.pm_.c:117 ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:210 ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:234
 msgid "ISDN Configuration"
 msgstr ""
 
-#: ../../netconnect.pm_.c:116
+#: ../../netconnect.pm_.c:117
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
 msgstr ""
 
-#: ../../netconnect.pm_.c:133
+#: ../../netconnect.pm_.c:134
 msgid "Connection Configuration"
 msgstr ""
 
-#: ../../netconnect.pm_.c:134
+#: ../../netconnect.pm_.c:135
 msgid "Please fill or check the field below"
 msgstr ""
 
-#: ../../netconnect.pm_.c:136
+#: ../../netconnect.pm_.c:137
 msgid "Card IRQ"
 msgstr ""
 
-#: ../../netconnect.pm_.c:137
+#: ../../netconnect.pm_.c:138
 msgid "Card mem (DMA)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:138
+#: ../../netconnect.pm_.c:139
 msgid "Card IO"
 msgstr ""
 
-#: ../../netconnect.pm_.c:139
+#: ../../netconnect.pm_.c:140
 msgid "Card IO_0"
 msgstr ""
 
-#: ../../netconnect.pm_.c:140
+#: ../../netconnect.pm_.c:141
 msgid "Card IO_1"
 msgstr ""
 
-#: ../../netconnect.pm_.c:141
+#: ../../netconnect.pm_.c:142
 msgid "Your personnal phone number"
 msgstr ""
 
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:144
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:145
 msgid "Provider phone number"
 msgstr ""
 
-#: ../../netconnect.pm_.c:145
+#: ../../netconnect.pm_.c:146
 msgid "Provider dns 1"
 msgstr ""
 
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:147
 msgid "Provider dns 2"
 msgstr ""
 
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:148
 msgid "Dialing mode"
 msgstr ""
 
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:149
 msgid ""
 "Time (secs) of inactivity after which\n"
 "it hangs up. (leave blank to disable it)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:150
 msgid "Account Login (user name)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:151
 msgid "Account Password"
 msgstr ""
 
-#: ../../netconnect.pm_.c:151
+#: ../../netconnect.pm_.c:152
 msgid "Confirm Password"
 msgstr ""
 
-#: ../../netconnect.pm_.c:183
+#: ../../netconnect.pm_.c:184
 msgid "Germany"
 msgstr ""
 
-#: ../../netconnect.pm_.c:183
+#: ../../netconnect.pm_.c:184
 msgid "Germany (1TR6)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:185
+#: ../../netconnect.pm_.c:186
 msgid "Europe"
 msgstr ""
 
-#: ../../netconnect.pm_.c:185
+#: ../../netconnect.pm_.c:186
 msgid "Europe (EDSS1)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:187
+#: ../../netconnect.pm_.c:188
 msgid "Rest of the world"
 msgstr ""
 
-#: ../../netconnect.pm_.c:187
+#: ../../netconnect.pm_.c:188
 msgid "Rest of the world - no D-Channel (leased lines)"
 msgstr ""
 
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:192
 msgid "Which protocol do you want to use ?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:201
+#: ../../netconnect.pm_.c:202
 msgid "ISA / PCMCIA"
 msgstr ""
 
-#: ../../netconnect.pm_.c:203
+#: ../../netconnect.pm_.c:204
 msgid "PCI"
 msgstr ""
 
-#: ../../netconnect.pm_.c:205
+#: ../../netconnect.pm_.c:206
 msgid "I don't know"
 msgstr ""
 
-#: ../../netconnect.pm_.c:210
+#: ../../netconnect.pm_.c:211
 msgid "What kind of card do you have?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:216
+#: ../../netconnect.pm_.c:217
 msgid "Continue"
 msgstr ""
 
-#: ../../netconnect.pm_.c:218
+#: ../../netconnect.pm_.c:219
 msgid "Abort"
 msgstr ""
 
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:223
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -4054,25 +4222,243 @@ msgid ""
 "If you have a PCMCIA card, you have to know the irq and io of your card.\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:234
+#: ../../netconnect.pm_.c:235
 msgid "Which is your ISDN card ?"
 msgstr ""
 
-#: ../../netconnect.pm_.c:258
+#: ../../netconnect.pm_.c:259
 msgid "I have found an ISDN Card:\n"
 msgstr ""
 
-#: ../../netconnect.pm_.c:264
+#: ../../netconnect.pm_.c:265
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
 msgstr ""
 
-#: ../../netconnect.pm_.c:274
+#: ../../netconnect.pm_.c:275
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr ""
 
-#: ../../netconnect.pm_.c:747
+#: ../../netconnect.pm_.c:306
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+
+#: ../../netconnect.pm_.c:310 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:311
+msgid ""
+"Please choose which network adapter you want to use to connect to internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:327 ../../netconnect.pm_.c:560
+#: ../../netconnect.pm_.c:685 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr ""
+
+#: ../../netconnect.pm_.c:328
+msgid "I'm about to restart the network device $device. Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:431
+msgid "ADSL configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:432
+msgid "Do you want to start your connection at boot?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:488
+msgid "Try to find a modem?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:498
+msgid "Please choose which serial port your modem is connected to."
+msgstr ""
+
+#: ../../netconnect.pm_.c:503
+msgid "Dialup options"
+msgstr ""
+
+#: ../../netconnect.pm_.c:504
+msgid "Connection name"
+msgstr ""
+
+#: ../../netconnect.pm_.c:505
+msgid "Phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:506
+msgid "Login ID"
+msgstr ""
+
+#: ../../netconnect.pm_.c:508
+msgid "Authentication"
+msgstr ""
+
+#: ../../netconnect.pm_.c:508
+msgid "PAP"
+msgstr ""
+
+#: ../../netconnect.pm_.c:508
+msgid "Script-based"
+msgstr ""
+
+#: ../../netconnect.pm_.c:508
+msgid "Terminal-based"
+msgstr ""
+
+#: ../../netconnect.pm_.c:509
+msgid "Domain name"
+msgstr ""
+
+#: ../../netconnect.pm_.c:511
+msgid "First DNS Server"
+msgstr ""
+
+#: ../../netconnect.pm_.c:512
+msgid "Second DNS Server"
+msgstr ""
+
+#: ../../netconnect.pm_.c:536
+msgid "Connect to internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:538
+msgid "Disconnect from internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:540
+msgid "Configure internet connection"
+msgstr ""
+
+#: ../../netconnect.pm_.c:543
+msgid "Internet connection & configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:544
+msgid "What do you wish to do?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:561 ../../netconnect.pm_.c:686
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:575
+msgid "Connect to internet with a normal modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:593
+msgid "Connect to internet using ISDN"
+msgstr ""
+
+#: ../../netconnect.pm_.c:598
+msgid "Internal ISDN card"
+msgstr ""
+
+#: ../../netconnect.pm_.c:600
+msgid "External ISDN modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:603 ../../netconnect.pm_.c:636
+#: ../../netconnect.pm_.c:648 ../../netconnect.pm_.c:672
+#: ../../netconnect.pm_.c:719
+msgid "Connect to the Internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:604
+msgid "What kind is your ISDN connection?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:622
+msgid "Connect to internet using DSL (or ADSL)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:631
+msgid "France"
+msgstr ""
+
+#: ../../netconnect.pm_.c:633
+msgid "Other countries"
+msgstr ""
+
+#: ../../netconnect.pm_.c:637
+msgid "In which country are you located ?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:643
+msgid "Alcatel modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:645
+msgid "ECI modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:649
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr ""
+
+#: ../../netconnect.pm_.c:667
+msgid "use pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:669
+msgid "don't use pppoe"
+msgstr ""
+
+#: ../../netconnect.pm_.c:673
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, it exists some connection that only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+
+#: ../../netconnect.pm_.c:696
+msgid "Connect to internet using Cable"
+msgstr ""
+
+#: ../../netconnect.pm_.c:720
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+
+#: ../../netconnect.pm_.c:733
+msgid "Configure local network"
+msgstr ""
+
+#: ../../netconnect.pm_.c:733
+msgid "Reconfigure local network"
+msgstr ""
+
+#: ../../netconnect.pm_.c:740
+msgid "Disable networking"
+msgstr ""
+
+#: ../../netconnect.pm_.c:750
+msgid "Connect to the Internet / Configure local Network"
+msgstr ""
+
+#: ../../netconnect.pm_.c:751
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+
+#: ../../netconnect.pm_.c:752
+msgid "How do you want to connect to the Internet?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:769
+msgid "Network Configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:770
 msgid ""
 "Now that your Internet connection is configured,\n"
 "your computer can be configured to share its Internet connection.\n"
@@ -4834,10 +5220,6 @@ msgid ""
 "hardware configuration tool."
 msgstr ""
 
-#: ../../standalone/drakgw_.c:217
-msgid "Network interface"
-msgstr ""
-
 #: ../../standalone/drakgw_.c:218
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -4847,10 +5229,6 @@ msgid ""
 "Would you like to setup your Local Area Network with that adapter?"
 msgstr ""
 
-#: ../../standalone/drakgw_.c:222
-msgid "Choose the network interface"
-msgstr ""
-
 #: ../../standalone/drakgw_.c:223
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index d34ba0626..d0e3e25d0 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: 2000-09-27 14:34+0200\n"
+"POT-Creation-Date: 2000-09-28 14:46+0200\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -478,7 +478,7 @@ msgstr "Hvor јnsker du installere oppstartslasteren?"
 msgid "LILO/grub Installation"
 msgstr "LILO/grub-installasjon"
 
-#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:638
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:744
 msgid "None"
 msgstr "Ingen"
 
@@ -514,14 +514,15 @@ msgstr "Skjermmodus"
 msgid "Delay before booting default image"
 msgstr "Forsinkelse fјr oppstart av standard bilde"
 
-#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:666
-#: ../../install_steps_interactive.pm_.c:717 ../../printerdrake.pm_.c:94
-#: ../../printerdrake.pm_.c:128 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:823 ../../netconnect.pm_.c:507
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Passord"
 
-#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:667
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:824
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Passord (igjen)"
@@ -544,14 +545,14 @@ msgid ""
 msgstr ""
 "Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:676
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:837
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Vennligst prјv igjen"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:676
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:837
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
@@ -570,8 +571,8 @@ msgid "Add"
 msgstr "Legg til"
 
 #: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:711 ../../printerdrake.pm_.c:353
-#: ../../standalone/adduserdrake_.c:36
+#: ../../install_steps_interactive.pm_.c:817 ../../netconnect.pm_.c:746
+#: ../../printerdrake.pm_.c:353 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Ferdig"
 
@@ -627,8 +628,8 @@ msgstr "Etikett"
 msgid "Default"
 msgstr "Standard"
 
-#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
-#: ../../install_steps_interactive.pm_.c:664 ../../interactive.pm_.c:76
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:770 ../../interactive.pm_.c:76
 #: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
 #: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
@@ -664,12 +665,13 @@ msgid "Do you have any %s interfaces?"
 msgstr "Har du noen %s grensesnitt?"
 
 #: ../../any.pm_.c:502 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:77 ../../printerdrake.pm_.c:234
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:428
+#: ../../printerdrake.pm_.c:234
 msgid "No"
 msgstr "Nei"
 
 #: ../../any.pm_.c:502 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:75
+#: ../../netconnect.pm_.c:76 ../../netconnect.pm_.c:426
 msgid "Yes"
 msgstr "Ja"
 
@@ -1048,7 +1050,7 @@ msgstr "Vцr forsiktig: denne operasjonen er farlig."
 # #: ../install_steps_interactive.pm_.c:37
 #: ../../diskdrake.pm_.c:202 ../../install_steps.pm_.c:73
 #: ../../install_steps_interactive.pm_.c:38
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:341 ../../standalone/diskdrake_.c:60
 #: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Feil"
@@ -1303,7 +1305,7 @@ msgstr "Formatering"
 msgid "Formatting loopback file %s"
 msgstr "Formaterer loopback-fil %s"
 
-#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:325
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:428
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formaterer partisjon %s"
@@ -1354,7 +1356,7 @@ msgid "Computing FAT filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
 #: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Endrer stјrrelse"
 
@@ -1375,7 +1377,7 @@ msgstr "Velg den nye stјrrelsen"
 
 #: ../../diskdrake.pm_.c:601 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
-#: ../../install_steps_interactive.pm_.c:426
+#: ../../install_steps_interactive.pm_.c:531
 #: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
@@ -1566,12 +1568,12 @@ msgid ""
 "installed or if you wish to use several operating systems.\n"
 "\n"
 "\n"
-"Please choose \"Rescue\" if you wish to rescue an already installed version "
+"Please choose \"Update\" if you wish to update an already installed version "
 "of Linux-Mandrake.\n"
 "\n"
 "\n"
 "Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or rescue your\n"
+"levels to install or update your\n"
 "Linux-Mandrake operating system:\n"
 "\n"
 "\t* Recommanded: if you have never installed a GNU/Linux operating system "
@@ -2825,7 +2827,7 @@ msgstr "Konfigurer mus"
 msgid "Choose your keyboard"
 msgstr "Velg tastatur"
 
-#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:420
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:524
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
@@ -2861,8 +2863,8 @@ msgstr "Konfigurer tjenester"
 msgid "Configure printer"
 msgstr "Konfigurer skriver"
 
-#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:665
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:771
 msgid "Set root password"
 msgstr "Sett root-passord"
 
@@ -2894,16 +2896,16 @@ msgstr "Avslutt installering"
 msgid "Error reading file $f"
 msgstr "Feil ved lesing av fil $f"
 
-#: ../../install_gtk.pm_.c:428
+#: ../../install_gtk.pm_.c:427
 msgid "Please test the mouse"
 msgstr "Vennligst test musen."
 
-#: ../../install_gtk.pm_.c:429
+#: ../../install_gtk.pm_.c:428
 #, fuzzy
 msgid "To activate the mouse,"
 msgstr "Vennligst test musen."
 
-#: ../../install_gtk.pm_.c:430
+#: ../../install_gtk.pm_.c:429
 msgid "MOVE YOUR WHEEL!"
 msgstr ""
 
@@ -2961,34 +2963,35 @@ msgid "Use the Windows partition for loopback"
 msgstr "Bruk Windows partisjonen for loopback"
 
 #: ../../install_interactive.pm_.c:90
-msgid "Which partition do you want to use to put Linux4Win?"
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Hvilken partisjon vil du bruke til х plassere Linux4Win?"
 
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:92
 msgid "Choose the sizes"
 msgstr "Velg stјrrelsene"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:93
 msgid "Root partition size in MB: "
 msgstr "Root-partisjonsstјrrelse i MB: "
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:94
 msgid "Swap partition size in MB: "
 msgstr "Veksel-partisjonsstјrrelse i MB: "
 
-#: ../../install_interactive.pm_.c:101
+#: ../../install_interactive.pm_.c:102
 msgid "Use the free space on the Windows partition"
 msgstr "Bruk den ledige plassen pх Windows partisjonen"
 
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:105
 msgid "Which partition do you want to resize?"
 msgstr "Hvilken partisjonstype јnsker du х forandre stјrrelse pх?"
 
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Computing Windows filesystem bounds"
 msgstr "Beregner Windows filsystemgrense"
 
-#: ../../install_interactive.pm_.c:108
+#: ../../install_interactive.pm_.c:109
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -2997,12 +3000,12 @@ msgstr ""
 "Stјrrelsesendreren for FAT greide ikke х hхndtere din partisjon, \n"
 "fјlgende feil oppsto: %s"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:112
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Windows-partisjonen din er for fragmentert, vennligst kjјr ``defrag'' fјrst"
 
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:113
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3022,21 +3025,21 @@ msgstr ""
 "dine data.\n"
 "Nхr du er sikker, trykk Ok."
 
-#: ../../install_interactive.pm_.c:121
+#: ../../install_interactive.pm_.c:122
 msgid "Which size do you want to keep for windows on"
 msgstr "Hvilken stјrrelse јnsker du х beholde vinduer pх?"
 
-#: ../../install_interactive.pm_.c:122
+#: ../../install_interactive.pm_.c:123
 #, c-format
 msgid "partition %s"
 msgstr "partisjon %s"
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:129
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Krymping/forstјrring av FAT feilet: %s"
 
-#: ../../install_interactive.pm_.c:143
+#: ../../install_interactive.pm_.c:144
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3044,36 +3047,36 @@ msgstr ""
 "Det finnes ingen FAT partisjon х forandre stјrrelsen pх eller х bruke som "
 "loopback (ikke nok plass igjen)"
 
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:150
 msgid "Erase entire disk"
 msgstr "Slette hele disken"
 
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:150
 msgid "Remove Windows(TM)"
 msgstr "Fjern Windows(TM)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:153
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Du har mer enn en harddisk, hvilken јnsker du х installere linux pх?"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:156
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "ALLE eksisterende partisjoner og deres data vil vцre tapt pх disk %s"
 
-#: ../../install_interactive.pm_.c:162
+#: ../../install_interactive.pm_.c:164
 msgid "Expert mode"
 msgstr "Ekspert modus"
 
-#: ../../install_interactive.pm_.c:162
+#: ../../install_interactive.pm_.c:164
 msgid "Use diskdrake"
 msgstr "Bruk diskdrake"
 
-#: ../../install_interactive.pm_.c:166
+#: ../../install_interactive.pm_.c:168
 msgid "Use fdisk"
 msgstr "Bruk fdisk"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:171
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3083,19 +3086,24 @@ msgstr ""
 "Nхr du er ferdig ikke glem х lagre med `w'"
 
 #: ../../install_interactive.pm_.c:202
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Jeg kan ikke legge til flere partisjoner"
+
+#: ../../install_interactive.pm_.c:205
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX partisjonsveiviseren fant disse lјsningene:"
 
-#: ../../install_interactive.pm_.c:207
+#: ../../install_interactive.pm_.c:210
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Partisjonering feilet: %s"
 
-#: ../../install_interactive.pm_.c:222
+#: ../../install_interactive.pm_.c:225
 msgid "Bringing up the network"
 msgstr "Henter opp nettverket"
 
-#: ../../install_interactive.pm_.c:227
+#: ../../install_interactive.pm_.c:230
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
@@ -3148,69 +3156,69 @@ msgstr "Velg stјrrelsen du јnsker х installere"
 msgid "Total size: "
 msgstr "Total stјrrelse: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:352
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:353
 #: ../../standalone/rpmdrake_.c:136
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versjon: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:353
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:354
 #: ../../standalone/rpmdrake_.c:137
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Stјrrelse: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:259
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:260
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du јnsker х installere"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:262
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:263
 msgid "Info"
 msgstr "Info"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:267
-#: ../../install_steps_interactive.pm_.c:139 ../../standalone/rpmdrake_.c:161
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:268
+#: ../../install_steps_interactive.pm_.c:242 ../../standalone/rpmdrake_.c:161
 msgid "Install"
 msgstr "Installer"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:465
-#: ../../install_steps_interactive.pm_.c:500
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:606
 msgid "Installing"
 msgstr "Installerer"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:472
 msgid "Please wait, "
 msgstr "Vennligst vent, "
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:474
 msgid "Time remaining "
 msgstr "Tid som gjenstхr "
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:474
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:475
 msgid "Total time "
 msgstr "Total tid "
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:483
-#: ../../install_steps_interactive.pm_.c:500
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:484
+#: ../../install_steps_interactive.pm_.c:606
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:499
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:500
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:541
-#: ../../install_steps_gtk.pm_.c:545
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:546
 msgid "Go on anyway?"
 msgstr "Fortsette uansett?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:541
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefјlge:"
 
 #: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Use existing configuration for X11?"
 msgstr "Bruke eksisterende konfigurasjon for X11?"
 
@@ -3230,13 +3238,13 @@ msgstr ""
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Vennligst velg en av fјlgende installasjonsklasser:"
 
-#: ../../install_steps_gtk.pm_.c:214
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Den totale stјrrelsen for gruppene du har valgt er omtrent %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:216
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -3250,7 +3258,7 @@ msgstr ""
 "En lav prosentdel vil installere bare de mest viktige pakkene;\n"
 "en prosentdel pх 100%% vil installere alle valgte pakker."
 
-#: ../../install_steps_gtk.pm_.c:221
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -3266,77 +3274,77 @@ msgstr ""
 "En lav prosentdel vil installere bare de mest viktige pakkene;\n"
 "en prosentdel pх %d%% vil installere sх mange pakker som mulig."
 
-#: ../../install_steps_gtk.pm_.c:227
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Du vil kunne velge disse mere spesifisert i neste trinn."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Prosentdel av pakker х installere"
 
-#: ../../install_steps_gtk.pm_.c:271
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Avhengigheter automatisk"
 
-#: ../../install_steps_gtk.pm_.c:331 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Utvid tre"
 
-#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Trekk sammen tre"
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Skift mellom flat og gruppesortert"
 
-#: ../../install_steps_gtk.pm_.c:350
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Dхrlig pakke"
 
-#: ../../install_steps_gtk.pm_.c:351
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Navn: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:354
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Viktighet: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:362
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total stјrrelse: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:381
+#: ../../install_steps_gtk.pm_.c:382
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr ""
 "Du kan ikke velge denne pakken da det ikke er igjen nok plass til х "
 "installere denne"
 
-#: ../../install_steps_gtk.pm_.c:385
+#: ../../install_steps_gtk.pm_.c:386
 msgid "The following packages are going to be installed"
 msgstr "Fјlgende pakker vil bli installert"
 
-#: ../../install_steps_gtk.pm_.c:386
+#: ../../install_steps_gtk.pm_.c:387
 msgid "The following packages are going to be removed"
 msgstr "Fјlgende pakker vil bli fjernet"
 
-#: ../../install_steps_gtk.pm_.c:396
+#: ../../install_steps_gtk.pm_.c:397
 msgid "You can't select/unselect this package"
 msgstr "Du kan ikke velge/fjerne denne pakken"
 
-#: ../../install_steps_gtk.pm_.c:415
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Dette er en bestemt pakke, den kan ikke fjernes"
 
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "Du kan ikke fjerne denne pakken, den er allerede installert"
 
-#: ../../install_steps_gtk.pm_.c:421
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -3344,27 +3352,27 @@ msgstr ""
 "Denne pakken mх oppgraderes\n"
 "Er du sikker pх at du ikke vil velge denne?"
 
-#: ../../install_steps_gtk.pm_.c:424
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Du kan ikke fjerne denne pakken. Den mх oppgraderes"
 
-#: ../../install_steps_gtk.pm_.c:468
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Beregner"
 
-#: ../../install_steps_gtk.pm_.c:480 ../../interactive.pm_.c:86
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
 #: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
 #: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
 #: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../../install_steps_gtk.pm_.c:494
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d pakker"
 
-#: ../../install_steps_gtk.pm_.c:525
+#: ../../install_steps_gtk.pm_.c:526
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3379,7 +3387,7 @@ msgstr ""
 "ferdig.\n"
 "Hvis du ikke har den trykk Avbryt for х unngх installasjon fra denne CD'en."
 
-#: ../../install_steps_gtk.pm_.c:545
+#: ../../install_steps_gtk.pm_.c:546
 msgid "There was an error installing packages:"
 msgstr "Det var en feil ved installering av pakkene:"
 
@@ -3391,65 +3399,229 @@ msgstr "En feil oppsto"
 msgid "Please, choose a language to use."
 msgstr "Vennligst velg sprхk som skal brukes."
 
-#: ../../install_steps_interactive.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+" Introduction\n"
+"\n"
+"The operating system and the different components available in the "
+"Linux-Mandrake distribution \n"
+"shall be called the \"Software Products\" hereafter. The Software Products "
+"include, but are not \n"
+"restricted to, the set of programs, methods, rules and documentation related "
+"to the operating \n"
+"system and the different components of the Linux-Mandrake distribution.\n"
+"\n"
+"\n"
+"1. License Agreement\n"
+"\n"
+"Please read carefully this document. This document is a license agreement "
+"between you and  \n"
+"MandrakeSoft S.A., 42, rue d'Aboukir, 75002 Paris - France, which applies to "
+"the Software Products.\n"
+"By installing, duplicating or using the Software Products in any manner, you "
+"explicitly \n"
+"accept and fully agree to conform to the terms and conditions of this "
+"License. \n"
+"If you disagree with any portion of the License, you are not allowed to "
+"install, duplicate or use \n"
+"the Software Products. \n"
+"Any attempt to install, duplicate or use the Software Products in a manner "
+"which does not comply \n"
+"with the terms and conditions of this License is void and will terminate "
+"your rights under this \n"
+"License. Upon termination of the License,  you must immediately destroy all "
+"copies of the \n"
+"Software Products.\n"
+"\n"
+"\n"
+"2. The GPL License and Related Licenses\n"
+"\n"
+"The Software Products consist of components created by different persons or "
+"entities.  Most \n"
+"of these components are governed under the terms and conditions of the GNU "
+"General Public \n"
+"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
+"licenses allow you to use, \n"
+"duplicate, adapt or redistribute the components which they cover. Please "
+"read carefully the terms \n"
+"and conditions of the license agreement for each component before using any "
+"component. Any question \n"
+"on a component license should be addressed to the component author and not "
+"to MandrakeSoft.\n"
+"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"Documentation written \n"
+"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"documentation for \n"
+"further details.\n"
+"Some versions of the Software Products may contain components which are not "
+"governed by the GPL \n"
+"License or similar agreements. Each such component is then governed by the "
+"terms and conditions \n"
+"of its own specific license. Please read carefully and comply with such "
+"specific licenses before \n"
+"you install, use or redistribute the said components. Such licenses will in "
+"general prevent the \n"
+"transfer,  duplication (except for backup purposes), redistribution, reverse "
+"engineering, \n"
+"de-assembly, \n"
+"de-compilation or modification of the component. Any breach of agreement "
+"will immediately terminate \n"
+"your rights under the specific license. Unless the specific license terms "
+"grant you such rights, \n"
+"you usually cannot install the programs on more than one system, or adapt it "
+"to be used on a \n"
+"network. \n"
+"In doubt, please contact directly the distributor or editor of the "
+"component. Transfer to third \n"
+"parties or copying of such components including the documentation is usually "
+"forbidden.\n"
+"\n"
+"\n"
+"3. Intellectual Property Rights\n"
+"\n"
+"All rights to the components of the Software Products belong to their "
+"respective authors and are \n"
+"protected by intellectual property and copyright laws applicable to software "
+"programs.\n"
+"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Products, as a whole or in \n"
+"parts,\n"
+"by all means and for all purposes.\n"
+"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  All rights \n"
+"are \n"
+"reserved. The duplication is forbidden without prior written consent by "
+"MandrakeSoft S.A.\n"
+"\n"
+"\n"
+"4. Limited Warranty\n"
+"\n"
+"The Software Products and attached documentation are provided \"as is\", "
+"with no warranty, to the \n"
+"extent permitted by law. Should the Software Products be defective, "
+"MandrakeSoft S.A. will at its \n"
+"own will either replace the Software Products, or reimburse the paid fee.\n"
+"This limited warranty is void if you fail to comply to the recommendations, "
+"instructions and \n"
+"conditions \n"
+"of use listed in the documentation or license agreements of the Software "
+"Products.\n"
+"To the extent permitted by law, MandrakeSoft S.A. will in no circumstances "
+"be liable for any \n"
+"special, \n"
+"incidental, direct or indirect damages whatsoever (including without "
+"limitation damages for loss of \n"
+"business, interruption of business, financial loss, legal fees and penalties "
+"resulting from a court \n"
+"judgement, or any other consequential loss) arising out of  the use or "
+"inability to use the \n"
+"Software \n"
+"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
+"occurance of such \n"
+"damages.\n"
+"\n"
+"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
+"COUNTRIES\n"
+"\n"
+"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"in no circumstances, be \n"
+"liable for any special, incidental, direct or indirect damages whatsoever "
+"(including without \n"
+"limitation \n"
+"damages for loss of business, interruption of business, financial loss, "
+"legal fees and penalties \n"
+"resulting from a court judgement, or any other consequential loss) arising "
+"out of the possession \n"
+"and \n"
+"use of software components or arising out of  downloading software "
+"components from one of \n"
+"Linux-Mandrake \n"
+"sites  which are prohibited or restricted in some countries by local laws. "
+"This limited liability \n"
+"applies to, but is not restricted to, the strong cryptography components "
+"included in the Software \n"
+"Products.\n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgement, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, \n"
+"the dispute will be referred to the appropriate Courts of Law of Paris - "
+"France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.,  \n"
+"42, rue d'Aboukir, 75002 Paris - France\n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:173
 msgid "Accept"
 msgstr "Godta"
 
-#: ../../install_steps_interactive.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:173
 msgid "Refuse"
 msgstr "Nekte"
 
-#: ../../install_steps_interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:180
 #: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../../install_steps_interactive.pm_.c:80
+#: ../../install_steps_interactive.pm_.c:181
 #: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Vennligst velg tastatur-oppsettet ditt."
 
-#: ../../install_steps_interactive.pm_.c:91
+#: ../../install_steps_interactive.pm_.c:192
 msgid "You can choose other languages that will be available after install"
 msgstr "Du kan velge andre sprхk som vil vцre tilgjengelige etter installasjon"
 
-#: ../../install_steps_interactive.pm_.c:98
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:199
+#: ../../install_steps_interactive.pm_.c:533
 msgid "All"
 msgstr "Alle"
 
-#: ../../install_steps_interactive.pm_.c:106
-#: ../../install_steps_interactive.pm_.c:150
+#: ../../install_steps_interactive.pm_.c:207
+#: ../../install_steps_interactive.pm_.c:253
 msgid "Install Class"
 msgstr "Installeringsklasse"
 
-#: ../../install_steps_interactive.pm_.c:106
+#: ../../install_steps_interactive.pm_.c:207
 msgid "Which installation class do you want?"
 msgstr "Hvilken installasjonsklasse јnsker du?"
 
-#: ../../install_steps_interactive.pm_.c:108
-msgid "Install/Rescue"
-msgstr "Installering/Redning"
+#: ../../install_steps_interactive.pm_.c:209
+#, fuzzy
+msgid "Install/Update"
+msgstr "Installer/Oppgrader"
 
-#: ../../install_steps_interactive.pm_.c:108
-msgid "Is this an install or a rescue?"
+#: ../../install_steps_interactive.pm_.c:209
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Er dette en installering eller en redning?"
 
-#: ../../install_steps_interactive.pm_.c:117
+#: ../../install_steps_interactive.pm_.c:218
 msgid "Recommended"
 msgstr "Anbefalt"
 
-#: ../../install_steps_interactive.pm_.c:119
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:221
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Customized"
 msgstr "Egendefinert"
 
-#: ../../install_steps_interactive.pm_.c:120
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Expert"
 msgstr "Ekspert"
 
-#: ../../install_steps_interactive.pm_.c:129
+#: ../../install_steps_interactive.pm_.c:232
 msgid ""
 "Are you sure you are an expert? \n"
 "You will be allowed to make powerful but dangerous things here.\n"
@@ -3463,67 +3635,68 @@ msgstr ""
 "Du vil bli spurt om ting som: ``Bruk skyggefil for passord?'',\n"
 "er du klar for х svare pх denne type spјrsmхl?"
 
-#: ../../install_steps_interactive.pm_.c:139
-msgid "Rescue"
-msgstr "Redning"
+#: ../../install_steps_interactive.pm_.c:242
+#, fuzzy
+msgid "Update"
+msgstr "Oppgrader"
 
-#: ../../install_steps_interactive.pm_.c:145
+#: ../../install_steps_interactive.pm_.c:248
 msgid "Workstation"
 msgstr "Arbeidstasjon"
 
-#: ../../install_steps_interactive.pm_.c:146
+#: ../../install_steps_interactive.pm_.c:249
 msgid "Development"
 msgstr "Utvikling"
 
-#: ../../install_steps_interactive.pm_.c:147
+#: ../../install_steps_interactive.pm_.c:250
 msgid "Server"
 msgstr "Tjener"
 
-#: ../../install_steps_interactive.pm_.c:151
+#: ../../install_steps_interactive.pm_.c:254
 msgid "What is your system used for?"
 msgstr "Hva er systemet ditt brukt til?"
 
-#: ../../install_steps_interactive.pm_.c:167 ../../standalone/mousedrake_.c:24
+#: ../../install_steps_interactive.pm_.c:270 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Vennligst velg din musetype."
 
-#: ../../install_steps_interactive.pm_.c:174 ../../standalone/mousedrake_.c:40
+#: ../../install_steps_interactive.pm_.c:277 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../../install_steps_interactive.pm_.c:175
+#: ../../install_steps_interactive.pm_.c:278
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Vennligst velg hvilken serieport musen din koblet til."
 
-#: ../../install_steps_interactive.pm_.c:194
+#: ../../install_steps_interactive.pm_.c:297
 msgid "Configuring PCMCIA cards..."
 msgstr "Konfigurerer PCMCIA kort..."
 
-#: ../../install_steps_interactive.pm_.c:194
+#: ../../install_steps_interactive.pm_.c:297
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:301
 msgid "Configuring IDE"
 msgstr "Konfigurerer IDE"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:301
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:211
+#: ../../install_steps_interactive.pm_.c:314
 msgid "no available partitions"
 msgstr "ingen tilgjengelige partisjoner"
 
-#: ../../install_steps_interactive.pm_.c:214
+#: ../../install_steps_interactive.pm_.c:317
 msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:325
 msgid "Choose the mount points"
 msgstr "Velg monteringspunktene"
 
-#: ../../install_steps_interactive.pm_.c:239
+#: ../../install_steps_interactive.pm_.c:342
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -3540,7 +3713,7 @@ msgstr ""
 "\n"
 "Vil du miste alle partisjonene?\n"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:355
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -3548,51 +3721,51 @@ msgstr ""
 "DiskDrake klarte ikke х lese partisjonstabellen korrekt.\n"
 "Fortsett pх eget ansvar!"
 
-#: ../../install_steps_interactive.pm_.c:260
+#: ../../install_steps_interactive.pm_.c:363
 msgid "Root Partition"
 msgstr "Root-partisjon"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:364
 msgid "What is the root partition (/) of your system?"
 msgstr "Hva er root-partisjonen (/) pх systemet ditt?"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:378
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Du mх starte maskinen pх nytt for at modifiseringene av partisjonstabellen\n"
 "skal tre i kraft"
 
-#: ../../install_steps_interactive.pm_.c:299
+#: ../../install_steps_interactive.pm_.c:402
 msgid "Choose the partitions you want to format"
 msgstr "Velg de partisjonene du јnsker х formatere"
 
-#: ../../install_steps_interactive.pm_.c:309
+#: ../../install_steps_interactive.pm_.c:412
 msgid "Check bad blocks?"
 msgstr "Sjekke dхrlige blokker?"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:423
 msgid "Formatting partitions"
 msgstr "Formaterer partisjoner"
 
-#: ../../install_steps_interactive.pm_.c:324
+#: ../../install_steps_interactive.pm_.c:427
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Oppretter og formaterer fil %s"
 
-#: ../../install_steps_interactive.pm_.c:327
+#: ../../install_steps_interactive.pm_.c:430
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr ""
 "Ikke nok vekslingsplass til х fullfјre installasjonen, vennligst legg til mer"
 
-#: ../../install_steps_interactive.pm_.c:333
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Looking for available packages"
 msgstr "Ser etter tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:339
+#: ../../install_steps_interactive.pm_.c:442
 msgid "Finding packages to upgrade"
 msgstr "Finner pakker х oppgradere"
 
-#: ../../install_steps_interactive.pm_.c:356
+#: ../../install_steps_interactive.pm_.c:459
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
@@ -3600,40 +3773,40 @@ msgstr ""
 "Systemet ditt har ikke nok plass for installasjon eller oppgradering (%d > "
 "%d)"
 
-#: ../../install_steps_interactive.pm_.c:378
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Ferdig (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:378
+#: ../../install_steps_interactive.pm_.c:481
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: ../../install_steps_interactive.pm_.c:378
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Minimum (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Anbefalt (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:491
 msgid "Select the size you want to install"
 msgstr "Velg stјrrelsen du јnsker х installere"
 
-#: ../../install_steps_interactive.pm_.c:422
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:534
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:582
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -3643,12 +3816,12 @@ msgstr ""
 "Hvis du ikke har noen av CDene, klikk Avbryt.\n"
 "Hvis bare noen av CDene mangler, fjern disse, klikk sх Ok."
 
-#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:587
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD-ROM merket \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:615
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -3656,11 +3829,11 @@ msgstr ""
 "Installerer pakke %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:518
+#: ../../install_steps_interactive.pm_.c:624
 msgid "Post-install configuration"
 msgstr "Konfigurasjon postinstallering"
 
-#: ../../install_steps_interactive.pm_.c:543
+#: ../../install_steps_interactive.pm_.c:649
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3734,92 +3907,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:574
+#: ../../install_steps_interactive.pm_.c:680
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: ../../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:688
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Kontakter speilet for х fх en liste over tilgjengelige pakker"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Please choose the packages you want to install."
 msgstr "Vennligst velg pakkene du јnsker х installere."
 
-#: ../../install_steps_interactive.pm_.c:597
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Which is your timezone?"
 msgstr "Hva er din tidsone?"
 
-#: ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_interactive.pm_.c:705
 msgid "Is your hardware clock set to GMT?"
 msgstr "Er maskinvareklokken din satt til GMT?"
 
-#: ../../install_steps_interactive.pm_.c:637
+#: ../../install_steps_interactive.pm_.c:743
 msgid "Which printing system do you want to use?"
 msgstr "Hvilket utskriftsystem јnsker du х bruke?"
 
-#: ../../install_steps_interactive.pm_.c:664
+#: ../../install_steps_interactive.pm_.c:770
 msgid "No password"
 msgstr "Intet passord"
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:775
 msgid "Use shadow file"
 msgstr "Bruk skyggefil"
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:775
 msgid "shadow"
 msgstr "skygge"
 
-#: ../../install_steps_interactive.pm_.c:670
+#: ../../install_steps_interactive.pm_.c:776
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:670
+#: ../../install_steps_interactive.pm_.c:776
 msgid "Use MD5 passwords"
 msgstr "Bruk MD5 passord"
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:778
 msgid "Use NIS"
 msgstr "Bruk NIS"
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:778
 msgid "yellow pages"
 msgstr "gule sider"
 
-#: ../../install_steps_interactive.pm_.c:678
+#: ../../install_steps_interactive.pm_.c:784
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Dette passordet er for enkelt (mх vцre minst %d tegn langt)"
 
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:791
 msgid "Authentification NIS"
 msgstr "Autentifikasjon NIS"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:792
 msgid "NIS Domain"
 msgstr "NIS-domene"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:792
 msgid "NIS Server"
 msgstr "NIS-tjener"
 
-#: ../../install_steps_interactive.pm_.c:711
+#: ../../install_steps_interactive.pm_.c:817
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Godta bruker"
 
-#: ../../install_steps_interactive.pm_.c:711
+#: ../../install_steps_interactive.pm_.c:817
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: ../../install_steps_interactive.pm_.c:712
+#: ../../install_steps_interactive.pm_.c:818
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(allerede lagt til %s)"
 
-#: ../../install_steps_interactive.pm_.c:712
+#: ../../install_steps_interactive.pm_.c:818
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3829,48 +4002,48 @@ msgstr ""
 "Entre en bruker\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:714
+#: ../../install_steps_interactive.pm_.c:820
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: ../../install_steps_interactive.pm_.c:715 ../../printerdrake.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:821 ../../printerdrake.pm_.c:93
 #: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Brukernavn"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Skall"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:838
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Dette passordet er for enkelt"
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:839
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Vennligst oppgi et brukernavn"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:840
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Brukernavnet kan kun inneholde smх bokstaver, tall, `-' og `_'"
 
-#: ../../install_steps_interactive.pm_.c:735
+#: ../../install_steps_interactive.pm_.c:841
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Denne brukeren er allerede lagt til"
 
-#: ../../install_steps_interactive.pm_.c:759
+#: ../../install_steps_interactive.pm_.c:865
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3901,19 +4074,19 @@ msgstr ""
 "en diskett\n"
 "i den fјrste stasjonen og trykk \"Ok\"."
 
-#: ../../install_steps_interactive.pm_.c:775
+#: ../../install_steps_interactive.pm_.c:881
 msgid "First floppy drive"
 msgstr "Fјrste diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:882
 msgid "Second floppy drive"
 msgstr "Andre diskettstasjon"
 
-#: ../../install_steps_interactive.pm_.c:777
+#: ../../install_steps_interactive.pm_.c:883
 msgid "Skip"
 msgstr "Dropp"
 
-#: ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:888
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3938,32 +4111,32 @@ msgstr ""
 "etter systemsvikt. иnsker du х opprette en oppstartsdiskett for systemet "
 "ditt?"
 
-#: ../../install_steps_interactive.pm_.c:791
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Sorry, no floppy drive available"
 msgstr "Beklager, ingen diskettstasjon tilgjengelig"
 
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../install_steps_interactive.pm_.c:900
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Velg diskettstasjonen du јnsker х bruke for х lage oppstartsdisketten"
 
-#: ../../install_steps_interactive.pm_.c:800
+#: ../../install_steps_interactive.pm_.c:906
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Sett inn en diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:803
+#: ../../install_steps_interactive.pm_.c:909
 msgid "Creating bootdisk"
 msgstr "Oppretter oppstartdiskett"
 
-#: ../../install_steps_interactive.pm_.c:810
+#: ../../install_steps_interactive.pm_.c:916
 msgid "Preparing bootloader"
 msgstr "Klargjјr oppstartslaster"
 
-#: ../../install_steps_interactive.pm_.c:819
+#: ../../install_steps_interactive.pm_.c:925
 msgid "Do you want to use aboot?"
 msgstr "иnsker du х bruke aboot?"
 
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:928
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3971,80 +4144,80 @@ msgstr ""
 "Feil ved installasjon av aboot, \n"
 "prјve х installere selv om det јdelegger den fјrste partisjonen?"
 
-#: ../../install_steps_interactive.pm_.c:831
+#: ../../install_steps_interactive.pm_.c:937
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Installasjon av oppstartslaster mislykket. Fјlgende feil oppsto:"
 
-#: ../../install_steps_interactive.pm_.c:845 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Velkommen til Crackers"
 
-#: ../../install_steps_interactive.pm_.c:846 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Dхrlig"
 
-#: ../../install_steps_interactive.pm_.c:847 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Lav"
 
-#: ../../install_steps_interactive.pm_.c:848 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Medium"
 
-#: ../../install_steps_interactive.pm_.c:849 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:955 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Hјy"
 
-#: ../../install_steps_interactive.pm_.c:850 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:956 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Paranoid"
 
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Miscellaneous questions"
 msgstr "Forskjellige spјrsmхl"
 
-#: ../../install_steps_interactive.pm_.c:865
+#: ../../install_steps_interactive.pm_.c:971
 msgid "(may cause data corruption)"
 msgstr "(kan forхrsake korrupsjon av data)"
 
-#: ../../install_steps_interactive.pm_.c:865
+#: ../../install_steps_interactive.pm_.c:971
 msgid "Use hard drive optimisations?"
 msgstr "Bruk harddisk-optimisering?"
 
-#: ../../install_steps_interactive.pm_.c:866 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:972 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Velg sikkerhetsnivх"
 
-#: ../../install_steps_interactive.pm_.c:867
+#: ../../install_steps_interactive.pm_.c:973
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Presiser RAM-stјrrelse hvis det trengs (funnet %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Removable media automounting"
 msgstr "Fjernbart media automontering"
 
-#: ../../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:977
 msgid "Clean /tmp at each boot"
 msgstr "Tјm /tmp ved hver oppstart"
 
-#: ../../install_steps_interactive.pm_.c:874
+#: ../../install_steps_interactive.pm_.c:980
 msgid "Enable multi profiles"
 msgstr "Slх pх multiprofiler"
 
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:982
 msgid "Enable num lock at startup"
 msgstr "Slх pх num lock ved oppstart"
 
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:985
 msgid "Give the ram size in MB"
 msgstr "Oppgi ram-stјrrelsen i MB"
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:987
 msgid "Can't use supermount in high security level"
 msgstr "Kan ikke bruke supermount i hјyt sikkerhetsnivх"
 
-#: ../../install_steps_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:989
 msgid ""
 "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
 "If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -4058,7 +4231,7 @@ msgstr ""
 "Mere generelt, ikke forvent х bruke maskinen din til annet enn en tjener.\n"
 "Du har blitt advart."
 
-#: ../../install_steps_interactive.pm_.c:888
+#: ../../install_steps_interactive.pm_.c:994
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
@@ -4066,17 +4239,17 @@ msgstr ""
 "Vцr forsiktig, х ha numlock slхtt pх forхrsaker at mange av tastene\n"
 "gir tall istedenfor vanlige bokstaver (f.eks: `p' gir `6')"
 
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:1040
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "иnsker du х generere en auto installeringsdiskett for linux replikasjon?"
 
-#: ../../install_steps_interactive.pm_.c:936
+#: ../../install_steps_interactive.pm_.c:1042
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:1057
 msgid "Creating auto install floppy"
 msgstr "Oppretter diskett for autoinstallasjon"
 
@@ -4456,21 +4629,21 @@ msgstr "Neste ->"
 msgid "Is this correct?"
 msgstr "Er dette riktig?"
 
-#: ../../netconnect.pm_.c:80
+#: ../../netconnect.pm_.c:81
 msgid "Internet configuration"
 msgstr "Internett-konfigurasjon"
 
-#: ../../netconnect.pm_.c:81
+#: ../../netconnect.pm_.c:82
 msgid "Do you want to try to connect to the internet now?"
 msgstr "Vil du prјve х koble opp mot Internett nх?"
 
-#: ../../netconnect.pm_.c:116 ../../netconnect.pm_.c:190
-#: ../../netconnect.pm_.c:209 ../../netconnect.pm_.c:221
-#: ../../netconnect.pm_.c:233
+#: ../../netconnect.pm_.c:117 ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:210 ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:234
 msgid "ISDN Configuration"
 msgstr "ISDN-konfigurasjon"
 
-#: ../../netconnect.pm_.c:116
+#: ../../netconnect.pm_.c:117
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -4478,59 +4651,59 @@ msgstr ""
 "Velg din tilbyder.\n"
 " Hvis den ikke er i listen, velg ikke i listen"
 
-#: ../../netconnect.pm_.c:133
+#: ../../netconnect.pm_.c:134
 msgid "Connection Configuration"
 msgstr "Konfigurasjon tilknytning."
 
-#: ../../netconnect.pm_.c:134
+#: ../../netconnect.pm_.c:135
 msgid "Please fill or check the field below"
 msgstr "Vennnligst fyll eller merk feltet under"
 
-#: ../../netconnect.pm_.c:136
+#: ../../netconnect.pm_.c:137
 msgid "Card IRQ"
 msgstr "Kort IRQ"
 
-#: ../../netconnect.pm_.c:137
+#: ../../netconnect.pm_.c:138
 msgid "Card mem (DMA)"
 msgstr "Kort mem (DMA)"
 
-#: ../../netconnect.pm_.c:138
+#: ../../netconnect.pm_.c:139
 msgid "Card IO"
 msgstr "Kort IO"
 
-#: ../../netconnect.pm_.c:139
+#: ../../netconnect.pm_.c:140
 msgid "Card IO_0"
 msgstr "Kort IO_0"
 
-#: ../../netconnect.pm_.c:140
+#: ../../netconnect.pm_.c:141
 msgid "Card IO_1"
 msgstr "Kort IO_1"
 
-#: ../../netconnect.pm_.c:141
+#: ../../netconnect.pm_.c:142
 msgid "Your personnal phone number"
 msgstr "Ditt telefonnummer"
 
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:144
 msgid "Provider name (ex provider.net)"
 msgstr "Navn tilbyder (f.eks. tilbyder.net)"
 
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:145
 msgid "Provider phone number"
 msgstr "Telefonnummer tilbyder"
 
-#: ../../netconnect.pm_.c:145
+#: ../../netconnect.pm_.c:146
 msgid "Provider dns 1"
 msgstr "Tilbyder dns 1"
 
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:147
 msgid "Provider dns 2"
 msgstr "Tilbyder dns 2"
 
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:148
 msgid "Dialing mode"
 msgstr "Oppringningsmodus"
 
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:149
 msgid ""
 "Time (secs) of inactivity after which\n"
 "it hangs up. (leave blank to disable it)"
@@ -4538,71 +4711,71 @@ msgstr ""
 "Tid (sek) uten aktivitet fјr\n"
 "nedkobling. (la vцre tom for х ikke bruke denne)"
 
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:150
 msgid "Account Login (user name)"
 msgstr "Logg inn (brukernavn)"
 
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:151
 msgid "Account Password"
 msgstr "Passord"
 
-#: ../../netconnect.pm_.c:151
+#: ../../netconnect.pm_.c:152
 msgid "Confirm Password"
 msgstr "Bekreft passord"
 
-#: ../../netconnect.pm_.c:183
+#: ../../netconnect.pm_.c:184
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../../netconnect.pm_.c:183
+#: ../../netconnect.pm_.c:184
 msgid "Germany (1TR6)"
 msgstr "Tyskland (1TR6)"
 
-#: ../../netconnect.pm_.c:185
+#: ../../netconnect.pm_.c:186
 msgid "Europe"
 msgstr "Europa"
 
-#: ../../netconnect.pm_.c:185
+#: ../../netconnect.pm_.c:186
 msgid "Europe (EDSS1)"
 msgstr "Europa (EDSS1)"
 
-#: ../../netconnect.pm_.c:187
+#: ../../netconnect.pm_.c:188
 msgid "Rest of the world"
 msgstr "Resten av verden"
 
-#: ../../netconnect.pm_.c:187
+#: ../../netconnect.pm_.c:188
 msgid "Rest of the world - no D-Channel (leased lines)"
 msgstr "Resten av verden - ingen D-kanal (leid linje)"
 
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:192
 msgid "Which protocol do you want to use ?"
 msgstr "Hvilken protokoll јnsker du х bruke?"
 
-#: ../../netconnect.pm_.c:201
+#: ../../netconnect.pm_.c:202
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:203
+#: ../../netconnect.pm_.c:204
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:205
+#: ../../netconnect.pm_.c:206
 msgid "I don't know"
 msgstr "Jeg vet ikke"
 
-#: ../../netconnect.pm_.c:210
+#: ../../netconnect.pm_.c:211
 msgid "What kind of card do you have?"
 msgstr "Hva slags kort har du?"
 
-#: ../../netconnect.pm_.c:216
+#: ../../netconnect.pm_.c:217
 msgid "Continue"
 msgstr "Fortsett"
 
-#: ../../netconnect.pm_.c:218
+#: ../../netconnect.pm_.c:219
 msgid "Abort"
 msgstr "Avbryt"
 
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:223
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -4614,15 +4787,15 @@ msgstr ""
 "\n"
 "Hvis du har et PCMCIA kort mх du vite irq og io for kortet.\n"
 
-#: ../../netconnect.pm_.c:234
+#: ../../netconnect.pm_.c:235
 msgid "Which is your ISDN card ?"
 msgstr "Hvilket er ditt ISDN-kort?"
 
-#: ../../netconnect.pm_.c:258
+#: ../../netconnect.pm_.c:259
 msgid "I have found an ISDN Card:\n"
 msgstr "Jeg har funnet et ISDN-kort:\n"
 
-#: ../../netconnect.pm_.c:264
+#: ../../netconnect.pm_.c:265
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -4630,11 +4803,244 @@ msgstr ""
 "Jeg har oppdaget et ISDN PCI-kort, men jeg vet ikke hviklet type. Vennligst "
 "velg et PCI-kort i neste skjermbilde."
 
-#: ../../netconnect.pm_.c:274
+#: ../../netconnect.pm_.c:275
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Ingen ISDN PCI-kort funnet. Vennligst velg et i neste skjermbilde."
 
-#: ../../netconnect.pm_.c:747
+#: ../../netconnect.pm_.c:306
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt. "
+"Vennligst kjјr verktјyet for maskinvarekonfigurasjon."
+
+#: ../../netconnect.pm_.c:310 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Velg nettverksgrensesnitt"
+
+#: ../../netconnect.pm_.c:311
+msgid ""
+"Please choose which network adapter you want to use to connect to internet"
+msgstr ""
+"Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp\n"
+"mot Internett"
+
+#: ../../netconnect.pm_.c:327 ../../netconnect.pm_.c:560
+#: ../../netconnect.pm_.c:685 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Nettverksgrensesnitt"
+
+#: ../../netconnect.pm_.c:328
+#, fuzzy
+msgid "I'm about to restart the network device $device. Do you agree?"
+msgstr "Jeg er i ferd med х starte nettverksgrensesnittet pх nytt. Er du enig?"
+
+#: ../../netconnect.pm_.c:431
+msgid "ADSL configuration"
+msgstr "ADSL-konfigurasjon"
+
+#: ../../netconnect.pm_.c:432
+msgid "Do you want to start your connection at boot?"
+msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
+
+#: ../../netconnect.pm_.c:488
+msgid "Try to find a modem?"
+msgstr "Prјve х finne et modem?"
+
+#: ../../netconnect.pm_.c:498
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
+
+#: ../../netconnect.pm_.c:503
+msgid "Dialup options"
+msgstr "Opsjoner oppringt"
+
+#: ../../netconnect.pm_.c:504
+msgid "Connection name"
+msgstr "Navn tilknytning"
+
+#: ../../netconnect.pm_.c:505
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: ../../netconnect.pm_.c:506
+msgid "Login ID"
+msgstr "Login ID"
+
+#: ../../netconnect.pm_.c:508
+msgid "Authentication"
+msgstr "Autentifikasjon"
+
+#: ../../netconnect.pm_.c:508
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:508
+msgid "Script-based"
+msgstr "Scriptbasert"
+
+#: ../../netconnect.pm_.c:508
+msgid "Terminal-based"
+msgstr "Terminalbasert"
+
+#: ../../netconnect.pm_.c:509
+msgid "Domain name"
+msgstr "Domenenavn"
+
+#: ../../netconnect.pm_.c:511
+msgid "First DNS Server"
+msgstr "Fјrste DNS-tjener"
+
+#: ../../netconnect.pm_.c:512
+msgid "Second DNS Server"
+msgstr "Andre DNS-tjener"
+
+#: ../../netconnect.pm_.c:536
+msgid "Connect to internet"
+msgstr "Koble opp mot Internett"
+
+#: ../../netconnect.pm_.c:538
+msgid "Disconnect from internet"
+msgstr "Koble ned fra Internett"
+
+#: ../../netconnect.pm_.c:540
+msgid "Configure internet connection"
+msgstr "Konfigurer Internett-tilkobling"
+
+#: ../../netconnect.pm_.c:543
+msgid "Internet connection & configuration"
+msgstr "Internett tilkobling & konfigurasjon"
+
+#: ../../netconnect.pm_.c:544
+msgid "What do you wish to do?"
+msgstr "Hva јnsker du х gjјre?"
+
+#: ../../netconnect.pm_.c:561 ../../netconnect.pm_.c:686
+#, fuzzy
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "Jeg er i ferd med х starte nettverksgrensesnittet pх nytt. Er du enig?"
+
+#: ../../netconnect.pm_.c:575
+msgid "Connect to internet with a normal modem"
+msgstr "Koble opp mot Internett med vanlig modem"
+
+#: ../../netconnect.pm_.c:593
+msgid "Connect to internet using ISDN"
+msgstr "Koble opp mot Internett med ISDN"
+
+#: ../../netconnect.pm_.c:598
+msgid "Internal ISDN card"
+msgstr "Internt ISDN-kort"
+
+#: ../../netconnect.pm_.c:600
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Eksternt modem"
+
+#: ../../netconnect.pm_.c:603 ../../netconnect.pm_.c:636
+#: ../../netconnect.pm_.c:648 ../../netconnect.pm_.c:672
+#: ../../netconnect.pm_.c:719
+msgid "Connect to the Internet"
+msgstr "Koble opp mot Internett"
+
+#: ../../netconnect.pm_.c:604
+msgid "What kind is your ISDN connection?"
+msgstr "Hva slags type er ISDN-tilknytningen din?"
+
+#: ../../netconnect.pm_.c:622
+msgid "Connect to internet using DSL (or ADSL)"
+msgstr "Koble opp mot Internett med DSL (eller ADSL)"
+
+#: ../../netconnect.pm_.c:631
+msgid "France"
+msgstr "Frankrike"
+
+#: ../../netconnect.pm_.c:633
+msgid "Other countries"
+msgstr "Andre land"
+
+#: ../../netconnect.pm_.c:637
+msgid "In which country are you located ?"
+msgstr "I hvilket land er du ?"
+
+#: ../../netconnect.pm_.c:643
+msgid "Alcatel modem"
+msgstr "Alcatel modem"
+
+#: ../../netconnect.pm_.c:645
+msgid "ECI modem"
+msgstr "ECI modem"
+
+#: ../../netconnect.pm_.c:649
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Hvis adsl modemet ditt er Alcatel, velg Alcatel. ellers, ECI."
+
+#: ../../netconnect.pm_.c:667
+msgid "use pppoe"
+msgstr "bruk pppoe"
+
+#: ../../netconnect.pm_.c:669
+msgid "don't use pppoe"
+msgstr "ikke bruk pppoe"
+
+#: ../../netconnect.pm_.c:673
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, it exists some connection that only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Den mest vanlige mхten х koble opp med adsl er dhcp + pppoe.\n"
+"Men, det eksisterer noen tilkoblinger som bare bruker dhcp.\n"
+"Hvis du ikke vet, velg 'bruk pppoe'"
+
+#: ../../netconnect.pm_.c:696
+msgid "Connect to internet using Cable"
+msgstr "Koble opp mot Internett med kabel"
+
+#: ../../netconnect.pm_.c:720
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr ""
+"Hvilken dhcp klient јnsker du х bruke?\n"
+"Standard er dhcpd"
+
+#: ../../netconnect.pm_.c:733
+msgid "Configure local network"
+msgstr "Konfigurer lokalt nettverk"
+
+#: ../../netconnect.pm_.c:733
+msgid "Reconfigure local network"
+msgstr "Rekonfigurer lokalt nettverk"
+
+#: ../../netconnect.pm_.c:740
+msgid "Disable networking"
+msgstr "slх av nettverk"
+
+#: ../../netconnect.pm_.c:750
+msgid "Connect to the Internet / Configure local Network"
+msgstr "Koble opp mot Internett / Konfigurer lokalt nettverk"
+
+#: ../../netconnect.pm_.c:751
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Lokalt nettverk har allerede blitt konfigurert.\n"
+"Vil du:"
+
+#: ../../netconnect.pm_.c:752
+msgid "How do you want to connect to the Internet?"
+msgstr "Hvordan vil du koble opp mot Internett?"
+
+#: ../../netconnect.pm_.c:769
+msgid "Network Configuration"
+msgstr "Nettverkskonfigurasjon"
+
+#: ../../netconnect.pm_.c:770
 msgid ""
 "Now that your Internet connection is configured,\n"
 "your computer can be configured to share its Internet connection.\n"
@@ -5526,10 +5932,6 @@ msgstr ""
 "Ikke noe ethernet nettverksadapter har blitt oppdaget i systemet ditt. "
 "Vennligst kjјr verktјyet for maskinvarekonfigurasjon."
 
-#: ../../standalone/drakgw_.c:217
-msgid "Network interface"
-msgstr "Nettverksgrensesnitt"
-
 #: ../../standalone/drakgw_.c:218
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -5544,10 +5946,6 @@ msgstr ""
 "\n"
 "иnsker du х sette opp ditt lokale nettverke (LAN) med dette adapteret?"
 
-#: ../../standalone/drakgw_.c:222
-msgid "Choose the network interface"
-msgstr "Velg nettverksgrensesnitt"
-
 #: ../../standalone/drakgw_.c:223
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -5894,6 +6292,12 @@ msgstr "Finner tillatelser"
 msgid "Finding leaves takes some time"
 msgstr "Finne tillatelser vil ta litt tid"
 
+#~ msgid "Install/Rescue"
+#~ msgstr "Installering/Redning"
+
+#~ msgid "Rescue"
+#~ msgstr "Redning"
+
 #~ msgid "Which partition type do you want?"
 #~ msgstr "Hvilken partisjonstype јnsker du?"
 
@@ -6200,163 +6604,6 @@ msgstr "Finne tillatelser vil ta litt tid"
 #~ msgid "Move your wheel!"
 #~ msgstr "Beveg hjulet!"
 
-#~ msgid ""
-#~ "Please choose which network adapter you want to use to connect to internet"
-#~ msgstr ""
-#~ "Vennligst velg hvilket nettverksadapter du јnsker х bruke til х koble opp\n"
-#~ "mot Internett"
-
-#~ msgid "I'm about to restart the network interface. Do you agree?"
-#~ msgstr ""
-#~ "Jeg er i ferd med х starte nettverksgrensesnittet pх nytt. Er du enig?"
-
-#~ msgid "ADSL configuration"
-#~ msgstr "ADSL-konfigurasjon"
-
-#~ msgid "Do you want to start your connection at boot?"
-#~ msgstr "иnsker du х starte tilkoblingen din ved oppstart?"
-
-#~ msgid "Try to find a modem?"
-#~ msgstr "Prјve х finne et modem?"
-
-#~ msgid "Please choose which serial port your modem is connected to."
-#~ msgstr "Vennligst velg hvilken serieport modemet ditt koblet til."
-
-#~ msgid "Dialup options"
-#~ msgstr "Opsjoner oppringt"
-
-#~ msgid "Connection name"
-#~ msgstr "Navn tilknytning"
-
-#~ msgid "Phone number"
-#~ msgstr "Telefonnummer"
-
-#~ msgid "Login ID"
-#~ msgstr "Login ID"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentifikasjon"
-
-#~ msgid "PAP"
-#~ msgstr "PAP"
-
-#~ msgid "Script-based"
-#~ msgstr "Scriptbasert"
-
-#~ msgid "Terminal-based"
-#~ msgstr "Terminalbasert"
-
-#~ msgid "Domain name"
-#~ msgstr "Domenenavn"
-
-#~ msgid "First DNS Server"
-#~ msgstr "Fјrste DNS-tjener"
-
-#~ msgid "Second DNS Server"
-#~ msgstr "Andre DNS-tjener"
-
-#~ msgid "Connect to internet"
-#~ msgstr "Koble opp mot Internett"
-
-#~ msgid "Disconnect from internet"
-#~ msgstr "Koble ned fra Internett"
-
-#~ msgid "Configure internet connection"
-#~ msgstr "Konfigurer Internett-tilkobling"
-
-#~ msgid "Internet connection & configuration"
-#~ msgstr "Internett tilkobling & konfigurasjon"
-
-#~ msgid "What do you wish to do?"
-#~ msgstr "Hva јnsker du х gjјre?"
-
-#~ msgid "Connect to internet with a normal modem"
-#~ msgstr "Koble opp mot Internett med vanlig modem"
-
-#~ msgid "Connect to internet using ISDN"
-#~ msgstr "Koble opp mot Internett med ISDN"
-
-#~ msgid "Internal ISDN card"
-#~ msgstr "Internt ISDN-kort"
-
-#~ msgid "External modem"
-#~ msgstr "Eksternt modem"
-
-#~ msgid "Connect to the Internet"
-#~ msgstr "Koble opp mot Internett"
-
-#~ msgid "What kind is your ISDN connection?"
-#~ msgstr "Hva slags type er ISDN-tilknytningen din?"
-
-#~ msgid "Connect to internet using DSL (or ADSL)"
-#~ msgstr "Koble opp mot Internett med DSL (eller ADSL)"
-
-#~ msgid "France"
-#~ msgstr "Frankrike"
-
-#~ msgid "Other countries"
-#~ msgstr "Andre land"
-
-#~ msgid "In which country are you located ?"
-#~ msgstr "I hvilket land er du ?"
-
-#~ msgid "Alcatel modem"
-#~ msgstr "Alcatel modem"
-
-#~ msgid "ECI modem"
-#~ msgstr "ECI modem"
-
-#~ msgid ""
-#~ "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
-#~ msgstr "Hvis adsl modemet ditt er Alcatel, velg Alcatel. ellers, ECI."
-
-#~ msgid "use pppoe"
-#~ msgstr "bruk pppoe"
-
-#~ msgid "don't use pppoe"
-#~ msgstr "ikke bruk pppoe"
-
-#~ msgid ""
-#~ "The most common way to connect with adsl is dhcp + pppoe.\n"
-#~ "However, it exists some connection that only use dhcp.\n"
-#~ "If you don't know, choose 'use pppoe'"
-#~ msgstr ""
-#~ "Den mest vanlige mхten х koble opp med adsl er dhcp + pppoe.\n"
-#~ "Men, det eksisterer noen tilkoblinger som bare bruker dhcp.\n"
-#~ "Hvis du ikke vet, velg 'bruk pppoe'"
-
-#~ msgid "Connect to internet using Cable"
-#~ msgstr "Koble opp mot Internett med kabel"
-
-#~ msgid ""
-#~ "Which dhcp client do you want to use?\n"
-#~ "Default is dhcpd"
-#~ msgstr ""
-#~ "Hvilken dhcp klient јnsker du х bruke?\n"
-#~ "Standard er dhcpd"
-
-#~ msgid "Configure local network"
-#~ msgstr "Konfigurer lokalt nettverk"
-
-#~ msgid "Reconfigure local network"
-#~ msgstr "Rekonfigurer lokalt nettverk"
-
-#~ msgid "Disable networking"
-#~ msgstr "slх av nettverk"
-
-#~ msgid "Connect to the Internet / Configure local Network"
-#~ msgstr "Koble opp mot Internett / Konfigurer lokalt nettverk"
-
-#~ msgid ""
-#~ "Local networking has already been configured.\n"
-#~ "Do you want to:"
-#~ msgstr ""
-#~ "Lokalt nettverk har allerede blitt konfigurert.\n"
-#~ "Vil du:"
-
-#~ msgid "How do you want to connect to the Internet?"
-#~ msgstr "Hvordan vil du koble opp mot Internett?"
-
 #~ msgid "Forget the changes?"
 #~ msgstr "Glem endringene?"
 
@@ -6525,9 +6772,6 @@ msgstr "Finne tillatelser vil ta litt tid"
 #~ msgid "Do not set up networking"
 #~ msgstr "Ikke sett opp nettverk"
 
-#~ msgid "Network Configuration"
-#~ msgstr "Nettverkskonfigurasjon"
-
 #~ msgid "Do you want to configure a local network for your system?"
 #~ msgstr "Vil du konfigurere lokalt LAN-nettverk for systemet ditt?"
 
@@ -6599,9 +6843,6 @@ msgstr "Finne tillatelser vil ta litt tid"
 #~ msgid "automagic"
 #~ msgstr "Automagisk"
 
-#~ msgid "Upgrade"
-#~ msgstr "Oppgrader"
-
 #~ msgid "Do not connect to internet"
 #~ msgstr "Ikke koble opp mot Internett"
 
@@ -6640,9 +6881,6 @@ msgstr "Finne tillatelser vil ta litt tid"
 #~ msgid "Normal"
 #~ msgstr "Normal"
 
-#~ msgid "Install/Upgrade"
-#~ msgstr "Installer/Oppgrader"
-
 #~ msgid "Configure my card"
 #~ msgstr "Konfigurer kortet mitt"
 
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 6290df89a..8be39fc4d 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-09-27 14:34+0200\n"
+"POT-Creation-Date: 2000-09-28 14:46+0200\n"
 "PO-Revision-Date: 1999-08-09 16:39+0200\n"
 "Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
 "Language-Team: Serbian (cyrillic)\n"
@@ -476,7 +476,7 @@ msgstr "Где бисте да инсталирате стартер?"
 msgid "LILO/grub Installation"
 msgstr "LILO/grub инсталација"
 
-#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:638
+#: ../../any.pm_.c:111 ../../install_steps_interactive.pm_.c:744
 msgid "None"
 msgstr "Ниjедан"
 
@@ -512,14 +512,15 @@ msgstr "Видео мод"
 msgid "Delay before booting default image"
 msgstr "Пауза пре стартања default image-а"
 
-#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:666
-#: ../../install_steps_interactive.pm_.c:717 ../../printerdrake.pm_.c:94
-#: ../../printerdrake.pm_.c:128 ../../standalone/adduserdrake_.c:42
+#: ../../any.pm_.c:134 ../../install_steps_interactive.pm_.c:772
+#: ../../install_steps_interactive.pm_.c:823 ../../netconnect.pm_.c:507
+#: ../../printerdrake.pm_.c:94 ../../printerdrake.pm_.c:128
+#: ../../standalone/adduserdrake_.c:42
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:667
-#: ../../install_steps_interactive.pm_.c:718
+#: ../../any.pm_.c:135 ../../install_steps_interactive.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:824
 #: ../../standalone/adduserdrake_.c:43
 msgid "Password (again)"
 msgstr "Лозинка (поновите)"
@@ -542,14 +543,14 @@ msgid ""
 msgstr ""
 "Опција``Ограничена командна линика - опције'' је неупотребљива без лозинке"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:676
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:837
 #: ../../standalone/adduserdrake_.c:56
 msgid "Please try again"
 msgstr "Пробајте поново"
 
-#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:676
-#: ../../install_steps_interactive.pm_.c:731
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:837
 #: ../../standalone/adduserdrake_.c:56
 msgid "The passwords do not match"
 msgstr "Неподударност лозинки"
@@ -568,8 +569,8 @@ msgid "Add"
 msgstr "Додај"
 
 #: ../../any.pm_.c:165 ../../diskdrake.pm_.c:45
-#: ../../install_steps_interactive.pm_.c:711 ../../printerdrake.pm_.c:353
-#: ../../standalone/adduserdrake_.c:36
+#: ../../install_steps_interactive.pm_.c:817 ../../netconnect.pm_.c:746
+#: ../../printerdrake.pm_.c:353 ../../standalone/adduserdrake_.c:36
 msgid "Done"
 msgstr "Урађено"
 
@@ -625,8 +626,8 @@ msgstr "Ознака"
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:82
-#: ../../install_steps_interactive.pm_.c:664 ../../interactive.pm_.c:76
+#: ../../any.pm_.c:220 ../../install_gtk.pm_.c:81
+#: ../../install_steps_interactive.pm_.c:770 ../../interactive.pm_.c:76
 #: ../../interactive.pm_.c:86 ../../interactive.pm_.c:250
 #: ../../interactive_newt.pm_.c:51 ../../interactive_newt.pm_.c:99
 #: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:243
@@ -662,12 +663,13 @@ msgid "Do you have any %s interfaces?"
 msgstr "Имате ли још %s интерфејса?"
 
 #: ../../any.pm_.c:502 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:77 ../../printerdrake.pm_.c:234
+#: ../../netconnect.pm_.c:78 ../../netconnect.pm_.c:428
+#: ../../printerdrake.pm_.c:234
 msgid "No"
 msgstr "Не"
 
 #: ../../any.pm_.c:502 ../../interactive.pm_.c:81 ../../my_gtk.pm_.c:485
-#: ../../netconnect.pm_.c:75
+#: ../../netconnect.pm_.c:76 ../../netconnect.pm_.c:426
 msgid "Yes"
 msgstr "Да"
 
@@ -1036,7 +1038,7 @@ msgstr "ПАЖЉИВО,ова операција jе опасна."
 
 #: ../../diskdrake.pm_.c:202 ../../install_steps.pm_.c:73
 #: ../../install_steps_interactive.pm_.c:38
-#: ../../install_steps_interactive.pm_.c:238 ../../standalone/diskdrake_.c:60
+#: ../../install_steps_interactive.pm_.c:341 ../../standalone/diskdrake_.c:60
 #: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
 msgid "Error"
 msgstr "Грешка"
@@ -1287,7 +1289,7 @@ msgstr "Форматирање"
 msgid "Formatting loopback file %s"
 msgstr "Форматирање loopback фаjлa %s"
 
-#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:325
+#: ../../diskdrake.pm_.c:518 ../../install_steps_interactive.pm_.c:428
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Форматирање партиције %s"
@@ -1338,7 +1340,7 @@ msgid "Computing FAT filesystem bounds"
 msgstr "Прорачунавам границе FAT фајл-система"
 
 #: ../../diskdrake.pm_.c:568 ../../diskdrake.pm_.c:622
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Resizing"
 msgstr "Промена величине (resizing)"
 
@@ -1357,7 +1359,7 @@ msgstr "Изаберите нову величину"
 
 #: ../../diskdrake.pm_.c:601 ../../install_steps_graphical.pm_.c:287
 #: ../../install_steps_graphical.pm_.c:334
-#: ../../install_steps_interactive.pm_.c:426
+#: ../../install_steps_interactive.pm_.c:531
 #: ../../partition_table_raw.pm_.c:101
 msgid "MB"
 msgstr "MB"
@@ -1548,12 +1550,12 @@ msgid ""
 "installed or if you wish to use several operating systems.\n"
 "\n"
 "\n"
-"Please choose \"Rescue\" if you wish to rescue an already installed version "
+"Please choose \"Update\" if you wish to update an already installed version "
 "of Linux-Mandrake.\n"
 "\n"
 "\n"
 "Depend of your knowledge in GNU/Linux, you can choose one of the following "
-"levels to install or rescue your\n"
+"levels to install or update your\n"
 "Linux-Mandrake operating system:\n"
 "\n"
 "\t* Recommanded: if you have never installed a GNU/Linux operating system "
@@ -2818,7 +2820,7 @@ msgstr "Подешавање миша"
 msgid "Choose your keyboard"
 msgstr "Изабери тастатуру"
 
-#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:420
+#: ../../install2.pm_.c:45 ../../install_steps_interactive.pm_.c:524
 msgid "Miscellaneous"
 msgstr "Разне опције"
 
@@ -2854,8 +2856,8 @@ msgstr "Подеси сервисе"
 msgid "Configure printer"
 msgstr "Подеси штампач"
 
-#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:664
-#: ../../install_steps_interactive.pm_.c:665
+#: ../../install2.pm_.c:55 ../../install_steps_interactive.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:771
 msgid "Set root password"
 msgstr "Унеси root лозинку"
 
@@ -2887,16 +2889,16 @@ msgstr "Излаз из инсталације"
 msgid "Error reading file $f"
 msgstr "Грешка код отварања фајла $f"
 
-#: ../../install_gtk.pm_.c:428
+#: ../../install_gtk.pm_.c:427
 msgid "Please test the mouse"
 msgstr "Молим Вас да тестирате миша"
 
-#: ../../install_gtk.pm_.c:429
+#: ../../install_gtk.pm_.c:428
 #, fuzzy
 msgid "To activate the mouse,"
 msgstr "Молим Вас да тестирате миша"
 
-#: ../../install_gtk.pm_.c:430
+#: ../../install_gtk.pm_.c:429
 msgid "MOVE YOUR WHEEL!"
 msgstr ""
 
@@ -2955,34 +2957,35 @@ msgid "Use the Windows partition for loopback"
 msgstr "Користи Windows партициjу за loopback"
 
 #: ../../install_interactive.pm_.c:90
-msgid "Which partition do you want to use to put Linux4Win?"
+#, fuzzy
+msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Коју партицију желите да корисите за Linux4Win?"
 
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:92
 msgid "Choose the sizes"
 msgstr "Изаберите  величину"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:93
 msgid "Root partition size in MB: "
 msgstr "Величина Root партициjе у MB:"
 
-#: ../../install_interactive.pm_.c:93
+#: ../../install_interactive.pm_.c:94
 msgid "Swap partition size in MB: "
 msgstr "Величина Swap партициjе у MB:"
 
-#: ../../install_interactive.pm_.c:101
+#: ../../install_interactive.pm_.c:102
 msgid "Use the free space on the Windows partition"
 msgstr "Корисити слободан простор на Windows партициjи"
 
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:105
 msgid "Which partition do you want to resize?"
 msgstr "Којоj партицији  желите да промените величину?"
 
-#: ../../install_interactive.pm_.c:106
+#: ../../install_interactive.pm_.c:107
 msgid "Computing Windows filesystem bounds"
 msgstr "Прорачунавам границе Windows фајл-система"
 
-#: ../../install_interactive.pm_.c:108
+#: ../../install_interactive.pm_.c:109
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -2992,12 +2995,12 @@ msgstr ""
 "партициjом, \n"
 "због следeће грeшкe: %s"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:112
 msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
 msgstr ""
 "Вaша Windows партициjа jе превише фрагментирана, прво покрените ``defrag''"
 
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:113
 msgid ""
 "WARNING!\n"
 "\n"
@@ -3015,21 +3018,21 @@ msgstr ""
 "scandisk (евентуално и defrag), а онда поново покрените инсталациjу.\n"
 "Ако сте сигурни, притисните Ок (У реду)."
 
-#: ../../install_interactive.pm_.c:121
+#: ../../install_interactive.pm_.c:122
 msgid "Which size do you want to keep for windows on"
 msgstr "Коjу величину желитe да задржите за прозорe"
 
-#: ../../install_interactive.pm_.c:122
+#: ../../install_interactive.pm_.c:123
 #, c-format
 msgid "partition %s"
 msgstr "партиција %s "
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:129
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "FAT измена величине неуспела: %s"
 
-#: ../../install_interactive.pm_.c:143
+#: ../../install_interactive.pm_.c:144
 msgid ""
 "There is no FAT partitions to resize or to use as loopback (or not enough "
 "space left)"
@@ -3037,38 +3040,38 @@ msgstr ""
 "Не постоje FAT партициjе коjимa се може променити величинa или коjе се могу "
 "кориситити зa loopback (или нема довољно слободног просторa)"
 
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:150
 msgid "Erase entire disk"
 msgstr "Избриши цели диск"
 
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:150
 msgid "Remove Windows(TM)"
 msgstr "Уклони Windows(TM)"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:153
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr ""
 "Имате више од jедног хард диска, на коjи од њих желите да инсталирате Линукс "
 "?"
 
-#: ../../install_interactive.pm_.c:154
+#: ../../install_interactive.pm_.c:156
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "СВЕ постоjeће партициjе и подаци на диску %s ће бити изгубљени"
 
-#: ../../install_interactive.pm_.c:162
+#: ../../install_interactive.pm_.c:164
 msgid "Expert mode"
 msgstr "Експерт мод"
 
-#: ../../install_interactive.pm_.c:162
+#: ../../install_interactive.pm_.c:164
 msgid "Use diskdrake"
 msgstr "Користи diskdrake"
 
-#: ../../install_interactive.pm_.c:166
+#: ../../install_interactive.pm_.c:168
 msgid "Use fdisk"
 msgstr "Користи fdisk"
 
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:171
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -3078,19 +3081,24 @@ msgstr ""
 "Кaдa завршите,не заборавите да потврдите користeћи `w'"
 
 #: ../../install_interactive.pm_.c:202
+#, fuzzy
+msgid "I can't find any room for installing"
+msgstr "Не могу додати више ни једну партицију"
+
+#: ../../install_interactive.pm_.c:205
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "DrakX чаробњак за партиционирaње jе пронaшао следeћа рeшeња:"
 
-#: ../../install_interactive.pm_.c:207
+#: ../../install_interactive.pm_.c:210
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Партиционирaње ниjе успело : %s"
 
-#: ../../install_interactive.pm_.c:222
+#: ../../install_interactive.pm_.c:225
 msgid "Bringing up the network"
 msgstr "Приступам  мрежу"
 
-#: ../../install_interactive.pm_.c:227
+#: ../../install_interactive.pm_.c:230
 msgid "Bringing down the network"
 msgstr "Одступам од мрежe"
 
@@ -3142,69 +3150,69 @@ msgstr "Изаберите величину компоненти за инсталацију"
 msgid "Total size: "
 msgstr "Укупна величина: "
 
-#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:352
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:353
 #: ../../standalone/rpmdrake_.c:136
 #, c-format
 msgid "Version: %s\n"
 msgstr "Верзија: %s\n"
 
-#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:353
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:354
 #: ../../standalone/rpmdrake_.c:137
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Величина: %d KB\n"
 
-#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:259
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:260
 msgid "Choose the packages you want to install"
 msgstr "Изабери пакете за инсталацију"
 
-#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:262
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:263
 msgid "Info"
 msgstr "Инфо"
 
-#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:267
-#: ../../install_steps_interactive.pm_.c:139 ../../standalone/rpmdrake_.c:161
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:268
+#: ../../install_steps_interactive.pm_.c:242 ../../standalone/rpmdrake_.c:161
 msgid "Install"
 msgstr "Инсталирај"
 
-#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:465
-#: ../../install_steps_interactive.pm_.c:500
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:466
+#: ../../install_steps_interactive.pm_.c:606
 msgid "Installing"
 msgstr "Инсталирам"
 
-#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:472
 msgid "Please wait, "
 msgstr "Молим сачекајте"
 
-#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:473
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:474
 msgid "Time remaining "
 msgstr "Преостало време"
 
-#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:474
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:475
 msgid "Total time "
 msgstr "Укупно време"
 
-#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:483
-#: ../../install_steps_interactive.pm_.c:500
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:484
+#: ../../install_steps_interactive.pm_.c:606
 msgid "Preparing installation"
 msgstr "Припремам инсталацију"
 
-#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:499
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:500
 #, c-format
 msgid "Installing package %s"
 msgstr "Инсталирам пакет %s"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:541
-#: ../../install_steps_gtk.pm_.c:545
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
+#: ../../install_steps_gtk.pm_.c:546
 msgid "Go on anyway?"
 msgstr "Свеједно наставити даље ?"
 
-#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:541
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:542
 msgid "There was an error ordering packages:"
 msgstr "Грешка у листи пакета:"
 
 #: ../../install_steps_graphical.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:905
+#: ../../install_steps_interactive.pm_.c:1011
 msgid "Use existing configuration for X11?"
 msgstr "Да ли да користим постојећу конфигурацију за X11 ?"
 
@@ -3225,13 +3233,13 @@ msgstr ""
 msgid "Please, choose one of the following classes of installation:"
 msgstr "Молим вас да изабетерте jедну од следeћих инсталационих класa:"
 
-#: ../../install_steps_gtk.pm_.c:214
+#: ../../install_steps_gtk.pm_.c:215
 #, c-format
 msgid ""
 "The total size for the groups you have selected is approximately %d MB.\n"
 msgstr "Укупна величинa група коjе стe изабрали износи  %d MB.\n"
 
-#: ../../install_steps_gtk.pm_.c:216
+#: ../../install_steps_gtk.pm_.c:217
 msgid ""
 "If you wish to install less than this size,\n"
 "select the percentage of packages that you want to install.\n"
@@ -3245,7 +3253,7 @@ msgstr ""
 "При малом проценту ће се инсталирати само важни пакети;\n"
 "док ће при проценту од 100%% бити инсталирани сви пакети."
 
-#: ../../install_steps_gtk.pm_.c:221
+#: ../../install_steps_gtk.pm_.c:222
 msgid ""
 "You have space on your disk for only %d%% of these packages.\n"
 "\n"
@@ -3261,75 +3269,75 @@ msgstr ""
 "При малом проценту ће се инсталирати само важни пакети;\n"
 "док ће при проценту од  %d%% бити инсталирано максимално могућ броj пакетa"
 
-#: ../../install_steps_gtk.pm_.c:227
+#: ../../install_steps_gtk.pm_.c:228
 msgid "You will be able to choose them more specifically in the next step."
 msgstr "Моћи ћете да их прецизније бирате у следећeм кораку."
 
-#: ../../install_steps_gtk.pm_.c:229
+#: ../../install_steps_gtk.pm_.c:230
 msgid "Percentage of packages to install"
 msgstr "Проценат пакетa за инсталацију"
 
-#: ../../install_steps_gtk.pm_.c:271
+#: ../../install_steps_gtk.pm_.c:272
 msgid "Automatic dependencies"
 msgstr "Аутоматскe  зависности"
 
-#: ../../install_steps_gtk.pm_.c:331 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:101
 msgid "Expand Tree"
 msgstr "Прошири стабло"
 
-#: ../../install_steps_gtk.pm_.c:332 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:333 ../../standalone/rpmdrake_.c:102
 msgid "Collapse Tree"
 msgstr "Скупи стабло"
 
-#: ../../install_steps_gtk.pm_.c:333
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Toggle between flat and group sorted"
 msgstr "Бираjте: равно или групно сортирано"
 
-#: ../../install_steps_gtk.pm_.c:350
+#: ../../install_steps_gtk.pm_.c:351
 msgid "Bad package"
 msgstr "Лош пакет"
 
-#: ../../install_steps_gtk.pm_.c:351
+#: ../../install_steps_gtk.pm_.c:352
 #, c-format
 msgid "Name: %s\n"
 msgstr "Име:  %s\n"
 
-#: ../../install_steps_gtk.pm_.c:354
+#: ../../install_steps_gtk.pm_.c:355
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Вaжно: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:362
+#: ../../install_steps_gtk.pm_.c:363
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Укупна величина: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:381
+#: ../../install_steps_gtk.pm_.c:382
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr "Не можете селектовати оваj пакет jер нема више слободног просторa"
 
-#: ../../install_steps_gtk.pm_.c:385
+#: ../../install_steps_gtk.pm_.c:386
 msgid "The following packages are going to be installed"
 msgstr "Слeдeћи пакети треба да буду инсталирани"
 
-#: ../../install_steps_gtk.pm_.c:386
+#: ../../install_steps_gtk.pm_.c:387
 msgid "The following packages are going to be removed"
 msgstr "Следeћи пакети ће бити избрисани"
 
-#: ../../install_steps_gtk.pm_.c:396
+#: ../../install_steps_gtk.pm_.c:397
 msgid "You can't select/unselect this package"
 msgstr "Не можете селектовати/деселектовати оваj пакет"
 
-#: ../../install_steps_gtk.pm_.c:415
+#: ../../install_steps_gtk.pm_.c:416
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Ово jе обавезни пакет,и не можe бити деселектован"
 
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:418
 msgid "You can't unselect this package. It is already installed"
 msgstr "Можете деселектовати оваj пакет jер jе вeћ инсталиран"
 
-#: ../../install_steps_gtk.pm_.c:421
+#: ../../install_steps_gtk.pm_.c:422
 msgid ""
 "This package must be upgraded\n"
 "Are you sure you want to deselect it?"
@@ -3337,27 +3345,27 @@ msgstr ""
 "Оваj пакет мора бити aжуриран\n"
 "Да ли сигурно желите да га деселектуjетe ?"
 
-#: ../../install_steps_gtk.pm_.c:424
+#: ../../install_steps_gtk.pm_.c:425
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Не можете деселектовати оваj пакет.Он мора бити aжуриран"
 
-#: ../../install_steps_gtk.pm_.c:468
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Estimating"
 msgstr "Процењујем"
 
-#: ../../install_steps_gtk.pm_.c:480 ../../interactive.pm_.c:86
+#: ../../install_steps_gtk.pm_.c:481 ../../interactive.pm_.c:86
 #: ../../interactive.pm_.c:249 ../../interactive_newt.pm_.c:51
 #: ../../interactive_newt.pm_.c:99 ../../interactive_stdio.pm_.c:27
 #: ../../my_gtk.pm_.c:246 ../../my_gtk.pm_.c:486
 msgid "Cancel"
 msgstr "Обустави"
 
-#: ../../install_steps_gtk.pm_.c:494
+#: ../../install_steps_gtk.pm_.c:495
 #, c-format
 msgid "%d packages"
 msgstr "%d пакета"
 
-#: ../../install_steps_gtk.pm_.c:525
+#: ../../install_steps_gtk.pm_.c:526
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -3371,7 +3379,7 @@ msgstr ""
 "Убацитe вaш CD ознaчен са \"%s\" у погон и притисните OK кадa сте спремни.\n"
 "Уколико га немате притисните  Поништи."
 
-#: ../../install_steps_gtk.pm_.c:545
+#: ../../install_steps_gtk.pm_.c:546
 msgid "There was an error installing packages:"
 msgstr "Грешка при инсталациjи пакетa:"
 
@@ -3383,65 +3391,229 @@ msgstr "Xм,поjавила се  грешка"
 msgid "Please, choose a language to use."
 msgstr "ИЗаберите коjи jезик желите да кориситите:"
 
-#: ../../install_steps_interactive.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:71
+msgid ""
+" Introduction\n"
+"\n"
+"The operating system and the different components available in the "
+"Linux-Mandrake distribution \n"
+"shall be called the \"Software Products\" hereafter. The Software Products "
+"include, but are not \n"
+"restricted to, the set of programs, methods, rules and documentation related "
+"to the operating \n"
+"system and the different components of the Linux-Mandrake distribution.\n"
+"\n"
+"\n"
+"1. License Agreement\n"
+"\n"
+"Please read carefully this document. This document is a license agreement "
+"between you and  \n"
+"MandrakeSoft S.A., 42, rue d'Aboukir, 75002 Paris - France, which applies to "
+"the Software Products.\n"
+"By installing, duplicating or using the Software Products in any manner, you "
+"explicitly \n"
+"accept and fully agree to conform to the terms and conditions of this "
+"License. \n"
+"If you disagree with any portion of the License, you are not allowed to "
+"install, duplicate or use \n"
+"the Software Products. \n"
+"Any attempt to install, duplicate or use the Software Products in a manner "
+"which does not comply \n"
+"with the terms and conditions of this License is void and will terminate "
+"your rights under this \n"
+"License. Upon termination of the License,  you must immediately destroy all "
+"copies of the \n"
+"Software Products.\n"
+"\n"
+"\n"
+"2. The GPL License and Related Licenses\n"
+"\n"
+"The Software Products consist of components created by different persons or "
+"entities.  Most \n"
+"of these components are governed under the terms and conditions of the GNU "
+"General Public \n"
+"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
+"licenses allow you to use, \n"
+"duplicate, adapt or redistribute the components which they cover. Please "
+"read carefully the terms \n"
+"and conditions of the license agreement for each component before using any "
+"component. Any question \n"
+"on a component license should be addressed to the component author and not "
+"to MandrakeSoft.\n"
+"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"Documentation written \n"
+"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"documentation for \n"
+"further details.\n"
+"Some versions of the Software Products may contain components which are not "
+"governed by the GPL \n"
+"License or similar agreements. Each such component is then governed by the "
+"terms and conditions \n"
+"of its own specific license. Please read carefully and comply with such "
+"specific licenses before \n"
+"you install, use or redistribute the said components. Such licenses will in "
+"general prevent the \n"
+"transfer,  duplication (except for backup purposes), redistribution, reverse "
+"engineering, \n"
+"de-assembly, \n"
+"de-compilation or modification of the component. Any breach of agreement "
+"will immediately terminate \n"
+"your rights under the specific license. Unless the specific license terms "
+"grant you such rights, \n"
+"you usually cannot install the programs on more than one system, or adapt it "
+"to be used on a \n"
+"network. \n"
+"In doubt, please contact directly the distributor or editor of the "
+"component. Transfer to third \n"
+"parties or copying of such components including the documentation is usually "
+"forbidden.\n"
+"\n"
+"\n"
+"3. Intellectual Property Rights\n"
+"\n"
+"All rights to the components of the Software Products belong to their "
+"respective authors and are \n"
+"protected by intellectual property and copyright laws applicable to software "
+"programs.\n"
+"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Products, as a whole or in \n"
+"parts,\n"
+"by all means and for all purposes.\n"
+"\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of "
+"MandrakeSoft S.A.  All rights \n"
+"are \n"
+"reserved. The duplication is forbidden without prior written consent by "
+"MandrakeSoft S.A.\n"
+"\n"
+"\n"
+"4. Limited Warranty\n"
+"\n"
+"The Software Products and attached documentation are provided \"as is\", "
+"with no warranty, to the \n"
+"extent permitted by law. Should the Software Products be defective, "
+"MandrakeSoft S.A. will at its \n"
+"own will either replace the Software Products, or reimburse the paid fee.\n"
+"This limited warranty is void if you fail to comply to the recommendations, "
+"instructions and \n"
+"conditions \n"
+"of use listed in the documentation or license agreements of the Software "
+"Products.\n"
+"To the extent permitted by law, MandrakeSoft S.A. will in no circumstances "
+"be liable for any \n"
+"special, \n"
+"incidental, direct or indirect damages whatsoever (including without "
+"limitation damages for loss of \n"
+"business, interruption of business, financial loss, legal fees and penalties "
+"resulting from a court \n"
+"judgement, or any other consequential loss) arising out of  the use or "
+"inability to use the \n"
+"Software \n"
+"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
+"occurance of such \n"
+"damages.\n"
+"\n"
+"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
+"COUNTRIES\n"
+"\n"
+"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"in no circumstances, be \n"
+"liable for any special, incidental, direct or indirect damages whatsoever "
+"(including without \n"
+"limitation \n"
+"damages for loss of business, interruption of business, financial loss, "
+"legal fees and penalties \n"
+"resulting from a court judgement, or any other consequential loss) arising "
+"out of the possession \n"
+"and \n"
+"use of software components or arising out of  downloading software "
+"components from one of \n"
+"Linux-Mandrake \n"
+"sites  which are prohibited or restricted in some countries by local laws. "
+"This limited liability \n"
+"applies to, but is not restricted to, the strong cryptography components "
+"included in the Software \n"
+"Products.\n"
+"\n"
+"\n"
+"5. Governing Laws \n"
+"\n"
+"If any portion of this agreement is held void, illegal or inapplicable by a "
+"court judgement, this \n"
+"portion is excluded from this contract. You remain bound by the other "
+"applicable sections of the \n"
+"agreement.\n"
+"The terms and conditions of this License are governed by the Laws of "
+"France.\n"
+"All disputes on the terms of this license will preferably be settled out of "
+"court. As a last \n"
+"resort, \n"
+"the dispute will be referred to the appropriate Courts of Law of Paris - "
+"France.\n"
+"For any question on this document, please contact MandrakeSoft S.A.,  \n"
+"42, rue d'Aboukir, 75002 Paris - France\n"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:173
 msgid "Accept"
 msgstr "Прихвати"
 
-#: ../../install_steps_interactive.pm_.c:72
+#: ../../install_steps_interactive.pm_.c:173
 msgid "Refuse"
 msgstr "Одбаци"
 
-#: ../../install_steps_interactive.pm_.c:79
+#: ../../install_steps_interactive.pm_.c:180
 #: ../../standalone/keyboarddrake_.c:21
 msgid "Keyboard"
 msgstr "Тастатурa"
 
-#: ../../install_steps_interactive.pm_.c:80
+#: ../../install_steps_interactive.pm_.c:181
 #: ../../standalone/keyboarddrake_.c:22
 msgid "Please, choose your keyboard layout."
 msgstr "Који  распоред тастатуре желите ?"
 
-#: ../../install_steps_interactive.pm_.c:91
+#: ../../install_steps_interactive.pm_.c:192
 msgid "You can choose other languages that will be available after install"
 msgstr "Можете изабрати други jезик коjи ће бити доступан после инсталациje "
 
-#: ../../install_steps_interactive.pm_.c:98
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:199
+#: ../../install_steps_interactive.pm_.c:533
 msgid "All"
 msgstr "Свe"
 
-#: ../../install_steps_interactive.pm_.c:106
-#: ../../install_steps_interactive.pm_.c:150
+#: ../../install_steps_interactive.pm_.c:207
+#: ../../install_steps_interactive.pm_.c:253
 msgid "Install Class"
 msgstr "Инсталације класе"
 
-#: ../../install_steps_interactive.pm_.c:106
+#: ../../install_steps_interactive.pm_.c:207
 msgid "Which installation class do you want?"
 msgstr "Коjу  инсталациону класу бирате ?"
 
-#: ../../install_steps_interactive.pm_.c:108
-msgid "Install/Rescue"
-msgstr "Инсталирај/Сaчуваj"
+#: ../../install_steps_interactive.pm_.c:209
+#, fuzzy
+msgid "Install/Update"
+msgstr "Инсталација/Ажурирање"
 
-#: ../../install_steps_interactive.pm_.c:108
-msgid "Is this an install or a rescue?"
+#: ../../install_steps_interactive.pm_.c:209
+#, fuzzy
+msgid "Is this an install or an update?"
 msgstr "Да ли је ово инсталација или спасавaњe ?"
 
-#: ../../install_steps_interactive.pm_.c:117
+#: ../../install_steps_interactive.pm_.c:218
 msgid "Recommended"
 msgstr "Препоручено"
 
-#: ../../install_steps_interactive.pm_.c:119
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:221
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Customized"
 msgstr "Избор по жељи"
 
-#: ../../install_steps_interactive.pm_.c:120
-#: ../../install_steps_interactive.pm_.c:134
+#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Expert"
 msgstr "Експерт"
 
-#: ../../install_steps_interactive.pm_.c:129
+#: ../../install_steps_interactive.pm_.c:232
 msgid ""
 "Are you sure you are an expert? \n"
 "You will be allowed to make powerful but dangerous things here.\n"
@@ -3455,67 +3627,68 @@ msgstr ""
 "?'',\n"
 "да ли сте спремни на одговорите на оваква питaњa ?"
 
-#: ../../install_steps_interactive.pm_.c:139
-msgid "Rescue"
-msgstr "Сaчуваj"
+#: ../../install_steps_interactive.pm_.c:242
+#, fuzzy
+msgid "Update"
+msgstr "Ажурирање"
 
-#: ../../install_steps_interactive.pm_.c:145
+#: ../../install_steps_interactive.pm_.c:248
 msgid "Workstation"
 msgstr "Радна станицa"
 
-#: ../../install_steps_interactive.pm_.c:146
+#: ../../install_steps_interactive.pm_.c:249
 msgid "Development"
 msgstr "Развојна"
 
-#: ../../install_steps_interactive.pm_.c:147
+#: ../../install_steps_interactive.pm_.c:250
 msgid "Server"
 msgstr "Сервер"
 
-#: ../../install_steps_interactive.pm_.c:151
+#: ../../install_steps_interactive.pm_.c:254
 msgid "What is your system used for?"
 msgstr "За шта ће те корисити систем ?"
 
-#: ../../install_steps_interactive.pm_.c:167 ../../standalone/mousedrake_.c:24
+#: ../../install_steps_interactive.pm_.c:270 ../../standalone/mousedrake_.c:24
 msgid "Please, choose the type of your mouse."
 msgstr "Изаберитe тип миша"
 
-#: ../../install_steps_interactive.pm_.c:174 ../../standalone/mousedrake_.c:40
+#: ../../install_steps_interactive.pm_.c:277 ../../standalone/mousedrake_.c:40
 msgid "Mouse Port"
 msgstr "Порт за миша"
 
-#: ../../install_steps_interactive.pm_.c:175
+#: ../../install_steps_interactive.pm_.c:278
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Изаберите на који серијски порт је ваш миш прикључен."
 
-#: ../../install_steps_interactive.pm_.c:194
+#: ../../install_steps_interactive.pm_.c:297
 msgid "Configuring PCMCIA cards..."
 msgstr "Конфигуришем PCMCIA картице..."
 
-#: ../../install_steps_interactive.pm_.c:194
+#: ../../install_steps_interactive.pm_.c:297
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:301
 msgid "Configuring IDE"
 msgstr "Kонфигурација  IDE"
 
-#: ../../install_steps_interactive.pm_.c:198
+#: ../../install_steps_interactive.pm_.c:301
 msgid "IDE"
 msgstr " IDE"
 
-#: ../../install_steps_interactive.pm_.c:211
+#: ../../install_steps_interactive.pm_.c:314
 msgid "no available partitions"
 msgstr "нема доступних партиција"
 
-#: ../../install_steps_interactive.pm_.c:214
+#: ../../install_steps_interactive.pm_.c:317
 msgid "Scanning partitions to find mount points"
 msgstr ""
 
-#: ../../install_steps_interactive.pm_.c:222
+#: ../../install_steps_interactive.pm_.c:325
 msgid "Choose the mount points"
 msgstr "Изаберите тачке монтирања"
 
-#: ../../install_steps_interactive.pm_.c:239
+#: ../../install_steps_interactive.pm_.c:342
 #, c-format
 msgid ""
 "I can't read your partition table, it's too corrupted for me :(\n"
@@ -3531,7 +3704,7 @@ msgstr ""
 "Друго рeшeње jе да се DrakX онемогући да модуфикуje табелу партициja.\n"
 "(грeшка je %s)\n"
 
-#: ../../install_steps_interactive.pm_.c:252
+#: ../../install_steps_interactive.pm_.c:355
 msgid ""
 "DiskDrake failed to read correctly the partition table.\n"
 "Continue at your own risk!"
@@ -3539,87 +3712,87 @@ msgstr ""
 "DiskDrake не може да исправно прочита табелу партиција.\n"
 "Даљи наставак иде на ваш ризик !"
 
-#: ../../install_steps_interactive.pm_.c:260
+#: ../../install_steps_interactive.pm_.c:363
 msgid "Root Partition"
 msgstr "Root партиција"
 
-#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:364
 msgid "What is the root partition (/) of your system?"
 msgstr "На којој партицији је root партиција (/) вашег система?"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:378
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Треба да ресетујете машину за примену измена у табели партиција"
 
-#: ../../install_steps_interactive.pm_.c:299
+#: ../../install_steps_interactive.pm_.c:402
 msgid "Choose the partitions you want to format"
 msgstr "Изабери партиције за форматирање"
 
-#: ../../install_steps_interactive.pm_.c:309
+#: ../../install_steps_interactive.pm_.c:412
 msgid "Check bad blocks?"
 msgstr "Провери лоше блокове ?"
 
-#: ../../install_steps_interactive.pm_.c:320
+#: ../../install_steps_interactive.pm_.c:423
 msgid "Formatting partitions"
 msgstr "Форматирање партицију"
 
-#: ../../install_steps_interactive.pm_.c:324
+#: ../../install_steps_interactive.pm_.c:427
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Креирaње и форматирaње фаjлa %s"
 
-#: ../../install_steps_interactive.pm_.c:327
+#: ../../install_steps_interactive.pm_.c:430
 msgid "Not enough swap to fulfill installation, please add some"
 msgstr "Нема довољно swap-а да заврши инсталацију, додајте још swap-а"
 
-#: ../../install_steps_interactive.pm_.c:333
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Looking for available packages"
 msgstr "Тражим пакете"
 
-#: ../../install_steps_interactive.pm_.c:339
+#: ../../install_steps_interactive.pm_.c:442
 msgid "Finding packages to upgrade"
 msgstr "Тражим пакете за ажурирање..."
 
-#: ../../install_steps_interactive.pm_.c:356
+#: ../../install_steps_interactive.pm_.c:459
 #, c-format
 msgid ""
 "Your system has not enough space left for installation or upgrade (%d > %d)"
 msgstr "Вaш систем нема довољно места за инсталациjу или aжурирaњe (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:378
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Complete (%dMB)"
 msgstr "Комплетнa (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:378
+#: ../../install_steps_interactive.pm_.c:481
 msgid "Custom"
 msgstr "Избор по жeљи"
 
-#: ../../install_steps_interactive.pm_.c:378
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Minimum (%dMB)"
 msgstr "Минималнa (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:383
+#: ../../install_steps_interactive.pm_.c:486
 #, c-format
 msgid "Recommended (%dMB)"
 msgstr "Препоручена (%dMB)"
 
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:491
 msgid "Select the size you want to install"
 msgstr "Изаберите величину  инсталацијe"
 
-#: ../../install_steps_interactive.pm_.c:422
+#: ../../install_steps_interactive.pm_.c:526
 msgid "Package Group Selection"
 msgstr "Одабир група пакета"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:534
 msgid "Individual package selection"
 msgstr "Поjединaчно бирaње пакетa"
 
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:582
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -3630,12 +3803,12 @@ msgstr ""
 "Ако вам недостаjу  само неки CD-ови , деселектуjтe иx, а онда кликните на  "
 "Ok."
 
-#: ../../install_steps_interactive.pm_.c:481
+#: ../../install_steps_interactive.pm_.c:587
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom ознaчен као \"%s"
 
-#: ../../install_steps_interactive.pm_.c:509
+#: ../../install_steps_interactive.pm_.c:615
 msgid ""
 "Installing package %s\n"
 "%d%%"
@@ -3643,11 +3816,11 @@ msgstr ""
 "Инсталирам пакете %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:518
+#: ../../install_steps_interactive.pm_.c:624
 msgid "Post-install configuration"
 msgstr "Постинсталациона конфигурацијa"
 
-#: ../../install_steps_interactive.pm_.c:543
+#: ../../install_steps_interactive.pm_.c:649
 msgid ""
 "You have now the possibility to download software aimed for encryption.\n"
 "\n"
@@ -3703,92 +3876,92 @@ msgstr ""
 "Altadena California 91001\n"
 "USA"
 
-#: ../../install_steps_interactive.pm_.c:574
+#: ../../install_steps_interactive.pm_.c:680
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изаберите mirror са ког ћете скинути пакете"
 
-#: ../../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:688
 msgid "Contacting the mirror to get the list of available packages"
 msgstr "Кантактирајте mirror за листу могућих пакета"
 
-#: ../../install_steps_interactive.pm_.c:585
+#: ../../install_steps_interactive.pm_.c:691
 msgid "Please choose the packages you want to install."
 msgstr "Изаберите пакете за инсталацију"
 
-#: ../../install_steps_interactive.pm_.c:597
+#: ../../install_steps_interactive.pm_.c:703
 msgid "Which is your timezone?"
 msgstr "Коjа jе вaша временска зонa ?"
 
-#: ../../install_steps_interactive.pm_.c:599
+#: ../../install_steps_interactive.pm_.c:705
 msgid "Is your hardware clock set to GMT?"
 msgstr "Да ли је ваш системски (BIOS) часовник подешен на GMT ?"
 
-#: ../../install_steps_interactive.pm_.c:637
+#: ../../install_steps_interactive.pm_.c:743
 msgid "Which printing system do you want to use?"
 msgstr "Који систем за штампaње желите да користитe ?"
 
-#: ../../install_steps_interactive.pm_.c:664
+#: ../../install_steps_interactive.pm_.c:770
 msgid "No password"
 msgstr "Без лозинке"
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:775
 msgid "Use shadow file"
 msgstr "Користи shadow фајл"
 
-#: ../../install_steps_interactive.pm_.c:669
+#: ../../install_steps_interactive.pm_.c:775
 msgid "shadow"
 msgstr "сенкa"
 
-#: ../../install_steps_interactive.pm_.c:670
+#: ../../install_steps_interactive.pm_.c:776
 msgid "MD5"
 msgstr "MD5"
 
-#: ../../install_steps_interactive.pm_.c:670
+#: ../../install_steps_interactive.pm_.c:776
 msgid "Use MD5 passwords"
 msgstr "Користи  MD5 лозинку"
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:778
 msgid "Use NIS"
 msgstr "Користи NIS"
 
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:778
 msgid "yellow pages"
 msgstr "жуте странице"
 
-#: ../../install_steps_interactive.pm_.c:678
+#: ../../install_steps_interactive.pm_.c:784
 #, c-format
 msgid "This password is too simple (must be at least %d characters long)"
 msgstr "Ова лозинка jе сувишe jедноставнa (треба дa има бар %d знакова)"
 
-#: ../../install_steps_interactive.pm_.c:685
+#: ../../install_steps_interactive.pm_.c:791
 msgid "Authentification NIS"
 msgstr "Аутентификација NIS"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:792
 msgid "NIS Domain"
 msgstr "NIS Домен"
 
-#: ../../install_steps_interactive.pm_.c:686
+#: ../../install_steps_interactive.pm_.c:792
 msgid "NIS Server"
 msgstr "NIS Сервер"
 
-#: ../../install_steps_interactive.pm_.c:711
+#: ../../install_steps_interactive.pm_.c:817
 #: ../../standalone/adduserdrake_.c:36
 msgid "Accept user"
 msgstr "Прихвати корисника"
 
-#: ../../install_steps_interactive.pm_.c:711
+#: ../../install_steps_interactive.pm_.c:817
 #: ../../standalone/adduserdrake_.c:36
 msgid "Add user"
 msgstr "Додај корисника"
 
-#: ../../install_steps_interactive.pm_.c:712
+#: ../../install_steps_interactive.pm_.c:818
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid "(already added %s)"
 msgstr "(%s већ постоји)"
 
-#: ../../install_steps_interactive.pm_.c:712
+#: ../../install_steps_interactive.pm_.c:818
 #: ../../standalone/adduserdrake_.c:37
 #, c-format
 msgid ""
@@ -3798,48 +3971,48 @@ msgstr ""
 "Унеси корисника\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:714
+#: ../../install_steps_interactive.pm_.c:820
 #: ../../standalone/adduserdrake_.c:39
 msgid "Real name"
 msgstr "Право име"
 
-#: ../../install_steps_interactive.pm_.c:715 ../../printerdrake.pm_.c:93
+#: ../../install_steps_interactive.pm_.c:821 ../../printerdrake.pm_.c:93
 #: ../../printerdrake.pm_.c:127 ../../standalone/adduserdrake_.c:40
 msgid "User name"
 msgstr "Корисничко име"
 
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_interactive.pm_.c:826
 #: ../../standalone/adduserdrake_.c:45
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../install_steps_interactive.pm_.c:722
+#: ../../install_steps_interactive.pm_.c:828
 #: ../../standalone/adduserdrake_.c:47
 msgid "Icon"
 msgstr "Иконa"
 
-#: ../../install_steps_interactive.pm_.c:732
+#: ../../install_steps_interactive.pm_.c:838
 #: ../../standalone/adduserdrake_.c:57
 msgid "This password is too simple"
 msgstr "Ова лозинка је превише проста"
 
-#: ../../install_steps_interactive.pm_.c:733
+#: ../../install_steps_interactive.pm_.c:839
 #: ../../standalone/adduserdrake_.c:58
 msgid "Please give a user name"
 msgstr "Одредите корисничко име"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:840
 #: ../../standalone/adduserdrake_.c:59
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Корисничко име може садржати само мала слова, бројеве, `-' и `_'"
 
-#: ../../install_steps_interactive.pm_.c:735
+#: ../../install_steps_interactive.pm_.c:841
 #: ../../standalone/adduserdrake_.c:60
 msgid "This user name is already added"
 msgstr "Ово корисничко име већ постоји"
 
-#: ../../install_steps_interactive.pm_.c:759
+#: ../../install_steps_interactive.pm_.c:865
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3865,19 +4038,19 @@ msgstr ""
 "Уколико желите да креирате стартну дискету за ваш системубаците дискету у "
 "погон и притисните \"Да\"."
 
-#: ../../install_steps_interactive.pm_.c:775
+#: ../../install_steps_interactive.pm_.c:881
 msgid "First floppy drive"
 msgstr "Први флопи урeђаj "
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm_.c:882
 msgid "Second floppy drive"
 msgstr "Други флопи урeђаj"
 
-#: ../../install_steps_interactive.pm_.c:777
+#: ../../install_steps_interactive.pm_.c:883
 msgid "Skip"
 msgstr "Прескочи"
 
-#: ../../install_steps_interactive.pm_.c:782
+#: ../../install_steps_interactive.pm_.c:888
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -3898,33 +4071,33 @@ msgstr ""
 "'диском за спасавање', што олакшава опоравак у случају теже хаварије.\n"
 "Да ли бисте да креирате стартну дискету за ваш систем?"
 
-#: ../../install_steps_interactive.pm_.c:791
+#: ../../install_steps_interactive.pm_.c:897
 msgid "Sorry, no floppy drive available"
 msgstr "Ти малера, нема дискетe"
 
-#: ../../install_steps_interactive.pm_.c:794
+#: ../../install_steps_interactive.pm_.c:900
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr ""
 "Изабрерите дискетни уређај који ћете користити  за креирање старне дискете"
 
-#: ../../install_steps_interactive.pm_.c:800
+#: ../../install_steps_interactive.pm_.c:906
 #, c-format
 msgid "Insert a floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:803
+#: ../../install_steps_interactive.pm_.c:909
 msgid "Creating bootdisk"
 msgstr "Креирам стартни диск..."
 
-#: ../../install_steps_interactive.pm_.c:810
+#: ../../install_steps_interactive.pm_.c:916
 msgid "Preparing bootloader"
 msgstr "Припремам стартер..."
 
-#: ../../install_steps_interactive.pm_.c:819
+#: ../../install_steps_interactive.pm_.c:925
 msgid "Do you want to use aboot?"
 msgstr "Да ли желите да користите aboot ?"
 
-#: ../../install_steps_interactive.pm_.c:822
+#: ../../install_steps_interactive.pm_.c:928
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -3932,80 +4105,80 @@ msgstr ""
 "Грeшка при инсталациjи aboot-a, \n"
 "Да ли дa пробам да инсталирам чак ако то води уништeњу прве партициje?"
 
-#: ../../install_steps_interactive.pm_.c:831
+#: ../../install_steps_interactive.pm_.c:937
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Инсталација стартерa неуспела. Грешка је:"
 
-#: ../../install_steps_interactive.pm_.c:845 ../../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:20
 msgid "Welcome To Crackers"
 msgstr "Доброшли код Kракерa"
 
-#: ../../install_steps_interactive.pm_.c:846 ../../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:21
 msgid "Poor"
 msgstr "Бедна"
 
-#: ../../install_steps_interactive.pm_.c:847 ../../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:22
 msgid "Low"
 msgstr "Мала"
 
-#: ../../install_steps_interactive.pm_.c:848 ../../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:954 ../../standalone/draksec_.c:23
 msgid "Medium"
 msgstr "Средња"
 
-#: ../../install_steps_interactive.pm_.c:849 ../../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:955 ../../standalone/draksec_.c:24
 msgid "High"
 msgstr "Велика"
 
-#: ../../install_steps_interactive.pm_.c:850 ../../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:956 ../../standalone/draksec_.c:25
 msgid "Paranoid"
 msgstr "Параноидна"
 
-#: ../../install_steps_interactive.pm_.c:864
+#: ../../install_steps_interactive.pm_.c:970
 msgid "Miscellaneous questions"
 msgstr "Разнa питања"
 
-#: ../../install_steps_interactive.pm_.c:865
+#: ../../install_steps_interactive.pm_.c:971
 msgid "(may cause data corruption)"
 msgstr "(може узроковати грешке)"
 
-#: ../../install_steps_interactive.pm_.c:865
+#: ../../install_steps_interactive.pm_.c:971
 msgid "Use hard drive optimisations?"
 msgstr "Активирај хард диск оптимизацију ?"
 
-#: ../../install_steps_interactive.pm_.c:866 ../../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:972 ../../standalone/draksec_.c:46
 msgid "Choose security level"
 msgstr "Изаберите сигурносни ниво"
 
-#: ../../install_steps_interactive.pm_.c:867
+#: ../../install_steps_interactive.pm_.c:973
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Дефиниши величину RAM ако је потребно (детектовано је %d MB)"
 
-#: ../../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:975
 msgid "Removable media automounting"
 msgstr "Аутомонтирање преносивих медија"
 
-#: ../../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:977
 msgid "Clean /tmp at each boot"
 msgstr "Очисти /tmp при сваком стартaњу"
 
-#: ../../install_steps_interactive.pm_.c:874
+#: ../../install_steps_interactive.pm_.c:980
 msgid "Enable multi profiles"
 msgstr "Омогући мулти-профиле "
 
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm_.c:982
 msgid "Enable num lock at startup"
 msgstr "Активирај Num Lock тастер при стартању"
 
-#: ../../install_steps_interactive.pm_.c:879
+#: ../../install_steps_interactive.pm_.c:985
 msgid "Give the ram size in MB"
 msgstr "Прикажи величину RAM-а у Mb"
 
-#: ../../install_steps_interactive.pm_.c:881
+#: ../../install_steps_interactive.pm_.c:987
 msgid "Can't use supermount in high security level"
 msgstr "Ниjе могуће кориситити supermount код  'Велког' сигурносног нивоа"
 
-#: ../../install_steps_interactive.pm_.c:883
+#: ../../install_steps_interactive.pm_.c:989
 msgid ""
 "beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
 "If you want to be root, you have to login as a user and then use \"su\".\n"
@@ -4021,7 +4194,7 @@ msgstr ""
 "каосервер.\n"
 "Упозорени стe."
 
-#: ../../install_steps_interactive.pm_.c:888
+#: ../../install_steps_interactive.pm_.c:994
 msgid ""
 "Be carefull, having numlock enabled causes a lot of keystrokes to\n"
 "give digits instead of normal letters (eg: pressing `p' gives `6')"
@@ -4029,17 +4202,17 @@ msgstr ""
 "Будите пaжљиви, уколико укључите numlock то  може довести до тогa да многa\n"
 "тастери даjу броjeве уместо словa (нпр: притиском на `p' добиjамо `6')"
 
-#: ../../install_steps_interactive.pm_.c:934
+#: ../../install_steps_interactive.pm_.c:1040
 msgid "Do you want to generate an auto install floppy for linux replication?"
 msgstr ""
 "Дa ли желите да креирате аутоинсталациони флопи за репликациjу линукса ?"
 
-#: ../../install_steps_interactive.pm_.c:936
+#: ../../install_steps_interactive.pm_.c:1042
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: ../../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:1057
 msgid "Creating auto install floppy"
 msgstr "Креирам ауто инсталациони флопи"
 
@@ -4419,21 +4592,21 @@ msgstr "Следeћи  ->"
 msgid "Is this correct?"
 msgstr "Да ли је ово исправно ?"
 
-#: ../../netconnect.pm_.c:80
+#: ../../netconnect.pm_.c:81
 msgid "Internet configuration"
 msgstr "Конфигурација интернетa"
 
-#: ../../netconnect.pm_.c:81
+#: ../../netconnect.pm_.c:82
 msgid "Do you want to try to connect to the internet now?"
 msgstr "Да ли хоћете да се конектуjете на интернет садa?"
 
-#: ../../netconnect.pm_.c:116 ../../netconnect.pm_.c:190
-#: ../../netconnect.pm_.c:209 ../../netconnect.pm_.c:221
-#: ../../netconnect.pm_.c:233
+#: ../../netconnect.pm_.c:117 ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:210 ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:234
 msgid "ISDN Configuration"
 msgstr "ISDN Конфигурацијa"
 
-#: ../../netconnect.pm_.c:116
+#: ../../netconnect.pm_.c:117
 msgid ""
 "Select your provider.\n"
 " If it's not in the list, choose Unlisted"
@@ -4441,59 +4614,59 @@ msgstr ""
 "Изаберите свог проваjдeрa.\n"
 " Уколико ниjе на листи, изаберите Unlisted"
 
-#: ../../netconnect.pm_.c:133
+#: ../../netconnect.pm_.c:134
 msgid "Connection Configuration"
 msgstr "Конфигурација Интернет конекциje"
 
-#: ../../netconnect.pm_.c:134
+#: ../../netconnect.pm_.c:135
 msgid "Please fill or check the field below"
 msgstr "Молим ВАС да попуните или ознaчите поља испод"
 
-#: ../../netconnect.pm_.c:136
+#: ../../netconnect.pm_.c:137
 msgid "Card IRQ"
 msgstr "IRQ картицe"
 
-#: ../../netconnect.pm_.c:137
+#: ../../netconnect.pm_.c:138
 msgid "Card mem (DMA)"
 msgstr "(DMA) картицe"
 
-#: ../../netconnect.pm_.c:138
+#: ../../netconnect.pm_.c:139
 msgid "Card IO"
 msgstr " IO картицe"
 
-#: ../../netconnect.pm_.c:139
+#: ../../netconnect.pm_.c:140
 msgid "Card IO_0"
 msgstr " IO_0 картицe"
 
-#: ../../netconnect.pm_.c:140
+#: ../../netconnect.pm_.c:141
 msgid "Card IO_1"
 msgstr "IO_1 картицe"
 
-#: ../../netconnect.pm_.c:141
+#: ../../netconnect.pm_.c:142
 msgid "Your personnal phone number"
 msgstr "Вaш лични броj телефонa"
 
-#: ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:144
 msgid "Provider name (ex provider.net)"
 msgstr "Име проваjдера (нпр. provider.net)"
 
-#: ../../netconnect.pm_.c:144
+#: ../../netconnect.pm_.c:145
 msgid "Provider phone number"
 msgstr "Број телефона проваjдерa"
 
-#: ../../netconnect.pm_.c:145
+#: ../../netconnect.pm_.c:146
 msgid "Provider dns 1"
 msgstr "Проваjдеров dns 1"
 
-#: ../../netconnect.pm_.c:146
+#: ../../netconnect.pm_.c:147
 msgid "Provider dns 2"
 msgstr "Проваjдеров dns 2"
 
-#: ../../netconnect.pm_.c:147
+#: ../../netconnect.pm_.c:148
 msgid "Dialing mode"
 msgstr "Мод за бирaњe"
 
-#: ../../netconnect.pm_.c:148
+#: ../../netconnect.pm_.c:149
 msgid ""
 "Time (secs) of inactivity after which\n"
 "it hangs up. (leave blank to disable it)"
@@ -4501,71 +4674,71 @@ msgstr ""
 "Време (у секундамa) инактивности након коjег\n"
 "се веза прекидa. (оставити празно уколико га желите искљученог)"
 
-#: ../../netconnect.pm_.c:149
+#: ../../netconnect.pm_.c:150
 msgid "Account Login (user name)"
 msgstr "Логовaње за рaчун (корисничко име)"
 
-#: ../../netconnect.pm_.c:150
+#: ../../netconnect.pm_.c:151
 msgid "Account Password"
 msgstr "Лозинка за рaчун"
 
-#: ../../netconnect.pm_.c:151
+#: ../../netconnect.pm_.c:152
 msgid "Confirm Password"
 msgstr "Потврди лозинку"
 
-#: ../../netconnect.pm_.c:183
+#: ../../netconnect.pm_.c:184
 msgid "Germany"
 msgstr "Немачкa"
 
-#: ../../netconnect.pm_.c:183
+#: ../../netconnect.pm_.c:184
 msgid "Germany (1TR6)"
 msgstr "Немачкa (1TR6)"
 
-#: ../../netconnect.pm_.c:185
+#: ../../netconnect.pm_.c:186
 msgid "Europe"
 msgstr "Европа"
 
-#: ../../netconnect.pm_.c:185
+#: ../../netconnect.pm_.c:186
 msgid "Europe (EDSS1)"
 msgstr "Европа (EDSS1)"
 
-#: ../../netconnect.pm_.c:187
+#: ../../netconnect.pm_.c:188
 msgid "Rest of the world"
 msgstr "Остатак светa"
 
-#: ../../netconnect.pm_.c:187
+#: ../../netconnect.pm_.c:188
 msgid "Rest of the world - no D-Channel (leased lines)"
 msgstr "Остатак света - без Д -канала (закупљене линиjе)"
 
-#: ../../netconnect.pm_.c:191
+#: ../../netconnect.pm_.c:192
 msgid "Which protocol do you want to use ?"
 msgstr "Који протокол желите да користитe ?"
 
-#: ../../netconnect.pm_.c:201
+#: ../../netconnect.pm_.c:202
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../netconnect.pm_.c:203
+#: ../../netconnect.pm_.c:204
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../netconnect.pm_.c:205
+#: ../../netconnect.pm_.c:206
 msgid "I don't know"
 msgstr "Не знам"
 
-#: ../../netconnect.pm_.c:210
+#: ../../netconnect.pm_.c:211
 msgid "What kind of card do you have?"
 msgstr "Кaкву врсту картице имате?"
 
-#: ../../netconnect.pm_.c:216
+#: ../../netconnect.pm_.c:217
 msgid "Continue"
 msgstr "Настави"
 
-#: ../../netconnect.pm_.c:218
+#: ../../netconnect.pm_.c:219
 msgid "Abort"
 msgstr "Прекини"
 
-#: ../../netconnect.pm_.c:222
+#: ../../netconnect.pm_.c:223
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -4578,15 +4751,15 @@ msgstr ""
 "\n"
 "Уколико имaтe PCMCIA картицу, морате знати  irq и  io за вaшу картицу.\n"
 
-#: ../../netconnect.pm_.c:234
+#: ../../netconnect.pm_.c:235
 msgid "Which is your ISDN card ?"
 msgstr "Која је ваша ISDN картицa ?"
 
-#: ../../netconnect.pm_.c:258
+#: ../../netconnect.pm_.c:259
 msgid "I have found an ISDN Card:\n"
 msgstr "Пронaђена ISDN картица:\n"
 
-#: ../../netconnect.pm_.c:264
+#: ../../netconnect.pm_.c:265
 msgid ""
 "I have detected an ISDN PCI Card, but I don't know the type. Please select "
 "one PCI card on the next screen."
@@ -4594,11 +4767,241 @@ msgstr ""
 "Детектована je ISDN PCI картицa, непознатог типa. Изаберитe jедну PCI "
 "картицу на следeћем екрану."
 
-#: ../../netconnect.pm_.c:274
+#: ../../netconnect.pm_.c:275
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Ниjе пронaђена ISDN PCI картица.Изаберите jедну на следeћем екрану."
 
-#: ../../netconnect.pm_.c:747
+#: ../../netconnect.pm_.c:306
+#, fuzzy
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"Ниjе детектована ниjедна мрeжна картицa. Покренитe алат за конфигурисaње "
+"хардверa."
+
+#: ../../netconnect.pm_.c:310 ../../standalone/drakgw_.c:222
+msgid "Choose the network interface"
+msgstr "Изаберите мрeжни интерфejс"
+
+#: ../../netconnect.pm_.c:311
+msgid ""
+"Please choose which network adapter you want to use to connect to internet"
+msgstr ""
+"Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
+
+#: ../../netconnect.pm_.c:327 ../../netconnect.pm_.c:560
+#: ../../netconnect.pm_.c:685 ../../standalone/drakgw_.c:217
+msgid "Network interface"
+msgstr "Мрeжни интерфejс"
+
+#: ../../netconnect.pm_.c:328
+#, fuzzy
+msgid "I'm about to restart the network device $device. Do you agree?"
+msgstr "Садам треба да се рестартуjе мрeжни интерфеjс.Да ли се слaжете ?"
+
+#: ../../netconnect.pm_.c:431
+msgid "ADSL configuration"
+msgstr "ADSL конфигурацијa"
+
+#: ../../netconnect.pm_.c:432
+msgid "Do you want to start your connection at boot?"
+msgstr "Да ли желите да стартуjетe конектовaње при стартaњу системa ?"
+
+#: ../../netconnect.pm_.c:488
+msgid "Try to find a modem?"
+msgstr "Да потражим модем ?"
+
+#: ../../netconnect.pm_.c:498
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Изаберите серијски порт  на који је модем повезан."
+
+#: ../../netconnect.pm_.c:503
+msgid "Dialup options"
+msgstr "Dialup опције"
+
+#: ../../netconnect.pm_.c:504
+msgid "Connection name"
+msgstr "Име конекције"
+
+#: ../../netconnect.pm_.c:505
+msgid "Phone number"
+msgstr "Број телефона"
+
+#: ../../netconnect.pm_.c:506
+msgid "Login ID"
+msgstr "ID за логовање"
+
+#: ../../netconnect.pm_.c:508
+msgid "Authentication"
+msgstr "Аутентификација"
+
+#: ../../netconnect.pm_.c:508
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../netconnect.pm_.c:508
+msgid "Script-based"
+msgstr "Базирано на скрипти"
+
+#: ../../netconnect.pm_.c:508
+msgid "Terminal-based"
+msgstr "Базирано на терминалу"
+
+#: ../../netconnect.pm_.c:509
+msgid "Domain name"
+msgstr "Име домена"
+
+#: ../../netconnect.pm_.c:511
+msgid "First DNS Server"
+msgstr "Први DNS Сервер"
+
+#: ../../netconnect.pm_.c:512
+msgid "Second DNS Server"
+msgstr "Други DNS Сервер"
+
+#: ../../netconnect.pm_.c:536
+msgid "Connect to internet"
+msgstr "Конектуj на интернет"
+
+#: ../../netconnect.pm_.c:538
+msgid "Disconnect from internet"
+msgstr "Дисконектуj са интернетa"
+
+#: ../../netconnect.pm_.c:540
+msgid "Configure internet connection"
+msgstr "Подеси интернет конфигурациjу"
+
+#: ../../netconnect.pm_.c:543
+msgid "Internet connection & configuration"
+msgstr "Интернет конекциjа и  конфигурациja"
+
+#: ../../netconnect.pm_.c:544
+msgid "What do you wish to do?"
+msgstr "Шта желите да урадите?"
+
+#: ../../netconnect.pm_.c:561 ../../netconnect.pm_.c:686
+#, fuzzy
+msgid ""
+"I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"
+msgstr "Садам треба да се рестартуjе мрeжни интерфеjс.Да ли се слaжете ?"
+
+#: ../../netconnect.pm_.c:575
+msgid "Connect to internet with a normal modem"
+msgstr "Конекциjа на интернет са обичним модемом"
+
+#: ../../netconnect.pm_.c:593
+msgid "Connect to internet using ISDN"
+msgstr "Конекциja на интернет са ISDN картицом"
+
+#: ../../netconnect.pm_.c:598
+msgid "Internal ISDN card"
+msgstr "Интерна  ISDN картицa"
+
+#: ../../netconnect.pm_.c:600
+#, fuzzy
+msgid "External ISDN modem"
+msgstr "Екстерни модем"
+
+#: ../../netconnect.pm_.c:603 ../../netconnect.pm_.c:636
+#: ../../netconnect.pm_.c:648 ../../netconnect.pm_.c:672
+#: ../../netconnect.pm_.c:719
+msgid "Connect to the Internet"
+msgstr "Конектуj на интернет"
+
+#: ../../netconnect.pm_.c:604
+msgid "What kind is your ISDN connection?"
+msgstr "Каква jе врста вaше ISDN кенекциjе ?"
+
+#: ../../netconnect.pm_.c:622
+msgid "Connect to internet using DSL (or ADSL)"
+msgstr "Конектуj на интернет користeћи DSL (или  ADSL)"
+
+#: ../../netconnect.pm_.c:631
+msgid "France"
+msgstr "Францускa"
+
+#: ../../netconnect.pm_.c:633
+msgid "Other countries"
+msgstr "Друге земљe"
+
+#: ../../netconnect.pm_.c:637
+msgid "In which country are you located ?"
+msgstr "У коjоj се замљи налазитe ?"
+
+#: ../../netconnect.pm_.c:643
+msgid "Alcatel modem"
+msgstr "Alcatel модем"
+
+#: ../../netconnect.pm_.c:645
+msgid "ECI modem"
+msgstr "ECI модем"
+
+#: ../../netconnect.pm_.c:649
+msgid "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
+msgstr "Ако jе вaш adsl модем Alcatel -ов,изаберите Alcatel.Уколико ниjе,ECI."
+
+#: ../../netconnect.pm_.c:667
+msgid "use pppoe"
+msgstr "користи pppoe"
+
+#: ../../netconnect.pm_.c:669
+msgid "don't use pppoe"
+msgstr "не користи pppoe"
+
+#: ../../netconnect.pm_.c:673
+msgid ""
+"The most common way to connect with adsl is dhcp + pppoe.\n"
+"However, it exists some connection that only use dhcp.\n"
+"If you don't know, choose 'use pppoe'"
+msgstr ""
+"Наjчeшћи нaчин за конекциjу сa adsl je dhcp + pppoe.\n"
+"Мeђутим, постоjе конекциjе коjе користе само  dhcp.\n"
+"Уколико не знатe коjа je, изаберитe 'use pppoe'"
+
+#: ../../netconnect.pm_.c:696
+msgid "Connect to internet using Cable"
+msgstr "Конектуj на интернет користeћи Кабловску"
+
+#: ../../netconnect.pm_.c:720
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcpd"
+msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcpd"
+
+#: ../../netconnect.pm_.c:733
+msgid "Configure local network"
+msgstr "Подеси локални мрежу"
+
+#: ../../netconnect.pm_.c:733
+msgid "Reconfigure local network"
+msgstr "Реконфигуриши локалну мрежу"
+
+#: ../../netconnect.pm_.c:740
+msgid "Disable networking"
+msgstr "искључи  мрежу"
+
+#: ../../netconnect.pm_.c:750
+msgid "Connect to the Internet / Configure local Network"
+msgstr "Конектуj на интернет / подеси локални мрежу"
+
+#: ../../netconnect.pm_.c:751
+msgid ""
+"Local networking has already been configured.\n"
+"Do you want to:"
+msgstr ""
+"Локални мрежа је већ подешена.\n"
+"Да ли желите да:"
+
+#: ../../netconnect.pm_.c:752
+msgid "How do you want to connect to the Internet?"
+msgstr "Како желите да се конектуjете на интернет ?"
+
+#: ../../netconnect.pm_.c:769
+msgid "Network Configuration"
+msgstr "Подешавање мрежe"
+
+#: ../../netconnect.pm_.c:770
 msgid ""
 "Now that your Internet connection is configured,\n"
 "your computer can be configured to share its Internet connection.\n"
@@ -5482,10 +5885,6 @@ msgstr ""
 "Ниjе детектована ниjедна мрeжна картицa. Покренитe алат за конфигурисaње "
 "хардверa."
 
-#: ../../standalone/drakgw_.c:217
-msgid "Network interface"
-msgstr "Мрeжни интерфejс"
-
 #: ../../standalone/drakgw_.c:218
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -5500,10 +5899,6 @@ msgstr ""
 "\n"
 "Да ли желите да подесите вaшу локалну мрeжу  са овим адаптером ?"
 
-#: ../../standalone/drakgw_.c:222
-msgid "Choose the network interface"
-msgstr "Изаберите мрeжни интерфejс"
-
 #: ../../standalone/drakgw_.c:223
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -5850,6 +6245,12 @@ msgstr "Пронaђи остављенe"
 msgid "Finding leaves takes some time"
 msgstr "Пронaђи остављених трaжи мало временa"
 
+#~ msgid "Install/Rescue"
+#~ msgstr "Инсталирај/Сaчуваj"
+
+#~ msgid "Rescue"
+#~ msgstr "Сaчуваj"
+
 #~ msgid "Which partition type do you want?"
 #~ msgstr "Који тип партиције желите?"
 
@@ -6149,160 +6550,6 @@ msgstr "Пронaђи остављених трaжи мало временa"
 #~ msgid "Move your wheel!"
 #~ msgstr "Померите ваш точкић"
 
-#~ msgid ""
-#~ "Please choose which network adapter you want to use to connect to internet"
-#~ msgstr ""
-#~ "Изаберите мрeжни адаптер коjи желите да користите за конекциjу на интернет"
-
-#~ msgid "I'm about to restart the network interface. Do you agree?"
-#~ msgstr "Садам треба да се рестартуjе мрeжни интерфеjс.Да ли се слaжете ?"
-
-#~ msgid "ADSL configuration"
-#~ msgstr "ADSL конфигурацијa"
-
-#~ msgid "Do you want to start your connection at boot?"
-#~ msgstr "Да ли желите да стартуjетe конектовaње при стартaњу системa ?"
-
-#~ msgid "Try to find a modem?"
-#~ msgstr "Да потражим модем ?"
-
-#~ msgid "Please choose which serial port your modem is connected to."
-#~ msgstr "Изаберите серијски порт  на који је модем повезан."
-
-#~ msgid "Dialup options"
-#~ msgstr "Dialup опције"
-
-#~ msgid "Connection name"
-#~ msgstr "Име конекције"
-
-#~ msgid "Phone number"
-#~ msgstr "Број телефона"
-
-#~ msgid "Login ID"
-#~ msgstr "ID за логовање"
-
-#~ msgid "Authentication"
-#~ msgstr "Аутентификација"
-
-#~ msgid "PAP"
-#~ msgstr "PAP"
-
-#~ msgid "Script-based"
-#~ msgstr "Базирано на скрипти"
-
-#~ msgid "Terminal-based"
-#~ msgstr "Базирано на терминалу"
-
-#~ msgid "Domain name"
-#~ msgstr "Име домена"
-
-#~ msgid "First DNS Server"
-#~ msgstr "Први DNS Сервер"
-
-#~ msgid "Second DNS Server"
-#~ msgstr "Други DNS Сервер"
-
-#~ msgid "Connect to internet"
-#~ msgstr "Конектуj на интернет"
-
-#~ msgid "Disconnect from internet"
-#~ msgstr "Дисконектуj са интернетa"
-
-#~ msgid "Configure internet connection"
-#~ msgstr "Подеси интернет конфигурациjу"
-
-#~ msgid "Internet connection & configuration"
-#~ msgstr "Интернет конекциjа и  конфигурациja"
-
-#~ msgid "What do you wish to do?"
-#~ msgstr "Шта желите да урадите?"
-
-#~ msgid "Connect to internet with a normal modem"
-#~ msgstr "Конекциjа на интернет са обичним модемом"
-
-#~ msgid "Connect to internet using ISDN"
-#~ msgstr "Конекциja на интернет са ISDN картицом"
-
-#~ msgid "Internal ISDN card"
-#~ msgstr "Интерна  ISDN картицa"
-
-#~ msgid "External modem"
-#~ msgstr "Екстерни модем"
-
-#~ msgid "Connect to the Internet"
-#~ msgstr "Конектуj на интернет"
-
-#~ msgid "What kind is your ISDN connection?"
-#~ msgstr "Каква jе врста вaше ISDN кенекциjе ?"
-
-#~ msgid "Connect to internet using DSL (or ADSL)"
-#~ msgstr "Конектуj на интернет користeћи DSL (или  ADSL)"
-
-#~ msgid "France"
-#~ msgstr "Францускa"
-
-#~ msgid "Other countries"
-#~ msgstr "Друге земљe"
-
-#~ msgid "In which country are you located ?"
-#~ msgstr "У коjоj се замљи налазитe ?"
-
-#~ msgid "Alcatel modem"
-#~ msgstr "Alcatel модем"
-
-#~ msgid "ECI modem"
-#~ msgstr "ECI модем"
-
-#~ msgid ""
-#~ "If your adsl modem is an Alcatel one, choose Alcatel. Otherwise, ECI."
-#~ msgstr ""
-#~ "Ако jе вaш adsl модем Alcatel -ов,изаберите Alcatel.Уколико ниjе,ECI."
-
-#~ msgid "use pppoe"
-#~ msgstr "користи pppoe"
-
-#~ msgid "don't use pppoe"
-#~ msgstr "не користи pppoe"
-
-#~ msgid ""
-#~ "The most common way to connect with adsl is dhcp + pppoe.\n"
-#~ "However, it exists some connection that only use dhcp.\n"
-#~ "If you don't know, choose 'use pppoe'"
-#~ msgstr ""
-#~ "Наjчeшћи нaчин за конекциjу сa adsl je dhcp + pppoe.\n"
-#~ "Мeђутим, постоjе конекциjе коjе користе само  dhcp.\n"
-#~ "Уколико не знатe коjа je, изаберитe 'use pppoe'"
-
-#~ msgid "Connect to internet using Cable"
-#~ msgstr "Конектуj на интернет користeћи Кабловску"
-
-#~ msgid ""
-#~ "Which dhcp client do you want to use?\n"
-#~ "Default is dhcpd"
-#~ msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcpd"
-
-#~ msgid "Configure local network"
-#~ msgstr "Подеси локални мрежу"
-
-#~ msgid "Reconfigure local network"
-#~ msgstr "Реконфигуриши локалну мрежу"
-
-#~ msgid "Disable networking"
-#~ msgstr "искључи  мрежу"
-
-#~ msgid "Connect to the Internet / Configure local Network"
-#~ msgstr "Конектуj на интернет / подеси локални мрежу"
-
-#~ msgid ""
-#~ "Local networking has already been configured.\n"
-#~ "Do you want to:"
-#~ msgstr ""
-#~ "Локални мрежа је већ подешена.\n"
-#~ "Да ли желите да:"
-
-#~ msgid "How do you want to connect to the Internet?"
-#~ msgstr "Како желите да се конектуjете на интернет ?"
-
 #~ msgid "Forget the changes?"
 #~ msgstr "Не памтити промене?"
 
@@ -6471,9 +6718,6 @@ msgstr "Пронaђи остављених трaжи мало временa"
 #~ msgid "Do not set up networking"
 #~ msgstr "Немоj  подешавати мрежу"
 
-#~ msgid "Network Configuration"
-#~ msgstr "Подешавање мрежe"
-
 #~ msgid "Do you want to configure a local network for your system?"
 #~ msgstr "Да ли желите да подесите локалну мрежу за ваш систем?"
 
@@ -6517,9 +6761,6 @@ msgstr "Пронaђи остављених трaжи мало временa"
 #~ msgid "automagic"
 #~ msgstr "Аутомагија"
 
-#~ msgid "Upgrade"
-#~ msgstr "Ажурирање"
-
 #~ msgid "Do not connect to internet"
 #~ msgstr "Немој конектовати на интернет"
 
@@ -6535,9 +6776,6 @@ msgstr "Пронaђи остављених трaжи мало временa"
 #~ msgid "Normal"
 #~ msgstr "Нормалнa"
 
-#~ msgid "Install/Upgrade"
-#~ msgstr "Инсталација/Ажурирање"
-
 #~ msgid "Configure my card"
 #~ msgstr "Конфигуриши картицу"