update-po

2 files changed, 311 insertions, 261 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index febb12b89..bbb27862b 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: 1999-12-16 11:28+0100\n"
+"POT-Creation-Date: 1999-12-16 15:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -330,7 +330,7 @@ msgstr ""
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr ""
 
-#: ../diskdrake.pm_.c:16
+#: ../diskdrake.pm_.c:16 ../diskdrake.pm_.c:367
 msgid "Create"
 msgstr ""
 
@@ -338,7 +338,7 @@ msgstr ""
 msgid "Unmount"
 msgstr ""
 
-#: ../diskdrake.pm_.c:18
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:369
 msgid "Delete"
 msgstr ""
 
@@ -346,15 +346,15 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:501
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:524
 msgid "Resize"
 msgstr ""
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:382
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:411
 msgid "Type"
 msgstr ""
 
-#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:404
+#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:427
 msgid "Mount point"
 msgstr ""
 
@@ -433,178 +433,183 @@ msgstr ""
 msgid "Reload"
 msgstr ""
 
-#: ../diskdrake.pm_.c:100
-msgid "Filesystem types:"
-msgstr ""
-
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Empty"
 msgstr ""
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Ext2"
 msgstr ""
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "FAT"
 msgstr ""
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Other"
 msgstr ""
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Swap"
 msgstr ""
 
-#: ../diskdrake.pm_.c:108
+#: ../diskdrake.pm_.c:104
+msgid "Filesystem types:"
+msgstr ""
+
+#: ../diskdrake.pm_.c:113
 msgid "Details"
 msgstr ""
 
-#: ../diskdrake.pm_.c:122
+#: ../diskdrake.pm_.c:127
 msgid ""
 "You have one big fat partition.\n"
 "I suggest you first resize that partition\n"
 "(click on it, then click on \"Resize\")"
 msgstr ""
 
-#: ../diskdrake.pm_.c:138
-#, c-format
-msgid "After %s partition %s,"
+#: ../diskdrake.pm_.c:131
+msgid "Please make a backup of your data first"
 msgstr ""
 
-#: ../diskdrake.pm_.c:138 ../diskdrake.pm_.c:432 ../diskdrake.pm_.c:461
+#: ../diskdrake.pm_.c:131 ../diskdrake.pm_.c:145 ../diskdrake.pm_.c:455
+#: ../diskdrake.pm_.c:484
 msgid "Read carefully!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:138
+#: ../diskdrake.pm_.c:145
+#, c-format
+msgid "After %s partition %s,"
+msgstr ""
+
+#: ../diskdrake.pm_.c:145
 msgid "all data on this partition will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:157 ../install_any.pm_.c:184 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:164 ../install_any.pm_.c:184 ../install_steps.pm_.c:67
 #: ../install_steps_interactive.pm_.c:36 ../standalone/diskdrake_.c:60
 msgid "Error"
 msgstr ""
 
-#: ../diskdrake.pm_.c:181 ../diskdrake.pm_.c:584
+#: ../diskdrake.pm_.c:188 ../diskdrake.pm_.c:607
 msgid "Mount point: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:182 ../diskdrake.pm_.c:219
+#: ../diskdrake.pm_.c:189 ../diskdrake.pm_.c:227
 msgid "Device: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:183
+#: ../diskdrake.pm_.c:190
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:184 ../diskdrake.pm_.c:222
+#: ../diskdrake.pm_.c:191 ../diskdrake.pm_.c:230
 msgid "Type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:185
+#: ../diskdrake.pm_.c:192
 #, c-format
 msgid "Start: sector %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:186
+#: ../diskdrake.pm_.c:193
 #, c-format
 msgid "Size: %s MB"
 msgstr ""
 
-#: ../diskdrake.pm_.c:188
+#: ../diskdrake.pm_.c:195
 #, c-format
 msgid ", %s sectors"
 msgstr ""
 
-#: ../diskdrake.pm_.c:190
+#: ../diskdrake.pm_.c:197
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:191
+#: ../diskdrake.pm_.c:198
 msgid "Formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:192
+#: ../diskdrake.pm_.c:199
 msgid "Not formatted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:193
+#: ../diskdrake.pm_.c:200
 msgid "Mounted\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:194
+#: ../diskdrake.pm_.c:201
 #, c-format
 msgid "RAID md%s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:195
+#: ../diskdrake.pm_.c:202
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:197
+#: ../diskdrake.pm_.c:204
 #, c-format
 msgid "Level %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:198
+#: ../diskdrake.pm_.c:205
 #, c-format
 msgid "Chunk size %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:199
+#: ../diskdrake.pm_.c:206
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:215
+#: ../diskdrake.pm_.c:223
 msgid "Please click on a partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:220
+#: ../diskdrake.pm_.c:228
 #, c-format
 msgid "Size: %d MB\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:221
+#: ../diskdrake.pm_.c:229
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:223
+#: ../diskdrake.pm_.c:231
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr ""
 
-#: ../diskdrake.pm_.c:236
+#: ../diskdrake.pm_.c:244
 msgid "Mount"
 msgstr ""
 
-#: ../diskdrake.pm_.c:237
+#: ../diskdrake.pm_.c:245
 msgid "Active"
 msgstr ""
 
-#: ../diskdrake.pm_.c:238
+#: ../diskdrake.pm_.c:246
 msgid "Add to RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:239
+#: ../diskdrake.pm_.c:247
 msgid "Remove from RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:240
+#: ../diskdrake.pm_.c:248
 msgid "Modify RAID"
 msgstr ""
 
-#: ../diskdrake.pm_.c:247
+#: ../diskdrake.pm_.c:255
 msgid "Choose action"
 msgstr ""
 
-#: ../diskdrake.pm_.c:338
+#: ../diskdrake.pm_.c:346
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -612,7 +617,7 @@ msgid ""
 "need /boot"
 msgstr ""
 
-#: ../diskdrake.pm_.c:342
+#: ../diskdrake.pm_.c:350
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -620,173 +625,182 @@ msgid ""
 "If you plan to use the LILO boot manager, be careful to add a /boot partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:356
