summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-21 19:45:38 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-21 19:45:38 +0000
commit773e000834f4faa55b962134945d77d4af19524c (patch)
tree81169e95a3ce681560224b8c01fd42bff819a1f9
parente1db87b9b9e4a582e106fb9f24e6be21c8fa0917 (diff)
downloaddrakx-backup-do-not-use-773e000834f4faa55b962134945d77d4af19524c.tar
drakx-backup-do-not-use-773e000834f4faa55b962134945d77d4af19524c.tar.gz
drakx-backup-do-not-use-773e000834f4faa55b962134945d77d4af19524c.tar.bz2
drakx-backup-do-not-use-773e000834f4faa55b962134945d77d4af19524c.tar.xz
drakx-backup-do-not-use-773e000834f4faa55b962134945d77d4af19524c.zip
no_comment
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/modules.pm2
-rw-r--r--perl-install/share/po/DrakX.pot342
-rw-r--r--perl-install/share/po/no.po348
-rwxr-xr-xtools/make_mdkinst_stage22
5 files changed, 351 insertions, 345 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index f29f47959..eef623e9e 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -374,7 +374,7 @@ sub rescuept($) {
$_->{start}--;
$_->{size}++;
}
- local $b->{notFormatted};
+ local $_->{notFormatted};
partition_table::add($hd, $_, ($b ? 'Extended' : 'Primary'), 1);
}
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 645825a0a..70c551972 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -139,7 +139,7 @@ my @drivers_by_category = (
"aztcd" => "Aztech CD",
"gscd" => "Goldstar R420",
"isp16" => "ISP16/MAD16/Mozart",
- "mcd" => "Mitsumi",
+#- "mcd" => "Mitsumi", #- removed for space
"mcdx" => "Mitsumi (alternate)",
"optcd" => "Optics Storage 8000",
"cm206" => "Phillips CM206/CM260",
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index be18fc846..ff43930f9 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-21 02:28+0100\n"
+"POT-Creation-Date: 1999-12-21 20:37+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"
@@ -355,7 +355,7 @@ msgstr ""
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr ""
-#: ../diskdrake.pm_.c:16 ../diskdrake.pm_.c:367
+#: ../diskdrake.pm_.c:16 ../diskdrake.pm_.c:370
msgid "Create"
msgstr ""
@@ -363,7 +363,7 @@ msgstr ""
msgid "Unmount"
msgstr ""
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:369
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:372
msgid "Delete"
msgstr ""
@@ -371,15 +371,15 @@ msgstr ""
msgid "Format"
msgstr ""
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:524
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:527
msgid "Resize"
msgstr ""
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:411
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:370 ../diskdrake.pm_.c:414
msgid "Type"
msgstr ""
-#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:430
msgid "Mount point"
msgstr ""
@@ -412,7 +412,7 @@ msgid "Save on floppy"
msgstr ""
#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:527
-#: ../install_steps_interactive.pm_.c:649 ../standalone/adduserdrake_.c:26
+#: ../install_steps_interactive.pm_.c:651 ../standalone/adduserdrake_.c:26
msgid "Done"
msgstr ""
@@ -442,10 +442,6 @@ msgid ""
"partition"
msgstr ""
-#: ../diskdrake.pm_.c:51
-msgid "Rescue partition table"
-msgstr ""
-
#: ../diskdrake.pm_.c:52
msgid "Undo"
msgstr ""
@@ -488,153 +484,154 @@ msgstr ""
#: ../diskdrake.pm_.c:127
msgid ""
-"You have one big fat partition.\n"
+"You have one big fat partition\n"
+"(generally use by MicroSoft Dos/Windows).\n"
"I suggest you first resize that partition\n"
"(click on it, then click on \"Resize\")"
msgstr ""
-#: ../diskdrake.pm_.c:131
+#: ../diskdrake.pm_.c:132
msgid "Please make a backup of your data first"
msgstr ""
-#: ../diskdrake.pm_.c:131 ../diskdrake.pm_.c:145 ../diskdrake.pm_.c:455
-#: ../diskdrake.pm_.c:484
+#: ../diskdrake.pm_.c:132 ../diskdrake.pm_.c:146 ../diskdrake.pm_.c:458
+#: ../diskdrake.pm_.c:487
msgid "Read carefully!"
msgstr ""
-#: ../diskdrake.pm_.c:145
+#: ../diskdrake.pm_.c:146
#, c-format
msgid "After %s partition %s,"
msgstr ""
-#: ../diskdrake.pm_.c:145
+#: ../diskdrake.pm_.c:146
msgid "all data on this partition will be lost"
msgstr ""
-#: ../diskdrake.pm_.c:164 ../install_any.pm_.c:184 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:165 ../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:188 ../diskdrake.pm_.c:607
+#: ../diskdrake.pm_.c:189 ../diskdrake.pm_.c:610
msgid "Mount point: "
msgstr ""
-#: ../diskdrake.pm_.c:189 ../diskdrake.pm_.c:227
+#: ../diskdrake.pm_.c:190 ../diskdrake.pm_.c:228
msgid "Device: "
msgstr ""
-#: ../diskdrake.pm_.c:190
+#: ../diskdrake.pm_.c:191
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr ""
-#: ../diskdrake.pm_.c:191 ../diskdrake.pm_.c:230
+#: ../diskdrake.pm_.c:192 ../diskdrake.pm_.c:231
msgid "Type: "
msgstr ""
-#: ../diskdrake.pm_.c:192
+#: ../diskdrake.pm_.c:193
#, c-format
msgid "Start: sector %s\n"
msgstr ""
-#: ../diskdrake.pm_.c:193
+#: ../diskdrake.pm_.c:194
#, c-format
msgid "Size: %s MB"
msgstr ""
-#: ../diskdrake.pm_.c:195
+#: ../diskdrake.pm_.c:196
#, c-format
msgid ", %s sectors"
msgstr ""
-#: ../diskdrake.pm_.c:197
+#: ../diskdrake.pm_.c:198
#, c-format
msgid "Cylinder %d to cylinder %d\n"
msgstr ""
-#: ../diskdrake.pm_.c:198
+#: ../diskdrake.pm_.c:199
msgid "Formatted\n"
msgstr ""
-#: ../diskdrake.pm_.c:199
+#: ../diskdrake.pm_.c:200
msgid "Not formatted\n"
msgstr ""
-#: ../diskdrake.pm_.c:200
+#: ../diskdrake.pm_.c:201
msgid "Mounted\n"
msgstr ""
-#: ../diskdrake.pm_.c:201
+#: ../diskdrake.pm_.c:202
#, c-format
msgid "RAID md%s\n"
msgstr ""
-#: ../diskdrake.pm_.c:202
+#: ../diskdrake.pm_.c:203
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
msgstr ""
-#: ../diskdrake.pm_.c:204
+#: ../diskdrake.pm_.c:205
#, c-format
msgid "Level %s\n"
msgstr ""
-#: ../diskdrake.pm_.c:205
+#: ../diskdrake.pm_.c:206
#, c-format
msgid "Chunk size %s\n"
msgstr ""
-#: ../diskdrake.pm_.c:206
+#: ../diskdrake.pm_.c:207
#, c-format
msgid "RAID-disks %s\n"
msgstr ""
-#: ../diskdrake.pm_.c:223
+#: ../diskdrake.pm_.c:224
msgid "Please click on a partition"
msgstr ""
-#: ../diskdrake.pm_.c:228
+#: ../diskdrake.pm_.c:229
#, c-format
msgid "Size: %d MB\n"
msgstr ""
-#: ../diskdrake.pm_.c:229
+#: ../diskdrake.pm_.c:230
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr ""
-#: ../diskdrake.pm_.c:231
+#: ../diskdrake.pm_.c:232
#, c-format
msgid "on bus %d id %d\n"
msgstr ""
-#: ../diskdrake.pm_.c:244
+#: ../diskdrake.pm_.c:245
msgid "Mount"
msgstr ""
-#: ../diskdrake.pm_.c:245
+#: ../diskdrake.pm_.c:246
msgid "Active"
msgstr ""
-#: ../diskdrake.pm_.c:246
+#: ../diskdrake.pm_.c:247
msgid "Add to RAID"
msgstr ""
-#: ../diskdrake.pm_.c:247
+#: ../diskdrake.pm_.c:248
msgid "Remove from RAID"
msgstr ""
-#: ../diskdrake.pm_.c:248
+#: ../diskdrake.pm_.c:249
msgid "Modify RAID"
msgstr ""
-#: ../diskdrake.pm_.c:255
+#: ../diskdrake.pm_.c:256
msgid "Choose action"
msgstr ""
-#: ../diskdrake.pm_.c:346
+#: ../diskdrake.pm_.c:349
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -642,7 +639,7 @@ msgid ""
"need /boot"
msgstr ""
-#: ../diskdrake.pm_.c:350
+#: ../diskdrake.pm_.c:353
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -650,181 +647,181 @@ msgid ""
"If you plan to use the LILO boot manager, be careful to add a /boot partition"
msgstr ""
-#: ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:369
+#: ../diskdrake.pm_.c:370 ../diskdrake.pm_.c:372
#, c-format
msgid "Use ``%s'' instead"
msgstr ""
-#: ../diskdrake.pm_.c:372
+#: ../diskdrake.pm_.c:375
msgid "Use ``Unmount'' first"
msgstr ""
-#: ../diskdrake.pm_.c:373 ../diskdrake.pm_.c:406
+#: ../diskdrake.pm_.c:376 ../diskdrake.pm_.c:409
msgid "changing type of"
msgstr ""
-#: ../diskdrake.pm_.c:385
+#: ../diskdrake.pm_.c:388
msgid "Continue anyway?"
msgstr ""
-#: ../diskdrake.pm_.c:390
+#: ../diskdrake.pm_.c:393
msgid "Quit without saving"
msgstr ""
-#: ../diskdrake.pm_.c:390
+#: ../diskdrake.pm_.c:393
msgid "Quit without writing the partition table?"
msgstr ""
-#: ../diskdrake.pm_.c:409
+#: ../diskdrake.pm_.c:412
msgid "Change partition type"
msgstr ""
-#: ../diskdrake.pm_.c:410
+#: ../diskdrake.pm_.c:413
msgid "Which partition type do you want?"
msgstr ""
-#: ../diskdrake.pm_.c:426
+#: ../diskdrake.pm_.c:429
#, c-format
msgid "Where do you want to mount device %s?"
msgstr ""
-#: ../diskdrake.pm_.c:448
+#: ../diskdrake.pm_.c:451
msgid "formatting"
msgstr ""
-#: ../diskdrake.pm_.c:450
+#: ../diskdrake.pm_.c:453
msgid "Formatting"
msgstr ""
-#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:213
+#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:213
#, c-format
msgid "Formatting partition %s"
msgstr ""
-#: ../diskdrake.pm_.c:455
+#: ../diskdrake.pm_.c:458
msgid "After formatting all partitions,"
msgstr ""
-#: ../diskdrake.pm_.c:455
+#: ../diskdrake.pm_.c:458
msgid "all data on these partitions will be lost"
msgstr ""
-#: ../diskdrake.pm_.c:465
+#: ../diskdrake.pm_.c:468
msgid "Move"
msgstr ""
-#: ../diskdrake.pm_.c:466
+#: ../diskdrake.pm_.c:469
msgid "Which disk do you want to move to?"
msgstr ""
-#: ../diskdrake.pm_.c:470
+#: ../diskdrake.pm_.c:473
msgid "Sector"
msgstr ""
-#: ../diskdrake.pm_.c:471
+#: ../diskdrake.pm_.c:474
msgid "Which sector do you want to move to?"
msgstr ""
-#: ../diskdrake.pm_.c:474
+#: ../diskdrake.pm_.c:477
msgid "Moving"
msgstr ""
-#: ../diskdrake.pm_.c:474
+#: ../diskdrake.pm_.c:477
msgid "Moving partition..."
msgstr ""
-#: ../diskdrake.pm_.c:484
+#: ../diskdrake.pm_.c:487
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr ""
-#: ../diskdrake.pm_.c:486
+#: ../diskdrake.pm_.c:489
msgid "You'll need to reboot before the modification can take place"
msgstr ""
-#: ../diskdrake.pm_.c:507 ../install_steps_gtk.pm_.c:254
+#: ../diskdrake.pm_.c:510 ../install_steps_gtk.pm_.c:254
msgid "Computing fat filesystem bounds"
msgstr ""
-#: ../diskdrake.pm_.c:507 ../diskdrake.pm_.c:552
+#: ../diskdrake.pm_.c:510 ../diskdrake.pm_.c:555
#: ../install_steps_gtk.pm_.c:254
msgid "Resizing"
msgstr ""
-#: ../diskdrake.pm_.c:521
+#: ../diskdrake.pm_.c:524
msgid "resizing"
msgstr ""
-#: ../diskdrake.pm_.c:531
+#: ../diskdrake.pm_.c:534
msgid "Choose the new size"
msgstr ""
-#: ../diskdrake.pm_.c:531 ../install_steps_gtk.pm_.c:328
+#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:328
#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
msgid "MB"
msgstr ""
-#: ../diskdrake.pm_.c:584
+#: ../diskdrake.pm_.c:587
msgid "Create a new partition"
msgstr ""
-#: ../diskdrake.pm_.c:600
+#: ../diskdrake.pm_.c:603
msgid "Start sector: "
msgstr ""
-#: ../diskdrake.pm_.c:603
+#: ../diskdrake.pm_.c:606
msgid "Size in MB: "
msgstr ""
-#: ../diskdrake.pm_.c:606
+#: ../diskdrake.pm_.c:609
msgid "Filesystem type: "
msgstr ""
-#: ../diskdrake.pm_.c:608
+#: ../diskdrake.pm_.c:611
msgid "Preference: "
msgstr ""
-#: ../diskdrake.pm_.c:652 ../diskdrake.pm_.c:668
+#: ../diskdrake.pm_.c:655 ../diskdrake.pm_.c:671
msgid "Select file"
msgstr ""
-#: ../diskdrake.pm_.c:661
+#: ../diskdrake.pm_.c:664
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
msgstr ""
-#: ../diskdrake.pm_.c:669
+#: ../diskdrake.pm_.c:672
msgid "Warning"
msgstr ""
-#: ../diskdrake.pm_.c:670
+#: ../diskdrake.pm_.c:673
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
msgstr ""
-#: ../diskdrake.pm_.c:684
+#: ../diskdrake.pm_.c:687
msgid "Trying to rescue partition table"
msgstr ""
-#: ../diskdrake.pm_.c:695
+#: ../diskdrake.pm_.c:698
msgid "device"
msgstr ""
-#: ../diskdrake.pm_.c:696
+#: ../diskdrake.pm_.c:699
msgid "level"
msgstr ""
-#: ../diskdrake.pm_.c:697
+#: ../diskdrake.pm_.c:700
msgid "chunk size"
msgstr ""
-#: ../diskdrake.pm_.c:709
+#: ../diskdrake.pm_.c:712
msgid "Choose an existing RAID to add to"
msgstr ""
-#: ../diskdrake.pm_.c:710
+#: ../diskdrake.pm_.c:713
msgid "new"
msgstr ""
@@ -997,9 +994,9 @@ msgid ""
"of its dependencies.\n"
"\n"
"\n"
-"Information on each category and specific package is available in the\n"
-"area titled \"Info\", located between list of packages and the\n"
-"button \"Install\" to start the installation."
+"Informations on specific package are available in the\n"
+"area titled \"Info\", located on the right of the list of\n"
+"packages."
msgstr ""
#: ../help.pm_.c:119
@@ -1046,8 +1043,8 @@ msgid ""
"\n"
"As for SCSI adapters, you can let the driver probe for the adapter\n"
"in the first time, otherwise you will have to specify the options\n"
-"to the driver that you will have fetched from Windows' control\n"
-"panel.\n"
+"to the driver that you will have fetched from documentation of your\n"
+"hardware.\n"
"\n"
"\n"
"If you install a Linux-Mandrake system on a machine which is part\n"
@@ -1447,28 +1444,28 @@ msgstr ""
msgid "Searching root partition."
msgstr ""
-#: ../install_any.pm_.c:242
+#: ../install_any.pm_.c:240
msgid "Information"
msgstr ""
-#: ../install_any.pm_.c:243
+#: ../install_any.pm_.c:241
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr ""
-#: ../install_any.pm_.c:245
+#: ../install_any.pm_.c:243
msgid "No root partition found"
msgstr ""
-#: ../install_any.pm_.c:281
+#: ../install_any.pm_.c:280
msgid "Can't use broadcast with no NIS domain"
msgstr ""
-#: ../install_any.pm_.c:456
+#: ../install_any.pm_.c:455
msgid "Error reading file $f"
msgstr ""
-#: ../install_any.pm_.c:462
+#: ../install_any.pm_.c:461
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr ""
@@ -1942,7 +1939,7 @@ msgid "No password"
msgstr ""
#: ../install_steps_interactive.pm_.c:485
-#: ../install_steps_interactive.pm_.c:699 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:701 ../interactive.pm_.c:74
#: ../interactive.pm_.c:84 ../interactive.pm_.c:163
#: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:423
@@ -1951,7 +1948,8 @@ msgid "Ok"
msgstr ""
#: ../install_steps_interactive.pm_.c:488
-#: ../install_steps_interactive.pm_.c:534 ../standalone/adduserdrake_.c:33
+#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:628 ../standalone/adduserdrake_.c:33
msgid "Password (again)"
msgstr ""
@@ -1980,12 +1978,14 @@ msgid "yellow pages"
msgstr ""
#: ../install_steps_interactive.pm_.c:497
-#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:545
+#: ../install_steps_interactive.pm_.c:639 ../standalone/adduserdrake_.c:44
msgid "Please try again"
msgstr ""
#: ../install_steps_interactive.pm_.c:497
-#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:545
+#: ../install_steps_interactive.pm_.c:639 ../standalone/adduserdrake_.c:44
msgid "The passwords do not match"
msgstr ""
@@ -2138,194 +2138,194 @@ msgstr ""
msgid "Video mode"
msgstr ""
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:629
msgid "Restrict command line options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:629
msgid "restrict"
msgstr ""
-#: ../install_steps_interactive.pm_.c:634
+#: ../install_steps_interactive.pm_.c:635
msgid "LILO main options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:637
+#: ../install_steps_interactive.pm_.c:638
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:649
msgid ""
"Here are the following entries in LILO.\n"
"You can add some more or change the existing ones."
msgstr ""
-#: ../install_steps_interactive.pm_.c:649
+#: ../install_steps_interactive.pm_.c:651
msgid "Add"
msgstr ""
-#: ../install_steps_interactive.pm_.c:658
+#: ../install_steps_interactive.pm_.c:660
msgid "Linux"
msgstr ""
-#: ../install_steps_interactive.pm_.c:658
+#: ../install_steps_interactive.pm_.c:660
msgid "Other OS (windows...)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:658
+#: ../install_steps_interactive.pm_.c:660
msgid "Which type of entry do you want to add"
msgstr ""
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:680
msgid "Image"
msgstr ""
-#: ../install_steps_interactive.pm_.c:679
-#: ../install_steps_interactive.pm_.c:687
+#: ../install_steps_interactive.pm_.c:681
+#: ../install_steps_interactive.pm_.c:689
msgid "Root"
msgstr ""
-#: ../install_steps_interactive.pm_.c:680
+#: ../install_steps_interactive.pm_.c:682
msgid "Append"
msgstr ""
-#: ../install_steps_interactive.pm_.c:681
+#: ../install_steps_interactive.pm_.c:683
msgid "Initrd"
msgstr ""
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:684
msgid "Read-write"
msgstr ""
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:690
msgid "Table"
msgstr ""
-#: ../install_steps_interactive.pm_.c:689
+#: ../install_steps_interactive.pm_.c:691
msgid "Unsafe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:694
+#: ../install_steps_interactive.pm_.c:696
msgid "Label"
msgstr ""
-#: ../install_steps_interactive.pm_.c:696
+#: ../install_steps_interactive.pm_.c:698
msgid "Default"
msgstr ""
-#: ../install_steps_interactive.pm_.c:699
+#: ../install_steps_interactive.pm_.c:701
msgid "Remove entry"
msgstr ""
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:704
msgid "Empty label not allowed"
msgstr ""
-#: ../install_steps_interactive.pm_.c:703
+#: ../install_steps_interactive.pm_.c:705
msgid "This label is already in use"
msgstr ""
-#: ../install_steps_interactive.pm_.c:704
+#: ../install_steps_interactive.pm_.c:706
#, c-format
msgid "A entry %s already exists"
msgstr ""
-#: ../install_steps_interactive.pm_.c:718
+#: ../install_steps_interactive.pm_.c:720
msgid "Installation of LILO failed. The following error occured:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:732
+#: ../install_steps_interactive.pm_.c:734
msgid "Proxies configuration"
msgstr ""
-#: ../install_steps_interactive.pm_.c:733
+#: ../install_steps_interactive.pm_.c:735
msgid "HTTP proxy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:734
+#: ../install_steps_interactive.pm_.c:736
msgid "FTP proxy"
msgstr ""
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:742
msgid "Proxy should be http://..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:741
+#: ../install_steps_interactive.pm_.c:743
msgid "Proxy should be ftp://..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:752 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:754 ../standalone/draksec_.c:21
msgid "Poor"
msgstr ""
-#: ../install_steps_interactive.pm_.c:753 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:755 ../standalone/draksec_.c:22
msgid "Low"
msgstr ""
-#: ../install_steps_interactive.pm_.c:754 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:23
msgid "Medium"
msgstr ""
-#: ../install_steps_interactive.pm_.c:755 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:757 ../standalone/draksec_.c:24
msgid "High"
msgstr ""
-#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:758 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr ""
-#: ../install_steps_interactive.pm_.c:769
+#: ../install_steps_interactive.pm_.c:771
msgid "Miscellaneous questions"
msgstr ""
-#: ../install_steps_interactive.pm_.c:770
+#: ../install_steps_interactive.pm_.c:772
msgid "(may cause data corruption)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:770
+#: ../install_steps_interactive.pm_.c:772
msgid "Use hard drive optimisations?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:771 ../standalone/draksec_.c:29
+#: ../install_steps_interactive.pm_.c:773 ../standalone/draksec_.c:30
msgid "Choose security level"
msgstr ""
-#: ../install_steps_interactive.pm_.c:772
+#: ../install_steps_interactive.pm_.c:774
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:773
+#: ../install_steps_interactive.pm_.c:775
msgid "Removable media automounting"
msgstr ""
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:777
msgid "Enable num lock at startup"
msgstr ""
-#: ../install_steps_interactive.pm_.c:778
+#: ../install_steps_interactive.pm_.c:780
msgid "Give the ram size in Mb"
msgstr ""
-#: ../install_steps_interactive.pm_.c:794
+#: ../install_steps_interactive.pm_.c:796
#: ../unused/install_steps_graphical.pm_.c:535
msgid "Use existing configuration for X11?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:806
-#: ../install_steps_interactive.pm_.c:919
+#: ../install_steps_interactive.pm_.c:808
+#: ../install_steps_interactive.pm_.c:921
msgid "Try to find PCI devices?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:821
+#: ../install_steps_interactive.pm_.c:823
msgid ""
"Some steps are not completed.\n"
"\n"
"Do you really want to quit now?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:828
+#: ../install_steps_interactive.pm_.c:830
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2338,26 +2338,26 @@ msgid ""
"install chapter of the Official Linux-Mandrake User's Guide."
msgstr ""
-#: ../install_steps_interactive.pm_.c:837
+#: ../install_steps_interactive.pm_.c:839
msgid "Shutting down"
msgstr ""
-#: ../install_steps_interactive.pm_.c:851
+#: ../install_steps_interactive.pm_.c:853
#, c-format
msgid "Installing driver for %s card %s"
msgstr ""
-#: ../install_steps_interactive.pm_.c:852
+#: ../install_steps_interactive.pm_.c:854
#, c-format
msgid "(module %s)"
msgstr ""
-#: ../install_steps_interactive.pm_.c:862
+#: ../install_steps_interactive.pm_.c:864
#, c-format
msgid "Which %s driver should I try?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:870
+#: ../install_steps_interactive.pm_.c:872
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2369,20 +2369,20 @@ msgid ""
"not cause any damage."
msgstr ""
-#: ../install_steps_interactive.pm_.c:875
+#: ../install_steps_interactive.pm_.c:877
msgid "Autoprobe"
msgstr ""
-#: ../install_steps_interactive.pm_.c:875
+#: ../install_steps_interactive.pm_.c:877
msgid "Specify options"
msgstr ""
-#: ../install_steps_interactive.pm_.c:879
+#: ../install_steps_interactive.pm_.c:881
#, c-format
msgid "You may now provide its options to module %s."
msgstr ""
-#: ../install_steps_interactive.pm_.c:885
+#: ../install_steps_interactive.pm_.c:887
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2390,54 +2390,54 @@ msgid ""
"For instance, ``io=0x300 irq=7''"
msgstr ""
-#: ../install_steps_interactive.pm_.c:888
+#: ../install_steps_interactive.pm_.c:890
msgid "Module options:"
msgstr ""
-#: ../install_steps_interactive.pm_.c:898
+#: ../install_steps_interactive.pm_.c:900
#, c-format
msgid ""
"Loading module %s failed.\n"
"Do you want to try again with other parameters?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:911
+#: ../install_steps_interactive.pm_.c:913
msgid "Try to find PCMCIA cards?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:912
+#: ../install_steps_interactive.pm_.c:914
msgid "Configuring PCMCIA cards..."
msgstr ""
-#: ../install_steps_interactive.pm_.c:912
+#: ../install_steps_interactive.pm_.c:914
msgid "PCMCIA"
msgstr ""
-#: ../install_steps_interactive.pm_.c:923
+#: ../install_steps_interactive.pm_.c:925
#, c-format
msgid "Found %s %s interfaces"
msgstr ""
-#: ../install_steps_interactive.pm_.c:924
+#: ../install_steps_interactive.pm_.c:926
msgid "Do you have another one?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:927
#, c-format
msgid "Do you have any %s interface?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:929 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:422 ../printerdrake.pm_.c:176
msgid "No"
msgstr ""
-#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:929 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:422
msgid "Yes"
msgstr ""
-#: ../install_steps_interactive.pm_.c:928
+#: ../install_steps_interactive.pm_.c:930
msgid "See hardware info"
msgstr ""
@@ -3056,7 +3056,7 @@ msgstr ""
msgid "Windows(TM)"
msgstr ""
-#: ../standalone/draksec_.c:30
+#: ../standalone/draksec_.c:32
msgid "Setting security level"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index ae3f5a59a..42a8a1068 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-21 02:28+0100\n"
+"POT-Creation-Date: 1999-12-21 20:37+0100\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -376,7 +376,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:367
+#: ../diskdrake.pm_.c:16 ../diskdrake.pm_.c:370
msgid "Create"
msgstr "Opprett"
@@ -384,7 +384,7 @@ msgstr "Opprett"
msgid "Unmount"
msgstr "Demonter"
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:369
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:372
msgid "Delete"
msgstr "Slett"
@@ -392,15 +392,15 @@ msgstr "Slett"
msgid "Format"
msgstr "Formater"
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:524
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:527
msgid "Resize"
msgstr "Endre størrelse"
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:411
+#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:370 ../diskdrake.pm_.c:414
msgid "Type"
msgstr "Type"
-#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:427
+#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:430
msgid "Mount point"
msgstr "Monteringspunkt"
@@ -433,7 +433,7 @@ msgid "Save on floppy"
msgstr "Lagre på diskett"
#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:527
-#: ../install_steps_interactive.pm_.c:649 ../standalone/adduserdrake_.c:26
+#: ../install_steps_interactive.pm_.c:651 ../standalone/adduserdrake_.c:26
msgid "Done"
msgstr "Ferdig"
@@ -465,10 +465,6 @@ msgstr ""
"For å ha flere partisjoner vennligst slett en for å kunne opprette en "
"utvidet partisjon"
-#: ../diskdrake.pm_.c:51
-msgid "Rescue partition table"
-msgstr "Redde partisjonstabell"
-
#: ../diskdrake.pm_.c:52
msgid "Undo"
msgstr "Angre"
@@ -510,8 +506,10 @@ msgid "Details"
msgstr "Detaljer"
#: ../diskdrake.pm_.c:127
+#, fuzzy
msgid ""
-"You have one big fat partition.\n"
+"You have one big fat partition\n"
+"(generally use by MicroSoft Dos/Windows).\n"
"I suggest you first resize that partition\n"
"(click on it, then click on \"Resize\")"
msgstr ""
@@ -519,85 +517,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:131
+#: ../diskdrake.pm_.c:132
msgid "Please make a backup of your data first"
msgstr "Vennligst ta sikkerhetskopi av din data først"
-#: ../diskdrake.pm_.c:131 ../diskdrake.pm_.c:145 ../diskdrake.pm_.c:455
-#: ../diskdrake.pm_.c:484
+#: ../diskdrake.pm_.c:132 ../diskdrake.pm_.c:146 ../diskdrake.pm_.c:458
+#: ../diskdrake.pm_.c:487
msgid "Read carefully!"
msgstr "Les nøye!"
-#: ../diskdrake.pm_.c:145
+#: ../diskdrake.pm_.c:146
#, c-format
msgid "After %s partition %s,"
msgstr "Etter %s partisjon %s,"
-#: ../diskdrake.pm_.c:145
+#: ../diskdrake.pm_.c:146
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:164 ../install_any.pm_.c:184 ../install_steps.pm_.c:67
+#: ../diskdrake.pm_.c:165 ../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:188 ../diskdrake.pm_.c:607
+#: ../diskdrake.pm_.c:189 ../diskdrake.pm_.c:610
msgid "Mount point: "
msgstr "Monteringspunkt: "
-#: ../diskdrake.pm_.c:189 ../diskdrake.pm_.c:227
+#: ../diskdrake.pm_.c:190 ../diskdrake.pm_.c:228
msgid "Device: "
msgstr "Enhet: "
-#: ../diskdrake.pm_.c:190
+#: ../diskdrake.pm_.c:191
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS diskbokstav: %s (bare en gjetning)\n"
-#: ../diskdrake.pm_.c:191 ../diskdrake.pm_.c:230
+#: ../diskdrake.pm_.c:192 ../diskdrake.pm_.c:231
msgid "Type: "
msgstr "Type: "
-#: ../diskdrake.pm_.c:192
+#: ../diskdrake.pm_.c:193
#, c-format
msgid "Start: sector %s\n"
msgstr "Start: sektor %s\n"
-#: ../diskdrake.pm_.c:193
+#: ../diskdrake.pm_.c:194
#, c-format
msgid "Size: %s MB"
msgstr "Størrelse: %s MB"
-#: ../diskdrake.pm_.c:195
+#: ../diskdrake.pm_.c:196
#, c-format
msgid ", %s sectors"
msgstr ", %s sektorer"
-#: ../diskdrake.pm_.c:197
+#: ../diskdrake.pm_.c:198
#, c-format
msgid "Cylinder %d to cylinder %d\n"
msgstr "Sylinder %d til sylinder %d\n"
-#: ../diskdrake.pm_.c:198
+#: ../diskdrake.pm_.c:199
msgid "Formatted\n"
msgstr "Formatert\n"
-#: ../diskdrake.pm_.c:199
+#: ../diskdrake.pm_.c:200
msgid "Not formatted\n"
msgstr "Ikke formatert\n"
-#: ../diskdrake.pm_.c:200
+#: ../diskdrake.pm_.c:201
msgid "Mounted\n"
msgstr "Montert\n"
-#: ../diskdrake.pm_.c:201
+#: ../diskdrake.pm_.c:202
#, c-format
msgid "RAID md%s\n"
msgstr "RAID md%s\n"
-#: ../diskdrake.pm_.c:202
+#: ../diskdrake.pm_.c:203
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
@@ -605,65 +603,65 @@ msgstr ""
"Partisjon startet opp som standard\n"
" (for MS-DOS oppstart, ikke for lilo)\n"
-#: ../diskdrake.pm_.c:204
+#: ../diskdrake.pm_.c:205
#, c-format
msgid "Level %s\n"
msgstr "Nivå %s\n"
-#: ../diskdrake.pm_.c:205
+#: ../diskdrake.pm_.c:206
#, c-format
msgid "Chunk size %s\n"
msgstr "Skivestørrelse %s\n"
-#: ../diskdrake.pm_.c:206
+#: ../diskdrake.pm_.c:207
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID-disker %s\n"
-#: ../diskdrake.pm_.c:223
+#: ../diskdrake.pm_.c:224
msgid "Please click on a partition"
msgstr "Vennligst klikk på en partisjon"
-#: ../diskdrake.pm_.c:228
+#: ../diskdrake.pm_.c:229
#, c-format
msgid "Size: %d MB\n"
msgstr "Størrelse: %d MB\n"
-#: ../diskdrake.pm_.c:229
+#: ../diskdrake.pm_.c:230
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n"
-#: ../diskdrake.pm_.c:231
+#: ../diskdrake.pm_.c:232
#, c-format
msgid "on bus %d id %d\n"
msgstr "på buss %d id %d\n"
-#: ../diskdrake.pm_.c:244
+#: ../diskdrake.pm_.c:245
msgid "Mount"
msgstr "Monter"
-#: ../diskdrake.pm_.c:245
+#: ../diskdrake.pm_.c:246
msgid "Active"
msgstr "Aktiv"
-#: ../diskdrake.pm_.c:246
+#: ../diskdrake.pm_.c:247
msgid "Add to RAID"
msgstr "Legg til RAID"
-#: ../diskdrake.pm_.c:247
+#: ../diskdrake.pm_.c:248
msgid "Remove from RAID"
msgstr "Fjern fra RAID"
-#: ../diskdrake.pm_.c:248
+#: ../diskdrake.pm_.c:249
msgid "Modify RAID"
msgstr "Modifiser RAID"
-#: ../diskdrake.pm_.c:255
+#: ../diskdrake.pm_.c:256
msgid "Choose action"
msgstr "Velg handling"
-#: ../diskdrake.pm_.c:346
+#: ../diskdrake.pm_.c:349
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -675,7 +673,7 @@ msgstr ""
"Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du "
"trenger ikke /boot"
-#: ../diskdrake.pm_.c:350
+#: ../diskdrake.pm_.c:353
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -688,145 +686,145 @@ msgstr ""
"Hvis du skal bruke oppstartshåndtereren LILO, vær nøye med å legge til en\n"
"/boot partisjon"
-#: ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:369
+#: ../diskdrake.pm_.c:370 ../diskdrake.pm_.c:372
#, c-format
msgid "Use ``%s'' instead"
msgstr "Bruk ``%s'' istedet"
-#: ../diskdrake.pm_.c:372
+#: ../diskdrake.pm_.c:375
msgid "Use ``Unmount'' first"
msgstr "Bruk ``Demonter'' først"
-#: ../diskdrake.pm_.c:373 ../diskdrake.pm_.c:406
+#: ../diskdrake.pm_.c:376 ../diskdrake.pm_.c:409
msgid "changing type of"
msgstr "endrer type av"
-#: ../diskdrake.pm_.c:385
+#: ../diskdrake.pm_.c:388
msgid "Continue anyway?"
msgstr "Fortsette likevel?"
-#: ../diskdrake.pm_.c:390
+#: ../diskdrake.pm_.c:393
msgid "Quit without saving"
msgstr "Avslutt uten å lagre"
-#: ../diskdrake.pm_.c:390
+#: ../diskdrake.pm_.c:393
msgid "Quit without writing the partition table?"
msgstr "Avslutt uten å skrive partisjonstabellen?"
-#: ../diskdrake.pm_.c:409
+#: ../diskdrake.pm_.c:412
msgid "Change partition type"
msgstr "Endre partisjonstype"
-#: ../diskdrake.pm_.c:410
+#: ../diskdrake.pm_.c:413
msgid "Which partition type do you want?"
msgstr "Hvilken partisjonstype ønsker du?"
-#: ../diskdrake.pm_.c:426
+#: ../diskdrake.pm_.c:429
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "Hvor vil du montere %s enheten?"
-#: ../diskdrake.pm_.c:448
+#: ../diskdrake.pm_.c:451
msgid "formatting"
msgstr "formatering"
-#: ../diskdrake.pm_.c:450
+#: ../diskdrake.pm_.c:453
msgid "Formatting"
msgstr "Formatering"
-#: ../diskdrake.pm_.c:450 ../install_steps_interactive.pm_.c:213
+#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:213
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
-#: ../diskdrake.pm_.c:455
+#: ../diskdrake.pm_.c:458
msgid "After formatting all partitions,"
msgstr "Etter formatering av alle partisjonene,"
-#: ../diskdrake.pm_.c:455
+#: ../diskdrake.pm_.c:458
msgid "all data on these partitions will be lost"
msgstr "alle data på disse partisjonene vil gå tapt"
-#: ../diskdrake.pm_.c:465
+#: ../diskdrake.pm_.c:468
msgid "Move"
msgstr "Flytt"
-#: ../diskdrake.pm_.c:466
+#: ../diskdrake.pm_.c:469
msgid "Which disk do you want to move to?"
msgstr "Hvilken disk vil du flytte til?"
-#: ../diskdrake.pm_.c:470
+#: ../diskdrake.pm_.c:473
msgid "Sector"
msgstr "Sektor"
-#: ../diskdrake.pm_.c:471
+#: ../diskdrake.pm_.c:474
msgid "Which sector do you want to move to?"
msgstr "Hvilken sektor vil du flytte til?"
-#: ../diskdrake.pm_.c:474
+#: ../diskdrake.pm_.c:477
msgid "Moving"
msgstr "Flytter"
-#: ../diskdrake.pm_.c:474
+#: ../diskdrake.pm_.c:477
msgid "Moving partition..."
msgstr "Flytter partisjon..."
-#: ../diskdrake.pm_.c:484
+#: ../diskdrake.pm_.c:487
#, 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:486
+#: ../diskdrake.pm_.c:489
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:507 ../install_steps_gtk.pm_.c:254
+#: ../diskdrake.pm_.c:510 ../install_steps_gtk.pm_.c:254
msgid "Computing fat filesystem bounds"
msgstr "Beregner fat filsystemgrense"
-#: ../diskdrake.pm_.c:507 ../diskdrake.pm_.c:552
+#: ../diskdrake.pm_.c:510 ../diskdrake.pm_.c:555
#: ../install_steps_gtk.pm_.c:254
msgid "Resizing"
msgstr "Endrer størrelse"
-#: ../diskdrake.pm_.c:521
+#: ../diskdrake.pm_.c:524
msgid "resizing"
msgstr "endrer størrelse"
-#: ../diskdrake.pm_.c:531
+#: ../diskdrake.pm_.c:534
msgid "Choose the new size"
msgstr "Velg den nye størrelsen"
-#: ../diskdrake.pm_.c:531 ../install_steps_gtk.pm_.c:328
+#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:328
#: ../install_steps_gtk.pm_.c:377 ../unused/install_steps_graphical.pm_.c:314
msgid "MB"
msgstr "MB"
-#: ../diskdrake.pm_.c:584
+#: ../diskdrake.pm_.c:587
msgid "Create a new partition"
msgstr "Opprette en ny partisjon"
-#: ../diskdrake.pm_.c:600
+#: ../diskdrake.pm_.c:603
msgid "Start sector: "
msgstr "Start sektor: "
-#: ../diskdrake.pm_.c:603
+#: ../diskdrake.pm_.c:606
msgid "Size in MB: "
msgstr "Størrelse i MB: "
-#: ../diskdrake.pm_.c:606
+#: ../diskdrake.pm_.c:609
msgid "Filesystem type: "
msgstr "Filsystemtype: "
-#: ../diskdrake.pm_.c:608
+#: ../diskdrake.pm_.c:611
msgid "Preference: "
msgstr "Valg: "
-#: ../diskdrake.pm_.c:652 ../diskdrake.pm_.c:668
+#: ../diskdrake.pm_.c:655 ../diskdrake.pm_.c:671
msgid "Select file"
msgstr "Velg fil"
-#: ../diskdrake.pm_.c:661
+#: ../diskdrake.pm_.c:664
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
@@ -834,11 +832,11 @@ msgstr ""
"Sikkerhetskopien av partisjonstabellen har ikke samme størrelse\n"
"Fortsette for det?"
-#: ../diskdrake.pm_.c:669
+#: ../diskdrake.pm_.c:672
msgid "Warning"
msgstr "Advarsel"
-#: ../diskdrake.pm_.c:670
+#: ../diskdrake.pm_.c:673
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
@@ -846,27 +844,27 @@ msgstr ""
"Sett inn en diskett i stasjonen\n"
"Alle data på denne disketten vil gå tapt"
-#: ../diskdrake.pm_.c:684
+#: ../diskdrake.pm_.c:687
msgid "Trying to rescue partition table"
msgstr "Prøver å redde partisjonstabell"
-#: ../diskdrake.pm_.c:695
+#: ../diskdrake.pm_.c:698
msgid "device"
msgstr "enhet"
-#: ../diskdrake.pm_.c:696
+#: ../diskdrake.pm_.c:699
msgid "level"
msgstr "nivå"
-#: ../diskdrake.pm_.c:697
+#: ../diskdrake.pm_.c:700
msgid "chunk size"
msgstr "skivestørrelse"
-#: ../diskdrake.pm_.c:709
+#: ../diskdrake.pm_.c:712
msgid "Choose an existing RAID to add to"
msgstr "Velg en eksisterende RAID for å legge til"
-#: ../diskdrake.pm_.c:710
+#: ../diskdrake.pm_.c:713
msgid "new"
msgstr "ny"
@@ -1105,6 +1103,7 @@ msgstr ""
"ønsker å beholde. Typiske å beholde er: /home og /usr/local."
#: ../help.pm_.c:98
+#, fuzzy
msgid ""
"You may now select the packages you wish to install.\n"
"\n"
@@ -1122,9 +1121,9 @@ msgid ""
"of its dependencies.\n"
"\n"
"\n"
-"Information on each category and specific package is available in the\n"
-"area titled \"Info\", located between list of packages and the\n"
-"button \"Install\" to start the installation."
+"Informations on specific package are available in the\n"
+"area titled \"Info\", located on the right of the list of\n"
+"packages."
msgstr ""
"Du kan nå velge de pakkene du ønsker å installere.\n"
"\n"
@@ -1191,6 +1190,7 @@ msgid ""
msgstr ""
#: ../help.pm_.c:143
+#, fuzzy
msgid ""
"This section is dedicated to configuring a local area\n"
"network (LAN) or a modem.\n"
@@ -1204,8 +1204,8 @@ msgid ""
"\n"
"As for SCSI adapters, you can let the driver probe for the adapter\n"
"in the first time, otherwise you will have to specify the options\n"
-"to the driver that you will have fetched from Windows' control\n"
-"panel.\n"
+"to the driver that you will have fetched from documentation of your\n"
+"hardware.\n"
"\n"
"\n"
"If you install a Linux-Mandrake system on a machine which is part\n"
@@ -1725,28 +1725,28 @@ msgstr ""
msgid "Searching root partition."
msgstr "Søker root-partisjon."
-#: ../install_any.pm_.c:242
+#: ../install_any.pm_.c:240
msgid "Information"
msgstr "Informasjon"
-#: ../install_any.pm_.c:243
+#: ../install_any.pm_.c:241
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr "%s: Dette er ikke en root-partisjon, vennligst velg en annen."
-#: ../install_any.pm_.c:245
+#: ../install_any.pm_.c:243
msgid "No root partition found"
msgstr "Ingen root-partisjon funnet"
-#: ../install_any.pm_.c:281
+#: ../install_any.pm_.c:280
msgid "Can't use broadcast with no NIS domain"
msgstr "Kan ikke bruke broadcast uten NIS domene"
-#: ../install_any.pm_.c:456
+#: ../install_any.pm_.c:455
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
-#: ../install_any.pm_.c:462
+#: ../install_any.pm_.c:461
#, c-format
msgid "Bad kickstart file %s (failed %s)"
msgstr "Dårlig kickstart-fil %s (mislykket %s)"
@@ -2247,7 +2247,7 @@ msgid "No password"
msgstr "Intet passord"
#: ../install_steps_interactive.pm_.c:485
-#: ../install_steps_interactive.pm_.c:699 ../interactive.pm_.c:74
+#: ../install_steps_interactive.pm_.c:701 ../interactive.pm_.c:74
#: ../interactive.pm_.c:84 ../interactive.pm_.c:163
#: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:94
#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:423
@@ -2256,7 +2256,8 @@ msgid "Ok"
msgstr "Ok"
#: ../install_steps_interactive.pm_.c:488
-#: ../install_steps_interactive.pm_.c:534 ../standalone/adduserdrake_.c:33
+#: ../install_steps_interactive.pm_.c:534
+#: ../install_steps_interactive.pm_.c:628 ../standalone/adduserdrake_.c:33
msgid "Password (again)"
msgstr "Passord (igjen)"
@@ -2285,12 +2286,14 @@ msgid "yellow pages"
msgstr "gule sider"
#: ../install_steps_interactive.pm_.c:497
-#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:545
+#: ../install_steps_interactive.pm_.c:639 ../standalone/adduserdrake_.c:44
msgid "Please try again"
msgstr "Vennligst prøv igjen"
#: ../install_steps_interactive.pm_.c:497
-#: ../install_steps_interactive.pm_.c:545 ../standalone/adduserdrake_.c:44
+#: ../install_steps_interactive.pm_.c:545
+#: ../install_steps_interactive.pm_.c:639 ../standalone/adduserdrake_.c:44
msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
@@ -2455,25 +2458,25 @@ msgstr "Forsinkelse før oppstart av standard bilde"
msgid "Video mode"
msgstr "Skjerm-modus"
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:629
msgid "Restrict command line options"
msgstr "Begrense kommandolinje-opsjoner"
-#: ../install_steps_interactive.pm_.c:628
+#: ../install_steps_interactive.pm_.c:629
msgid "restrict"
msgstr "begrense"
-#: ../install_steps_interactive.pm_.c:634
+#: ../install_steps_interactive.pm_.c:635
msgid "LILO main options"
msgstr "LILO hovedopsjoner"
-#: ../install_steps_interactive.pm_.c:637
+#: ../install_steps_interactive.pm_.c:638
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr ""
"Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
-#: ../install_steps_interactive.pm_.c:647
+#: ../install_steps_interactive.pm_.c:649
#, fuzzy
msgid ""
"Here are the following entries in LILO.\n"
@@ -2482,164 +2485,164 @@ msgstr ""
"Her er følgende oppføringer i LILO\n"
"Du kan legge til noen flere eller endre de eksisterende."
-#: ../install_steps_interactive.pm_.c:649
+#: ../install_steps_interactive.pm_.c:651
msgid "Add"
msgstr "Legg til"
-#: ../install_steps_interactive.pm_.c:658
+#: ../install_steps_interactive.pm_.c:660
msgid "Linux"
msgstr "Linux"
-#: ../install_steps_interactive.pm_.c:658
+#: ../install_steps_interactive.pm_.c:660
msgid "Other OS (windows...)"
msgstr "Andre OS (windows...)"
-#: ../install_steps_interactive.pm_.c:658
+#: ../install_steps_interactive.pm_.c:660
msgid "Which type of entry do you want to add"
msgstr "Hvilken inngangstype vil du legge til"
-#: ../install_steps_interactive.pm_.c:678
+#: ../install_steps_interactive.pm_.c:680
msgid "Image"
msgstr "Bilde"
-#: ../install_steps_interactive.pm_.c:679
-#: ../install_steps_interactive.pm_.c:687
+#: ../install_steps_interactive.pm_.c:681
+#: ../install_steps_interactive.pm_.c:689
msgid "Root"
msgstr "Root"
-#: ../install_steps_interactive.pm_.c:680
+#: ../install_steps_interactive.pm_.c:682
msgid "Append"
msgstr "Tilføye"
-#: ../install_steps_interactive.pm_.c:681
+#: ../install_steps_interactive.pm_.c:683
msgid "Initrd"
msgstr "Initrd"
-#: ../install_steps_interactive.pm_.c:682
+#: ../install_steps_interactive.pm_.c:684
msgid "Read-write"
msgstr "Les-skriv"
-#: ../install_steps_interactive.pm_.c:688
+#: ../install_steps_interactive.pm_.c:690
msgid "Table"
msgstr "Tabell"
-#: ../install_steps_interactive.pm_.c:689
+#: ../install_steps_interactive.pm_.c:691
msgid "Unsafe"
msgstr "Usikker"
-#: ../install_steps_interactive.pm_.c:694
+#: ../install_steps_interactive.pm_.c:696
msgid "Label"
msgstr "Etikett"
-#: ../install_steps_interactive.pm_.c:696
+#: ../install_steps_interactive.pm_.c:698
msgid "Default"
msgstr "Standard"
-#: ../install_steps_interactive.pm_.c:699
+#: ../install_steps_interactive.pm_.c:701
msgid "Remove entry"
msgstr "Fjern inngang"
-#: ../install_steps_interactive.pm_.c:702
+#: ../install_steps_interactive.pm_.c:704
msgid "Empty label not allowed"
msgstr "Tom etikett er ikke tillatt"
-#: ../install_steps_interactive.pm_.c:703
+#: ../install_steps_interactive.pm_.c:705
msgid "This label is already in use"
msgstr "Denne etiketten er allerede i bruk"
-#: ../install_steps_interactive.pm_.c:704
+#: ../install_steps_interactive.pm_.c:706
#, c-format
msgid "A entry %s already exists"
msgstr "En inngang %s eksisterer ellerede"
-#: ../install_steps_interactive.pm_.c:718
+#: ../install_steps_interactive.pm_.c:720
msgid "Installation of LILO failed. The following error occured:"
msgstr "Installasjon av LILO mislykket. Følgende feil oppsto:"
-#: ../install_steps_interactive.pm_.c:732
+#: ../install_steps_interactive.pm_.c:734
msgid "Proxies configuration"
msgstr "Proxy-konfigurasjon"
-#: ../install_steps_interactive.pm_.c:733
+#: ../install_steps_interactive.pm_.c:735
msgid "HTTP proxy"
msgstr "HTTP-proxy"
-#: ../install_steps_interactive.pm_.c:734
+#: ../install_steps_interactive.pm_.c:736
msgid "FTP proxy"
msgstr "FTP-proxy"
-#: ../install_steps_interactive.pm_.c:740
+#: ../install_steps_interactive.pm_.c:742
msgid "Proxy should be http://..."
msgstr "Proxy burde være http://..."
-#: ../install_steps_interactive.pm_.c:741
+#: ../install_steps_interactive.pm_.c:743
msgid "Proxy should be ftp://..."
msgstr "Proxy burde være ftp://..."
-#: ../install_steps_interactive.pm_.c:752 ../standalone/draksec_.c:21
+#: ../install_steps_interactive.pm_.c:754 ../standalone/draksec_.c:21
msgid "Poor"
msgstr "Dårlig"
-#: ../install_steps_interactive.pm_.c:753 ../standalone/draksec_.c:22
+#: ../install_steps_interactive.pm_.c:755 ../standalone/draksec_.c:22
msgid "Low"
msgstr "Lav"
-#: ../install_steps_interactive.pm_.c:754 ../standalone/draksec_.c:23
+#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:23
msgid "Medium"
msgstr "Medium"
-#: ../install_steps_interactive.pm_.c:755 ../standalone/draksec_.c:24
+#: ../install_steps_interactive.pm_.c:757 ../standalone/draksec_.c:24
msgid "High"
msgstr "Høy"
-#: ../install_steps_interactive.pm_.c:756 ../standalone/draksec_.c:25
+#: ../install_steps_interactive.pm_.c:758 ../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Paranoid"
-#: ../install_steps_interactive.pm_.c:769
+#: ../install_steps_interactive.pm_.c:771
msgid "Miscellaneous questions"
msgstr "Forskjellige spørsmål"
-#: ../install_steps_interactive.pm_.c:770
+#: ../install_steps_interactive.pm_.c:772
msgid "(may cause data corruption)"
msgstr "(kan forårsake korrupsjon av data)"
-#: ../install_steps_interactive.pm_.c:770
+#: ../install_steps_interactive.pm_.c:772
msgid "Use hard drive optimisations?"
msgstr "Bruk harddisk-optimisering?"
-#: ../install_steps_interactive.pm_.c:771 ../standalone/draksec_.c:29
+#: ../install_steps_interactive.pm_.c:773 ../standalone/draksec_.c:30
msgid "Choose security level"
msgstr "Velg sikkerhetsnivå"
-#: ../install_steps_interactive.pm_.c:772
+#: ../install_steps_interactive.pm_.c:774
#, 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:773
+#: ../install_steps_interactive.pm_.c:775
msgid "Removable media automounting"
msgstr "Fjernbart media automonterer"
-#: ../install_steps_interactive.pm_.c:775
+#: ../install_steps_interactive.pm_.c:777
msgid "Enable num lock at startup"
msgstr "Slå på num lock ved oppstart"
-#: ../install_steps_interactive.pm_.c:778
+#: ../install_steps_interactive.pm_.c:780
msgid "Give the ram size in Mb"
msgstr "Oppgi ram-størrelsen i Mb"
-#: ../install_steps_interactive.pm_.c:794
+#: ../install_steps_interactive.pm_.c:796
#: ../unused/install_steps_graphical.pm_.c:535
msgid "Use existing configuration for X11?"
msgstr "Bruke eksisterende konfigurasjon for X11?"
-#: ../install_steps_interactive.pm_.c:806
-#: ../install_steps_interactive.pm_.c:919
+#: ../install_steps_interactive.pm_.c:808
+#: ../install_steps_interactive.pm_.c:921
msgid "Try to find PCI devices?"
msgstr "Prøve å finne PCI-enheter?"
-#: ../install_steps_interactive.pm_.c:821
+#: ../install_steps_interactive.pm_.c:823
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -2649,7 +2652,7 @@ msgstr ""
"\n"
"Ønsker du virkelig å slutte nå?"
-#: ../install_steps_interactive.pm_.c:828
+#: ../install_steps_interactive.pm_.c:830
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2671,26 +2674,26 @@ msgstr ""
"Informasjon om konfigurering av systemet ditt finnes i post\n"
"install-kapittelet i Official Linux Mandrake User's Guide."
-#: ../install_steps_interactive.pm_.c:837
+#: ../install_steps_interactive.pm_.c:839
msgid "Shutting down"
msgstr "Stenger av"
-#: ../install_steps_interactive.pm_.c:851
+#: ../install_steps_interactive.pm_.c:853
#, c-format
msgid "Installing driver for %s card %s"
msgstr "Installerer driver for %s kort %s"
-#: ../install_steps_interactive.pm_.c:852
+#: ../install_steps_interactive.pm_.c:854
#, c-format
msgid "(module %s)"
msgstr "(modul %s)"
-#: ../install_steps_interactive.pm_.c:862
+#: ../install_steps_interactive.pm_.c:864
#, c-format
msgid "Which %s driver should I try?"
msgstr "Hvilken %s driver skal jeg prøve?"
-#: ../install_steps_interactive.pm_.c:870
+#: ../install_steps_interactive.pm_.c:872
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2710,20 +2713,20 @@ msgstr ""
"forårsake\n"
"noen skade."
-#: ../install_steps_interactive.pm_.c:875
+#: ../install_steps_interactive.pm_.c:877
msgid "Autoprobe"
msgstr "Automatisk sondering"
-#: ../install_steps_interactive.pm_.c:875
+#: ../install_steps_interactive.pm_.c:877
msgid "Specify options"
msgstr "Spesifiser opsjoner"
-#: ../install_steps_interactive.pm_.c:879
+#: ../install_steps_interactive.pm_.c:881
#, c-format
msgid "You may now provide its options to module %s."
msgstr "Du kan nå gi dens opsjoner til modul %s."
-#: ../install_steps_interactive.pm_.c:885
+#: ../install_steps_interactive.pm_.c:887
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2734,11 +2737,11 @@ msgstr ""
"Opsjonene er i format ``name=value name2=value2 ...''.\n"
"F.eks., ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:888
+#: ../install_steps_interactive.pm_.c:890
msgid "Module options:"
msgstr "Modulopsjoner:"
-#: ../install_steps_interactive.pm_.c:898
+#: ../install_steps_interactive.pm_.c:900
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2747,43 +2750,43 @@ msgstr ""
"Lasting av modul %s feilet.\n"
"Ønsker du å prøve igjen med andre parametere?"
-#: ../install_steps_interactive.pm_.c:911
+#: ../install_steps_interactive.pm_.c:913
msgid "Try to find PCMCIA cards?"
msgstr "Prøve å finne PCMCIA-kort?"
-#: ../install_steps_interactive.pm_.c:912
+#: ../install_steps_interactive.pm_.c:914
msgid "Configuring PCMCIA cards..."
msgstr "Konfigurerer PCMCIA-kort..."
-#: ../install_steps_interactive.pm_.c:912
+#: ../install_steps_interactive.pm_.c:914
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:923
+#: ../install_steps_interactive.pm_.c:925
#, c-format
msgid "Found %s %s interfaces"
msgstr "Fant %s %s grensesnitt"
-#: ../install_steps_interactive.pm_.c:924
+#: ../install_steps_interactive.pm_.c:926
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../install_steps_interactive.pm_.c:925
+#: ../install_steps_interactive.pm_.c:927
#, c-format
msgid "Do you have any %s interface?"
msgstr "Har du noen %s grensesnitt?"
-#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:929 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:422 ../printerdrake.pm_.c:176
msgid "No"
msgstr "Nei"
-#: ../install_steps_interactive.pm_.c:927 ../interactive.pm_.c:79
+#: ../install_steps_interactive.pm_.c:929 ../interactive.pm_.c:79
#: ../my_gtk.pm_.c:422
msgid "Yes"
msgstr "Ja"
-#: ../install_steps_interactive.pm_.c:928
+#: ../install_steps_interactive.pm_.c:930
msgid "See hardware info"
msgstr "Se maskinvareinfo"
@@ -3437,7 +3440,7 @@ msgstr "Ikke nok partisjoner for RAID nivå %d\n"
msgid "Windows(TM)"
msgstr "Windows(TM)"
-#: ../standalone/draksec_.c:30
+#: ../standalone/draksec_.c:32
msgid "Setting security level"
msgstr "Setter sikkerhetsnivå"
@@ -3466,6 +3469,9 @@ msgstr "Vis alle"
msgid "Show more"
msgstr ""
+#~ msgid "Rescue partition table"
+#~ msgstr "Redde partisjonstabell"
+
#~ msgid "You can now select some miscellaneous options for your system."
#~ msgstr "Du kan nå velge noen forskjellige opsjoner for systemet ditt."
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index 192c3a881..f2619095e 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -24,7 +24,7 @@ $SUDO cp -a $DEST/* $STAGE2TMP
mkdir -p $MNTPOINT 2>/dev/null
for i in $MNTPOINT $STAGE2; do $SUDO umount $i 2>/dev/null ; done
-dd if=/dev/zero of=$STAGE2 bs=1M count=16
+dd if=/dev/zero of=$STAGE2 bs=1k count=15700
$MKE2FS -N 1000 $STAGE2
$SUDO mount -t ext2 $STAGE2 $MNTPOINT -o loop