diff options
| -rw-r--r-- | perl-install/c/.cvsignore | 1 | ||||
| -rw-r--r-- | perl-install/common.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 36 | ||||
| -rw-r--r-- | perl-install/interactive_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/po/DrakX.pot | 839 | ||||
| -rw-r--r-- | perl-install/share/po/no.po | 875 |
6 files changed, 996 insertions, 760 deletions
diff --git a/perl-install/c/.cvsignore b/perl-install/c/.cvsignore index 8453a1ab9..c2c3c1628 100644 --- a/perl-install/c/.cvsignore +++ b/perl-install/c/.cvsignore @@ -1,4 +1,5 @@ Makefile +Makefile_c stuff.c stuff.bs pm_to_blib diff --git a/perl-install/common.pm b/perl-install/common.pm index f983b1bfd..31caedba1 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int @ISA = qw(Exporter); %EXPORT_TAGS = ( - common => [ qw(__ even odd min max sqr sum and_ or_ sign product bool invbool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX formatLines) ], + common => [ qw(__ even odd min max sqr sum and_ or_ sign product bool invbool listlength bool2text text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX formatLines deref) ], functional => [ qw(fold_left compose map_index grep_index map_each grep_each map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ], file => [ qw(dirname basename touch all glob_ cat_ output symlinkf chop_ mode typeFromMagic) ], system => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile availableRam availableMemory removeXiBSuffix template2file) ], @@ -67,6 +67,7 @@ sub text2bool { my $t = lc($_[0]); $t eq "true" || $t eq "yes" ? 1 : 0 } sub strcpy { substr($_[0], $_[2] || 0, length $_[1]) = $_[1] } sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = <F>; wantarray ? @l : join '', @l } sub output { my $f = shift; local *F; open F, ">$f" or die "output in file $f failed: $!\n"; print F foreach @_; } +sub deref { ref $_[0] eq "ARRAY" ? @{$_[0]} : ref $_[0] eq "HASH" ? %{$_[0]} : $_[0] } sub linkf { unlink $_[1]; link $_[0], $_[1] } sub symlinkf { unlink $_[1]; symlink $_[0], $_[1] } sub chop_ { map { my $l = $_; chomp $l; $l } @_ } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 7cd0d2ae2..7f247a41d 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -716,7 +716,7 @@ sub setupBootloader { $::expert and $o->ask_yesorno('', _("Do you want to use LILO?"), 1) || return; my @l = ( -_("Boot device") => { val => \$b->{boot}, list => [ map { "/dev/$_->{device}" } @{$o->{hds}}, @{$o->{fstab}} ], not_edit => !$::expert }, +_("Boot device") => { val => \$b->{boot}, list => [ map { "/dev/$_->{device}" } @{$o->{hds}}, @{$o->{fstab}}, detect_devices::floppies ], not_edit => !$::expert }, _("Linear (needed for some SCSI drives)") => { val => \$b->{linear}, type => "bool", text => _("linear") }, _("Compact") => { val => \$b->{compact}, type => "bool", text => _("compact") }, _("Delay before booting default image") => \$b->{timeout}, @@ -747,10 +747,21 @@ You can add some more or change the existent ones."), ); $c eq "Done" and last; - my $e = { type => 'other' }; - my $name = ''; - - if ($c ne "Add") { + my ($e, $name); + + if ($c eq "Add") { + my @labels = map { $_->{label} } values %{$b->{entries}}; + my $prefix; + if ($o->ask_from_list_('', _("Which type of entry do you want to add"), [ __("Linux"), __("Other OS (windows...)") ]) eq "Linux") { + $e = { type => 'image' }; + $prefix = "linux"; + } else { + $e = { type => 'other' }; + $prefix = "windows"; + } + $e->{label} = $prefix; + for (my $nb = 0; member($e->{label}, @labels); $nb++) { $e->{label} = "$prefix-$nb" } + } else { ($name) = $c =~ /\((.*?)\)/; $e = $b->{entries}{$name}; } @@ -782,17 +793,20 @@ _("Label") => \$e->{label}, _("Default") => { val => \$default, type => 'bool' }, ); - if ($o->ask_from_entries_refH('', '', \@l, - complete => sub { - $name ne $old_name && $b->{entries}{$name} and $o->ask_warn("A entry %s already exists", $name), return 1; - } - )) { + if ($o->ask_from_entries_refH($c eq "Add" ? '' : ['', _("Ok"), _("Remove entry")], + '', \@l, + complete => sub { + $e->{label} or $o->ask_warn('', _("Empty label not allowed")), return 1; + member($e->{label}, map { $_->{label} } grep { $_ != $e } values %{$b->{entries}}) and $o->ask_warn('', _("This label is already in use")), return 1; + $name ne $old_name && $b->{entries}{$name} and $o->ask_warn('', _("A entry %s already exists", $name)), return 1; + } + )) { $b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default}; delete $b->{entries}{$old_name}; $b->{entries}{$name} = $e; } else { - %$e = %old_e; + delete $b->{entries}{$old_name}; } } eval { $o->SUPER::setupBootloader }; diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm index c820b9f73..34e08d62f 100644 --- a/perl-install/interactive_gtk.pm +++ b/perl-install/interactive_gtk.pm @@ -22,7 +22,7 @@ use my_gtk qw(:helpers :wrappers); sub ask_from_listW { my ($o, $title, $messages, $l, $def) = @_; - my $w = my_gtk->new($title, %$o); + my $w = my_gtk->new(first(deref($title)), %$o); $w->{retval} = $def || $l->[0]; #- nearly especially for the X test case (see timeout in Xconfigurator.pm) if (@$l < 5) { #- really ? : && sum(map { length $_ } @$l) < 90) { my $defW; diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 29bab1d0d..2b9fba318 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-11-08 15:49+0100\n" +"POT-Creation-Date: 1999-11-09 14:08+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" @@ -87,8 +87,8 @@ msgstr "" msgid "(leaving in %d seconds)" msgstr "" -#: ../Xconfigurator.pm_.c:328 ../install_steps_interactive.pm_.c:570 -#: ../my_gtk.pm_.c:436 +#: ../Xconfigurator.pm_.c:328 ../install_steps_interactive.pm_.c:571 +#: ../my_gtk.pm_.c:437 msgid "Is this correct?" msgstr "" @@ -107,7 +107,7 @@ msgid "" "You can switch if off if you want, you'll hear a beep when it's over" msgstr "" -#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:535 +#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:536 msgid "Resolution" msgstr "" @@ -315,241 +315,274 @@ msgstr "" msgid "Monitor that can do 1600x1200 at 76 Hz" msgstr "" -#: ../diskdrake.pm_.c:15 +#: ../diskdrake.pm_.c:16 msgid "Create" msgstr "" -#: ../diskdrake.pm_.c:16 +#: ../diskdrake.pm_.c:17 msgid "Unmount" msgstr "" -#: ../diskdrake.pm_.c:17 +#: ../diskdrake.pm_.c:18 msgid "Delete" msgstr "" -#: ../diskdrake.pm_.c:17 +#: ../diskdrake.pm_.c:18 msgid "Format" msgstr "" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:398 +#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:418 msgid "Move" msgstr "" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:456 +#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:476 msgid "Resize" msgstr "" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:345 +#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:365 msgid "Type" msgstr "" -#: ../diskdrake.pm_.c:18 -msgid "Mount_point" +#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:381 +msgid "Mount point" msgstr "" -#: ../diskdrake.pm_.c:32 +#: ../diskdrake.pm_.c:33 msgid "Write /etc/fstab" msgstr "" -#: ../diskdrake.pm_.c:33 +#: ../diskdrake.pm_.c:34 msgid "Normal > Expert" msgstr "" -#: ../diskdrake.pm_.c:34 +#: ../diskdrake.pm_.c:35 msgid "Expert > Normal" msgstr "" -#: ../diskdrake.pm_.c:35 +#: ../diskdrake.pm_.c:36 msgid "Restore from file" msgstr "" -#: ../diskdrake.pm_.c:36 +#: ../diskdrake.pm_.c:37 msgid "Save in file" msgstr "" -#: ../diskdrake.pm_.c:37 +#: ../diskdrake.pm_.c:38 msgid "Restore from floppy" msgstr "" -#: ../diskdrake.pm_.c:38 +#: ../diskdrake.pm_.c:39 msgid "Save on floppy" msgstr "" -#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:627 -#: ../install_steps_interactive.pm_.c:745 +#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:628 +#: ../install_steps_interactive.pm_.c:746 msgid "Done" msgstr "" -#: ../diskdrake.pm_.c:42 +#: ../diskdrake.pm_.c:43 msgid "Clear all" msgstr "" -#: ../diskdrake.pm_.c:43 +#: ../diskdrake.pm_.c:44 msgid "Format all" msgstr "" -#: ../diskdrake.pm_.c:44 +#: ../diskdrake.pm_.c:45 msgid "Auto allocate" msgstr "" -#: ../diskdrake.pm_.c:47 +#: ../diskdrake.pm_.c:48 msgid "All primary partitions are used" msgstr "" -#: ../diskdrake.pm_.c:47 +#: ../diskdrake.pm_.c:48 msgid "I can't add any more partition" msgstr "" -#: ../diskdrake.pm_.c:47 +#: ../diskdrake.pm_.c:48 msgid "" "To have more partitions, please delete one to be able to create an extended " "partition" msgstr "" -#: ../diskdrake.pm_.c:50 +#: ../diskdrake.pm_.c:51 msgid "Rescue partition table" msgstr "" -#: ../diskdrake.pm_.c:51 +#: ../diskdrake.pm_.c:52 msgid "Undo" msgstr "" -#: ../diskdrake.pm_.c:52 +#: ../diskdrake.pm_.c:53 msgid "Write partition table" msgstr "" -#: ../diskdrake.pm_.c:53 +#: ../diskdrake.pm_.c:54 msgid "Reload" msgstr "" -#: ../diskdrake.pm_.c:93 +#: ../diskdrake.pm_.c:98 msgid "Filesystem types:" msgstr "" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Empty" msgstr "" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Ext2" msgstr "" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "FAT" msgstr "" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Other" msgstr "" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Swap" msgstr "" -#: ../diskdrake.pm_.c:100 +#: ../diskdrake.pm_.c:105 msgid "Choose action" msgstr "" -#: ../diskdrake.pm_.c:102 +#: ../diskdrake.pm_.c:107 msgid "Details" msgstr "" -#: ../diskdrake.pm_.c:127 +#: ../diskdrake.pm_.c:132 #, c-format msgid "After %s partition %s," msgstr "" -#: ../diskdrake.pm_.c:127 ../diskdrake.pm_.c:388 ../diskdrake.pm_.c:416 +#: ../diskdrake.pm_.c:132 ../diskdrake.pm_.c:408 ../diskdrake.pm_.c:436 msgid "Read carefully!" msgstr "" -#: ../diskdrake.pm_.c:127 +#: ../diskdrake.pm_.c:132 msgid "all data on this partition will be lost" msgstr "" -#: ../diskdrake.pm_.c:146 ../install_any.pm_.c:175 ../install_steps.pm_.c:70 -#: ../install_steps_interactive.pm_.c:40 +#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:177 ../install_steps.pm_.c:71 +#: ../install_steps_interactive.pm_.c:41 msgid "Error" msgstr "" -#: ../diskdrake.pm_.c:170 ../diskdrake.pm_.c:533 +#: ../diskdrake.pm_.c:175 ../diskdrake.pm_.c:553 msgid "Mount point: " msgstr "" -#: ../diskdrake.pm_.c:171 ../diskdrake.pm_.c:195 +#: ../diskdrake.pm_.c:176 ../diskdrake.pm_.c:208 msgid "Device: " msgstr "" -#: ../diskdrake.pm_.c:172 +#: ../diskdrake.pm_.c:177 #, c-format msgid "DOS drive letter: %s (just a guess)\n" msgstr "" -#: ../diskdrake.pm_.c:173 ../diskdrake.pm_.c:198 +#: ../diskdrake.pm_.c:178 ../diskdrake.pm_.c:211 msgid "Type: " msgstr "" -#: ../diskdrake.pm_.c:174 +#: ../diskdrake.pm_.c:179 #, c-format msgid "Start: sector %s\n" msgstr "" -#: ../diskdrake.pm_.c:175 -msgid "Size: %s MB (%s%%)" +#: ../diskdrake.pm_.c:180 +#, c-format +msgid "Size: %s MB" msgstr "" -#: ../diskdrake.pm_.c:176 +#: ../diskdrake.pm_.c:182 #, c-format msgid ", %s sectors" msgstr "" -#: ../diskdrake.pm_.c:178 +#: ../diskdrake.pm_.c:184 #, c-format msgid "Cylinder %d to cylinder %d\n" msgstr "" -#: ../diskdrake.pm_.c:179 +#: ../diskdrake.pm_.c:185 msgid "Formatted\n" msgstr "" -#: ../diskdrake.pm_.c:180 +#: ../diskdrake.pm_.c:186 msgid "Not formatted\n" msgstr "" -#: ../diskdrake.pm_.c:181 +#: ../diskdrake.pm_.c:187 msgid "Mounted\n" msgstr "" -#: ../diskdrake.pm_.c:182 +#: ../diskdrake.pm_.c:188 +#, c-format +msgid "RAID md%s\n" +msgstr "" + +#: ../diskdrake.pm_.c:189 msgid "" "Partition booted by default\n" " (for MS-DOS boot, not for lilo)\n" msgstr "" -#: ../diskdrake.pm_.c:196 +#: ../diskdrake.pm_.c:191 +#, c-format +msgid "Level %s\n" +msgstr "" + +#: ../diskdrake.pm_.c:192 +#, c-format +msgid "Chunk size %s\n" +msgstr "" + +#: ../diskdrake.pm_.c:193 +#, c-format +msgid "RAID-disks %s\n" +msgstr "" + +#: ../diskdrake.pm_.c:209 #, c-format msgid "Size: %d MB\n" msgstr "" -#: ../diskdrake.pm_.c:197 +#: ../diskdrake.pm_.c:210 #, c-format msgid "Geometry: %s cylinders, %s heads, %s sectors\n" msgstr "" -#: ../diskdrake.pm_.c:199 +#: ../diskdrake.pm_.c:212 #, c-format msgid "on bus %d id %d\n" msgstr "" -#: ../diskdrake.pm_.c:211 +#: ../diskdrake.pm_.c:224 msgid "Mount" msgstr "" -#: ../diskdrake.pm_.c:213 +#: ../diskdrake.pm_.c:226 msgid "Active" msgstr "" -#: ../diskdrake.pm_.c:307 +#: ../diskdrake.pm_.c:227 +msgid "Add to RAID" +msgstr "" + +#: ../diskdrake.pm_.c:228 +msgid "Remove from RAID" +msgstr "" + +#: ../diskdrake.pm_.c:229 +msgid "Modify RAID" +msgstr "" + +#: ../diskdrake.pm_.c:325 msgid "" "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > " "1024).\n" @@ -557,7 +590,7 @@ msgid "" "need /boot" msgstr "" -#: ../diskdrake.pm_.c:311 +#: ../diskdrake.pm_.c:329 msgid "" "The partition you've selected to add as root (/) is physically located " "beyond\n" @@ -565,141 +598,158 @@ msgid "" "If you plan to use the LILO boot manager, be careful to add a /boot partition" msgstr "" -#: ../diskdrake.pm_.c:325 +#: ../diskdrake.pm_.c:344 msgid "Quit without saving" msgstr "" -#: ../diskdrake.pm_.c:325 +#: ../diskdrake.pm_.c:344 msgid "Quit without writing the partition table?" msgstr "" -#: ../diskdrake.pm_.c:340 +#: ../diskdrake.pm_.c:360 msgid "changing type of" msgstr "" -#: ../diskdrake.pm_.c:343 +#: ../diskdrake.pm_.c:363 msgid "Change partition type" msgstr "" -#: ../diskdrake.pm_.c:344 +#: ../diskdrake.pm_.c:364 msgid "Which partition type do you want?" msgstr "" -#: ../diskdrake.pm_.c:360 +#: ../diskdrake.pm_.c:380 #, c-format msgid "Where do you want to mount device %s?" msgstr "" -#: ../diskdrake.pm_.c:361 -msgid "Mount point" -msgstr "" - -#: ../diskdrake.pm_.c:382 +#: ../diskdrake.pm_.c:402 msgid "formatting" msgstr "" -#: ../diskdrake.pm_.c:388 +#: ../diskdrake.pm_.c:408 msgid "After formatting all partitions," msgstr "" -#: ../diskdrake.pm_.c:388 +#: ../diskdrake.pm_.c:408 msgid "all data on these partitions will be lost" msgstr "" -#: ../diskdrake.pm_.c:399 +#: ../diskdrake.pm_.c:419 msgid "Which disk do you want to move to?" msgstr "" -#: ../diskdrake.pm_.c:403 +#: ../diskdrake.pm_.c:423 msgid "Sector" msgstr "" -#: ../diskdrake.pm_.c:404 +#: ../diskdrake.pm_.c:424 msgid "Which sector do you want to move to?" msgstr "" -#: ../diskdrake.pm_.c:407 +#: ../diskdrake.pm_.c:427 msgid "Moving" msgstr "" -#: ../diskdrake.pm_.c:407 +#: ../diskdrake.pm_.c:427 msgid "Moving partition..." msgstr "" -#: ../diskdrake.pm_.c:416 +#: ../diskdrake.pm_.c:436 #, c-format msgid "Partition table of drive %s is going to be written to disk!" msgstr "" -#: ../diskdrake.pm_.c:418 +#: ../diskdrake.pm_.c:438 msgid "You'll need to reboot before the modification can take place" msgstr "" -#: ../diskdrake.pm_.c:439 +#: ../diskdrake.pm_.c:459 msgid "Computing fat filesystem bounds" msgstr "" -#: ../diskdrake.pm_.c:439 ../diskdrake.pm_.c:484 +#: ../diskdrake.pm_.c:459 ../diskdrake.pm_.c:504 msgid "Resizing" msgstr "" -#: ../diskdrake.pm_.c:453 +#: ../diskdrake.pm_.c:473 msgid "resizing" msgstr "" -#: ../diskdrake.pm_.c:463 +#: ../diskdrake.pm_.c:483 msgid "Choose the new size" msgstr "" -#: ../diskdrake.pm_.c:463 ../install_steps_graphical.pm_.c:290 +#: ../diskdrake.pm_.c:483 ../install_steps_graphical.pm_.c:290 #: ../install_steps_graphical.pm_.c:337 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "MB" msgstr "" -#: ../diskdrake.pm_.c:510 +#: ../diskdrake.pm_.c:530 msgid "Create a new partition" msgstr "" -#: ../diskdrake.pm_.c:526 +#: ../diskdrake.pm_.c:546 msgid "Start sector: " msgstr "" -#: ../diskdrake.pm_.c:529 +#: ../diskdrake.pm_.c:549 msgid "Size in MB: " msgstr "" -#: ../diskdrake.pm_.c:532 +#: ../diskdrake.pm_.c:552 msgid "Filesystem type: " msgstr "" -#: ../diskdrake.pm_.c:534 +#: ../diskdrake.pm_.c:554 msgid "Preference: " msgstr "" -#: ../diskdrake.pm_.c:576 ../diskdrake.pm_.c:592 +#: ../diskdrake.pm_.c:596 ../diskdrake.pm_.c:612 msgid "Select file" msgstr "" -#: ../diskdrake.pm_.c:585 +#: ../diskdrake.pm_.c:605 msgid "" "The backup partition table has not the same size\n" "Still continue?" msgstr "" -#: ../diskdrake.pm_.c:593 +#: ../diskdrake.pm_.c:613 msgid "Warning" msgstr "" -#: ../diskdrake.pm_.c:594 +#: ../diskdrake.pm_.c:614 msgid "" "Insert a floppy in drive\n" "All data on this floppy will be lost" msgstr "" -#: ../diskdrake.pm_.c:608 +#: ../diskdrake.pm_.c:628 msgid "Trying to rescue partition table" msgstr "" +#: ../diskdrake.pm_.c:639 +msgid "device" +msgstr "" + +#: ../diskdrake.pm_.c:640 +msgid "level" +msgstr "" + +#: ../diskdrake.pm_.c:641 +msgid "chunk size" +msgstr "" + +#: ../diskdrake.pm_.c:658 +msgid "Choose an existent RAID to add to" +msgstr "" + +#: ../diskdrake.pm_.c:659 +msgid "new" +msgstr "" + #: ../fs.pm_.c:67 ../fs.pm_.c:73 #, c-format msgid "%s formatting of %s failed" @@ -723,27 +773,27 @@ msgstr "" msgid "error unmounting %s: %s" msgstr "" -#: ../fsedit.pm_.c:162 +#: ../fsedit.pm_.c:168 msgid "Mount points must begin with a leading /" msgstr "" -#: ../fsedit.pm_.c:165 +#: ../fsedit.pm_.c:171 #, c-format msgid "There is already a partition with mount point %s" msgstr "" -#: ../fsedit.pm_.c:295 +#: ../fsedit.pm_.c:301 #, c-format msgid "Error opening %s for writing: %s" msgstr "" -#: ../fsedit.pm_.c:367 +#: ../fsedit.pm_.c:373 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:382 +#: ../fsedit.pm_.c:388 msgid "You don't have any partitions!" msgstr "" @@ -1127,8 +1177,8 @@ msgstr "" msgid "Configure printer" msgstr "" -#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:585 -#: ../install_steps_interactive.pm_.c:586 +#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:586 +#: ../install_steps_interactive.pm_.c:587 msgid "Set root password" msgstr "" @@ -1172,60 +1222,60 @@ msgstr "" msgid "Partitioning failed: no root filesystem" msgstr "" -#: ../install2.pm_.c:319 +#: ../install2.pm_.c:316 msgid "Not enough swap to fulfill installation, please add some" msgstr "" -#: ../install_any.pm_.c:176 +#: ../install_any.pm_.c:178 msgid "" "I can't read your partition table, it's too corrupted for me :(\n" "I'll try to go on blanking bad partitions" msgstr "" -#: ../install_any.pm_.c:192 +#: ../install_any.pm_.c:194 msgid "" "DiskDrake failed to read correctly the partition table.\n" "Continue at your own risk!" msgstr "" -#: ../install_any.pm_.c:231 +#: ../install_any.pm_.c:233 msgid "Information" msgstr "" -#: ../install_any.pm_.c:232 +#: ../install_any.pm_.c:234 #, c-format msgid "%s: This is not a root partition, please select another one." msgstr "" -#: ../install_any.pm_.c:234 +#: ../install_any.pm_.c:236 msgid "No root partition found" msgstr "" -#: ../install_any.pm_.c:270 +#: ../install_any.pm_.c:272 msgid "Can't use broadcast with no NIS domain" msgstr "" -#: ../install_any.pm_.c:414 +#: ../install_any.pm_.c:420 msgid "Error reading file $f" msgstr "" -#: ../install_any.pm_.c:419 +#: ../install_any.pm_.c:425 #, c-format msgid "Bad kickstart file %s (failed %s)" msgstr "" -#: ../install_steps.pm_.c:71 +#: ../install_steps.pm_.c:72 msgid "" "An error occurred, but I don't know how to handle it nicely.\n" "Continue at your own risk." msgstr "" -#: ../install_steps.pm_.c:135 +#: ../install_steps.pm_.c:136 #, c-format msgid "Duplicate mount point %s" msgstr "" -#: ../install_steps.pm_.c:383 +#: ../install_steps.pm_.c:417 msgid "No floppy drive available" msgstr "" @@ -1235,10 +1285,12 @@ msgid "Entering step `%s'\n" msgstr "" #: ../install_steps_graphical.pm_.c:259 +#: ../unused/install_steps_graphical.pm_.c:255 msgid "You must have a swap partition" msgstr "" #: ../install_steps_graphical.pm_.c:261 +#: ../unused/install_steps_graphical.pm_.c:258 msgid "" "You don't have a swap partition\n" "\n" @@ -1250,271 +1302,286 @@ msgid "Choose the size you want to install" msgstr "" #: ../install_steps_graphical.pm_.c:337 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "Total size: " msgstr "" #: ../install_steps_graphical.pm_.c:349 +#: ../unused/install_steps_graphical.pm_.c:284 #, c-format msgid "Version: %s\n" msgstr "" #: ../install_steps_graphical.pm_.c:350 +#: ../unused/install_steps_graphical.pm_.c:285 #, c-format msgid "Size: %d KB\n" msgstr "" #: ../install_steps_graphical.pm_.c:465 +#: ../unused/install_steps_graphical.pm_.c:421 msgid "Choose the packages you want to install" msgstr "" #: ../install_steps_graphical.pm_.c:468 +#: ../unused/install_steps_graphical.pm_.c:424 msgid "Info" msgstr "" -#: ../install_steps_graphical.pm_.c:476 ../install_steps_interactive.pm_.c:84 +#: ../install_steps_graphical.pm_.c:476 ../install_steps_interactive.pm_.c:85 +#: ../unused/install_steps_graphical.pm_.c:432 msgid "Install" msgstr "" #: ../install_steps_graphical.pm_.c:495 +#: ../unused/install_steps_graphical.pm_.c:451 msgid "Installing" msgstr "" #: ../install_steps_graphical.pm_.c:502 +#: ../unused/install_steps_graphical.pm_.c:457 msgid "Please wait, " msgstr "" #: ../install_steps_graphical.pm_.c:504 +#: ../unused/install_steps_graphical.pm_.c:459 msgid "Time remaining " msgstr "" #: ../install_steps_graphical.pm_.c:505 +#: ../unused/install_steps_graphical.pm_.c:460 msgid "Total time " msgstr "" #: ../install_steps_graphical.pm_.c:510 +#: ../unused/install_steps_graphical.pm_.c:465 msgid "Preparing installation" msgstr "" #: ../install_steps_graphical.pm_.c:533 +#: ../unused/install_steps_graphical.pm_.c:486 #, c-format msgid "Installing package %s" msgstr "" #: ../install_steps_graphical.pm_.c:558 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "Go on anyway?" msgstr "" #: ../install_steps_graphical.pm_.c:558 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "There was an error ordering packages:" msgstr "" #: ../install_steps_graphical.pm_.c:582 +#: ../unused/install_steps_graphical.pm_.c:535 msgid "Use existing configuration for X11?" msgstr "" -#: ../install_steps_interactive.pm_.c:40 +#: ../install_steps_interactive.pm_.c:41 msgid "An error occurred" msgstr "" -#: ../install_steps_interactive.pm_.c:57 +#: ../install_steps_interactive.pm_.c:58 msgid "Which language do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:72 +#: ../install_steps_interactive.pm_.c:73 msgid "What is your keyboard layout?" msgstr "" -#: ../install_steps_interactive.pm_.c:82 +#: ../install_steps_interactive.pm_.c:83 msgid "Install/Upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:83 +#: ../install_steps_interactive.pm_.c:84 msgid "Is this an install or an upgrade?" msgstr "" -#: ../install_steps_interactive.pm_.c:84 +#: ../install_steps_interactive.pm_.c:85 msgid "Upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:92 +#: ../install_steps_interactive.pm_.c:93 msgid "Root Partition" msgstr "" -#: ../install_steps_interactive.pm_.c:93 +#: ../install_steps_interactive.pm_.c:94 msgid "What is the root partition (/) of your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:103 +#: ../install_steps_interactive.pm_.c:104 msgid "Recommended" msgstr "" -#: ../install_steps_interactive.pm_.c:104 -msgid "Personalized" +#: ../install_steps_interactive.pm_.c:105 +msgid "Customized" msgstr "" -#: ../install_steps_interactive.pm_.c:105 +#: ../install_steps_interactive.pm_.c:106 msgid "Expert" msgstr "" -#: ../install_steps_interactive.pm_.c:107 -#: ../install_steps_interactive.pm_.c:121 +#: ../install_steps_interactive.pm_.c:108 +#: ../install_steps_interactive.pm_.c:122 msgid "Install Class" msgstr "" -#: ../install_steps_interactive.pm_.c:108 +#: ../install_steps_interactive.pm_.c:109 msgid "What installation class do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:117 +#: ../install_steps_interactive.pm_.c:118 msgid "Normal" msgstr "" -#: ../install_steps_interactive.pm_.c:118 +#: ../install_steps_interactive.pm_.c:119 msgid "Developement" msgstr "" -#: ../install_steps_interactive.pm_.c:119 +#: ../install_steps_interactive.pm_.c:120 msgid "Server" msgstr "" -#: ../install_steps_interactive.pm_.c:122 +#: ../install_steps_interactive.pm_.c:123 msgid "What usage do you want?" msgstr "" -#: ../install_steps_interactive.pm_.c:135 +#: ../install_steps_interactive.pm_.c:136 msgid "What is the type of your mouse?" msgstr "" -#: ../install_steps_interactive.pm_.c:139 +#: ../install_steps_interactive.pm_.c:140 msgid "Emulate third button?" msgstr "" -#: ../install_steps_interactive.pm_.c:142 +#: ../install_steps_interactive.pm_.c:143 msgid "Mouse Port" msgstr "" -#: ../install_steps_interactive.pm_.c:143 +#: ../install_steps_interactive.pm_.c:144 msgid "Which serial port is your mouse connected to?" msgstr "" -#: ../install_steps_interactive.pm_.c:156 +#: ../install_steps_interactive.pm_.c:157 msgid "no available partitions" msgstr "" -#: ../install_steps_interactive.pm_.c:158 +#: ../install_steps_interactive.pm_.c:159 #, c-format msgid "(%dMb)" msgstr "" -#: ../install_steps_interactive.pm_.c:165 +#: ../install_steps_interactive.pm_.c:166 msgid "Which partition do you want to use as your root partition" msgstr "" -#: ../install_steps_interactive.pm_.c:172 +#: ../install_steps_interactive.pm_.c:173 msgid "Choose the mount points" msgstr "" -#: ../install_steps_interactive.pm_.c:184 +#: ../install_steps_interactive.pm_.c:185 msgid "You need to reboot for the partition table modifications to take place" msgstr "" -#: ../install_steps_interactive.pm_.c:203 +#: ../install_steps_interactive.pm_.c:204 msgid "Choose the partitions you want to format" msgstr "" -#: ../install_steps_interactive.pm_.c:213 +#: ../install_steps_interactive.pm_.c:214 #, c-format msgid "Formatting partition %s" msgstr "" -#: ../install_steps_interactive.pm_.c:222 +#: ../install_steps_interactive.pm_.c:223 msgid "Looking for available packages" msgstr "" -#: ../install_steps_interactive.pm_.c:228 +#: ../install_steps_interactive.pm_.c:229 msgid "Finding packages to upgrade" msgstr "" -#: ../install_steps_interactive.pm_.c:237 +#: ../install_steps_interactive.pm_.c:238 msgid "Package Group Selection" msgstr "" -#: ../install_steps_interactive.pm_.c:249 +#: ../install_steps_interactive.pm_.c:250 msgid "Keep the current IP configuration" msgstr "" -#: ../install_steps_interactive.pm_.c:250 +#: ../install_steps_interactive.pm_.c:251 msgid "Reconfigure network now" msgstr "" -#: ../install_steps_interactive.pm_.c:251 -#: ../install_steps_interactive.pm_.c:263 +#: ../install_steps_interactive.pm_.c:252 +#: ../install_steps_interactive.pm_.c:264 msgid "Do not set up networking" msgstr "" -#: ../install_steps_interactive.pm_.c:253 -#: ../install_steps_interactive.pm_.c:261 +#: ../install_steps_interactive.pm_.c:254 +#: ../install_steps_interactive.pm_.c:262 msgid "Network Configuration" msgstr "" -#: ../install_steps_interactive.pm_.c:254 +#: ../install_steps_interactive.pm_.c:255 msgid "Local networking has already been configured. Do you want to:" msgstr "" -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:263 msgid "Do you want to configure networking for yout system?" msgstr "" -#: ../install_steps_interactive.pm_.c:263 +#: ../install_steps_interactive.pm_.c:264 msgid "Dialup with modem" msgstr "" -#: ../install_steps_interactive.pm_.c:263 +#: ../install_steps_interactive.pm_.c:264 msgid "Local LAN" msgstr "" -#: ../install_steps_interactive.pm_.c:272 +#: ../install_steps_interactive.pm_.c:273 msgid "no network card found" msgstr "" -#: ../install_steps_interactive.pm_.c:301 +#: ../install_steps_interactive.pm_.c:302 #, c-format msgid "Configuring network device %s" msgstr "" -#: ../install_steps_interactive.pm_.c:302 +#: ../install_steps_interactive.pm_.c:303 msgid "" "Please enter the IP configuration for this machine.\n" "Each item should be entered as an IP address in dotted-decimal\n" "notation (for example, 1.2.3.4)." msgstr "" -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:306 msgid "Automatic IP" msgstr "" -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:306 msgid "IP address:" msgstr "" -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:306 msgid "Netmask:" msgstr "" -#: ../install_steps_interactive.pm_.c:306 +#: ../install_steps_interactive.pm_.c:307 msgid "(bootp/dhcp)" msgstr "" -#: ../install_steps_interactive.pm_.c:312 -#: ../install_steps_interactive.pm_.c:475 +#: ../install_steps_interactive.pm_.c:313 +#: ../install_steps_interactive.pm_.c:476 msgid "IP address should be in format 1.2.3.4" msgstr "" -#: ../install_steps_interactive.pm_.c:331 +#: ../install_steps_interactive.pm_.c:332 msgid "Configuring network" msgstr "" -#: ../install_steps_interactive.pm_.c:332 +#: ../install_steps_interactive.pm_.c:333 msgid "" "Please enter your host name.\n" "Your host name should be a fully-qualified host name,\n" @@ -1522,179 +1589,179 @@ msgid "" "You may also enter the IP address of the gateway if you have one" msgstr "" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "DNS server:" msgstr "" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "Gateway device:" msgstr "" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "Gateway:" msgstr "" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "Host name:" msgstr "" -#: ../install_steps_interactive.pm_.c:347 -msgid "Skip modem autodetection?" +#: ../install_steps_interactive.pm_.c:348 +msgid "Try to find a modem?" msgstr "" -#: ../install_steps_interactive.pm_.c:356 +#: ../install_steps_interactive.pm_.c:357 msgid "Which serial port is your modem connected to?" msgstr "" -#: ../install_steps_interactive.pm_.c:360 +#: ../install_steps_interactive.pm_.c:361 msgid "Dialup options" msgstr "" -#: ../install_steps_interactive.pm_.c:361 +#: ../install_steps_interactive.pm_.c:362 msgid "Connection name" msgstr "" -#: ../install_steps_interactive.pm_.c:362 +#: ../install_steps_interactive.pm_.c:363 msgid "Phone number" msgstr "" -#: ../install_steps_interactive.pm_.c:363 +#: ../install_steps_interactive.pm_.c:364 msgid "Login ID" msgstr "" -#: ../install_steps_interactive.pm_.c:364 -#: ../install_steps_interactive.pm_.c:587 -#: ../install_steps_interactive.pm_.c:633 -#: ../install_steps_interactive.pm_.c:724 +#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:588 +#: ../install_steps_interactive.pm_.c:634 +#: ../install_steps_interactive.pm_.c:725 msgid "Password" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "Authentication" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "CHAP" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "PAP" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "Script-based" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "Terminal-based" msgstr "" -#: ../install_steps_interactive.pm_.c:366 +#: ../install_steps_interactive.pm_.c:367 msgid "Domain name" msgstr "" -#: ../install_steps_interactive.pm_.c:367 +#: ../install_steps_interactive.pm_.c:368 msgid "First DNS Server" msgstr "" -#: ../install_steps_interactive.pm_.c:368 +#: ../install_steps_interactive.pm_.c:369 msgid "Second DNS Server" msgstr "" -#: ../install_steps_interactive.pm_.c:377 +#: ../install_steps_interactive.pm_.c:378 msgid "Which is your timezone?" msgstr "" -#: ../install_steps_interactive.pm_.c:378 +#: ../install_steps_interactive.pm_.c:379 msgid "Is your hardware clock set to GMT?" msgstr "" -#: ../install_steps_interactive.pm_.c:388 +#: ../install_steps_interactive.pm_.c:389 msgid "Printer" msgstr "" -#: ../install_steps_interactive.pm_.c:389 +#: ../install_steps_interactive.pm_.c:390 msgid "Would you like to configure a printer?" msgstr "" -#: ../install_steps_interactive.pm_.c:401 +#: ../install_steps_interactive.pm_.c:402 msgid "Local Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:402 +#: ../install_steps_interactive.pm_.c:403 msgid "" "Every print queue (which print jobs are directed to) needs a\n" "name (often lp) and a spool directory associated with it. What\n" "name and directory should be used for this queue?" msgstr "" -#: ../install_steps_interactive.pm_.c:405 +#: ../install_steps_interactive.pm_.c:406 msgid "Name of queue:" msgstr "" -#: ../install_steps_interactive.pm_.c:405 +#: ../install_steps_interactive.pm_.c:406 msgid "Spool directory:" msgstr "" -#: ../install_steps_interactive.pm_.c:416 +#: ../install_steps_interactive.pm_.c:417 msgid "Select Printer Connection" msgstr "" -#: ../install_steps_interactive.pm_.c:417 +#: ../install_steps_interactive.pm_.c:418 msgid "How is the printer connected?" msgstr "" -#: ../install_steps_interactive.pm_.c:425 +#: ../install_steps_interactive.pm_.c:426 msgid "Detecting devices..." msgstr "" -#: ../install_steps_interactive.pm_.c:425 +#: ../install_steps_interactive.pm_.c:426 msgid "Test ports" msgstr "" -#: ../install_steps_interactive.pm_.c:438 +#: ../install_steps_interactive.pm_.c:439 #, c-format msgid "A printer, model \"%s\", has been detected on " msgstr "" -#: ../install_steps_interactive.pm_.c:445 +#: ../install_steps_interactive.pm_.c:446 msgid "Local Printer Device" msgstr "" -#: ../install_steps_interactive.pm_.c:446 +#: ../install_steps_interactive.pm_.c:447 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" msgstr "" -#: ../install_steps_interactive.pm_.c:447 +#: ../install_steps_interactive.pm_.c:448 msgid "Printer Device:" msgstr "" -#: ../install_steps_interactive.pm_.c:451 +#: ../install_steps_interactive.pm_.c:452 msgid "Remote lpd Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:452 +#: ../install_steps_interactive.pm_.c:453 msgid "" "To use a remote lpd print queue, you need to supply\n" "the hostname of the printer server and the queue name\n" "on that server which jobs should be placed in." msgstr "" -#: ../install_steps_interactive.pm_.c:455 +#: ../install_steps_interactive.pm_.c:456 msgid "Remote hostname:" msgstr "" -#: ../install_steps_interactive.pm_.c:455 +#: ../install_steps_interactive.pm_.c:456 msgid "Remote queue" msgstr "" -#: ../install_steps_interactive.pm_.c:460 +#: ../install_steps_interactive.pm_.c:461 msgid "SMB (Windows 9x/NT) Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:461 +#: ../install_steps_interactive.pm_.c:462 msgid "" "To print to a SMB printer, you need to provide the\n" "SMB host name (Note! It may be different from its\n" @@ -1703,37 +1770,37 @@ msgid "" "applicable user name, password, and workgroup information." msgstr "" -#: ../install_steps_interactive.pm_.c:466 +#: ../install_steps_interactive.pm_.c:467 msgid "SMB server IP:" msgstr "" -#: ../install_steps_interactive.pm_.c:466 +#: ../install_steps_interactive.pm_.c:467 msgid "SMB server host:" msgstr "" -#: ../install_steps_interactive.pm_.c:467 -#: ../install_steps_interactive.pm_.c:489 +#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:490 msgid "Password:" msgstr "" -#: ../install_steps_interactive.pm_.c:467 +#: ../install_steps_interactive.pm_.c:468 msgid "Share name:" msgstr "" -#: ../install_steps_interactive.pm_.c:467 -#: ../install_steps_interactive.pm_.c:489 +#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:490 msgid "User name:" msgstr "" -#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:469 msgid "Workgroup:" msgstr "" -#: ../install_steps_interactive.pm_.c:483 +#: ../install_steps_interactive.pm_.c:484 msgid "NetWare Printer Options" msgstr "" -#: ../install_steps_interactive.pm_.c:484 +#: ../install_steps_interactive.pm_.c:485 msgid "" "To print to a NetWare printer, you need to provide the\n" "NetWare print server name (Note! it may be different from its\n" @@ -1741,181 +1808,182 @@ msgid "" "wish to access and any applicable user name and password." msgstr "" -#: ../install_steps_interactive.pm_.c:488 +#: ../install_steps_interactive.pm_.c:489 msgid "Print Queue Name:" msgstr "" -#: ../install_steps_interactive.pm_.c:488 +#: ../install_steps_interactive.pm_.c:489 msgid "Printer Server:" msgstr "" -#: ../install_steps_interactive.pm_.c:499 -msgid "Yes, print ascii page" -msgstr "" - #: ../install_steps_interactive.pm_.c:500 -msgid "Yes, print postscript page" +msgid "Yes, print ascii test page" msgstr "" #: ../install_steps_interactive.pm_.c:501 -msgid "Yes, print both pages" +msgid "Yes, print postscript test page" msgstr "" #: ../install_steps_interactive.pm_.c:502 -#: ../install_steps_interactive.pm_.c:957 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:435 +msgid "Yes, print both test pages" +msgstr "" + +#: ../install_steps_interactive.pm_.c:503 +#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:436 msgid "No" msgstr "" -#: ../install_steps_interactive.pm_.c:508 +#: ../install_steps_interactive.pm_.c:509 msgid "Configure Printer" msgstr "" -#: ../install_steps_interactive.pm_.c:509 +#: ../install_steps_interactive.pm_.c:510 msgid "What type of printer do you have?" msgstr "" -#: ../install_steps_interactive.pm_.c:531 +#: ../install_steps_interactive.pm_.c:532 msgid "Printer options" msgstr "" -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:533 msgid "Paper Size" msgstr "" -#: ../install_steps_interactive.pm_.c:533 +#: ../install_steps_interactive.pm_.c:534 msgid "Eject page after job?" msgstr "" -#: ../install_steps_interactive.pm_.c:536 +#: ../install_steps_interactive.pm_.c:537 msgid "Fix stair-stepping text?" msgstr "" -#: ../install_steps_interactive.pm_.c:539 +#: ../install_steps_interactive.pm_.c:540 msgid "Uniprint driver options" msgstr "" -#: ../install_steps_interactive.pm_.c:540 +#: ../install_steps_interactive.pm_.c:541 msgid "Color depth options" msgstr "" -#: ../install_steps_interactive.pm_.c:549 +#: ../install_steps_interactive.pm_.c:550 msgid "Do you want to test printing?" msgstr "" -#: ../install_steps_interactive.pm_.c:585 +#: ../install_steps_interactive.pm_.c:586 msgid "No password" msgstr "" -#: ../install_steps_interactive.pm_.c:585 ../interactive.pm_.c:47 +#: ../install_steps_interactive.pm_.c:586 +#: ../install_steps_interactive.pm_.c:796 ../interactive.pm_.c:47 #: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22 -#: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:436 -#: ../my_gtk.pm_.c:533 +#: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:437 +#: ../my_gtk.pm_.c:534 ../unused/install_steps_graphical.pm_.c:608 msgid "Ok" msgstr "" -#: ../install_steps_interactive.pm_.c:588 -#: ../install_steps_interactive.pm_.c:634 +#: ../install_steps_interactive.pm_.c:589 +#: ../install_steps_interactive.pm_.c:635 msgid "Password (again)" msgstr "" -#: ../install_steps_interactive.pm_.c:590 +#: ../install_steps_interactive.pm_.c:591 msgid "Use shadow file" msgstr "" -#: ../install_steps_interactive.pm_.c:590 +#: ../install_steps_interactive.pm_.c:591 msgid "shadow" msgstr "" -#: ../install_steps_interactive.pm_.c:591 +#: ../install_steps_interactive.pm_.c:592 msgid "MD5" msgstr "" -#: ../install_steps_interactive.pm_.c:591 +#: ../install_steps_interactive.pm_.c:592 msgid "Use MD5 passwords" msgstr "" -#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:594 msgid "Use NIS" msgstr "" -#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:594 msgid "yellow pages" msgstr "" -#: ../install_steps_interactive.pm_.c:597 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:598 +#: ../install_steps_interactive.pm_.c:646 msgid "Please try again" msgstr "" -#: ../install_steps_interactive.pm_.c:597 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:598 +#: ../install_steps_interactive.pm_.c:646 msgid "The passwords do not match" msgstr "" -#: ../install_steps_interactive.pm_.c:599 -#: ../install_steps_interactive.pm_.c:646 +#: ../install_steps_interactive.pm_.c:600 +#: ../install_steps_interactive.pm_.c:647 msgid "This password is too simple" msgstr "" -#: ../install_steps_interactive.pm_.c:606 +#: ../install_steps_interactive.pm_.c:607 msgid "TODO" msgstr "" -#: ../install_steps_interactive.pm_.c:607 +#: ../install_steps_interactive.pm_.c:608 msgid "NIS Domain" msgstr "" -#: ../install_steps_interactive.pm_.c:607 +#: ../install_steps_interactive.pm_.c:608 msgid "NIS Server" msgstr "" -#: ../install_steps_interactive.pm_.c:627 +#: ../install_steps_interactive.pm_.c:628 msgid "Accept user" msgstr "" -#: ../install_steps_interactive.pm_.c:627 +#: ../install_steps_interactive.pm_.c:628 msgid "Add user" msgstr "" -#: ../install_steps_interactive.pm_.c:628 +#: ../install_steps_interactive.pm_.c:629 #, c-format msgid "(already added %s)" msgstr "" -#: ../install_steps_interactive.pm_.c:628 +#: ../install_steps_interactive.pm_.c:629 #, c-format msgid "" "Enter a user\n" "%s" msgstr "" -#: ../install_steps_interactive.pm_.c:630 +#: ../install_steps_interactive.pm_.c:631 msgid "Real name" msgstr "" -#: ../install_steps_interactive.pm_.c:631 +#: ../install_steps_interactive.pm_.c:632 msgid "User name" msgstr "" -#: ../install_steps_interactive.pm_.c:636 +#: ../install_steps_interactive.pm_.c:637 msgid "Shell" msgstr "" -#: ../install_steps_interactive.pm_.c:647 +#: ../install_steps_interactive.pm_.c:648 msgid "Please give a user name" msgstr "" -#: ../install_steps_interactive.pm_.c:648 +#: ../install_steps_interactive.pm_.c:649 msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" msgstr "" -#: ../install_steps_interactive.pm_.c:649 +#: ../install_steps_interactive.pm_.c:650 msgid "This user name is already added" msgstr "" -#: ../install_steps_interactive.pm_.c:670 +#: ../install_steps_interactive.pm_.c:671 msgid "" "A custom bootdisk provides a way of booting into your Linux system without\n" "depending on the normal bootloader. This is useful if you don't want to " @@ -1929,229 +1997,246 @@ msgid "" "failures. Would you like to create a bootdisk for your system?" msgstr "" -#: ../install_steps_interactive.pm_.c:679 +#: ../install_steps_interactive.pm_.c:680 msgid "Sorry, no floppy drive available" msgstr "" -#: ../install_steps_interactive.pm_.c:682 +#: ../install_steps_interactive.pm_.c:683 msgid "Choose the floppy drive you want to use to make the bootdisk" msgstr "" -#: ../install_steps_interactive.pm_.c:683 +#: ../install_steps_interactive.pm_.c:684 msgid "Skip" msgstr "" -#: ../install_steps_interactive.pm_.c:687 +#: ../install_steps_interactive.pm_.c:688 #, c-format msgid "Insert a floppy in drive %s" msgstr "" -#: ../install_steps_interactive.pm_.c:688 +#: ../install_steps_interactive.pm_.c:689 msgid "Creating bootdisk" msgstr "" -#: ../install_steps_interactive.pm_.c:695 +#: ../install_steps_interactive.pm_.c:696 msgid "Preparing bootloader" msgstr "" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:708 msgid "First sector of boot partition" msgstr "" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:708 msgid "First sector of drive (MBR)" msgstr "" -#: ../install_steps_interactive.pm_.c:711 +#: ../install_steps_interactive.pm_.c:712 msgid "LILO Installation" msgstr "" -#: ../install_steps_interactive.pm_.c:712 +#: ../install_steps_interactive.pm_.c:713 msgid "Where do you want to install the bootloader?" msgstr "" -#: ../install_steps_interactive.pm_.c:715 +#: ../install_steps_interactive.pm_.c:716 msgid "Do you want to use LILO?" msgstr "" -#: ../install_steps_interactive.pm_.c:718 +#: ../install_steps_interactive.pm_.c:719 msgid "Boot device" msgstr "" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:720 msgid "Linear (needed for some SCSI drives)" msgstr "" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:720 msgid "linear" msgstr "" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:721 msgid "Compact" msgstr "" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:721 msgid "compact" msgstr "" -#: ../install_steps_interactive.pm_.c:721 +#: ../install_steps_interactive.pm_.c:722 msgid "Delay before booting default image" msgstr "" -#: ../install_steps_interactive.pm_.c:722 +#: ../install_steps_interactive.pm_.c:723 msgid "Video mode" msgstr "" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:726 msgid "Restrict command line options" msgstr "" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:726 msgid "restrict" msgstr "" -#: ../install_steps_interactive.pm_.c:731 +#: ../install_steps_interactive.pm_.c:732 msgid "LILO main options" msgstr "" -#: ../install_steps_interactive.pm_.c:733 +#: ../install_steps_interactive.pm_.c:734 msgid "" "At this level of security, a password (and a good one) in lilo is requested" msgstr "" -#: ../install_steps_interactive.pm_.c:734 +#: ../install_steps_interactive.pm_.c:735 msgid "" "Option ``Restrict command line options'' is of no use without a password" msgstr "" -#: ../install_steps_interactive.pm_.c:743 +#: ../install_steps_interactive.pm_.c:744 msgid "" "Here are the following entries in LILO.\n" "You can add some more or change the existent ones." msgstr "" -#: ../install_steps_interactive.pm_.c:745 +#: ../install_steps_interactive.pm_.c:746 msgid "Add" msgstr "" -#: ../install_steps_interactive.pm_.c:763 +#: ../install_steps_interactive.pm_.c:755 +msgid "Linux" +msgstr "" + +#: ../install_steps_interactive.pm_.c:755 +msgid "Other OS (windows...)" +msgstr "" + +#: ../install_steps_interactive.pm_.c:755 +msgid "Which type of entry do you want to add" +msgstr "" + +#: ../install_steps_interactive.pm_.c:775 msgid "Image" msgstr "" -#: ../install_steps_interactive.pm_.c:764 -#: ../install_steps_interactive.pm_.c:772 +#: ../install_steps_interactive.pm_.c:776 +#: ../install_steps_interactive.pm_.c:784 msgid "Root" msgstr "" -#: ../install_steps_interactive.pm_.c:765 +#: ../install_steps_interactive.pm_.c:777 msgid "Append" msgstr "" -#: ../install_steps_interactive.pm_.c:766 +#: ../install_steps_interactive.pm_.c:778 msgid "Initrd" msgstr "" -#: ../install_steps_interactive.pm_.c:767 +#: ../install_steps_interactive.pm_.c:779 msgid "Read-write" msgstr "" -#: ../install_steps_interactive.pm_.c:773 +#: ../install_steps_interactive.pm_.c:785 msgid "Table" msgstr "" -#: ../install_steps_interactive.pm_.c:774 +#: ../install_steps_interactive.pm_.c:786 msgid "Unsafe" msgstr "" -#: ../install_steps_interactive.pm_.c:779 +#: ../install_steps_interactive.pm_.c:791 msgid "Label" msgstr "" -#: ../install_steps_interactive.pm_.c:781 +#: ../install_steps_interactive.pm_.c:793 msgid "Default" msgstr "" +#: ../install_steps_interactive.pm_.c:796 +msgid "Remove entry" +msgstr "" + +#: ../install_steps_interactive.pm_.c:799 +msgid "Empty label not allowed" +msgstr "" + #: ../install_steps_interactive.pm_.c:800 -msgid "Installation of LILO failed. The following error occured:" +msgid "This label is already in use" msgstr "" -#: ../install_steps_interactive.pm_.c:810 -msgid "Windows(TM)" +#: ../install_steps_interactive.pm_.c:801 +#, c-format +msgid "A entry %s already exists" msgstr "" -#: ../install_steps_interactive.pm_.c:811 -msgid "Poor" +#: ../install_steps_interactive.pm_.c:815 +msgid "Installation of LILO failed. The following error occured:" msgstr "" -#: ../install_steps_interactive.pm_.c:812 +#: ../install_steps_interactive.pm_.c:827 msgid "Low" msgstr "" -#: ../install_steps_interactive.pm_.c:813 +#: ../install_steps_interactive.pm_.c:828 msgid "Medium" msgstr "" -#: ../install_steps_interactive.pm_.c:814 +#: ../install_steps_interactive.pm_.c:829 msgid "High" msgstr "" -#: ../install_steps_interactive.pm_.c:815 -msgid "Paranoid" -msgstr "" - -#: ../install_steps_interactive.pm_.c:823 +#: ../install_steps_interactive.pm_.c:838 msgid "Miscellaneous questions" msgstr "" -#: ../install_steps_interactive.pm_.c:824 +#: ../install_steps_interactive.pm_.c:839 msgid "Do you have a laptop?" msgstr "" -#: ../install_steps_interactive.pm_.c:825 +#: ../install_steps_interactive.pm_.c:840 msgid "Use hard drive optimizations" msgstr "" -#: ../install_steps_interactive.pm_.c:826 +#: ../install_steps_interactive.pm_.c:841 msgid "Security level" msgstr "" -#: ../install_steps_interactive.pm_.c:827 +#: ../install_steps_interactive.pm_.c:842 msgid "HTTP proxy" msgstr "" -#: ../install_steps_interactive.pm_.c:828 +#: ../install_steps_interactive.pm_.c:843 msgid "FTP proxy" msgstr "" -#: ../install_steps_interactive.pm_.c:830 +#: ../install_steps_interactive.pm_.c:845 #, c-format msgid "Precise ram size (found %d MB)" msgstr "" -#: ../install_steps_interactive.pm_.c:833 +#: ../install_steps_interactive.pm_.c:848 msgid "(may cause disk problems)" msgstr "" -#: ../install_steps_interactive.pm_.c:841 +#: ../install_steps_interactive.pm_.c:856 msgid "Proxy should be http://..." msgstr "" -#: ../install_steps_interactive.pm_.c:842 +#: ../install_steps_interactive.pm_.c:857 msgid "Proxy should be ftp://..." msgstr "" -#: ../install_steps_interactive.pm_.c:843 +#: ../install_steps_interactive.pm_.c:858 msgid "Give the ram size in Mb" msgstr "" -#: ../install_steps_interactive.pm_.c:856 +#: ../install_steps_interactive.pm_.c:871 msgid "" "Some steps are not completed.\n" "\n" "Do you really want to quit now?" msgstr "" -#: ../install_steps_interactive.pm_.c:863 +#: ../install_steps_interactive.pm_.c:878 msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" @@ -2164,22 +2249,22 @@ msgid "" "install chapter of the Official Linux-Mandrake User's Guide." msgstr "" -#: ../install_steps_interactive.pm_.c:882 +#: ../install_steps_interactive.pm_.c:897 #, c-format msgid "Installing driver for %s card %s" msgstr "" -#: ../install_steps_interactive.pm_.c:883 +#: ../install_steps_interactive.pm_.c:898 #, c-format msgid "(module %s)" msgstr "" -#: ../install_steps_interactive.pm_.c:893 +#: ../install_steps_interactive.pm_.c:908 #, c-format msgid "What %s card do you have?" msgstr "" -#: ../install_steps_interactive.pm_.c:900 +#: ../install_steps_interactive.pm_.c:915 #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" @@ -2191,20 +2276,20 @@ msgid "" "not cause any damage." msgstr "" -#: ../install_steps_interactive.pm_.c:905 +#: ../install_steps_interactive.pm_.c:920 msgid "Autoprobe" msgstr "" -#: ../install_steps_interactive.pm_.c:905 +#: ../install_steps_interactive.pm_.c:920 msgid "Specify options" msgstr "" -#: ../install_steps_interactive.pm_.c:909 +#: ../install_steps_interactive.pm_.c:924 #, c-format msgid "You may now provide its options to module %s." msgstr "" -#: ../install_steps_interactive.pm_.c:915 +#: ../install_steps_interactive.pm_.c:930 #, c-format msgid "" "You may now provide its options to module %s.\n" @@ -2212,59 +2297,59 @@ msgid "" "For instance, ``io=0x300 irq=7''" msgstr "" -#: ../install_steps_interactive.pm_.c:918 +#: ../install_steps_interactive.pm_.c:933 msgid "Module options:" msgstr "" -#: ../install_steps_interactive.pm_.c:928 +#: ../install_steps_interactive.pm_.c:943 #, c-format msgid "" "Loading module %s failed.\n" "Do you want to try again with other parameters?" msgstr "" -#: ../install_steps_interactive.pm_.c:941 +#: ../install_steps_interactive.pm_.c:956 #, c-format msgid "Skip %s PCMCIA probing" msgstr "" -#: ../install_steps_interactive.pm_.c:942 +#: ../install_steps_interactive.pm_.c:957 msgid "Configuring PCMCIA cards..." msgstr "" -#: ../install_steps_interactive.pm_.c:942 +#: ../install_steps_interactive.pm_.c:957 msgid "PCMCIA" msgstr "" -#: ../install_steps_interactive.pm_.c:949 +#: ../install_steps_interactive.pm_.c:964 msgid "Try to find PCI devices?" msgstr "" -#: ../install_steps_interactive.pm_.c:953 +#: ../install_steps_interactive.pm_.c:968 #, c-format msgid "Found %s %s interfaces" msgstr "" -#: ../install_steps_interactive.pm_.c:954 +#: ../install_steps_interactive.pm_.c:969 msgid "Do you have another one?" msgstr "" -#: ../install_steps_interactive.pm_.c:955 +#: ../install_steps_interactive.pm_.c:970 #, c-format msgid "Do you have an %s interface?" msgstr "" -#: ../install_steps_interactive.pm_.c:957 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:435 +#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:436 msgid "Yes" msgstr "" -#: ../install_steps_interactive.pm_.c:958 +#: ../install_steps_interactive.pm_.c:973 msgid "See hardware info" msgstr "" #: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22 -#: ../interactive_newt.pm_.c:55 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:436 +#: ../interactive_newt.pm_.c:55 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:437 msgid "Cancel" msgstr "" @@ -2541,28 +2626,28 @@ msgstr "" msgid "USB Mouse (3 buttons or more)" msgstr "" -#: ../partition_table.pm_.c:449 +#: ../partition_table.pm_.c:452 msgid "" "You have a hole in your partition table but I can't use it.\n" "The only solution is to move your primary partitions to have the hole next " "to the extended partitions" msgstr "" -#: ../partition_table.pm_.c:535 +#: ../partition_table.pm_.c:538 #, c-format msgid "Error reading file %s" msgstr "" -#: ../partition_table.pm_.c:542 +#: ../partition_table.pm_.c:545 #, c-format msgid "Restoring from file %s failed: %s" msgstr "" -#: ../partition_table.pm_.c:544 +#: ../partition_table.pm_.c:547 msgid "Bad backup file" msgstr "" -#: ../partition_table.pm_.c:564 +#: ../partition_table.pm_.c:567 #, c-format msgid "Error writing to file %s" msgstr "" @@ -2582,3 +2667,25 @@ msgstr "" #: ../printer.pm_.c:247 msgid "NetWare" msgstr "" + +#: ../raid.pm_.c:34 +#, c-format +msgid "Can't add a partition to _formatted_ RAID md%d" +msgstr "" + +#: ../raid.pm_.c:92 +msgid "Can't write file $file" +msgstr "" + +#: ../raid.pm_.c:127 +#, c-format +msgid "Not enough partitions for RAID level %d\n" +msgstr "" + +#: ../unused/install_steps_graphical.pm_.c:433 +msgid "Show less" +msgstr "" + +#: ../unused/install_steps_graphical.pm_.c:434 +msgid "Show more" +msgstr "" diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po index 9de69e0a0..011793082 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-11-08 15:49+0100\n" +"POT-Creation-Date: 1999-11-09 14:08+0100\n" "PO-Revision-Date: 1999-08-25 11:07+0200\n" "Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n" "Language-Team: norwegian\n" @@ -98,8 +98,8 @@ msgstr "" msgid "(leaving in %d seconds)" msgstr "(slutter om %d sekunder)" -#: ../Xconfigurator.pm_.c:328 ../install_steps_interactive.pm_.c:570 -#: ../my_gtk.pm_.c:436 +#: ../Xconfigurator.pm_.c:328 ../install_steps_interactive.pm_.c:571 +#: ../my_gtk.pm_.c:437 msgid "Is this correct?" msgstr "Er dette riktig?" @@ -121,7 +121,7 @@ msgstr "" "Skjermen din vil blinke...\n" "Du kan slå av hvis du vil, du vil høre et bipp når det er ferdig" -#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:535 +#: ../Xconfigurator.pm_.c:396 ../install_steps_interactive.pm_.c:536 msgid "Resolution" msgstr "Oppløsning" @@ -336,92 +336,92 @@ 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:15 +#: ../diskdrake.pm_.c:16 msgid "Create" msgstr "Opprett" -#: ../diskdrake.pm_.c:16 +#: ../diskdrake.pm_.c:17 msgid "Unmount" msgstr "Demonter" -#: ../diskdrake.pm_.c:17 +#: ../diskdrake.pm_.c:18 msgid "Delete" msgstr "Slett" -#: ../diskdrake.pm_.c:17 +#: ../diskdrake.pm_.c:18 msgid "Format" msgstr "Formater" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:398 +#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:418 msgid "Move" msgstr "Flytt" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:456 +#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:476 msgid "Resize" msgstr "Endre størrelse" -#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:345 +#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:365 msgid "Type" msgstr "Type" -#: ../diskdrake.pm_.c:18 -msgid "Mount_point" +#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:381 +msgid "Mount point" msgstr "Monteringspunkt" -#: ../diskdrake.pm_.c:32 +#: ../diskdrake.pm_.c:33 msgid "Write /etc/fstab" msgstr "Skriv /etc/fstab" -#: ../diskdrake.pm_.c:33 +#: ../diskdrake.pm_.c:34 msgid "Normal > Expert" msgstr "Normal > Ekspert" -#: ../diskdrake.pm_.c:34 +#: ../diskdrake.pm_.c:35 msgid "Expert > Normal" msgstr "Ekspert > Normal" -#: ../diskdrake.pm_.c:35 +#: ../diskdrake.pm_.c:36 msgid "Restore from file" msgstr "Gjenopprett fra fil" -#: ../diskdrake.pm_.c:36 +#: ../diskdrake.pm_.c:37 msgid "Save in file" msgstr "Lagre i fil" -#: ../diskdrake.pm_.c:37 +#: ../diskdrake.pm_.c:38 msgid "Restore from floppy" msgstr "Gjenopprett fra diskett" -#: ../diskdrake.pm_.c:38 +#: ../diskdrake.pm_.c:39 msgid "Save on floppy" msgstr "Lagre på diskett" -#: ../diskdrake.pm_.c:39 ../install_steps_interactive.pm_.c:627 -#: ../install_steps_interactive.pm_.c:745 +#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:628 +#: ../install_steps_interactive.pm_.c:746 msgid "Done" msgstr "Ferdig" -#: ../diskdrake.pm_.c:42 +#: ../diskdrake.pm_.c:43 msgid "Clear all" msgstr "Fjern alle" -#: ../diskdrake.pm_.c:43 +#: ../diskdrake.pm_.c:44 msgid "Format all" msgstr "Formater alle" -#: ../diskdrake.pm_.c:44 +#: ../diskdrake.pm_.c:45 msgid "Auto allocate" msgstr "Automatisk allokering" -#: ../diskdrake.pm_.c:47 +#: ../diskdrake.pm_.c:48 msgid "All primary partitions are used" msgstr "Alle primære partisjoner er i bruk" -#: ../diskdrake.pm_.c:47 +#: ../diskdrake.pm_.c:48 msgid "I can't add any more partition" msgstr "Jeg kan ikke legge til flere partisjoner" -#: ../diskdrake.pm_.c:47 +#: ../diskdrake.pm_.c:48 msgid "" "To have more partitions, please delete one to be able to create an extended " "partition" @@ -429,123 +429,129 @@ msgstr "" "For å ha flere partisjoner vennligst slett en for å kunne opprette en " "utvidet partisjon" -#: ../diskdrake.pm_.c:50 +#: ../diskdrake.pm_.c:51 msgid "Rescue partition table" msgstr "Redde partisjonstabell" -#: ../diskdrake.pm_.c:51 +#: ../diskdrake.pm_.c:52 msgid "Undo" msgstr "Angre" -#: ../diskdrake.pm_.c:52 +#: ../diskdrake.pm_.c:53 msgid "Write partition table" msgstr "Skriv partisjonstabell" -#: ../diskdrake.pm_.c:53 +#: ../diskdrake.pm_.c:54 msgid "Reload" msgstr "Last igjen" -#: ../diskdrake.pm_.c:93 +#: ../diskdrake.pm_.c:98 #, fuzzy msgid "Filesystem types:" msgstr "Filsystemtype: " -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Empty" msgstr "Tom" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Ext2" msgstr "Ext2" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "FAT" msgstr "FAT" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Other" msgstr "Andre" -#: ../diskdrake.pm_.c:97 +#: ../diskdrake.pm_.c:102 msgid "Swap" msgstr "Veksle" -#: ../diskdrake.pm_.c:100 +#: ../diskdrake.pm_.c:105 msgid "Choose action" msgstr "Velg handling" -#: ../diskdrake.pm_.c:102 +#: ../diskdrake.pm_.c:107 msgid "Details" msgstr "Detaljer" -#: ../diskdrake.pm_.c:127 +#: ../diskdrake.pm_.c:132 #, c-format msgid "After %s partition %s," msgstr "Etter %s partisjon %s," -#: ../diskdrake.pm_.c:127 ../diskdrake.pm_.c:388 ../diskdrake.pm_.c:416 +#: ../diskdrake.pm_.c:132 ../diskdrake.pm_.c:408 ../diskdrake.pm_.c:436 msgid "Read carefully!" msgstr "Les nøye!" -#: ../diskdrake.pm_.c:127 +#: ../diskdrake.pm_.c:132 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:146 ../install_any.pm_.c:175 ../install_steps.pm_.c:70 -#: ../install_steps_interactive.pm_.c:40 +#: ../diskdrake.pm_.c:151 ../install_any.pm_.c:177 ../install_steps.pm_.c:71 +#: ../install_steps_interactive.pm_.c:41 msgid "Error" msgstr "Feil" -#: ../diskdrake.pm_.c:170 ../diskdrake.pm_.c:533 +#: ../diskdrake.pm_.c:175 ../diskdrake.pm_.c:553 msgid "Mount point: " msgstr "Monteringspunkt: " -#: ../diskdrake.pm_.c:171 ../diskdrake.pm_.c:195 +#: ../diskdrake.pm_.c:176 ../diskdrake.pm_.c:208 msgid "Device: " msgstr "Enhet: " -#: ../diskdrake.pm_.c:172 +#: ../diskdrake.pm_.c:177 #, c-format msgid "DOS drive letter: %s (just a guess)\n" msgstr "DOS diskbokstav: %s (bare en gjetning)\n" -#: ../diskdrake.pm_.c:173 ../diskdrake.pm_.c:198 +#: ../diskdrake.pm_.c:178 ../diskdrake.pm_.c:211 msgid "Type: " msgstr "Type: " -#: ../diskdrake.pm_.c:174 +#: ../diskdrake.pm_.c:179 #, c-format msgid "Start: sector %s\n" msgstr "Start: sektor %s\n" -#: ../diskdrake.pm_.c:175 -msgid "Size: %s MB (%s%%)" -msgstr "Størrelse: %s MB (%s%%)" +#: ../diskdrake.pm_.c:180 +#, fuzzy, c-format +msgid "Size: %s MB" +msgstr "Størrelse: %d MB\n" -#: ../diskdrake.pm_.c:176 +#: ../diskdrake.pm_.c:182 #, c-format msgid ", %s sectors" msgstr ", %s sektorer" -#: ../diskdrake.pm_.c:178 +#: ../diskdrake.pm_.c:184 #, c-format msgid "Cylinder %d to cylinder %d\n" msgstr "Sylinder %d til sylinder %d\n" -#: ../diskdrake.pm_.c:179 +#: ../diskdrake.pm_.c:185 msgid "Formatted\n" msgstr "Formatert\n" -#: ../diskdrake.pm_.c:180 +#: ../diskdrake.pm_.c:186 msgid "Not formatted\n" msgstr "Ikke formatert\n" -#: ../diskdrake.pm_.c:181 +#: ../diskdrake.pm_.c:187 msgid "Mounted\n" msgstr "Montert\n" -#: ../diskdrake.pm_.c:182 +#: ../diskdrake.pm_.c:188 +#, c-format +msgid "RAID md%s\n" +msgstr "" + +#: ../diskdrake.pm_.c:189 msgid "" "Partition booted by default\n" " (for MS-DOS boot, not for lilo)\n" @@ -553,30 +559,58 @@ msgstr "" "Partisjon startet opp som standard\n" " (for MS-DOS oppstart, ikke for lilo)\n" -#: ../diskdrake.pm_.c:196 +#: ../diskdrake.pm_.c:191 +#, c-format +msgid "Level %s\n" +msgstr "" + +#: ../diskdrake.pm_.c:192 +#, c-format +msgid "Chunk size %s\n" +msgstr "" + +#: ../diskdrake.pm_.c:193 +#, c-format +msgid "RAID-disks %s\n" +msgstr "" + +#: ../diskdrake.pm_.c:209 #, c-format msgid "Size: %d MB\n" msgstr "Størrelse: %d MB\n" -#: ../diskdrake.pm_.c:197 +#: ../diskdrake.pm_.c:210 #, c-format msgid "Geometry: %s cylinders, %s heads, %s sectors\n" msgstr "Geometri: %s sylindere, %s hoder, %s sektorer\n" -#: ../diskdrake.pm_.c:199 +#: ../diskdrake.pm_.c:212 #, c-format msgid "on bus %d id %d\n" msgstr "på buss %d id %d\n" -#: ../diskdrake.pm_.c:211 +#: ../diskdrake.pm_.c:224 msgid "Mount" msgstr "Monter" -#: ../diskdrake.pm_.c:213 +#: ../diskdrake.pm_.c:226 msgid "Active" msgstr "Aktiv" -#: ../diskdrake.pm_.c:307 +#: ../diskdrake.pm_.c:227 +msgid "Add to RAID" +msgstr "" + +#: ../diskdrake.pm_.c:228 +#, fuzzy +msgid "Remove from RAID" +msgstr "Gjenopprett fra fil" + +#: ../diskdrake.pm_.c:229 +msgid "Modify RAID" +msgstr "" + +#: ../diskdrake.pm_.c:325 msgid "" "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > " "1024).\n" @@ -588,7 +622,7 @@ msgstr "" "Enten bruker du LILO og denne ikke virker, eller du bruker ikke LILO og du " "trenger ikke /boot" -#: ../diskdrake.pm_.c:311 +#: ../diskdrake.pm_.c:329 msgid "" "The partition you've selected to add as root (/) is physically located " "beyond\n" @@ -601,122 +635,119 @@ msgstr "" "Hvis du skal bruke oppstartshåndtereren LILO, vær nøye med å legge til en\n" "/boot partisjon" -#: ../diskdrake.pm_.c:325 +#: ../diskdrake.pm_.c:344 msgid "Quit without saving" msgstr "Avslutt uten å lagre" -#: ../diskdrake.pm_.c:325 +#: ../diskdrake.pm_.c:344 msgid "Quit without writing the partition table?" msgstr "Avslutt uten å skrive partisjonstabellen?" -#: ../diskdrake.pm_.c:340 +#: ../diskdrake.pm_.c:360 msgid "changing type of" msgstr "endrer type av" -#: ../diskdrake.pm_.c:343 +#: ../diskdrake.pm_.c:363 msgid "Change partition type" msgstr "Endre partisjonstype" -#: ../diskdrake.pm_.c:344 +#: ../diskdrake.pm_.c:364 msgid "Which partition type do you want?" msgstr "Hvilken partisjonstype ønsker du?" -#: ../diskdrake.pm_.c:360 +#: ../diskdrake.pm_.c:380 #, c-format msgid "Where do you want to mount device %s?" msgstr "Hvor vil du montere %s enheten?" -#: ../diskdrake.pm_.c:361 -msgid "Mount point" -msgstr "Monteringspunkt" - -#: ../diskdrake.pm_.c:382 +#: ../diskdrake.pm_.c:402 msgid "formatting" msgstr "formatering" -#: ../diskdrake.pm_.c:388 +#: ../diskdrake.pm_.c:408 msgid "After formatting all partitions," msgstr "Etter formatering av alle partisjonene," -#: ../diskdrake.pm_.c:388 +#: ../diskdrake.pm_.c:408 msgid "all data on these partitions will be lost" msgstr "alle data på disse partisjonene vil gå tapt" -#: ../diskdrake.pm_.c:399 +#: ../diskdrake.pm_.c:419 msgid "Which disk do you want to move to?" msgstr "Hvilken disk vil du flytte til?" -#: ../diskdrake.pm_.c:403 +#: ../diskdrake.pm_.c:423 msgid "Sector" msgstr "Sektor" -#: ../diskdrake.pm_.c:404 +#: ../diskdrake.pm_.c:424 msgid "Which sector do you want to move to?" msgstr "Hvilken sektor vil du flytte til?" -#: ../diskdrake.pm_.c:407 +#: ../diskdrake.pm_.c:427 msgid "Moving" msgstr "Flytter" -#: ../diskdrake.pm_.c:407 +#: ../diskdrake.pm_.c:427 msgid "Moving partition..." msgstr "Flytter partisjon..." -#: ../diskdrake.pm_.c:416 +#: ../diskdrake.pm_.c:436 #, 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:418 +#: ../diskdrake.pm_.c:438 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:439 +#: ../diskdrake.pm_.c:459 msgid "Computing fat filesystem bounds" msgstr "Beregner fat filsystemgrense" -#: ../diskdrake.pm_.c:439 ../diskdrake.pm_.c:484 +#: ../diskdrake.pm_.c:459 ../diskdrake.pm_.c:504 msgid "Resizing" msgstr "Endrer størrelse" -#: ../diskdrake.pm_.c:453 +#: ../diskdrake.pm_.c:473 msgid "resizing" msgstr "endrer størrelse" -#: ../diskdrake.pm_.c:463 +#: ../diskdrake.pm_.c:483 msgid "Choose the new size" msgstr "Velg den nye størrelsen" -#: ../diskdrake.pm_.c:463 ../install_steps_graphical.pm_.c:290 +#: ../diskdrake.pm_.c:483 ../install_steps_graphical.pm_.c:290 #: ../install_steps_graphical.pm_.c:337 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "MB" msgstr "MB" -#: ../diskdrake.pm_.c:510 +#: ../diskdrake.pm_.c:530 msgid "Create a new partition" msgstr "Opprette en ny partisjon" -#: ../diskdrake.pm_.c:526 +#: ../diskdrake.pm_.c:546 msgid "Start sector: " msgstr "Start sektor: " -#: ../diskdrake.pm_.c:529 +#: ../diskdrake.pm_.c:549 msgid "Size in MB: " msgstr "Størrelse i MB: " -#: ../diskdrake.pm_.c:532 +#: ../diskdrake.pm_.c:552 msgid "Filesystem type: " msgstr "Filsystemtype: " -#: ../diskdrake.pm_.c:534 +#: ../diskdrake.pm_.c:554 msgid "Preference: " msgstr "Valg: " -#: ../diskdrake.pm_.c:576 ../diskdrake.pm_.c:592 +#: ../diskdrake.pm_.c:596 ../diskdrake.pm_.c:612 msgid "Select file" msgstr "Velg fil" -#: ../diskdrake.pm_.c:585 +#: ../diskdrake.pm_.c:605 msgid "" "The backup partition table has not the same size\n" "Still continue?" @@ -724,11 +755,11 @@ msgstr "" "Sikkerhetskopien av partisjonstabellen har ikke samme størrelse\n" "Fortsette for det?" -#: ../diskdrake.pm_.c:593 +#: ../diskdrake.pm_.c:613 msgid "Warning" msgstr "Advarsel" -#: ../diskdrake.pm_.c:594 +#: ../diskdrake.pm_.c:614 msgid "" "Insert a floppy in drive\n" "All data on this floppy will be lost" @@ -736,10 +767,31 @@ msgstr "" "Sett inn en diskett i stasjonen\n" "Alle data på denne disketten vil gå tapt" -#: ../diskdrake.pm_.c:608 +#: ../diskdrake.pm_.c:628 msgid "Trying to rescue partition table" msgstr "Prøver å redde partisjonstabell" +#: ../diskdrake.pm_.c:639 +#, fuzzy +msgid "device" +msgstr "Enhet: " + +#: ../diskdrake.pm_.c:640 +msgid "level" +msgstr "" + +#: ../diskdrake.pm_.c:641 +msgid "chunk size" +msgstr "" + +#: ../diskdrake.pm_.c:658 +msgid "Choose an existent RAID to add to" +msgstr "" + +#: ../diskdrake.pm_.c:659 +msgid "new" +msgstr "" + #: ../fs.pm_.c:67 ../fs.pm_.c:73 #, c-format msgid "%s formatting of %s failed" @@ -763,21 +815,21 @@ msgstr "montering mislykket: " msgid "error unmounting %s: %s" msgstr "feil ved demontering av %s: %s" -#: ../fsedit.pm_.c:162 +#: ../fsedit.pm_.c:168 msgid "Mount points must begin with a leading /" msgstr "Monteringspunkter må begynne med /" -#: ../fsedit.pm_.c:165 +#: ../fsedit.pm_.c:171 #, c-format msgid "There is already a partition with mount point %s" msgstr "Det finnes allerede en partisjon med monteringspunkt %s" -#: ../fsedit.pm_.c:295 +#: ../fsedit.pm_.c:301 #, c-format msgid "Error opening %s for writing: %s" msgstr "Feil ved åpning av %s for skriving: %s" -#: ../fsedit.pm_.c:367 +#: ../fsedit.pm_.c:373 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" @@ -785,7 +837,7 @@ 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:382 +#: ../fsedit.pm_.c:388 msgid "You don't have any partitions!" msgstr "Du har ingen partisjoner!" @@ -1400,8 +1452,8 @@ msgstr "Konfigurer tidssone" msgid "Configure printer" msgstr "Konfigurer skriver" -#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:585 -#: ../install_steps_interactive.pm_.c:586 +#: ../install2.pm_.c:55 ../install_steps_interactive.pm_.c:586 +#: ../install_steps_interactive.pm_.c:587 msgid "Set root password" msgstr "Sett root-passord" @@ -1445,12 +1497,12 @@ msgstr "tjener" msgid "Partitioning failed: no root filesystem" msgstr "Partisjonering feilet: intet root-filsystem" -#: ../install2.pm_.c:319 +#: ../install2.pm_.c:316 msgid "Not enough swap to fulfill installation, please add some" msgstr "" "Ikke nok vekslingsplass til å fullføre installasjonen, du må legge til mer" -#: ../install_any.pm_.c:176 +#: ../install_any.pm_.c:178 msgid "" "I can't read your partition table, it's too corrupted for me :(\n" "I'll try to go on blanking bad partitions" @@ -1458,7 +1510,7 @@ msgstr "" "Jeg kan ikke lese partisjonstabellen din, den er for ødelagt for meg :(\n" "Jeg vil førsøke å blanke ut dårlige partisjoner" -#: ../install_any.pm_.c:192 +#: ../install_any.pm_.c:194 msgid "" "DiskDrake failed to read correctly the partition table.\n" "Continue at your own risk!" @@ -1466,33 +1518,33 @@ msgstr "" "DiskDrake klarte ikke å lese partisjonstabellen korrekt.\n" "Fortsett på egen risiko!" -#: ../install_any.pm_.c:231 +#: ../install_any.pm_.c:233 msgid "Information" msgstr "Informasjon" -#: ../install_any.pm_.c:232 +#: ../install_any.pm_.c:234 #, 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:234 +#: ../install_any.pm_.c:236 msgid "No root partition found" msgstr "Ingen root-partisjon funnet" -#: ../install_any.pm_.c:270 +#: ../install_any.pm_.c:272 msgid "Can't use broadcast with no NIS domain" msgstr "Kan ikke bruke broadcast uten NIS domene" -#: ../install_any.pm_.c:414 +#: ../install_any.pm_.c:420 msgid "Error reading file $f" msgstr "Feil ved lesing av fil $f" -#: ../install_any.pm_.c:419 +#: ../install_any.pm_.c:425 #, c-format msgid "Bad kickstart file %s (failed %s)" msgstr "Dårlig kickstart-fil %s (mislykket %s)" -#: ../install_steps.pm_.c:71 +#: ../install_steps.pm_.c:72 msgid "" "An error occurred, but I don't know how to handle it nicely.\n" "Continue at your own risk." @@ -1501,12 +1553,12 @@ msgstr "" "pen måte.\n" "Fortsett på eget ansvar." -#: ../install_steps.pm_.c:135 +#: ../install_steps.pm_.c:136 #, c-format msgid "Duplicate mount point %s" msgstr "Dupliser monteringspunkt %s" -#: ../install_steps.pm_.c:383 +#: ../install_steps.pm_.c:417 msgid "No floppy drive available" msgstr "Ingen diskettstasjon tilgjengelig" @@ -1516,10 +1568,12 @@ msgid "Entering step `%s'\n" msgstr "Entrer trinn `%s'\n" #: ../install_steps_graphical.pm_.c:259 +#: ../unused/install_steps_graphical.pm_.c:255 msgid "You must have a swap partition" msgstr "Du må ha en vekslingspartisjon" #: ../install_steps_graphical.pm_.c:261 +#: ../unused/install_steps_graphical.pm_.c:258 msgid "" "You don't have a swap partition\n" "\n" @@ -1534,247 +1588,262 @@ msgid "Choose the size you want to install" msgstr "Velg størrelsen du ønsker å installere" #: ../install_steps_graphical.pm_.c:337 +#: ../unused/install_steps_graphical.pm_.c:314 msgid "Total size: " msgstr "Total størrelse: " #: ../install_steps_graphical.pm_.c:349 +#: ../unused/install_steps_graphical.pm_.c:284 #, c-format msgid "Version: %s\n" msgstr "Versjon: %s\n" #: ../install_steps_graphical.pm_.c:350 +#: ../unused/install_steps_graphical.pm_.c:285 #, c-format msgid "Size: %d KB\n" msgstr "Størrelse: %d KB\n" #: ../install_steps_graphical.pm_.c:465 +#: ../unused/install_steps_graphical.pm_.c:421 msgid "Choose the packages you want to install" msgstr "Velg pakkene du ønsker å installere" #: ../install_steps_graphical.pm_.c:468 +#: ../unused/install_steps_graphical.pm_.c:424 msgid "Info" msgstr "Info" -#: ../install_steps_graphical.pm_.c:476 ../install_steps_interactive.pm_.c:84 +#: ../install_steps_graphical.pm_.c:476 ../install_steps_interactive.pm_.c:85 +#: ../unused/install_steps_graphical.pm_.c:432 msgid "Install" msgstr "Installer" #: ../install_steps_graphical.pm_.c:495 +#: ../unused/install_steps_graphical.pm_.c:451 msgid "Installing" msgstr "Installerer" #: ../install_steps_graphical.pm_.c:502 +#: ../unused/install_steps_graphical.pm_.c:457 msgid "Please wait, " msgstr "Vennligst vent, " #: ../install_steps_graphical.pm_.c:504 +#: ../unused/install_steps_graphical.pm_.c:459 msgid "Time remaining " msgstr "Tid som gjenstår " #: ../install_steps_graphical.pm_.c:505 +#: ../unused/install_steps_graphical.pm_.c:460 msgid "Total time " msgstr "Total tid " #: ../install_steps_graphical.pm_.c:510 +#: ../unused/install_steps_graphical.pm_.c:465 msgid "Preparing installation" msgstr "Forbereder installasjon" #: ../install_steps_graphical.pm_.c:533 +#: ../unused/install_steps_graphical.pm_.c:486 #, c-format msgid "Installing package %s" msgstr "Installerer pakke %s" #: ../install_steps_graphical.pm_.c:558 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "Go on anyway?" msgstr "Fortsette uansett?" #: ../install_steps_graphical.pm_.c:558 +#: ../unused/install_steps_graphical.pm_.c:511 msgid "There was an error ordering packages:" msgstr "Det var en feil ved endring av pakkenes rekkefølge:" #: ../install_steps_graphical.pm_.c:582 +#: ../unused/install_steps_graphical.pm_.c:535 msgid "Use existing configuration for X11?" msgstr "Bruke eksisterende konfigurasjon for X11?" -#: ../install_steps_interactive.pm_.c:40 +#: ../install_steps_interactive.pm_.c:41 msgid "An error occurred" msgstr "En feil oppsto" -#: ../install_steps_interactive.pm_.c:57 +#: ../install_steps_interactive.pm_.c:58 msgid "Which language do you want?" msgstr "Hvilket språk ønsker du?" -#: ../install_steps_interactive.pm_.c:72 +#: ../install_steps_interactive.pm_.c:73 msgid "What is your keyboard layout?" msgstr "Hva er tastatur-oppsettet ditt?" -#: ../install_steps_interactive.pm_.c:82 +#: ../install_steps_interactive.pm_.c:83 msgid "Install/Upgrade" msgstr "Installer/Oppgrader" -#: ../install_steps_interactive.pm_.c:83 +#: ../install_steps_interactive.pm_.c:84 msgid "Is this an install or an upgrade?" msgstr "Er dette en installasjon eller en oppgradering?" -#: ../install_steps_interactive.pm_.c:84 +#: ../install_steps_interactive.pm_.c:85 msgid "Upgrade" msgstr "Oppgrader" -#: ../install_steps_interactive.pm_.c:92 +#: ../install_steps_interactive.pm_.c:93 msgid "Root Partition" msgstr "Root-partisjon" -#: ../install_steps_interactive.pm_.c:93 +#: ../install_steps_interactive.pm_.c:94 msgid "What is the root partition (/) of your system?" msgstr "Hva er root-partisjonen (/) på systemet ditt?" -#: ../install_steps_interactive.pm_.c:103 +#: ../install_steps_interactive.pm_.c:104 msgid "Recommended" msgstr "" -#: ../install_steps_interactive.pm_.c:104 -msgid "Personalized" +#: ../install_steps_interactive.pm_.c:105 +msgid "Customized" msgstr "" -#: ../install_steps_interactive.pm_.c:105 +#: ../install_steps_interactive.pm_.c:106 #, fuzzy msgid "Expert" msgstr "ekspert" -#: ../install_steps_interactive.pm_.c:107 -#: ../install_steps_interactive.pm_.c:121 +#: ../install_steps_interactive.pm_.c:108 +#: ../install_steps_interactive.pm_.c:122 msgid "Install Class" msgstr "Installeringsklasse" -#: ../install_steps_interactive.pm_.c:108 +#: ../install_steps_interactive.pm_.c:109 msgid "What installation class do you want?" msgstr "Hvilken installasjonsklasse ønsker du?" -#: ../install_steps_interactive.pm_.c:117 +#: ../install_steps_interactive.pm_.c:118 #, fuzzy msgid "Normal" msgstr "Normal DAC" -#: ../install_steps_interactive.pm_.c:118 +#: ../install_steps_interactive.pm_.c:119 #, fuzzy msgid "Developement" msgstr "utvikler" -#: ../install_steps_interactive.pm_.c:119 +#: ../install_steps_interactive.pm_.c:120 #, fuzzy msgid "Server" msgstr "tjener" -#: ../install_steps_interactive.pm_.c:122 +#: ../install_steps_interactive.pm_.c:123 #, fuzzy msgid "What usage do you want?" msgstr "Hvilket språk ønsker du?" -#: ../install_steps_interactive.pm_.c:135 +#: ../install_steps_interactive.pm_.c:136 msgid "What is the type of your mouse?" msgstr "Hva slags type er musen din?" -#: ../install_steps_interactive.pm_.c:139 +#: ../install_steps_interactive.pm_.c:140 msgid "Emulate third button?" msgstr "Emulere tredje knapp?" -#: ../install_steps_interactive.pm_.c:142 +#: ../install_steps_interactive.pm_.c:143 msgid "Mouse Port" msgstr "Museport" -#: ../install_steps_interactive.pm_.c:143 +#: ../install_steps_interactive.pm_.c:144 msgid "Which serial port is your mouse connected to?" msgstr "Hvilken serieport er musen din koblet til?" -#: ../install_steps_interactive.pm_.c:156 +#: ../install_steps_interactive.pm_.c:157 msgid "no available partitions" msgstr "ingen tilgjengelige partisjoner" -#: ../install_steps_interactive.pm_.c:158 +#: ../install_steps_interactive.pm_.c:159 #, c-format msgid "(%dMb)" msgstr "(%dMb)" -#: ../install_steps_interactive.pm_.c:165 +#: ../install_steps_interactive.pm_.c:166 msgid "Which partition do you want to use as your root partition" msgstr "Hvilken partisjon vil du bruke som din root-partisjon" -#: ../install_steps_interactive.pm_.c:172 +#: ../install_steps_interactive.pm_.c:173 msgid "Choose the mount points" msgstr "Velg monteringspunkter" -#: ../install_steps_interactive.pm_.c:184 +#: ../install_steps_interactive.pm_.c:185 msgid "You need to reboot for the partition table modifications to take place" msgstr "" "Du må starte maskinen på nytt for at modifiseringene av partisjonstabellen\n" "skal tre i kraft" -#: ../install_steps_interactive.pm_.c:203 +#: ../install_steps_interactive.pm_.c:204 msgid "Choose the partitions you want to format" msgstr "Velg de partisjonene du ønsker å formatere" -#: ../install_steps_interactive.pm_.c:213 +#: ../install_steps_interactive.pm_.c:214 #, c-format msgid "Formatting partition %s" msgstr "Formaterer partisjon %s" -#: ../install_steps_interactive.pm_.c:222 +#: ../install_steps_interactive.pm_.c:223 msgid "Looking for available packages" msgstr "Ser etter tilgjengelige pakker" -#: ../install_steps_interactive.pm_.c:228 +#: ../install_steps_interactive.pm_.c:229 msgid "Finding packages to upgrade" msgstr "Finner pakker å oppgradere" -#: ../install_steps_interactive.pm_.c:237 +#: ../install_steps_interactive.pm_.c:238 msgid "Package Group Selection" msgstr "Valg pakkegruppe" -#: ../install_steps_interactive.pm_.c:249 +#: ../install_steps_interactive.pm_.c:250 msgid "Keep the current IP configuration" msgstr "Behold nåværende IP-konfigurasjon" -#: ../install_steps_interactive.pm_.c:250 +#: ../install_steps_interactive.pm_.c:251 msgid "Reconfigure network now" msgstr "Rekonfigurer nettverket nå" -#: ../install_steps_interactive.pm_.c:251 -#: ../install_steps_interactive.pm_.c:263 +#: ../install_steps_interactive.pm_.c:252 +#: ../install_steps_interactive.pm_.c:264 msgid "Do not set up networking" msgstr "Ikke sett opp nettverk" -#: ../install_steps_interactive.pm_.c:253 -#: ../install_steps_interactive.pm_.c:261 +#: ../install_steps_interactive.pm_.c:254 +#: ../install_steps_interactive.pm_.c:262 msgid "Network Configuration" msgstr "Nettverks-konfigurasjon" -#: ../install_steps_interactive.pm_.c:254 +#: ../install_steps_interactive.pm_.c:255 msgid "Local networking has already been configured. Do you want to:" msgstr "Lokalt nettverk har allerede blitt konfigurert. Vil du:" -#: ../install_steps_interactive.pm_.c:262 +#: ../install_steps_interactive.pm_.c:263 #, fuzzy msgid "Do you want to configure networking for yout system?" msgstr "Vil du konfigurere LAN (ikke oppringt) nettverk for systemet ditt?" -#: ../install_steps_interactive.pm_.c:263 +#: ../install_steps_interactive.pm_.c:264 msgid "Dialup with modem" msgstr "" -#: ../install_steps_interactive.pm_.c:263 +#: ../install_steps_interactive.pm_.c:264 msgid "Local LAN" msgstr "" -#: ../install_steps_interactive.pm_.c:272 +#: ../install_steps_interactive.pm_.c:273 msgid "no network card found" msgstr "ingen nettverkskort funnet" -#: ../install_steps_interactive.pm_.c:301 +#: ../install_steps_interactive.pm_.c:302 #, c-format msgid "Configuring network device %s" msgstr "Konfigurerer nettverks-enhet %s" -#: ../install_steps_interactive.pm_.c:302 +#: ../install_steps_interactive.pm_.c:303 msgid "" "Please enter the IP configuration for this machine.\n" "Each item should be entered as an IP address in dotted-decimal\n" @@ -1784,32 +1853,32 @@ msgstr "" "Hvert element bør entres som en IP-adresse i punkt-desimal\n" "notasjon (f.eks, 1.2.3.4)." -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:306 msgid "Automatic IP" msgstr "Automatisk IP" -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:306 msgid "IP address:" msgstr "IP-adresse:" -#: ../install_steps_interactive.pm_.c:305 +#: ../install_steps_interactive.pm_.c:306 msgid "Netmask:" msgstr "Nettmaske:" -#: ../install_steps_interactive.pm_.c:306 +#: ../install_steps_interactive.pm_.c:307 msgid "(bootp/dhcp)" msgstr "(bootp/dhcp)" -#: ../install_steps_interactive.pm_.c:312 -#: ../install_steps_interactive.pm_.c:475 +#: ../install_steps_interactive.pm_.c:313 +#: ../install_steps_interactive.pm_.c:476 msgid "IP address should be in format 1.2.3.4" msgstr "IP-adresse bør være i format 1.2.3.4" -#: ../install_steps_interactive.pm_.c:331 +#: ../install_steps_interactive.pm_.c:332 msgid "Configuring network" msgstr "Konfigurerer nettverk" -#: ../install_steps_interactive.pm_.c:332 +#: ../install_steps_interactive.pm_.c:333 msgid "" "Please enter your host name.\n" "Your host name should be a fully-qualified host name,\n" @@ -1821,111 +1890,112 @@ msgstr "" "så som ``minboks.mittlab.mittfirma.no''.\n" "Du kan også entre IP-adressen til gateway'en hvis du har en" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "DNS server:" msgstr "DNS-tjener:" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "Gateway device:" msgstr "Gateway-enhet:" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "Gateway:" msgstr "Gateway:" -#: ../install_steps_interactive.pm_.c:336 +#: ../install_steps_interactive.pm_.c:337 msgid "Host name:" msgstr "Vertsnavn:" -#: ../install_steps_interactive.pm_.c:347 -msgid "Skip modem autodetection?" -msgstr "" +#: ../install_steps_interactive.pm_.c:348 +#, fuzzy +msgid "Try to find a modem?" +msgstr "Har du en bærbar maskin?" -#: ../install_steps_interactive.pm_.c:356 +#: ../install_steps_interactive.pm_.c:357 #, fuzzy msgid "Which serial port is your modem connected to?" msgstr "Hvilken serieport er musen din koblet til?" -#: ../install_steps_interactive.pm_.c:360 +#: ../install_steps_interactive.pm_.c:361 #, fuzzy msgid "Dialup options" msgstr "LILO hovedopsjoner" -#: ../install_steps_interactive.pm_.c:361 +#: ../install_steps_interactive.pm_.c:362 msgid "Connection name" msgstr "" -#: ../install_steps_interactive.pm_.c:362 +#: ../install_steps_interactive.pm_.c:363 msgid "Phone number" msgstr "" -#: ../install_steps_interactive.pm_.c:363 +#: ../install_steps_interactive.pm_.c:364 msgid "Login ID" msgstr "" -#: ../install_steps_interactive.pm_.c:364 -#: ../install_steps_interactive.pm_.c:587 -#: ../install_steps_interactive.pm_.c:633 -#: ../install_steps_interactive.pm_.c:724 +#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:588 +#: ../install_steps_interactive.pm_.c:634 +#: ../install_steps_interactive.pm_.c:725 msgid "Password" msgstr "Passord" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "Authentication" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "CHAP" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "PAP" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "Script-based" msgstr "" -#: ../install_steps_interactive.pm_.c:365 +#: ../install_steps_interactive.pm_.c:366 msgid "Terminal-based" msgstr "" -#: ../install_steps_interactive.pm_.c:366 +#: ../install_steps_interactive.pm_.c:367 #, fuzzy msgid "Domain name" msgstr "Virkelig navn" -#: ../install_steps_interactive.pm_.c:367 +#: ../install_steps_interactive.pm_.c:368 #, fuzzy msgid "First DNS Server" msgstr "NIS-tjener" -#: ../install_steps_interactive.pm_.c:368 +#: ../install_steps_interactive.pm_.c:369 #, fuzzy msgid "Second DNS Server" msgstr "NIS-tjener" -#: ../install_steps_interactive.pm_.c:377 +#: ../install_steps_interactive.pm_.c:378 msgid "Which is your timezone?" msgstr "Hvilken er tidsonen din?" -#: ../install_steps_interactive.pm_.c:378 +#: ../install_steps_interactive.pm_.c:379 msgid "Is your hardware clock set to GMT?" msgstr "Er maskinvareklokken din satt til GMT?" -#: ../install_steps_interactive.pm_.c:388 +#: ../install_steps_interactive.pm_.c:389 msgid "Printer" msgstr "Skriver" -#: ../install_steps_interactive.pm_.c:389 +#: ../install_steps_interactive.pm_.c:390 msgid "Would you like to configure a printer?" msgstr "Ønsker du å konfigurere en skriver?" -#: ../install_steps_interactive.pm_.c:401 +#: ../install_steps_interactive.pm_.c:402 msgid "Local Printer Options" msgstr "Opsjoner for lokal skriver" -#: ../install_steps_interactive.pm_.c:402 +#: ../install_steps_interactive.pm_.c:403 msgid "" "Every print queue (which print jobs are directed to) needs a\n" "name (often lp) and a spool directory associated with it. What\n" @@ -1935,40 +2005,40 @@ msgstr "" "(ofte lp) og en spolingskatalog assosiert til denne. Hvilket\n" "navn og katalog skal brukes for denne køen?" -#: ../install_steps_interactive.pm_.c:405 +#: ../install_steps_interactive.pm_.c:406 msgid "Name of queue:" msgstr "Køens navn:" -#: ../install_steps_interactive.pm_.c:405 +#: ../install_steps_interactive.pm_.c:406 msgid "Spool directory:" msgstr "Spolingskatalog:" -#: ../install_steps_interactive.pm_.c:416 +#: ../install_steps_interactive.pm_.c:417 msgid "Select Printer Connection" msgstr "Velg skrivertilkobling" -#: ../install_steps_interactive.pm_.c:417 +#: ../install_steps_interactive.pm_.c:418 msgid "How is the printer connected?" msgstr "Hvordan er skriveren tilkoblet?" -#: ../install_steps_interactive.pm_.c:425 +#: ../install_steps_interactive.pm_.c:426 msgid "Detecting devices..." msgstr "Finner enheter..." -#: ../install_steps_interactive.pm_.c:425 +#: ../install_steps_interactive.pm_.c:426 msgid "Test ports" msgstr "Test porter" -#: ../install_steps_interactive.pm_.c:438 +#: ../install_steps_interactive.pm_.c:439 #, c-format msgid "A printer, model \"%s\", has been detected on " msgstr "En skriver, modell \"%s\", ble funnet på " -#: ../install_steps_interactive.pm_.c:445 +#: ../install_steps_interactive.pm_.c:446 msgid "Local Printer Device" msgstr "Lokal skriverenhet" -#: ../install_steps_interactive.pm_.c:446 +#: ../install_steps_interactive.pm_.c:447 msgid "" "What device is your printer connected to \n" "(note that /dev/lp0 is equivalent to LPT1:)?\n" @@ -1976,15 +2046,15 @@ msgstr "" "Hvilken enhet er skriveren din koblet til \n" "(merk at /dev/lp0 er det samme som LPT1:)?\n" -#: ../install_steps_interactive.pm_.c:447 +#: ../install_steps_interactive.pm_.c:448 msgid "Printer Device:" msgstr "Skriverenhet:" -#: ../install_steps_interactive.pm_.c:451 +#: ../install_steps_interactive.pm_.c:452 msgid "Remote lpd Printer Options" msgstr "Opsjoner for fjern-lpd skriver" -#: ../install_steps_interactive.pm_.c:452 +#: ../install_steps_interactive.pm_.c:453 msgid "" "To use a remote lpd print queue, you need to supply\n" "the hostname of the printer server and the queue name\n" @@ -1994,19 +2064,19 @@ msgstr "" "til skrivertjeneren og kønavnet til den tjeneren som\n" "jobbene skal plasseres i." -#: ../install_steps_interactive.pm_.c:455 +#: ../install_steps_interactive.pm_.c:456 msgid "Remote hostname:" msgstr "Fjern-vertnavn:" -#: ../install_steps_interactive.pm_.c:455 +#: ../install_steps_interactive.pm_.c:456 msgid "Remote queue" msgstr "Fjern-kø" -#: ../install_steps_interactive.pm_.c:460 +#: ../install_steps_interactive.pm_.c:461 msgid "SMB (Windows 9x/NT) Printer Options" msgstr "Opsjoner for SMB (Windows 9x/NT) skriver" -#: ../install_steps_interactive.pm_.c:461 +#: ../install_steps_interactive.pm_.c:462 msgid "" "To print to a SMB printer, you need to provide the\n" "SMB host name (Note! It may be different from its\n" @@ -2020,37 +2090,37 @@ msgstr "" "navnet til skriveren du ønsker tilgang til og anvendelige brukernavn,\n" "passord og arbeidsgruppeinformasjon." -#: ../install_steps_interactive.pm_.c:466 +#: ../install_steps_interactive.pm_.c:467 msgid "SMB server IP:" msgstr "SMB-tjener IP:" -#: ../install_steps_interactive.pm_.c:466 +#: ../install_steps_interactive.pm_.c:467 msgid "SMB server host:" msgstr "SMB-tjener vert:" -#: ../install_steps_interactive.pm_.c:467 -#: ../install_steps_interactive.pm_.c:489 +#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:490 msgid "Password:" msgstr "Passord:" -#: ../install_steps_interactive.pm_.c:467 +#: ../install_steps_interactive.pm_.c:468 msgid "Share name:" msgstr "Delt navn:" -#: ../install_steps_interactive.pm_.c:467 -#: ../install_steps_interactive.pm_.c:489 +#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:490 msgid "User name:" msgstr "Brukernavn:" -#: ../install_steps_interactive.pm_.c:468 +#: ../install_steps_interactive.pm_.c:469 msgid "Workgroup:" msgstr "Arbeidsgruppe:" -#: ../install_steps_interactive.pm_.c:483 +#: ../install_steps_interactive.pm_.c:484 msgid "NetWare Printer Options" msgstr "NetWare skriveropsjoner" -#: ../install_steps_interactive.pm_.c:484 +#: ../install_steps_interactive.pm_.c:485 msgid "" "To print to a NetWare printer, you need to provide the\n" "NetWare print server name (Note! it may be different from its\n" @@ -2062,153 +2132,154 @@ msgstr "" "vertsnavn!) så vel som navnet på skriverkøen til skriveren du ønsker\n" "adgang til og anvendelige brukernavn og passord." -#: ../install_steps_interactive.pm_.c:488 +#: ../install_steps_interactive.pm_.c:489 msgid "Print Queue Name:" msgstr "Skriverkø-navn:" -#: ../install_steps_interactive.pm_.c:488 +#: ../install_steps_interactive.pm_.c:489 msgid "Printer Server:" msgstr "Skrivertjener:" -#: ../install_steps_interactive.pm_.c:499 -msgid "Yes, print ascii page" -msgstr "" - #: ../install_steps_interactive.pm_.c:500 -msgid "Yes, print postscript page" +msgid "Yes, print ascii test page" msgstr "" #: ../install_steps_interactive.pm_.c:501 -msgid "Yes, print both pages" +msgid "Yes, print postscript test page" msgstr "" #: ../install_steps_interactive.pm_.c:502 -#: ../install_steps_interactive.pm_.c:957 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:435 +msgid "Yes, print both test pages" +msgstr "" + +#: ../install_steps_interactive.pm_.c:503 +#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:436 msgid "No" msgstr "Nei" -#: ../install_steps_interactive.pm_.c:508 +#: ../install_steps_interactive.pm_.c:509 msgid "Configure Printer" msgstr "Konfigurer skriver" -#: ../install_steps_interactive.pm_.c:509 +#: ../install_steps_interactive.pm_.c:510 msgid "What type of printer do you have?" msgstr "Hva slags type skriver har du?" -#: ../install_steps_interactive.pm_.c:531 +#: ../install_steps_interactive.pm_.c:532 #, fuzzy msgid "Printer options" msgstr "Opsjoner for lokal skriver" -#: ../install_steps_interactive.pm_.c:532 +#: ../install_steps_interactive.pm_.c:533 msgid "Paper Size" msgstr "Papirstørrelse" -#: ../install_steps_interactive.pm_.c:533 +#: ../install_steps_interactive.pm_.c:534 msgid "Eject page after job?" msgstr "" -#: ../install_steps_interactive.pm_.c:536 +#: ../install_steps_interactive.pm_.c:537 msgid "Fix stair-stepping text?" msgstr "Fikse trappestegs-tekst?" -#: ../install_steps_interactive.pm_.c:539 +#: ../install_steps_interactive.pm_.c:540 #, fuzzy msgid "Uniprint driver options" msgstr "Bruk harddisk-optimisering" -#: ../install_steps_interactive.pm_.c:540 +#: ../install_steps_interactive.pm_.c:541 #, fuzzy msgid "Color depth options" msgstr "Modulopsjoner:" -#: ../install_steps_interactive.pm_.c:549 +#: ../install_steps_interactive.pm_.c:550 #, fuzzy msgid "Do you want to test printing?" msgstr "Vil du teste konfigurasjonen?" -#: ../install_steps_interactive.pm_.c:585 +#: ../install_steps_interactive.pm_.c:586 msgid "No password" msgstr "Intet passord" -#: ../install_steps_interactive.pm_.c:585 ../interactive.pm_.c:47 +#: ../install_steps_interactive.pm_.c:586 +#: ../install_steps_interactive.pm_.c:796 ../interactive.pm_.c:47 #: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22 -#: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:436 -#: ../my_gtk.pm_.c:533 +#: ../interactive_newt.pm_.c:54 ../my_gtk.pm_.c:199 ../my_gtk.pm_.c:437 +#: ../my_gtk.pm_.c:534 ../unused/install_steps_graphical.pm_.c:608 msgid "Ok" msgstr "Ok" -#: ../install_steps_interactive.pm_.c:588 -#: ../install_steps_interactive.pm_.c:634 +#: ../install_steps_interactive.pm_.c:589 +#: ../install_steps_interactive.pm_.c:635 msgid "Password (again)" msgstr "Passord (igjen)" -#: ../install_steps_interactive.pm_.c:590 +#: ../install_steps_interactive.pm_.c:591 msgid "Use shadow file" msgstr "Bruk skyggefil" -#: ../install_steps_interactive.pm_.c:590 +#: ../install_steps_interactive.pm_.c:591 msgid "shadow" msgstr "skygge" -#: ../install_steps_interactive.pm_.c:591 +#: ../install_steps_interactive.pm_.c:592 msgid "MD5" msgstr "MD5" -#: ../install_steps_interactive.pm_.c:591 +#: ../install_steps_interactive.pm_.c:592 msgid "Use MD5 passwords" msgstr "Bruk MD5 passord" -#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:594 msgid "Use NIS" msgstr "Bruk NIS" -#: ../install_steps_interactive.pm_.c:593 +#: ../install_steps_interactive.pm_.c:594 msgid "yellow pages" msgstr "gule sider" -#: ../install_steps_interactive.pm_.c:597 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:598 +#: ../install_steps_interactive.pm_.c:646 msgid "Please try again" msgstr "Vennligst prøv igjen" -#: ../install_steps_interactive.pm_.c:597 -#: ../install_steps_interactive.pm_.c:645 +#: ../install_steps_interactive.pm_.c:598 +#: ../install_steps_interactive.pm_.c:646 msgid "The passwords do not match" msgstr "Passordene stemmer ikke overens" -#: ../install_steps_interactive.pm_.c:599 -#: ../install_steps_interactive.pm_.c:646 +#: ../install_steps_interactive.pm_.c:600 +#: ../install_steps_interactive.pm_.c:647 msgid "This password is too simple" msgstr "Dette passordet er for enkelt" -#: ../install_steps_interactive.pm_.c:606 +#: ../install_steps_interactive.pm_.c:607 msgid "TODO" msgstr "TODO" -#: ../install_steps_interactive.pm_.c:607 +#: ../install_steps_interactive.pm_.c:608 msgid "NIS Domain" msgstr "NIS-domene" -#: ../install_steps_interactive.pm_.c:607 +#: ../install_steps_interactive.pm_.c:608 msgid "NIS Server" msgstr "NIS-tjener" -#: ../install_steps_interactive.pm_.c:627 +#: ../install_steps_interactive.pm_.c:628 msgid "Accept user" msgstr "Godta bruker" -#: ../install_steps_interactive.pm_.c:627 +#: ../install_steps_interactive.pm_.c:628 msgid "Add user" msgstr "Legg til bruker" -#: ../install_steps_interactive.pm_.c:628 +#: ../install_steps_interactive.pm_.c:629 #, c-format msgid "(already added %s)" msgstr "(allerede lagt til %s)" -#: ../install_steps_interactive.pm_.c:628 +#: ../install_steps_interactive.pm_.c:629 #, c-format msgid "" "Enter a user\n" @@ -2217,32 +2288,32 @@ msgstr "" "Entre en bruker\n" "%s" -#: ../install_steps_interactive.pm_.c:630 +#: ../install_steps_interactive.pm_.c:631 msgid "Real name" msgstr "Virkelig navn" -#: ../install_steps_interactive.pm_.c:631 +#: ../install_steps_interactive.pm_.c:632 msgid "User name" msgstr "Brukernavn" -#: ../install_steps_interactive.pm_.c:636 +#: ../install_steps_interactive.pm_.c:637 msgid "Shell" msgstr "Skall" -#: ../install_steps_interactive.pm_.c:647 +#: ../install_steps_interactive.pm_.c:648 msgid "Please give a user name" msgstr "Vennligst oppgi et brukernavn" -#: ../install_steps_interactive.pm_.c:648 +#: ../install_steps_interactive.pm_.c:649 msgid "" "The user name must contain only lower cased letters, numbers, `-' and `_'" msgstr "Brukernavnet kan kun inneholde små bokstaver, tall, `-' og `_'" -#: ../install_steps_interactive.pm_.c:649 +#: ../install_steps_interactive.pm_.c:650 msgid "This user name is already added" msgstr "" -#: ../install_steps_interactive.pm_.c:670 +#: ../install_steps_interactive.pm_.c:671 msgid "" "A custom bootdisk provides a way of booting into your Linux system without\n" "depending on the normal bootloader. This is useful if you don't want to " @@ -2266,103 +2337,103 @@ msgstr "" "systemsvikt.\n" "Ønsker du å opprette en oppstartsdiskett for systemet ditt?" -#: ../install_steps_interactive.pm_.c:679 +#: ../install_steps_interactive.pm_.c:680 msgid "Sorry, no floppy drive available" msgstr "Beklager, ingen diskettstasjon tilgjengelig" -#: ../install_steps_interactive.pm_.c:682 +#: ../install_steps_interactive.pm_.c:683 msgid "Choose the floppy drive you want to use to make the bootdisk" msgstr "Velg diskettstasjonen du ønsker å bruke for å lage oppstartsdisketten" -#: ../install_steps_interactive.pm_.c:683 +#: ../install_steps_interactive.pm_.c:684 msgid "Skip" msgstr "Dropp" -#: ../install_steps_interactive.pm_.c:687 +#: ../install_steps_interactive.pm_.c:688 #, c-format msgid "Insert a floppy in drive %s" msgstr "Sett inn en diskett i stasjon %s" -#: ../install_steps_interactive.pm_.c:688 +#: ../install_steps_interactive.pm_.c:689 msgid "Creating bootdisk" msgstr "Oppretter oppstartdiskett" -#: ../install_steps_interactive.pm_.c:695 +#: ../install_steps_interactive.pm_.c:696 msgid "Preparing bootloader" msgstr "Klargjør oppstartslaster" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:708 msgid "First sector of boot partition" msgstr "Første sektor av oppstartspartisjon" -#: ../install_steps_interactive.pm_.c:707 +#: ../install_steps_interactive.pm_.c:708 msgid "First sector of drive (MBR)" msgstr "Første sektor av disk (MBR)" -#: ../install_steps_interactive.pm_.c:711 +#: ../install_steps_interactive.pm_.c:712 msgid "LILO Installation" msgstr "LILO-installasjon" -#: ../install_steps_interactive.pm_.c:712 +#: ../install_steps_interactive.pm_.c:713 msgid "Where do you want to install the bootloader?" msgstr "Hvor vil du installere oppstartslasteren?" -#: ../install_steps_interactive.pm_.c:715 +#: ../install_steps_interactive.pm_.c:716 msgid "Do you want to use LILO?" msgstr "Ønsker du å bruke LILO?" -#: ../install_steps_interactive.pm_.c:718 +#: ../install_steps_interactive.pm_.c:719 msgid "Boot device" msgstr "Oppstartsenhet" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:720 msgid "Linear (needed for some SCSI drives)" msgstr "Lineær (behøves av noen SCSI-disker)" -#: ../install_steps_interactive.pm_.c:719 +#: ../install_steps_interactive.pm_.c:720 msgid "linear" msgstr "lineær" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:721 msgid "Compact" msgstr "Kompakt" -#: ../install_steps_interactive.pm_.c:720 +#: ../install_steps_interactive.pm_.c:721 msgid "compact" msgstr "kompakt" -#: ../install_steps_interactive.pm_.c:721 +#: ../install_steps_interactive.pm_.c:722 msgid "Delay before booting default image" msgstr "Forsinkelse før oppstart av standard bilde" -#: ../install_steps_interactive.pm_.c:722 +#: ../install_steps_interactive.pm_.c:723 msgid "Video mode" msgstr "Skjerm-modus" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:726 msgid "Restrict command line options" msgstr "Begrense kommandolinje-opsjoner" -#: ../install_steps_interactive.pm_.c:725 +#: ../install_steps_interactive.pm_.c:726 msgid "restrict" msgstr "begrense" -#: ../install_steps_interactive.pm_.c:731 +#: ../install_steps_interactive.pm_.c:732 msgid "LILO main options" msgstr "LILO hovedopsjoner" -#: ../install_steps_interactive.pm_.c:733 +#: ../install_steps_interactive.pm_.c:734 msgid "" "At this level of security, a password (and a good one) in lilo is requested" msgstr "På dette sikkerhetsnivået anmodes et passord (og et godt et) i lilo" -#: ../install_steps_interactive.pm_.c:734 +#: ../install_steps_interactive.pm_.c:735 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:743 +#: ../install_steps_interactive.pm_.c:744 msgid "" "Here are the following entries in LILO.\n" "You can add some more or change the existent ones." @@ -2370,121 +2441,139 @@ 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:745 +#: ../install_steps_interactive.pm_.c:746 msgid "Add" msgstr "Legg til" -#: ../install_steps_interactive.pm_.c:763 +#: ../install_steps_interactive.pm_.c:755 +msgid "Linux" +msgstr "" + +#: ../install_steps_interactive.pm_.c:755 +msgid "Other OS (windows...)" +msgstr "" + +#: ../install_steps_interactive.pm_.c:755 +#, fuzzy +msgid "Which type of entry do you want to add" +msgstr "Hvilken sektor vil du flytte til?" + +#: ../install_steps_interactive.pm_.c:775 msgid "Image" msgstr "Bilde" -#: ../install_steps_interactive.pm_.c:764 -#: ../install_steps_interactive.pm_.c:772 +#: ../install_steps_interactive.pm_.c:776 +#: ../install_steps_interactive.pm_.c:784 msgid "Root" msgstr "Root" -#: ../install_steps_interactive.pm_.c:765 +#: ../install_steps_interactive.pm_.c:777 msgid "Append" msgstr "Tilføye" -#: ../install_steps_interactive.pm_.c:766 +#: ../install_steps_interactive.pm_.c:778 msgid "Initrd" msgstr "Initrd" -#: ../install_steps_interactive.pm_.c:767 +#: ../install_steps_interactive.pm_.c:779 msgid "Read-write" msgstr "Les-skriv" -#: ../install_steps_interactive.pm_.c:773 +#: ../install_steps_interactive.pm_.c:785 msgid "Table" msgstr "Tabell" -#: ../install_steps_interactive.pm_.c:774 +#: ../install_steps_interactive.pm_.c:786 msgid "Unsafe" msgstr "Usikker" -#: ../install_steps_interactive.pm_.c:779 +#: ../install_steps_interactive.pm_.c:791 msgid "Label" msgstr "Etikett" -#: ../install_steps_interactive.pm_.c:781 +#: ../install_steps_interactive.pm_.c:793 msgid "Default" msgstr "Standard" -#: ../install_steps_interactive.pm_.c:800 -msgid "Installation of LILO failed. The following error occured:" -msgstr "Installasjon av LILO mislykket. Følgende feil oppsto:" +#: ../install_steps_interactive.pm_.c:796 +msgid "Remove entry" +msgstr "" -#: ../install_steps_interactive.pm_.c:810 -msgid "Windows(TM)" -msgstr "Windows(TM)" +#: ../install_steps_interactive.pm_.c:799 +msgid "Empty label not allowed" +msgstr "" -#: ../install_steps_interactive.pm_.c:811 -msgid "Poor" +#: ../install_steps_interactive.pm_.c:800 +msgid "This label is already in use" msgstr "" -#: ../install_steps_interactive.pm_.c:812 +#: ../install_steps_interactive.pm_.c:801 +#, c-format +msgid "A entry %s already exists" +msgstr "" + +#: ../install_steps_interactive.pm_.c:815 +msgid "Installation of LILO failed. The following error occured:" +msgstr "Installasjon av LILO mislykket. Følgende feil oppsto:" + +#: ../install_steps_interactive.pm_.c:827 msgid "Low" msgstr "Lav" -#: ../install_steps_interactive.pm_.c:813 +#: ../install_steps_interactive.pm_.c:828 msgid "Medium" msgstr "Medium" -#: ../install_steps_interactive.pm_.c:814 +#: ../install_steps_interactive.pm_.c:829 msgid "High" msgstr "Høy" -#: ../install_steps_interactive.pm_.c:815 -msgid "Paranoid" -msgstr "Paranoid" - -#: ../install_steps_interactive.pm_.c:823 +#: ../install_steps_interactive.pm_.c:838 msgid "Miscellaneous questions" msgstr "Forskjellige spørsmål" -#: ../install_steps_interactive.pm_.c:824 +#: ../install_steps_interactive.pm_.c:839 msgid "Do you have a laptop?" msgstr "Har du en bærbar maskin?" -#: ../install_steps_interactive.pm_.c:825 +#: ../install_steps_interactive.pm_.c:840 msgid "Use hard drive optimizations" msgstr "Bruk harddisk-optimisering" -#: ../install_steps_interactive.pm_.c:826 +#: ../install_steps_interactive.pm_.c:841 msgid "Security level" msgstr "Sikkerhetsnivå" -#: ../install_steps_interactive.pm_.c:827 +#: ../install_steps_interactive.pm_.c:842 msgid "HTTP proxy" msgstr "HTTP-proxy" -#: ../install_steps_interactive.pm_.c:828 +#: ../install_steps_interactive.pm_.c:843 msgid "FTP proxy" msgstr "FTP-proxy" -#: ../install_steps_interactive.pm_.c:830 +#: ../install_steps_interactive.pm_.c:845 #, c-format msgid "Precise ram size (found %d MB)" msgstr "Nøyaktig ram-størrelse (funnet %d MB)" -#: ../install_steps_interactive.pm_.c:833 +#: ../install_steps_interactive.pm_.c:848 msgid "(may cause disk problems)" msgstr "(kan forårsake diskproblemer)" -#: ../install_steps_interactive.pm_.c:841 +#: ../install_steps_interactive.pm_.c:856 msgid "Proxy should be http://..." msgstr "Proxy burde være http://..." -#: ../install_steps_interactive.pm_.c:842 +#: ../install_steps_interactive.pm_.c:857 msgid "Proxy should be ftp://..." msgstr "Proxy burde være ftp://..." -#: ../install_steps_interactive.pm_.c:843 +#: ../install_steps_interactive.pm_.c:858 msgid "Give the ram size in Mb" msgstr "" -#: ../install_steps_interactive.pm_.c:856 +#: ../install_steps_interactive.pm_.c:871 msgid "" "Some steps are not completed.\n" "\n" @@ -2494,7 +2583,7 @@ msgstr "" "\n" "Ønsker du virkelig å slutte nå?" -#: ../install_steps_interactive.pm_.c:863 +#: ../install_steps_interactive.pm_.c:878 msgid "" "Congratulations, installation is complete.\n" "Remove the boot media and press return to reboot.\n" @@ -2516,22 +2605,22 @@ 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:882 +#: ../install_steps_interactive.pm_.c:897 #, c-format msgid "Installing driver for %s card %s" msgstr "Installerer driver for %s kort %s" -#: ../install_steps_interactive.pm_.c:883 +#: ../install_steps_interactive.pm_.c:898 #, c-format msgid "(module %s)" msgstr "(modul %s)" -#: ../install_steps_interactive.pm_.c:893 +#: ../install_steps_interactive.pm_.c:908 #, c-format msgid "What %s card do you have?" msgstr "Hvilket %s kort har du?" -#: ../install_steps_interactive.pm_.c:900 +#: ../install_steps_interactive.pm_.c:915 #, c-format msgid "" "In some cases, the %s driver needs to have extra information to work\n" @@ -2551,20 +2640,20 @@ msgstr "" "forårsake\n" "forårsake noen skade." -#: ../install_steps_interactive.pm_.c:905 +#: ../install_steps_interactive.pm_.c:920 msgid "Autoprobe" msgstr "Automatisk sondering" -#: ../install_steps_interactive.pm_.c:905 +#: ../install_steps_interactive.pm_.c:920 msgid "Specify options" msgstr "Spesifiser opsjoner" -#: ../install_steps_interactive.pm_.c:909 +#: ../install_steps_interactive.pm_.c:924 #, 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:915 +#: ../install_steps_interactive.pm_.c:930 #, c-format msgid "" "You may now provide its options to module %s.\n" @@ -2575,11 +2664,11 @@ msgstr "" "Opsjonene er i format ``name=value name2=value2 ...''.\n" "F.eks., ``io=0x300 irq=7''" -#: ../install_steps_interactive.pm_.c:918 +#: ../install_steps_interactive.pm_.c:933 msgid "Module options:" msgstr "Modulopsjoner:" -#: ../install_steps_interactive.pm_.c:928 +#: ../install_steps_interactive.pm_.c:943 #, c-format msgid "" "Loading module %s failed.\n" @@ -2588,48 +2677,48 @@ msgstr "" "Lasting av modul %s feilet.\n" "Ønsker du å prøve igjen med andre parametere?" -#: ../install_steps_interactive.pm_.c:941 +#: ../install_steps_interactive.pm_.c:956 #, c-format msgid "Skip %s PCMCIA probing" msgstr "Dropp %s PCMCIA-sondering" -#: ../install_steps_interactive.pm_.c:942 +#: ../install_steps_interactive.pm_.c:957 msgid "Configuring PCMCIA cards..." msgstr "Konfigurerer PCMCIA-kort..." -#: ../install_steps_interactive.pm_.c:942 +#: ../install_steps_interactive.pm_.c:957 msgid "PCMCIA" msgstr "PCMCIA" -#: ../install_steps_interactive.pm_.c:949 +#: ../install_steps_interactive.pm_.c:964 msgid "Try to find PCI devices?" msgstr "" -#: ../install_steps_interactive.pm_.c:953 +#: ../install_steps_interactive.pm_.c:968 #, c-format msgid "Found %s %s interfaces" msgstr "Fant %s %s grensesnitt" -#: ../install_steps_interactive.pm_.c:954 +#: ../install_steps_interactive.pm_.c:969 msgid "Do you have another one?" msgstr "Har du enda ett?" -#: ../install_steps_interactive.pm_.c:955 +#: ../install_steps_interactive.pm_.c:970 #, c-format msgid "Do you have an %s interface?" msgstr "Har du et %s grensesnitt?" -#: ../install_steps_interactive.pm_.c:957 ../interactive.pm_.c:52 -#: ../my_gtk.pm_.c:435 +#: ../install_steps_interactive.pm_.c:972 ../interactive.pm_.c:52 +#: ../my_gtk.pm_.c:436 msgid "Yes" msgstr "Ja" -#: ../install_steps_interactive.pm_.c:958 +#: ../install_steps_interactive.pm_.c:973 msgid "See hardware info" msgstr "Se maskinvareinfo" #: ../interactive.pm_.c:57 ../interactive_newt.pm_.c:22 -#: ../interactive_newt.pm_.c:55 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:436 +#: ../interactive_newt.pm_.c:55 ../my_gtk.pm_.c:200 ../my_gtk.pm_.c:437 msgid "Cancel" msgstr "Avbryt" @@ -2914,7 +3003,7 @@ msgstr "Ingen mus" msgid "USB Mouse (3 buttons or more)" msgstr "" -#: ../partition_table.pm_.c:449 +#: ../partition_table.pm_.c:452 msgid "" "You have a hole in your partition table but I can't use it.\n" "The only solution is to move your primary partitions to have the hole next " @@ -2924,21 +3013,21 @@ msgstr "" "Den eneste løsningen er å flytte primærpartisjonene dine for å ha hullet ved " "siden av de utvidede partisjonene" -#: ../partition_table.pm_.c:535 +#: ../partition_table.pm_.c:538 #, c-format msgid "Error reading file %s" msgstr "Feil ved lesing av fil %s" -#: ../partition_table.pm_.c:542 +#: ../partition_table.pm_.c:545 #, c-format msgid "Restoring from file %s failed: %s" msgstr "Gjenoppretting fra fil %s mislykket: %s" -#: ../partition_table.pm_.c:544 +#: ../partition_table.pm_.c:547 msgid "Bad backup file" msgstr "Dårlig sikkerhetskopi-fil" -#: ../partition_table.pm_.c:564 +#: ../partition_table.pm_.c:567 #, c-format msgid "Error writing to file %s" msgstr "Feil ved skriving til fil %s" @@ -2959,14 +3048,42 @@ msgstr "SMB/Windows 95/98/NT" msgid "NetWare" msgstr "NetWare" -#~ msgid "Legend:" -#~ msgstr "Legende:" +#: ../raid.pm_.c:34 +#, c-format +msgid "Can't add a partition to _formatted_ RAID md%d" +msgstr "" + +#: ../raid.pm_.c:92 +msgid "Can't write file $file" +msgstr "" + +#: ../raid.pm_.c:127 +#, c-format +msgid "Not enough partitions for RAID level %d\n" +msgstr "" -#~ msgid "Show less" -#~ msgstr "Vis færre" +#: ../unused/install_steps_graphical.pm_.c:433 +msgid "Show less" +msgstr "Vis færre" -#~ msgid "Show more" -#~ msgstr "Vis flere" +#: ../unused/install_steps_graphical.pm_.c:434 +msgid "Show more" +msgstr "Vis flere" + +#~ msgid "Mount_point" +#~ msgstr "Monteringspunkt" + +#~ msgid "Size: %s MB (%s%%)" +#~ msgstr "Størrelse: %s MB (%s%%)" + +#~ msgid "Windows(TM)" +#~ msgstr "Windows(TM)" + +#~ msgid "Paranoid" +#~ msgstr "Paranoid" + +#~ msgid "Legend:" +#~ msgstr "Legende:" #, fuzzy #~ msgid "Change printer" @@ -3458,10 +3575,6 @@ msgstr "NetWare" #~ msgstr "Velg flere" #, fuzzy -#~ msgid "Do you have a modem?" -#~ msgstr "Har du en bærbar maskin?" - -#, fuzzy #~ msgid "" #~ "\n" #~ " <h1>Pixel's links</h1>\n" |