+#: ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:369
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr ""
+
+#: ../diskdrake.pm_.c:372
+msgid "Use ``Unmount'' first"
+msgstr ""
+
+#: ../diskdrake.pm_.c:373 ../diskdrake.pm_.c:406
+msgid "changing type of"
+msgstr ""
+
+#: ../diskdrake.pm_.c:385
 msgid "Continue anyway?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:361
+#: ../diskdrake.pm_.c:390
 msgid "Quit without saving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:361
+#: ../diskdrake.pm_.c:390
 msgid "Quit without writing the partition table?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:377
-msgid "changing type of"
-msgstr ""
-
-#: ../diskdrake.pm_.c:380
+#: ../diskdrake.pm_.c:409
 msgid "Change partition type"
 msgstr ""
 
-#: ../diskdrake.pm_.c:381
+#: ../diskdrake.pm_.c:410
 msgid "Which partition type do you want?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:403
+#: ../diskdrake.pm_.c:426
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:425
+#: ../diskdrake.pm_.c:448
 msgid "formatting"
 msgstr ""
 
-#: ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:450
 msgid "Formatting"
 msgstr ""
 
-#: ../diskdrake.pm_.c:427 ../install_steps_interactive.pm_.c:210
+#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:210
 #, c-format
 msgid "Formatting partition %s"
 msgstr ""
 
-#: ../diskdrake.pm_.c:432
+#: ../diskdrake.pm_.c:455
 msgid "After formatting all partitions,"
 msgstr ""
 
-#: ../diskdrake.pm_.c:432
+#: ../diskdrake.pm_.c:455
 msgid "all data on these partitions will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:442
+#: ../diskdrake.pm_.c:465
 msgid "Move"
 msgstr ""
 
-#: ../diskdrake.pm_.c:443
+#: ../diskdrake.pm_.c:466
 msgid "Which disk do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:447
+#: ../diskdrake.pm_.c:470
 msgid "Sector"
 msgstr ""
 
-#: ../diskdrake.pm_.c:448
+#: ../diskdrake.pm_.c:471
 msgid "Which sector do you want to move to?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:451
+#: ../diskdrake.pm_.c:474
 msgid "Moving"
 msgstr ""
 
-#: ../diskdrake.pm_.c:451
+#: ../diskdrake.pm_.c:474
 msgid "Moving partition..."
 msgstr ""
 
-#: ../diskdrake.pm_.c:461
+#: ../diskdrake.pm_.c:484
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr ""
 
-#: ../diskdrake.pm_.c:463
+#: ../diskdrake.pm_.c:486
 msgid "You'll need to reboot before the modification can take place"
 msgstr ""
 
-#: ../diskdrake.pm_.c:484 ../install_steps_gtk.pm_.c:254
+#: ../diskdrake.pm_.c:507 ../install_steps_gtk.pm_.c:254
 msgid "Computing fat filesystem bounds"
 msgstr ""
 
-#: ../diskdrake.pm_.c:484 ../diskdrake.pm_.c:529
+#: ../diskdrake.pm_.c:507 ../diskdrake.pm_.c:552
 #: ../install_steps_gtk.pm_.c:254
 msgid "Resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:498
+#: ../diskdrake.pm_.c:521
 msgid "resizing"
 msgstr ""
 
-#: ../diskdrake.pm_.c:508
+#: ../diskdrake.pm_.c:531
 msgid "Choose the new size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:508 ../install_steps_graphical.pm_.c:287
+#: ../diskdrake.pm_.c:531 ../install_steps_graphical.pm_.c:287
 #: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:322
 #: ../install_steps_gtk.pm_.c:371
 msgid "MB"
 msgstr ""
 
-#: ../diskdrake.pm_.c:561
+#: ../diskdrake.pm_.c:584
 msgid "Create a new partition"
 msgstr ""
 
-#: ../diskdrake.pm_.c:577
+#: ../diskdrake.pm_.c:600
 msgid "Start sector: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:580
+#: ../diskdrake.pm_.c:603
 msgid "Size in MB: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:583
+#: ../diskdrake.pm_.c:606
 msgid "Filesystem type: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:585
+#: ../diskdrake.pm_.c:608
 msgid "Preference: "
 msgstr ""
 
-#: ../diskdrake.pm_.c:629 ../diskdrake.pm_.c:645
+#: ../diskdrake.pm_.c:652 ../diskdrake.pm_.c:668
 msgid "Select file"
 msgstr ""
 
-#: ../diskdrake.pm_.c:638
+#: ../diskdrake.pm_.c:661
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
 
-#: ../diskdrake.pm_.c:646
+#: ../diskdrake.pm_.c:669
 msgid "Warning"
 msgstr ""
 
-#: ../diskdrake.pm_.c:647
+#: ../diskdrake.pm_.c:670
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
 
-#: ../diskdrake.pm_.c:661
+#: ../diskdrake.pm_.c:684
 msgid "Trying to rescue partition table"
 msgstr ""
 
-#: ../diskdrake.pm_.c:672
+#: ../diskdrake.pm_.c:695
 msgid "device"
 msgstr ""
 
-#: ../diskdrake.pm_.c:673
+#: ../diskdrake.pm_.c:696
 msgid "level"
 msgstr ""
 
-#: ../diskdrake.pm_.c:674
+#: ../diskdrake.pm_.c:697
 msgid "chunk size"
 msgstr ""
 
-#: ../diskdrake.pm_.c:686
+#: ../diskdrake.pm_.c:709
 msgid "Choose an existing RAID to add to"
 msgstr ""
 
-#: ../diskdrake.pm_.c:687
+#: ../diskdrake.pm_.c:710
 msgid "new"
 msgstr ""
 
@@ -827,21 +841,21 @@ msgstr ""
 msgid "Error opening %s for writing: %s"
 msgstr ""
 
-#: ../fsedit.pm_.c:377
+#: ../fsedit.pm_.c:387
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
 msgstr ""
 
-#: ../fsedit.pm_.c:392
+#: ../fsedit.pm_.c:402
 msgid "You don't have any partitions!"
 msgstr ""
 
-#: ../help.pm_.c:7 ../help.pm_.c:277
+#: ../help.pm_.c:7 ../help.pm_.c:280
 msgid "Choose preferred language for install and system usage."
 msgstr ""
 
-#: ../help.pm_.c:10 ../help.pm_.c:280
+#: ../help.pm_.c:10 ../help.pm_.c:283
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr ""
 
@@ -852,7 +866,7 @@ msgid ""
 "\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
+"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus) or 6.1 (Helios)."
 msgstr ""
 
 #: ../help.pm_.c:21
@@ -901,7 +915,7 @@ msgid ""
 "are the options you will need to provide to the driver."
 msgstr ""
 
-#: ../help.pm_.c:66
+#: ../help.pm_.c:63
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -930,7 +944,7 @@ msgid ""
 "and take your time before proceeding."
 msgstr ""
 
-#: ../help.pm_.c:92 ../help.pm_.c:352
+#: ../help.pm_.c:89 ../help.pm_.c:355
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -940,15 +954,14 @@ msgid ""
 "Typically retained are /home and /usr/local."
 msgstr ""
 
-#: ../help.pm_.c:100
+#: ../help.pm_.c:97
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
 "\n"
-"First you can select the size of your installed system and an automated\n"
-"selection of packages will be done according to your system usage. After\n"
-"that you can select more packages by group or click on Ok to keep the\n"
-"previous selection.\n"
+"First you can select group of package to install or upgrade. After that\n"
+"you can select more packages according to the total size you wish to\n"
+"select.\n"
 "\n"
 "\n"
 "If you are in expert mode, you can select packages individually.\n"
@@ -964,7 +977,7 @@ msgid ""
 "button \"Install\" to start the installation."
 msgstr ""
 
-#: ../help.pm_.c:122
+#: ../help.pm_.c:118
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -972,7 +985,7 @@ msgid ""
 "upgrade starts."
 msgstr ""
 
-#: ../help.pm_.c:128 ../help.pm_.c:381
+#: ../help.pm_.c:124 ../help.pm_.c:384
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -988,7 +1001,7 @@ msgid ""
 "which serial port it is connected to."
 msgstr ""
 
-#: ../help.pm_.c:142
+#: ../help.pm_.c:138
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1020,7 +1033,18 @@ msgid ""
 "your modem is connected to."
 msgstr ""
 
-#: ../help.pm_.c:172
+#: ../help.pm_.c:168
+msgid ""
+"You can install cryptographic package if your internet connection has been\n"
+"set up correctly. First choose a mirror where you wish to download packages "
+"and\n"
+"after that select the packages to install.\n"
+"\n"
+"Note you have to select mirror and cryptographic according to your "
+"legislation."
+msgstr ""
+
+#: ../help.pm_.c:175
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1029,12 +1053,12 @@ msgid ""
 "in local time according to the time zone you have selected."
 msgstr ""
 
-#: ../help.pm_.c:179 ../help.pm_.c:417 ../help.pm_.c:420 ../help.pm_.c:508
+#: ../help.pm_.c:182 ../help.pm_.c:420 ../help.pm_.c:423 ../help.pm_.c:511
 #: ../install2.pm_.c:67
 msgid "Help"
 msgstr ""
 
-#: ../help.pm_.c:182
+#: ../help.pm_.c:185
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -1059,7 +1083,7 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../help.pm_.c:205
+#: ../help.pm_.c:208
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1077,7 +1101,7 @@ msgid ""
 "effort."
 msgstr ""
 
-#: ../help.pm_.c:221 ../help.pm_.c:462
+#: ../help.pm_.c:224 ../help.pm_.c:465
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"priviledged\" user account, root. You can create\n"
@@ -1101,7 +1125,7 @@ msgid ""
 "and maintenance purposes."
 msgstr ""
 
-#: ../help.pm_.c:240 ../help.pm_.c:481
+#: ../help.pm_.c:243 ../help.pm_.c:484
 msgid ""
 "Please, please, answer \"Yes\" here! Just for example, when you\n"
 "reinstall Windows, it will overwrite the boot sector. Unless you have\n"
@@ -1109,7 +1133,7 @@ msgid ""
 "any more!"
 msgstr ""
 
-#: ../help.pm_.c:246 ../help.pm_.c:487
+#: ../help.pm_.c:249 ../help.pm_.c:490
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1119,7 +1143,7 @@ msgid ""
 "drive (MBR)\"."
 msgstr ""
 
-#: ../help.pm_.c:254 ../help.pm_.c:495
+#: ../help.pm_.c:257 ../help.pm_.c:498
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1134,15 +1158,15 @@ msgid ""
 "change them, as many times as necessary."
 msgstr ""
 
-#: ../help.pm_.c:267
+#: ../help.pm_.c:270
 msgid "You can now select some miscellaneous options for your system."
 msgstr ""
 
-#: ../help.pm_.c:270
+#: ../help.pm_.c:273
 msgid "Exit Linux-Mandrake installation to reboot your system."
 msgstr ""
 
-#: ../help.pm_.c:283
+#: ../help.pm_.c:286
 msgid ""
 "Choose \"Installation\" if there are no previous versions of Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
@@ -1152,7 +1176,7 @@ msgid ""
 "Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
 msgstr ""
 
-#: ../help.pm_.c:291
+#: ../help.pm_.c:294
 msgid ""
 "Select:\n"
 "\n"
@@ -1172,7 +1196,7 @@ msgid ""
 "a highly customized installation, this Install Class is for you."
 msgstr ""
 
-#: ../help.pm_.c:309
+#: ../help.pm_.c:312
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -1195,13 +1219,13 @@ msgid ""
 "These are the options you will need to provide to the driver."
 msgstr ""
 
-#: ../help.pm_.c:330
+#: ../help.pm_.c:333
 msgid ""
 "In this stage, you may choose what partition(s) use to install your\n"
 "Linux-Mandrake system."
 msgstr ""
 
-#: ../help.pm_.c:360
+#: ../help.pm_.c:363
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
@@ -1218,7 +1242,7 @@ msgid ""
 "buttons \"Install\", \"Select more/less\" and \"Show more/less\"."
 msgstr ""
 
-#: ../help.pm_.c:375
+#: ../help.pm_.c:378
 msgid ""
 "The packages selected are now being installed.\n"
 "\n"
@@ -1226,7 +1250,7 @@ msgid ""
 "This operation should take a few minutes."
 msgstr ""
 
-#: ../help.pm_.c:395
+#: ../help.pm_.c:398
 msgid ""
 "This section is dedicated to configuring a local area network,\n"
 "or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
@@ -1250,7 +1274,7 @@ msgid ""
 "addresses "
 msgstr ""
 
-#: ../help.pm_.c:423
+#: ../help.pm_.c:426
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -1275,7 +1299,7 @@ msgid ""
 "for a NetWare printer, except that you need no workgroup information."
 msgstr ""
 
-#: ../help.pm_.c:446
+#: ../help.pm_.c:449
 msgid ""
 "You must now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 3f134cdd4..525181f90 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 1999-12-16 11:28+0100\n"
+"POT-Creation-Date: 1999-12-16 15:32+0100\n"
 "PO-Revision-Date: 1999-08-25 11:07+0200\n"
 "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
 "Language-Team: norwegian\n"
@@ -351,7 +351,7 @@ msgstr "Monitor som kan klare 1600x1200 ved 70 Hz"
 msgid "Monitor that can do 1600x1200 at 76 Hz"
 msgstr "Monitor som kan klare 1600x1200 ved 76 Hz"
 
-#: ../diskdrake.pm_.c:16
+#: ../diskdrake.pm_.c:16 ../diskdrake.pm_.c:367
 msgid "Create"
 msgstr "Opprett"
 
@@ -359,7 +359,7 @@ msgstr "Opprett"
 msgid "Unmount"
 msgstr "Demonter"
 
-#: ../diskdrake.pm_.c:18
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:369
 msgid "Delete"
 msgstr "Slett"
 
@@ -367,15 +367,15 @@ msgstr "Slett"
 msgid "Format"
 msgstr "Formater"
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:501
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:524
 msgid "Resize"
 msgstr "Endre størrelse"
 
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:382
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:411
 msgid "Type"
 msgstr "Type"
 
-#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:404
+#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:427
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
@@ -456,35 +456,35 @@ msgstr "Skriv partisjonstabell"
 msgid "Reload"
 msgstr "Last igjen"
 
-#: ../diskdrake.pm_.c:100
-msgid "Filesystem types:"
-msgstr "Filsystemtype:"
-
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Empty"
 msgstr "Tom"
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "FAT"
 msgstr "FAT"
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Other"
 msgstr "Andre"
 
-#: ../diskdrake.pm_.c:104
+#: ../diskdrake.pm_.c:98
 msgid "Swap"
 msgstr "Veksle"
 
-#: ../diskdrake.pm_.c:108
+#: ../diskdrake.pm_.c:104
+msgid "Filesystem types:"
+msgstr "Filsystemtype:"
+
+#: ../diskdrake.pm_.c:113
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../diskdrake.pm_.c:122
+#: ../diskdrake.pm_.c:127
 msgid ""
 "You have one big fat partition.\n"
 "I suggest you first resize that partition\n"
@@ -494,80 +494,85 @@ msgstr ""
 "Jeg forslår at du først endrer størrelsen på denne partisjonen\n"
 "(klikk på den, klikk så på \"Endre størrelse\")"
 
-#: ../diskdrake.pm_.c:138
-#, c-format
-msgid "After %s partition %s,"
-msgstr "Etter %s partisjon %s,"
+#: ../diskdrake.pm_.c:131
+msgid "Please make a backup of your data first"
+msgstr ""
 
-#: ../diskdrake.pm_.c:138 ../diskdrake.pm_.c:432 ../diskdrake.pm_.c:461
+#: ../diskdrake.pm_.c:131 ../diskdrake.pm_.c:145 ../diskdrake.pm_.c:455
+#: ../diskdrake.pm_.c:484
 msgid "Read carefully!"
 msgstr "Les nøye!"
 
-#: ../diskdrake.pm_.c:138
+#: ../diskdrake.pm_.c:145
+#, c-format
+msgid "After %s partition %s,"
+msgstr "Etter %s partisjon %s,"
+
+#: ../diskdrake.pm_.c:145
 msgid "all data on this partition will be lost"
 msgstr "alle data på denne partisjonen vil gå tapt"
 
 # #: ../install_steps_interactive.pm_.c:37
-#: ../diskdrake.pm_.c:157 ../install_any.pm_.c:184 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:164 ../install_any.pm_.c:184 ../install_steps.pm_.c:67
 #: ../install_steps_interactive.pm_.c:36 ../standalone/diskdrake_.c:60
 msgid "Error"
 msgstr "Feil"
 
-#: ../diskdrake.pm_.c:181 ../diskdrake.pm_.c:584
+#: ../diskdrake.pm_.c:188 ../diskdrake.pm_.c:607
 msgid "Mount point: "
 msgstr "Monteringspunkt: "
 
-#: ../diskdrake.pm_.c:182 ../diskdrake.pm_.c:219
+#: ../diskdrake.pm_.c:189 ../diskdrake.pm_.c:227
 msgid "Device: "
 msgstr "Enhet: "
 
-#: ../diskdrake.pm_.c:183
+#: ../diskdrake.pm_.c:190
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS diskbokstav: %s (bare en gjetning)\n"
 
-#: ../diskdrake.pm_.c:184 ../diskdrake.pm_.c:222
+#: ../diskdrake.pm_.c:191 ../diskdrake.pm_.c:230
 msgid "Type: "
 msgstr "Type: "
 
-#: ../diskdrake.pm_.c:185
+#: ../diskdrake.pm_.c:192
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Start: sektor %s\n"
 
-#: ../diskdrake.pm_.c:186
+#: ../diskdrake.pm_.c:193
 #, c-format
 msgid "Size: %s MB"
 msgstr "Størrelse: %s MB"
 
-#: ../diskdrake.pm_.c:188
+#: ../diskdrake.pm_.c:195
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorer"
 
-#: ../diskdrake.pm_.c:190
+#: ../diskdrake.pm_.c:197
 #, c-format
 msgid "Cylinder %d to cylinder %d\n"
 msgstr "Sylinder %d til sylinder %d\n"
 
-#: ../diskdrake.pm_.c:191
+#: ../diskdrake.pm_.c:198
 msgid "Formatted\n"
 msgstr "Formatert\n"
 
-#: ../diskdrake.pm_.c:192
+#: ../diskdrake.pm_.c:199
 msgid "Not formatted\n"
 msgstr "Ikke formatert\n"
 
-#: ../diskdrake.pm_.c:193
+#: ../diskdrake.pm_.c:200
 msgid "Mounted\n"
 msgstr "Montert\n"
 
-#: ../diskdrake.pm_.c:194
+#: ../diskdrake.pm_.c:201
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../diskdrake.pm_.c:195
+#: ../diskdrake.pm_.c:202
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -575,66 +580,66 @@ msgstr ""
 "Partisjon startet opp som standard\n"
 "    (for MS-DOS oppstart, ikke for lilo)\n"
 
-#: ../diskdrake.pm_.c:197
+#: ../diskdrake.pm_.c:204
 #, c-format
 msgid "Level %s\n"
 msgstr "Nivå %s\n"
 
-#: ../diskdrake.pm_.c:198
+#: ../diskdrake.pm_.c:205
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Blokkstørrelse %s\n"
 
-#: ../diskdrake.pm_.c:199
+#: ../diskdrake.pm_.c:206
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-disker %s\n"
 
-#: ../diskdrake.pm_.c:215
+#: ../diskdrake.pm_.c:223
 #, fuzzy
 msgid "Please click on a partition"
 msgstr "Opprette en ny partisjon"
 
-#: ../diskdrake.pm_.c:220
+#: ../diskdrake.pm_.c:228
 #, c-format
 msgid "Size: %d MB\n"
 msgstr "Størrelse: %d MB\n"
 
-#: ../diskdrake.pm_.c:221
+#: ../diskdrake.pm_.c:229
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
 
-#: ../diskdrake.pm_.c:223
+#: ../diskdrake.pm_.c:231
 #, c-format
 msgid "on bus %d id %d\n"
 msgstr "på buss %d id %d\n"
 
-#: ../diskdrake.pm_.c:236
+#: ../diskdrake.pm_.c:244
 msgid "Mount"
 msgstr "Monter"
 
-#: ../diskdrake.pm_.c:237
+#: ../diskdrake.pm_.c:245
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../diskdrake.pm_.c:238
+#: ../diskdrake.pm_.c:246
 msgid "Add to RAID"
 msgstr "Legg til RAID"
 
-#: ../diskdrake.pm_.c:239
+#: ../diskdrake.pm_.c:247
 msgid "Remove from RAID"
 msgstr "Fjern fra RAID"
 
-#: ../diskdrake.pm_.c:240
+#: ../diskdrake.pm_.c:248
 msgid "Modify RAID"
 msgstr "Modifiser RAID"
 
-#: ../diskdrake.pm_.c:247
+#: ../diskdrake.pm_.c:255
 msgid "Choose action"
 msgstr "Velg handling"
 
-#: ../diskdrake.pm_.c:338
+#: ../diskdrake.pm_.c:346
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -646,7 +651,7 @@ msgstr ""
 "Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du "
 "trenger ikke /boot"
 
-#: ../diskdrake.pm_.c:342
+#: ../diskdrake.pm_.c:350
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -659,137 +664,146 @@ msgstr ""
 "Hvis du skal bruke oppstartshåndtereren LILO, vær nøye med å legge til en\n"
 "/boot partisjon"
 
-#: ../diskdrake.pm_.c:356
+#: ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:369
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr ""
+
+#: ../diskdrake.pm_.c:372
+msgid "Use ``Unmount'' first"
+msgstr ""
+
+#: ../diskdrake.pm_.c:373 ../diskdrake.pm_.c:406
+msgid "changing type of"
+msgstr "endrer type av"
+
+#: ../diskdrake.pm_.c:385
 msgid "Continue anyway?"
 msgstr "Fortsette likevel?"
 
-#: ../diskdrake.pm_.c:361
+#: ../diskdrake.pm_.c:390
 msgid "Quit without saving"
 msgstr "Avslutt uten å lagre"
 
-#: ../diskdrake.pm_.c:361
+#: ../diskdrake.pm_.c:390
 msgid "Quit without writing the partition table?"
 msgstr "Avslutt uten å skrive partisjonstabellen?"
 
-#: ../diskdrake.pm_.c:377
-msgid "changing type of"
-msgstr "endrer type av"
-
-#: ../diskdrake.pm_.c:380
+#: ../diskdrake.pm_.c:409
 msgid "Change partition type"
 msgstr "Endre partisjonstype"
 
-#: ../diskdrake.pm_.c:381
+#: ../diskdrake.pm_.c:410
 msgid "Which partition type do you want?"
 msgstr "Hvilken partisjonstype ønsker du?"
 
-#: ../diskdrake.pm_.c:403
+#: ../diskdrake.pm_.c:426
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Hvor vil du montere %s enheten?"
 
-#: ../diskdrake.pm_.c:425
+#: ../diskdrake.pm_.c:448
 msgid "formatting"
 msgstr "formatering"
 
-#: ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:450
 msgid "Formatting"
 msgstr "Formatering"
 
-#: ../diskdrake.pm_.c:427 ../install_steps_interactive.pm_.c:210
+#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:210
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Formaterer partisjon %s"
 
-#: ../diskdrake.pm_.c:432
+#: ../diskdrake.pm_.c:455
 msgid "After formatting all partitions,"
 msgstr "Etter formatering av alle partisjonene,"
 
-#: ../diskdrake.pm_.c:432
+#: ../diskdrake.pm_.c:455
 msgid "all data on these partitions will be lost"
 msgstr "alle data på disse partisjonene vil gå tapt"
 
-#: ../diskdrake.pm_.c:442
+#: ../diskdrake.pm_.c:465
 msgid "Move"
 msgstr "Flytt"
 
-#: ../diskdrake.pm_.c:443
+#: ../diskdrake.pm_.c:466
 msgid "Which disk do you want to move to?"
 msgstr "Hvilken disk vil du flytte til?"
 
-#: ../diskdrake.pm_.c:447
+#: ../diskdrake.pm_.c:470
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../diskdrake.pm_.c:448
+#: ../diskdrake.pm_.c:471
 msgid "Which sector do you want to move to?"
 msgstr "Hvilken sektor vil du flytte til?"
 
-#: ../diskdrake.pm_.c:451
+#: ../diskdrake.pm_.c:474
 msgid "Moving"
 msgstr "Flytter"
 
-#: ../diskdrake.pm_.c:451
+#: ../diskdrake.pm_.c:474
 msgid "Moving partition..."
 msgstr "Flytter partisjon..."
 
-#: ../diskdrake.pm_.c:461
+#: ../diskdrake.pm_.c:484
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Partisjonstabellen på disk %s blir nå skrevet til disk!"
 
-#: ../diskdrake.pm_.c:463
+#: ../diskdrake.pm_.c:486
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Du må starte maskinen på nytt for at modifiseringene skal tre i kraft"
 
-#: ../diskdrake.pm_.c:484 ../install_steps_gtk.pm_.c:254
+#: ../diskdrake.pm_.c:507 ../install_steps_gtk.pm_.c:254
 msgid "Computing fat filesystem bounds"
 msgstr "Beregner fat filsystemgrense"
 
-#: ../diskdrake.pm_.c:484 ../diskdrake.pm_.c:529
+#: ../diskdrake.pm_.c:507 ../diskdrake.pm_.c:552
 #: ../install_steps_gtk.pm_.c:254
 msgid "Resizing"
 msgstr "Endrer størrelse"
 
-#: ../diskdrake.pm_.c:498
+#: ../diskdrake.pm_.c:521
 msgid "resizing"
 msgstr "endrer størrelse"
 
-#: ../diskdrake.pm_.c:508
+#: ../diskdrake.pm_.c:531
 msgid "Choose the new size"
 msgstr "Velg den nye størrelsen"
 
-#: ../diskdrake.pm_.c:508 ../install_steps_graphical.pm_.c:287
+#: ../diskdrake.pm_.c:531 ../install_steps_graphical.pm_.c:287
 #: ../install_steps_graphical.pm_.c:334 ../install_steps_gtk.pm_.c:322
 #: ../install_steps_gtk.pm_.c:371
 msgid "MB"
 msgstr "MB"
 
-#: ../diskdrake.pm_.c:561
+#: ../diskdrake.pm_.c:584
 msgid "Create a new partition"
 msgstr "Opprette en ny partisjon"
 
-#: ../diskdrake.pm_.c:577
+#: ../diskdrake.pm_.c:600
 msgid "Start sector: "
 msgstr "Start sektor: "
 
-#: ../diskdrake.pm_.c:580
+#: ../diskdrake.pm_.c:603
 msgid "Size in MB: "
 msgstr "Størrelse i MB: "
 
-#: ../diskdrake.pm_.c:583
+#: ../diskdrake.pm_.c:606
 msgid "Filesystem type: "
 msgstr "Filsystemtype: "
 
-#: ../diskdrake.pm_.c:585
+#: ../diskdrake.pm_.c:608
 msgid "Preference: "
 msgstr "Valg: "
 
-#: ../diskdrake.pm_.c:629 ../diskdrake.pm_.c:645
+#: ../diskdrake.pm_.c:652 ../diskdrake.pm_.c:668
 msgid "Select file"
 msgstr "Velg fil"
 
-#: ../diskdrake.pm_.c:638
+#: ../diskdrake.pm_.c:661
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -797,11 +811,11 @@ msgstr ""
 "Sikkerhetskopien av partisjonstabellen har ikke samme størrelse\n"
 "Fortsette for det?"
 
-#: ../diskdrake.pm_.c:646
+#: ../diskdrake.pm_.c:669
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../diskdrake.pm_.c:647
+#: ../diskdrake.pm_.c:670
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -809,27 +823,27 @@ msgstr ""
 "Sett inn en diskett i stasjonen\n"
 "Alle data på denne disketten vil gå tapt"
 
-#: ../diskdrake.pm_.c:661
+#: ../diskdrake.pm_.c:684
 msgid "Trying to rescue partition table"
 msgstr "Prøver å redde partisjonstabell"
 
-#: ../diskdrake.pm_.c:672
+#: ../diskdrake.pm_.c:695
 msgid "device"
 msgstr "enhet"
 
-#: ../diskdrake.pm_.c:673
+#: ../diskdrake.pm_.c:696
 msgid "level"
 msgstr "nivå"
 
-#: ../diskdrake.pm_.c:674
+#: ../diskdrake.pm_.c:697
 msgid "chunk size"
 msgstr "blokkstørrelse"
 
-#: ../diskdrake.pm_.c:686
+#: ../diskdrake.pm_.c:709
 msgid "Choose an existing RAID to add to"
 msgstr "Velg en eksisterende RAID for å legge til"
 
-#: ../diskdrake.pm_.c:687
+#: ../diskdrake.pm_.c:710
 msgid "new"
 msgstr "ny"
 
@@ -870,7 +884,7 @@ msgstr "Det finnes allerede en partisjon med monteringspunkt %s"
 msgid "Error opening %s for writing: %s"
 msgstr "Feil ved åpning av %s for skriving: %s"
 
-#: ../fsedit.pm_.c:377
+#: ../fsedit.pm_.c:387
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems. Please check your hardware for the cause of this problem"
@@ -878,15 +892,15 @@ msgstr ""
 "En feil har oppstått - ingen gyldige enheter ble funnet for å opprette nye "
 "filsystemer. Vennligst sjekk maskinvaren din for årsaken til dette problemet"
 
-#: ../fsedit.pm_.c:392
+#: ../fsedit.pm_.c:402
 msgid "You don't have any partitions!"
 msgstr "Du har ingen partisjoner!"
 
-#: ../help.pm_.c:7 ../help.pm_.c:277
+#: ../help.pm_.c:7 ../help.pm_.c:280
 msgid "Choose preferred language for install and system usage."
 msgstr "Velg ønsket språk for installering og systembruk."
 
-#: ../help.pm_.c:10 ../help.pm_.c:280
+#: ../help.pm_.c:10 ../help.pm_.c:283
 msgid "Choose the layout corresponding to your keyboard from the list above"
 msgstr "Velg oppsettet som stemmer med tastaturet ditt fra listen ovenfor"
 
@@ -897,7 +911,7 @@ msgid ""
 "\n"
 "\n"
 "Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."
+"Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus) or 6.1 (Helios)."
 msgstr ""
 "Velg \"Installasjon\" hvis det ikke er installert noen tidligere versjoner\n"
 "av Linux, eller hvis du ønsker å bruke flere distribusjoner eller\n"
@@ -905,7 +919,8 @@ msgstr ""
 "\n"
 "\n"
 "Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
-"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)."
+"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen)\n"
+"6.0 (Venus) eller 6.1 (Helios)."
 
 #: ../help.pm_.c:21
 msgid ""
@@ -992,7 +1007,7 @@ msgstr ""
 "som foreslått i installasjonsguiden. Dette er opsjonene du vil trenge å\n"
 "gi til driveren."
 
-#: ../help.pm_.c:66
+#: ../help.pm_.c:63
 msgid ""
 "At this point, you may choose what partition(s) to use to install\n"
 "your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1047,7 +1062,7 @@ msgstr ""
 "DiskDrake forenkler prosessen så den ikke trenger å være det. Les\n"
 "dokumentasjonen og ta deg god tid før du begynner."
 
-#: ../help.pm_.c:92 ../help.pm_.c:352
+#: ../help.pm_.c:89 ../help.pm_.c:355
 msgid ""
 "Any partitions that have been newly defined must be formatted for\n"
 "use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1063,15 +1078,15 @@ msgstr ""
 "eksisterende partisjoner, især hvis de inneholder filer eller data som du\n"
 "ønsker å beholde. Typiske å beholde er: /home og /usr/local."
 
-#: ../help.pm_.c:100
+#: ../help.pm_.c:97
+#, fuzzy
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
 "\n"
-"First you can select the size of your installed system and an automated\n"
-"selection of packages will be done according to your system usage. After\n"
-"that you can select more packages by group or click on Ok to keep the\n"
-"previous selection.\n"
+"First you can select group of package to install or upgrade. After that\n"
+"you can select more packages according to the total size you wish to\n"
+"select.\n"
 "\n"
 "\n"
 "If you are in expert mode, you can select packages individually.\n"
@@ -1107,7 +1122,7 @@ msgstr ""
 "kalt \"Info\", som du finner mellom listen over pakker og knappen\n"
 "\"Installer\" for å starte installasjonen."
 
-#: ../help.pm_.c:122
+#: ../help.pm_.c:118
 msgid ""
 "The packages selected are now being installed. This operation\n"
 "should take a few minutes unless you have chosen to upgrade an\n"
@@ -1119,7 +1134,7 @@ msgstr ""
 "eksisterende system. I så tilfelle kan det ta lengre tid også før\n"
 "oppgraderingen starter."
 
-#: ../help.pm_.c:128 ../help.pm_.c:381
+#: ../help.pm_.c:124 ../help.pm_.c:384
 msgid ""
 "If DrakX failed to find your mouse, or if you want to\n"
 "check what it has done, you will be presented the list of mice\n"
@@ -1146,7 +1161,7 @@ msgstr ""
 "Hvis du har en seriell mus, må du også fortelle DrakX hvilken\n"
 "serie-port den er koblet til."
 
-#: ../help.pm_.c:142
+#: ../help.pm_.c:138
 msgid ""
 "This section is dedicated to configuring a local area\n"
 "network (LAN) or a modem.\n"
@@ -1204,7 +1219,18 @@ msgstr ""
 "hvis dette mislykkes må du velge den riktige serieporten hvor\n"
 "modemet ditt er tilkoblet."
 
-#: ../help.pm_.c:172
+#: ../help.pm_.c:168
+msgid ""
+"You can install cryptographic package if your internet connection has been\n"
+"set up correctly. First choose a mirror where you wish to download packages "
+"and\n"
+"after that select the packages to install.\n"
+"\n"
+"Note you have to select mirror and cryptographic according to your "
+"legislation."
+msgstr ""
+
+#: ../help.pm_.c:175
 msgid ""
 "You can now select your timezone according to where you live.\n"
 "\n"
@@ -1219,12 +1245,12 @@ msgstr ""
 "den til lokal tid som stemmer overens med den tidssonen du har valgt."
 
 # #: ../help.pm_.c:376 ../help.pm_.c:463 ../install2.pm_.c:65
-#: ../help.pm_.c:179 ../help.pm_.c:417 ../help.pm_.c:420 ../help.pm_.c:508
+#: ../help.pm_.c:182 ../help.pm_.c:420 ../help.pm_.c:423 ../help.pm_.c:511
 #: ../install2.pm_.c:67
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../help.pm_.c:182
+#: ../help.pm_.c:185
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -1271,7 +1297,7 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
-#: ../help.pm_.c:205
+#: ../help.pm_.c:208
 msgid ""
 "You can now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -1302,7 +1328,7 @@ msgstr ""
 "bli skrevet ned. Ikke lag passordet for langt eller for komplisert:\n"
 "du må kunne klare å huske det."
 
-#: ../help.pm_.c:221 ../help.pm_.c:462
+#: ../help.pm_.c:224 ../help.pm_.c:465
 msgid ""
 "You may now create one or more \"regular\" user account(s), as\n"
 "opposed to the \"priviledged\" user account, root. You can create\n"
@@ -1345,7 +1371,7 @@ msgstr ""
 "du vil ha opprettet her, og bare logge inn som root for administrasjon-\n"
 "og vedlikeholdsformål."
 
-#: ../help.pm_.c:240 ../help.pm_.c:481
+#: ../help.pm_.c:243 ../help.pm_.c:484
 msgid ""
 "Please, please, answer \"Yes\" here! Just for example, when you\n"
 "reinstall Windows, it will overwrite the boot sector. Unless you have\n"
@@ -1357,7 +1383,7 @@ msgstr ""
 "ikke har opprettet oppstartsdisketten som foreslått, vil du ikke kunne\n"
 "starte Linux mer!"
 
-#: ../help.pm_.c:246 ../help.pm_.c:487
+#: ../help.pm_.c:249 ../help.pm_.c:490
 msgid ""
 "You need to indicate where you wish\n"
 "to place the information required to boot to Linux.\n"
@@ -1373,7 +1399,7 @@ msgstr ""
 "Med mindre du vet akkurat hva du gjør, velg \"Første sektor av\n"
 "disken (MBR)\"."
 
-#: ../help.pm_.c:254 ../help.pm_.c:495
+#: ../help.pm_.c:257 ../help.pm_.c:498
 msgid ""
 "Now it's time to configure the X Window System, which is the\n"
 "core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1399,15 +1425,15 @@ msgstr ""
 "passer deg. Hvis de ikke gjør det, kan du komme tilbake og endre\n"
 "disse så mange ganger som det måtte behøves."
 
-#: ../help.pm_.c:267
+#: ../help.pm_.c:270
 msgid "You can now select some miscellaneous options for your system."
 msgstr "Du kan nå velge noen forskjellige opsjoner for systemet ditt."
 
-#: ../help.pm_.c:270
+#: ../help.pm_.c:273
 msgid "Exit Linux-Mandrake installation to reboot your system."
 msgstr "Avslutt Linux-Mandrake installasjonen for å starte systemet på nytt."
 
-#: ../help.pm_.c:283
+#: ../help.pm_.c:286
 msgid ""
 "Choose \"Installation\" if there are no previous versions of Linux\n"
 "installed, or if you wish to use multiple distributions or versions.\n"
@@ -1424,7 +1450,7 @@ msgstr ""
 "Velg \"Oppdater\" hvis du ønsker å oppdatere en tidligere versjon av\n"
 "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) eller 6.0 (Venus)."
 
-#: ../help.pm_.c:291
+#: ../help.pm_.c:294
 msgid ""
 "Select:\n"
 "\n"
@@ -1458,7 +1484,7 @@ msgstr ""
 "  - Ekspert: Hvis du allerede kjenner GNU/Linux og ønsker å gjøre en\n"
 "egendefinert installasjon, så er dette installasjonsvalget for deg."
 
-#: ../help.pm_.c:309
+#: ../help.pm_.c:312
 msgid ""
 "DrakX will attempt at first to look for one or more PCI\n"
 "SCSI adapter(s). If it finds it (or them)  and knows which driver(s)\n"
@@ -1500,7 +1526,7 @@ msgstr ""
 "ditt), som foreslått i installasjonsguiden. Dette er opsjonene du vil\n"
 "trenge å gi til driveren."
 
-#: ../help.pm_.c:330
+#: ../help.pm_.c:333
 msgid ""
 "In this stage, you may choose what partition(s) use to install your\n"
 "Linux-Mandrake system."
@@ -1508,7 +1534,7 @@ msgstr ""
 "På dette punktet kan du velge hvilken partisjon(er) som skal brukes til\n"
 "å installere Linux-Mandrake systemet ditt."
 
-#: ../help.pm_.c:360
+#: ../help.pm_.c:363
 msgid ""
 "You may now select the packages you wish to install.\n"
 "\n"
@@ -1538,7 +1564,7 @@ msgstr ""
 "kalt \"Info\", som du finner mellom listen over pakker og de fem knappene\n"
 "\"Installer\", \"Velg flere/færre\" og \"Vis flere/færre\"."
 
-#: ../help.pm_.c:375
+#: ../help.pm_.c:378
 msgid ""
 "The packages selected are now being installed.\n"
 "\n"
@@ -1550,7 +1576,7 @@ msgstr ""
 "\n"
 "Denne operasjonen burde ta noen minutter."
 
-#: ../help.pm_.c:395
+#: ../help.pm_.c:398
 msgid ""
 "This section is dedicated to configuring a local area network,\n"
 "or LAN. If you answer \"Yes\" here, DrakX will try to find an\n"
@@ -1591,7 +1617,7 @@ msgstr ""
 "submask eller netmask, og vertsnavn). Hvis du f.eks. setter\n"
 "opp et privat nettverk hjemme, burde du velge adresser."
 
-#: ../help.pm_.c:423
+#: ../help.pm_.c:426
 msgid ""
 "Linux can deal with many types of printer. Each of these\n"
 "types require a different setup.\n"
@@ -1638,7 +1664,7 @@ msgstr ""
 "en NetWare-skriver, med unntak av at du ikke trenger noen arbeidsgruppe-\n"
 "informasjon."
 
-#: ../help.pm_.c:446
+#: ../help.pm_.c:449
 msgid ""
 "You must now enter the root password for your Linux-Mandrake\n"
 "system. The password must be entered twice to verify that both\n"
@@ -3495,8 +3521,8 @@ msgstr ""
 msgid "no serial_usb found\n"
 msgstr ""
 
-#~ msgid "Normal > Expert"
-#~ msgstr "Normal > Ekspert"
-
 #~ msgid "Expert > Normal"
 #~ msgstr "Ekspert > Normal"
+
+#~ msgid "Normal > Expert"
+#~ msgstr "Normal > Ekspert"