package urpm::download; use strict; use urpm::msg; use urpm::cfg; use Cwd; #- proxy config file. our $PROXY_CFG = '/etc/urpmi/proxy.cfg'; my $proxy_config; #- Timeout for curl connection and wget operations our $CONNECT_TIMEOUT = 60; #- (in seconds) sub basename { local $_ = shift; s|/*\s*$||; s|.*/||; $_ } sub import () { my $c = caller; no strict 'refs'; foreach my $symbol (qw(get_proxy propagate_sync_callback sync_file sync_wget sync_curl sync_rsync sync_ssh set_proxy_config dump_proxy_config )) { *{$c . '::' . $symbol} = *$symbol; } } #- parses proxy.cfg (private) sub load_proxy_config () { return if defined $proxy_config; open my $f, $PROXY_CFG or $proxy_config = {}, return; local $_; while (<$f>) { chomp; s/#.*$//; s/^\s*//; s/\s*$//; if (/^(?:(.*):\s*)?(ftp_proxy|http_proxy)\s*=\s*(.*)$/) { $proxy_config->{$1 || ''}{$2} = $3; next; } if (/^(?:(.*):\s*)?proxy_user\s*=\s*([^:]*)(?::(.*))?$/) { $proxy_config->{$1 || ''}{user} = $2; $proxy_config->{$1 || ''}{pwd} = $3 if defined $3; next; } if (/^(?:(.*):\s*)?proxy_user_ask/) { $proxy_config->{$1 || ''}{ask} = 1; next; } } close $f; } #- writes proxy.cfg sub dump_proxy_config () { return 0 unless defined $proxy_config; #- hasn't been read yet open my $f, '>', $PROXY_CFG or return 0; foreach ('', sort grep { !/^(|cmd_line)$/ } keys %$proxy_config) { my $m = $_ eq '' ? '' : "$_:"; my $p = $proxy_config->{$_}; foreach (qw(http_proxy ftp_proxy)) { defined $p->{$_} && $p->{$_} ne '' and print $f "$m$_=$p->{$_}\n"; } if ($p->{ask}) { print $f "${m}proxy_user_ask\n"; next; } defined $p->{user} && $p->{user} ne '' and print $f "${m}proxy_user=$p->{user}:$p->{pwd}\n"; } close $f; chmod 0600, $PROXY_CFG; #- may contain passwords return 1; } #- deletes the proxy configuration for the specified media sub remove_proxy_media { defined $proxy_config and delete $proxy_config->{$_[0] || ''}; } #- reads and loads the proxy.cfg file ; #- returns the global proxy settings (without arguments) or the #- proxy settings for the specified media (with a media name as argument) sub get_proxy (;$) { my ($o_media) = @_; $o_media ||= ''; load_proxy_config(); my $p = $proxy_config->{cmd_line} || $proxy_config->{$o_media} || $proxy_config->{''} || { http_proxy => undef, ftp_proxy => undef, user => undef, pwd => undef, }; if ($p->{ask} && ($p->{http_proxy} || $p->{ftp_proxy}) && !$p->{user}) { our $PROMPT_PROXY; unless (defined $PROMPT_PROXY) { require urpm::prompt; $PROMPT_PROXY = new urpm::prompt( N("Please enter your credentials for accessing proxy\n"), [ N("User name:"), N("Password:") ], undef, [ 0, 1 ], ); } ($p->{user}, $p->{pwd}) = $PROMPT_PROXY->prompt; } $p; } #- copies the settings for proxies from the command line to media named $media #- and writes the proxy.cfg file (used when adding new media) sub copy_cmd_line_proxy { my ($media) = @_; return unless $media; if (defined $proxy_config->{cmd_line}) { $proxy_config->{$media} = $proxy_config->{cmd_line}; dump_proxy_config(); } } #- overrides the config file proxy settings with values passed via command-line sub set_cmdline_proxy { my (%h) = @_; $proxy_config->{cmd_line} ||= { http_proxy => undef, ftp_proxy => undef, user => undef, pwd => undef, }; $proxy_config->{cmd_line}{$_} = $h{$_} foreach keys %h; } #- changes permanently the proxy settings sub set_proxy_config { my ($key, $value, $o_media) = @_; $proxy_config->{$o_media || ''}{$key} = $value; } #- set up the environment for proxy usage for the appropriate tool. #- returns an array of command-line arguments for wget or curl. sub set_proxy { my ($proxy) = @_; my @res; if (defined $proxy->{proxy}{http_proxy} || defined $proxy->{proxy}{ftp_proxy}) { for ($proxy->{type}) { /\bwget\b/ and do { for ($proxy->{proxy}) { if (defined $_->{http_proxy}) { $ENV{http_proxy} = $_->{http_proxy} =~ /^http:/ ? $_->{http_proxy} : "http://$_->{http_proxy}"; } $ENV{ftp_proxy} = $_->{ftp_proxy} if defined $_->{ftp_proxy}; @res = ("--proxy-user=$_->{user}", "--proxy-passwd=$_->{pwd}") if defined $_->{user} && defined $_->{pwd}; } last; }; /\bcurl\b/ and do { for ($proxy->{proxy}) { push @res, ('-x', $_->{http_proxy}) if defined $_->{http_proxy}; push @res, ('-x', $_->{ftp_proxy}) if defined $_->{ftp_proxy}; push @res, ('-U', "$_->{user}:$_->{pwd}") if defined $_->{user} && defined $_->{pwd}; } last; }; die N("Unknown webfetch `%s' !!!\n", $proxy->{type}); } } return @res; } sub propagate_sync_callback { my $options = shift @_; if (ref($options) && $options->{callback}) { my $mode = shift @_; if ($mode =~ /^(?:start|progress|end)$/) { my $file = shift @_; $file =~ s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; #- if needed... return $options->{callback}($mode, $file, @_); } else { return $options->{callback}($mode, @_); } } } sub sync_file { my $options = shift; foreach (@_) { my ($in) = m!^(?:removable[^:]*:/|file:/)(/.*)!; propagate_sync_callback($options, 'start', $_); require urpm::util; urpm::util::copy($in || $_, ref($options) ? $options->{dir} : $options) or die N("copy failed"); propagate_sync_callback($options, 'end', $_); } } sub sync_wget { -x "/usr/bin/wget" or die N("wget is missing\n"); my $options = shift @_; $options = { dir => $options } if !ref $options; #- force download to be done in cachedir to avoid polluting cwd. my $cwd = getcwd(); chdir $options->{dir}; my ($buf, $total, $file) = ('', undef, undef); my $wget_pid = open my $wget, join(" ", map { "'$_'" } #- construction of the wget command-line "/usr/bin/wget", ($options->{limit_rate} ? "--limit-rate=$options->{limit_rate}" : ()), ($options->{resume} ? "--continue" : ()), ($options->{proxy} ? set_proxy({ type => "wget", proxy => $options->{proxy} }) : ()), ($options->{retry} ? ('-t', $options->{retry}) : ()), ($options->{callback} ? ("--progress=bar:force", "-o", "-") : $options->{quiet} ? "-q" : @{[]}), "--retr-symlinks", "--timeout=$CONNECT_TIMEOUT", "-NP", $options->{dir}, @_ ) . " |"; local $/ = \1; #- read input by only one char, this is slow but very nice (and it works!). while (<$wget>) { $buf .= $_; if ($_ eq "\r" || $_ eq "\n") { if ($options->{callback}) { if ($buf =~ /^--\d\d:\d\d:\d\d--\s+(\S.*)\n/ms) { if ($file && $file ne $1) { propagate_sync_callback($options, 'end', $file); undef $file; } ! defined $file and propagate_sync_callback($options, 'start', $file = $1); } elsif (defined $file && ! defined $total && $buf =~ /==>\s+RETR/) { $total = ''; } elsif (defined $total && $total eq '' && $buf =~ /^[^:]*:\s+(\d\S*)/) { $total = $1; } elsif (my ($percent, $speed, $eta) = $buf =~ /^\s*(\d+)%.*\s+(\S+)\s+ETA\s+(\S+)\s*[\r\n]$/ms) { if (propagate_sync_callback($options, 'progress', $file, $percent, $total, $eta, $speed) eq 'canceled') { kill 15, $wget_pid; close $wget; return; } if ($_ eq "\n") { propagate_sync_callback($options, 'end', $file); ($total, $file) = (undef, undef); } } } else { $options->{quiet} or print STDERR $buf; } $buf = ''; } } $file and propagate_sync_callback($options, 'end', $file); chdir $cwd; close $wget or die N("wget failed: exited with %d or signal %d\n", $? >> 8, $? & 127); } sub sync_curl { -x "/usr/bin/curl" or die N("curl is missing\n"); my $options = shift @_; $options = { dir => $options } if !ref $options; #- force download to be done in cachedir to avoid polluting cwd, #- however for curl, this is mandatory. my $cwd = getcwd(); chdir($options->{dir}); my (@ftp_files, @other_files); foreach (@_) { my ($proto, $nick, $rest) = m,^(http|ftp)://([^:/]+):(.*),,; if ($nick) { #- escape @ in user names $nick =~ s/@/%40/; $_ = "$proto://$nick:$rest"; } if (m|^ftp://.*/([^/]*)$| && -e $1 && -s _ > 8192) { #- manage time stamp for large file only push @ftp_files, $_; next; } push @other_files, $_; } if (@ftp_files) { my ($cur_ftp_file, %ftp_files_info); eval { require Date::Manip }; #- prepare to get back size and time stamp of each file. open my $curl, join(" ", map { "'$_'" } "/usr/bin/curl", ($options->{limit_rate} ? ("--limit-rate", $options->{limit_rate}) : ()), ($options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()), ($options->{retry} ? ('--retry', $options->{retry}) : ()), "--stderr", "-", # redirect everything to stdout "--disable-epsv", "--connect-timeout", $CONNECT_TIMEOUT, "-s", "-I", @ftp_files) . " |"; while (<$curl>) { if (/Content-Length:\s*(\d+)/) { !$cur_ftp_file || exists($ftp_files_info{$cur_ftp_file}{size}) and $cur_ftp_file = shift @ftp_files; $ftp_files_info{$cur_ftp_file}{size} = $1; } if (/Last-Modified:\s*(.*)/) { !$cur_ftp_file || exists($ftp_files_info{$cur_ftp_file}{time}) and $cur_ftp_file = shift @ftp_files; eval { $ftp_files_info{$cur_ftp_file}{time} = Date::Manip::ParseDate($1); }; } } close $curl; #- now analyse size and time stamp according to what already exists here. if (@ftp_files) { #- re-insert back shifted element of ftp_files, because curl output above #- has not been parsed correctly, so in doubt download them all. push @ftp_files, keys %ftp_files_info; } else { #- for that, it should be clear ftp_files is empty... #- elsewhere, the above work was useless. foreach (keys %ftp_files_info) { my ($lfile) = m|/([^/]*)$| or next; #- strange if we can't parse it correctly. my $ltime = eval { Date::Manip::ParseDate(scalar gmtime((stat $1)[9])) }; $ltime && -s $lfile == $ftp_files_info{$_}{size} && $ftp_files_info{$_}{time} eq $ltime or push @ftp_files, $_; } } } # Indicates whether this option is available in our curl our $location_trusted; if (!defined $location_trusted) { $location_trusted = `/usr/bin/curl -h` =~ /location-trusted/ ? 1 : 0; } #- http files (and other files) are correctly managed by curl wrt conditional download. #- options for ftp files, -R (-O )* #- options for http files, -R (-O )* if (my @all_files = ( (map { ("-O", $_) } @ftp_files), (map { m|/| ? ("-O", $_) : @{[]} } @other_files))) { my @l = (@ftp_files, @other_files); my ($buf, $file); $buf = ''; my $curl_pid = open my $curl, join(" ", map { "'$_'" } "/usr/bin/curl", ($options->{limit_rate} ? ("--limit-rate", $options->{limit_rate}) : ()), ($options->{resume} ? ("--continue-at", "-") : ()), ($options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()), ($options->{retry} ? ('--retry', $options->{retry}) : ()), ($options->{quiet} ? "-s" : @{[]}), "-k", $location_trusted ? "--location-trusted" : @{[]}, "-R", "-f", "--disable-epsv", "--connect-timeout", $CONNECT_TIMEOUT, "--stderr", "-", # redirect everything to stdout @all_files) . " |"; local $/ = \1; #- read input by only one char, this is slow but very nice (and it works!). while (<$curl>) { $buf .= $_; if ($_ eq "\r" || $_ eq "\n") { if ($options->{callback}) { unless (defined $file) { $file = shift @l; propagate_sync_callback($options, 'start', $file); } if (my ($percent, $total, $eta, $speed) = $buf =~ /^\s*(\d+)\s+(\S+)[^\r\n]*\s+(\S+)\s+(\S+)\s*[\r\n]$/ms) { $speed =~ s/^-//; if (propagate_sync_callback($options, 'progress', $file, $percent, $total, $eta, $speed) eq 'canceled') { kill 15, $curl_pid; close $curl; return; } #- this checks that download has actually started if ($_ eq "\n" && !($speed == 0 && $percent == 100 && index($eta, '--') >= 0) #- work around bug 13685 ) { propagate_sync_callback($options, 'end', $file); $file = undef; } } elsif ($buf =~ /^curl:/) { #- likely to be an error reported by curl local $/ = "\n"; chomp $buf; propagate_sync_callback($options, 'error', $file, $buf); } } else { $options->{quiet} or print STDERR $buf; } $buf = ''; } } chdir $cwd; close $curl or die N("curl failed: exited with %d or signal %d\n", $? >> 8, $? & 127); } else { chdir $cwd; } } sub _calc_limit_rate { my $limit_rate = $_[0]; for ($limit_rate) { /^(\d+)$/ and $limit_rate = int $1/1024, last; /^(\d+)[kK]$/ and $limit_rate = $1, last; /^(\d+)[mM]$/ and $limit_rate = 1024*$1, last; /^(\d+)[gG]$/ and $limit_rate = 1024*1024*$1, last; } $limit_rate; } sub sync_rsync { -x "/usr/bin/rsync" or die N("rsync is missing\n"); my $options = shift @_; $options = { dir => $options } if !ref $options; #- force download to be done in cachedir to avoid polluting cwd. my $cwd = getcwd(); chdir($options->{dir}); my $limit_rate = _calc_limit_rate $options->{limit_rate}; foreach (@_) { my $count = 10; #- retry count on error (if file exists). my $basename = basename($_); my $file = m!^rsync://([^/]*::.*)! ? $1 : $_; propagate_sync_callback($options, 'start', $file); do { local $_; my $buf = ''; open my $rsync, join(" ", "/usr/bin/rsync", ($limit_rate ? "--bwlimit=$limit_rate" : @{[]}), ($options->{quiet} ? qw(-q) : qw(--progress -v)), ($options->{compress} ? qw(-z) : @{[]}), ($options->{ssh} ? qw(-e ssh) : @{[]}), qw(--partial --no-whole-file), "'$file' '$options->{dir}' |"); local $/ = \1; #- read input by only one char, this is slow but very nice (and it works!). while (<$rsync>) { $buf .= $_; if ($_ eq "\r" || $_ eq "\n") { if ($options->{callback}) { if (my ($percent, $speed) = $buf =~ /^\s*\d+\s+(\d+)%\s+(\S+)\s+/) { propagate_sync_callback($options, 'progress', $file, $percent, undef, undef, $speed); } } else { $options->{quiet} or print STDERR $buf; } $buf = ''; } } close $rsync; } while ($? != 0 && --$count > 0 && -e $options->{dir} . "/$basename"); propagate_sync_callback($options, 'end', $file); } chdir $cwd; $? == 0 or die N("rsync failed: exited with %d or signal %d\n", $? >> 8, $? & 127); } sub sync_ssh { -x "/usr/bin/ssh" or die N("ssh is missing\n"); my $options = shift(@_); $options->{ssh} = 1; sync_rsync($options, @_); } #- get the width of the terminal my $wchar = 79; eval { require Term::ReadKey; ($wchar) = Term::ReadKey::GetTerminalSize(); --$wchar; }; #- default logger suitable for sync operation on STDERR only. sub sync_logger { my ($mode, $file, $percent, $total, $eta, $speed) = @_; if ($mode eq 'start') { print STDERR " $file\n"; } elsif ($mode eq 'progress') { my $text; if (defined $total && defined $eta) { $text = N(" %s%% of %s completed, ETA = %s, speed = %s", $percent, $total, $eta, $speed); } else { $text = N(" %s%% completed, speed = %s", $percent, $speed); } if (length($text) > $wchar) { $text = substr($text, 0, $wchar) } print STDERR $text, " " x ($wchar - length($text)), "\r"; } elsif ($mode eq 'end') { print STDERR " " x $wchar, "\r"; } elsif ($mode eq 'error') { #- error is 3rd argument, saved in $percent print STDERR N("...retrieving failed: %s", $percent), "\n"; } } 1; __END__ =head1 NAME urpm::download - download routines for the urpm* tools =head1 SYNOPSIS =head1 DESCRIPTION =head1 COPYRIGHT Copyright (C) 2000-2005 Mandriva =cut div>
-#, c-format
-msgid ""
-"Option ``Restrict command line options'' is of no use without a password"
-msgstr ""
-"Indstillingen ``Begræns kommandolinie-indstillinger'' er intet værd uden\n"
-"en adgangskode"
-
-#: any.pm:448
-#, c-format
msgid "Clean /tmp at each boot"
msgstr "Rens /tmp ved hver systemopstart"
-#: any.pm:458
+#: any.pm:451
#, c-format
msgid "Init Message"
msgstr "Init-besked"
-#: any.pm:460
+#: any.pm:453
#, c-format
msgid "Open Firmware Delay"
msgstr "Åben firmwareforsinkelse"
-#: any.pm:461
+#: any.pm:454
#, c-format
msgid "Kernel Boot Timeout"
msgstr "Ventetid før kerneopstart"
-#: any.pm:462
+#: any.pm:455
#, c-format
msgid "Enable CD Boot?"
msgstr "Skal det være muligt at starte fra CD?"
-#: any.pm:463
+#: any.pm:456
#, c-format
msgid "Enable OF Boot?"
msgstr "Skal det være muligt at starte fra OF?"
-#: any.pm:464
+#: any.pm:457
#, c-format
msgid "Default OS?"
msgstr "Forvalgt styresystem?"
-#: any.pm:537
+#: any.pm:530
#, c-format
msgid "Image"
msgstr "Billede"
-#: any.pm:538 any.pm:551
+#: any.pm:531 any.pm:545
#, c-format
msgid "Root"
msgstr "Rod"
-#: any.pm:539 any.pm:564
+#: any.pm:532 any.pm:558
#, c-format
msgid "Append"
msgstr "Vedhæft"
-#: any.pm:541
+#: any.pm:534
#, c-format
msgid "Xen append"
msgstr "Xen-tilføjning"
-#: any.pm:544
+#: any.pm:536
+#, c-format
+msgid "Requires password to boot"
+msgstr ""
+
+#: any.pm:538
#, c-format
msgid "Video mode"
msgstr "Videoindstilling"
-#: any.pm:546
+#: any.pm:540
#, c-format
msgid "Initrd"
msgstr "Initrd"
-#: any.pm:547
+#: any.pm:541
#, c-format
msgid "Network profile"
msgstr "Netværksprofil"
-#: any.pm:556 any.pm:561 any.pm:563 diskdrake/interactive.pm:407
+#: any.pm:550 any.pm:555 any.pm:557 diskdrake/interactive.pm:407
#, c-format
msgid "Label"
msgstr "Mærkat"
-#: any.pm:558 any.pm:566 harddrake/v4l.pm:438
+#: any.pm:552 any.pm:560 harddrake/v4l.pm:438
#, c-format
msgid "Default"
msgstr "Standard"
-#: any.pm:565
+#: any.pm:559
#, c-format
msgid "NoVideo"
msgstr "Ingen video"
-#: any.pm:576
+#: any.pm:570
#, c-format
msgid "Empty label not allowed"
msgstr "Tom mærkat er ikke tilladt"
-#: any.pm:577
+#: any.pm:571
#, c-format
msgid "You must specify a kernel image"
msgstr "Du skal angive en kerne-fil"
-#: any.pm:577
+#: any.pm:571
#, c-format
msgid "You must specify a root partition"
msgstr "Du skal angive en root-partition"
-#: any.pm:578
+#: any.pm:572
#, c-format
msgid "This label is already used"
msgstr "Denne mærkat er allerede brugt"
-#: any.pm:596
+#: any.pm:590
#, c-format
msgid "Which type of entry do you want to add?"
msgstr "Hvilken type ønsker du at tilføje"
-#: any.pm:597
+#: any.pm:591
#, c-format
msgid "Linux"
msgstr "Linux"
-#: any.pm:597
+#: any.pm:591
#, c-format
msgid "Other OS (SunOS...)"
msgstr "Andet styresystem (SunOS...)"
-#: any.pm:598
+#: any.pm:592
#, c-format
msgid "Other OS (MacOS...)"
msgstr "Andet styresystem (MacOS...)"
-#: any.pm:598
+#: any.pm:592
#, c-format
msgid "Other OS (Windows...)"
msgstr "Andet styresystem (Windows...)"
-#: any.pm:645
+#: any.pm:639
#, c-format
msgid "Bootloader Configuration"
msgstr "Konfiguration af opstarter"
-#: any.pm:646
+#: any.pm:640
#, c-format
msgid ""
"Here are the entries on your boot menu so far.\n"
@@ -371,47 +358,47 @@ msgstr ""
"Her er følgende typer indgange.\n"
"Du kan tilføje flere eller ændre de eksisterende."
-#: any.pm:851
+#: any.pm:845
#, c-format
msgid "access to X programs"
msgstr "adgang til X-programmer"
-#: any.pm:852
+#: any.pm:846
#, c-format
msgid "access to rpm tools"
msgstr "adgang til rpm-værktøjer"
-#: any.pm:853
+#: any.pm:847
#, c-format
msgid "allow \"su\""
msgstr "tillad \"su\""
-#: any.pm:854
+#: any.pm:848
#, c-format
msgid "access to administrative files"
msgstr "adgang til administrative filer"
-#: any.pm:855
+#: any.pm:849
#, c-format
msgid "access to network tools"
msgstr "adgang til netværksværktøjer"
-#: any.pm:856
+#: any.pm:850
#, c-format
msgid "access to compilation tools"
msgstr "adgang til oversættelsesværktøjer"
-#: any.pm:862
+#: any.pm:856
#, c-format
msgid "(already added %s)"
msgstr "(har allerede tilføjet %s)"
-#: any.pm:868
+#: any.pm:862
#, c-format
msgid "Please give a user name"
msgstr "Indtast et brugernavn"
-#: any.pm:869
+#: any.pm:863
#, c-format
msgid ""
"The user name must start with a lower case letter followed by only lower "
@@ -420,148 +407,148 @@ msgstr ""
"Brugernavnet skal starte et lille bogstav, efterfulgt kun af små bogstaver, "
"tal, `-' og `_'"
-#: any.pm:870
+#: any.pm:864
#, c-format
msgid "The user name is too long"
msgstr "Dette brugernavn er for langt"
-#: any.pm:871
+#: any.pm:865
#, c-format
msgid "This user name has already been added"
msgstr "Dette brugernavn eksisterer allerede"
-#: any.pm:877 any.pm:911
+#: any.pm:871 any.pm:905
#, c-format
msgid "User ID"
msgstr "Bruger-id"
-#: any.pm:877 any.pm:912
+#: any.pm:871 any.pm:906
#, c-format
msgid "Group ID"
msgstr "Gruppe-id"
-#: any.pm:878
+#: any.pm:872
#, c-format
msgid "%s must be a number"
msgstr "%s skal være et tal"
-#: any.pm:879
+#: any.pm:873
#, c-format
msgid "%s should be above 500. Accept anyway?"
msgstr "%s burde være over 500. Acceptér alligevel?"
-#: any.pm:883
+#: any.pm:877
#, c-format
msgid "User management"
msgstr "Administration af brugere"
-#: any.pm:889
+#: any.pm:883
#, c-format
msgid "Enable guest account"
msgstr "Aktivér kontoen guest"
-#: any.pm:890 authentication.pm:237
+#: any.pm:884 authentication.pm:237
#, c-format
msgid "Set administrator (root) password"
msgstr "Sæt administrator (root) adgangskode"
-#: any.pm:895
+#: any.pm:889
#, c-format
msgid "Enter a user"
msgstr "Indtast en bruger"
-#: any.pm:897
+#: any.pm:891
#, c-format
msgid "Icon"
msgstr "Ikon"
-#: any.pm:900
+#: any.pm:894
#, c-format
msgid "Real name"
msgstr "Rigtige navn"
-#: any.pm:905
+#: any.pm:899
#, c-format
msgid "Login name"
msgstr "Logindnavn"
-#: any.pm:910
+#: any.pm:904
#, c-format
msgid "Shell"
msgstr "Skal"
-#: any.pm:953
+#: any.pm:947
#, c-format
msgid "Please wait, adding media..."
msgstr "Vent venligst, tilføjer medie..."
-#: any.pm:983 security/l10n.pm:14
+#: any.pm:977 security/l10n.pm:14
#, c-format
msgid "Autologin"
msgstr "Autologin"
-#: any.pm:984
+#: any.pm:978
#, c-format
msgid "I can set up your computer to automatically log on one user."
msgstr ""
"Jeg kan sætte din maskine op til automatisk at logge en bestemt bruger på."
-#: any.pm:985
+#: any.pm:979
#, c-format
msgid "Use this feature"
msgstr "Brug denne facilitet"
-#: any.pm:986
+#: any.pm:980
#, c-format
msgid "Choose the default user:"
msgstr "Vælg den forvalgte bruger:"
-#: any.pm:987
+#: any.pm:981
#, c-format
msgid "Choose the window manager to run:"
msgstr "Vælg den vindueshåndtering du ønsker at benytte:"
-#: any.pm:998 any.pm:1018 any.pm:1091
+#: any.pm:992 any.pm:1012 any.pm:1085
#, c-format
msgid "Release Notes"
msgstr "Udgivelsesnoter"
-#: any.pm:1025 any.pm:1379 interactive/gtk.pm:819
+#: any.pm:1019 any.pm:1373 interactive/gtk.pm:819
#, c-format
msgid "Close"
msgstr "Luk"
-#: any.pm:1077
+#: any.pm:1071
#, c-format
msgid "License agreement"
msgstr "Licensaftale"
-#: any.pm:1079 diskdrake/dav.pm:26
+#: any.pm:1073 diskdrake/dav.pm:26
#, c-format
msgid "Quit"
msgstr "Afslut"
-#: any.pm:1086
+#: any.pm:1080
#, c-format
msgid "Do you accept this license ?"
msgstr "Accepterer du denne licens?"
-#: any.pm:1087
+#: any.pm:1081
#, c-format
msgid "Accept"
msgstr "Acceptér"
-#: any.pm:1087
+#: any.pm:1081
#, c-format
msgid "Refuse"
msgstr "Nægt"
-#: any.pm:1113 any.pm:1175
+#: any.pm:1107 any.pm:1169
#, c-format
msgid "Please choose a language to use"
msgstr "Vælg det sprog, der skal bruges"
-#: any.pm:1141
+#: any.pm:1135
#, c-format
msgid ""
"Mandriva Linux can support multiple languages. Select\n"
@@ -570,77 +557,77 @@ msgid ""
msgstr ""
"Du kan vælge andre sprog der vil være tilgængelige efter installationen"
-#: any.pm:1144
+#: any.pm:1138
#, c-format
msgid "Multi languages"
msgstr "Flere sprog"
-#: any.pm:1153 any.pm:1184
+#: any.pm:1147 any.pm:1178
#, c-format
msgid "Old compatibility (non UTF-8) encoding"
msgstr "Gammel kompatibilitetskoding (ikke UTF-8)"
-#: any.pm:1154
+#: any.pm:1148
#, c-format
msgid "All languages"
msgstr "Alle sprog"
-#: any.pm:1176
+#: any.pm:1170
#, c-format
msgid "Language choice"
msgstr "Sprogvalg"
-#: any.pm:1230
+#: any.pm:1224
#, c-format
msgid "Country / Region"
msgstr "Land / Region"
-#: any.pm:1231
+#: any.pm:1225
#, c-format
msgid "Please choose your country"
msgstr "Vælg dit land"
-#: any.pm:1233
+#: any.pm:1227
#, c-format
msgid "Here is the full list of available countries"
msgstr "Her er den komplette liste over tilgængelige lande"
-#: any.pm:1234
+#: any.pm:1228
#, c-format
msgid "Other Countries"
msgstr "Andre lande"
-#: any.pm:1234 interactive.pm:488 interactive/gtk.pm:445
+#: any.pm:1228 interactive.pm:488 interactive/gtk.pm:445
#, c-format
msgid "Advanced"
msgstr "Avanceret"
-#: any.pm:1240
+#: any.pm:1234
#, c-format
msgid "Input method:"
msgstr "Indtastningsmetode:"
-#: any.pm:1243
+#: any.pm:1237
#, c-format
msgid "None"
msgstr "Ingen"
-#: any.pm:1324
+#: any.pm:1318
#, c-format
msgid "No sharing"
msgstr "Ingen fildeling"
-#: any.pm:1324
+#: any.pm:1318
#, c-format
msgid "Allow all users"
msgstr "Tillad alle brugere"
-#: any.pm:1324
+#: any.pm:1318
#, c-format
msgid "Custom"
msgstr "Tilpasset"
-#: any.pm:1328
+#: any.pm:1322
#, c-format
msgid ""
"Would you like to allow users to share some of their directories?\n"
@@ -654,7 +641,7 @@ msgstr ""
"Tilladelse af dette vil sætte brugere i stand til simpelthen at klikke på "
"'Fildeling' i konqueror og nautilus.\n"
-#: any.pm:1340
+#: any.pm:1334
#, c-format
msgid ""
"NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -663,7 +650,7 @@ msgstr ""
"NFS: det traditionlle Unix fildelingssystem, med mindre funktionalitet på "
"Mac og Windows."
-#: any.pm:1343
+#: any.pm:1337
#, c-format
msgid ""
"SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -672,18 +659,18 @@ msgstr ""
"SMB: et fildelingssystem brugt på Windows, Mac OS X og mange moderne Linux-"
"systemer."
-#: any.pm:1351
+#: any.pm:1345
#, c-format
msgid ""
"You can export using NFS or SMB. Please select which you would like to use."
msgstr "Du kan eksportere med NFS eller SMB. Hvilken vil du bruge"
-#: any.pm:1379
+#: any.pm:1373
#, c-format
msgid "Launch userdrake"
msgstr "Start userdrake"
-#: any.pm:1381
+#: any.pm:1375
#, c-format
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
@@ -692,7 +679,7 @@ msgstr ""
"Deling per bruger bruger gruppen 'fileshare'. \n"
"Du kan bruge userdrake til at tilføje en bruger til denne gruppe."
-#: any.pm:1487
+#: any.pm:1481
#, c-format
msgid ""
"You need to logout and back in again for changes to take effect. Press OK to "
@@ -701,47 +688,47 @@ msgstr ""
"Du skal logge ud og ind igen for at ændringerne skal gælde. Tryk O.k. for at "
"logge ud nu."
-#: any.pm:1491
+#: any.pm:1485
#, c-format
msgid "You need to log out and back in again for changes to take effect"
msgstr "Du skal logge ud og ind igen for at ændringerne skal gælde"
-#: any.pm:1526
+#: any.pm:1520
#, c-format
msgid "Timezone"
msgstr "Tidszone"
-#: any.pm:1526
+#: any.pm:1520
#, c-format
msgid "Which is your timezone?"
msgstr "Hvad er din tidszone?"
-#: any.pm:1549 any.pm:1551
+#: any.pm:1543 any.pm:1545
#, c-format
msgid "Date, Clock & Time Zone Settings"
msgstr "Dato-, klokke- og tidszoneopsætning"
-#: any.pm:1552
+#: any.pm:1546
#, c-format
msgid "What is the best time?"
msgstr "Hvad er den bedste tid?"
-#: any.pm:1556
+#: any.pm:1550
#, c-format
msgid "%s (hardware clock set to UTC)"
msgstr "%s (Maskin-ur sat til UTC)"
-#: any.pm:1557
+#: any.pm:1551
#, c-format
msgid "%s (hardware clock set to local time)"
msgstr "%s (Maskin-ur sat til lokal tid)"
-#: any.pm:1559
+#: any.pm:1553
#, c-format
msgid "NTP Server"
msgstr "NTP-server"
-#: any.pm:1560
+#: any.pm:1554
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr "Automatisk tidssynkronisering (ved hjælp af NTP)"
@@ -1131,12 +1118,12 @@ msgstr "SILO"
msgid "not enough room in /boot"
msgstr "Ikke nok plads i /boot"
-#: bootloader.pm:1923
+#: bootloader.pm:1932
#, c-format
msgid "You can not install the bootloader on a %s partition\n"
msgstr "Du kan ikke installere opstartsindlæseren på en %s-partition\n"
-#: bootloader.pm:2044
+#: bootloader.pm:2053
#, c-format
msgid ""
"Your bootloader configuration must be updated because partition has been "
@@ -1145,7 +1132,7 @@ msgstr ""
"Din opstartsindlæserkonfiguration behøver at opdateres da rækkefølgen på "
"dine partitioner er blevet ændret"
-#: bootloader.pm:2057
+#: bootloader.pm:2066
#, c-format
msgid ""
"The bootloader can not be installed correctly. You have to boot rescue and "
@@ -1154,7 +1141,7 @@ msgstr ""
"Opstartsindlæseren kan ikke blive installeret korrekt. Du skal lave "
"nødopstart og vælge \"%s\""
-#: bootloader.pm:2058
+#: bootloader.pm:2067
#, c-format
msgid "Re-install Boot Loader"
msgstr "Geninstallér systemopstarter"
@@ -1239,15 +1226,15 @@ msgid "Server"
msgstr "Server"
#: diskdrake/dav.pm:66 diskdrake/interactive.pm:404
-#: diskdrake/interactive.pm:674 diskdrake/interactive.pm:692
-#: diskdrake/interactive.pm:696 diskdrake/removable.pm:23
+#: diskdrake/interactive.pm:724 diskdrake/interactive.pm:742
+#: diskdrake/interactive.pm:746 diskdrake/removable.pm:23
#: diskdrake/smbnfs_gtk.pm:79
#, c-format
msgid "Mount point"
msgstr "Monteringssti"
#: diskdrake/dav.pm:67 diskdrake/interactive.pm:406
-#: diskdrake/interactive.pm:1098 diskdrake/removable.pm:24
+#: diskdrake/interactive.pm:1153 diskdrake/removable.pm:24
#: diskdrake/smbnfs_gtk.pm:80
#, c-format
msgid "Options"
@@ -1264,18 +1251,18 @@ msgstr "Fjern"
msgid "Done"
msgstr "Færdig"
-#: diskdrake/dav.pm:78 diskdrake/hd_gtk.pm:128 diskdrake/hd_gtk.pm:294
+#: diskdrake/dav.pm:78 diskdrake/hd_gtk.pm:128 diskdrake/hd_gtk.pm:292
#: diskdrake/interactive.pm:247 diskdrake/interactive.pm:260
#: diskdrake/interactive.pm:453 diskdrake/interactive.pm:523
-#: diskdrake/interactive.pm:528 diskdrake/interactive.pm:664
-#: diskdrake/interactive.pm:917 diskdrake/interactive.pm:968
-#: diskdrake/interactive.pm:1144 diskdrake/interactive.pm:1157
-#: diskdrake/interactive.pm:1160 diskdrake/interactive.pm:1428
-#: diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23 do_pkgs.pm:28 do_pkgs.pm:44
-#: do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:82 fsedit.pm:246
-#: interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19
-#: scanner.pm:95 scanner.pm:106 scanner.pm:113 scanner.pm:120 wizards.pm:95
-#: wizards.pm:99 wizards.pm:121
+#: diskdrake/interactive.pm:541 diskdrake/interactive.pm:546
+#: diskdrake/interactive.pm:714 diskdrake/interactive.pm:993
+#: diskdrake/interactive.pm:1044 diskdrake/interactive.pm:1199
+#: diskdrake/interactive.pm:1212 diskdrake/interactive.pm:1215
+#: diskdrake/interactive.pm:1483 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:23
+#: do_pkgs.pm:28 do_pkgs.pm:44 do_pkgs.pm:60 do_pkgs.pm:65 do_pkgs.pm:82
+#: fsedit.pm:246 interactive/http.pm:117 interactive/http.pm:118
+#: modules/interactive.pm:19 scanner.pm:95 scanner.pm:106 scanner.pm:113
+#: scanner.pm:120 wizards.pm:95 wizards.pm:99 wizards.pm:121
#, c-format
msgid "Error"
msgstr "Fejl"
@@ -1290,12 +1277,12 @@ msgstr "Indtast LRL for WebDAV-serveren"
msgid "The URL must begin with http:// or https://"
msgstr "URL'en skal begynde med http:// eller https://"
-#: diskdrake/dav.pm:106 diskdrake/hd_gtk.pm:412 diskdrake/interactive.pm:306
-#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:553
-#: diskdrake/interactive.pm:755 diskdrake/interactive.pm:813
-#: diskdrake/interactive.pm:948 diskdrake/interactive.pm:990
-#: diskdrake/interactive.pm:991 diskdrake/interactive.pm:1241
-#: diskdrake/interactive.pm:1279 diskdrake/interactive.pm:1427 do_pkgs.pm:19
+#: diskdrake/dav.pm:106 diskdrake/hd_gtk.pm:417 diskdrake/interactive.pm:306
+#: diskdrake/interactive.pm:391 diskdrake/interactive.pm:594
+#: diskdrake/interactive.pm:817 diskdrake/interactive.pm:875
+#: diskdrake/interactive.pm:1024 diskdrake/interactive.pm:1066
+#: diskdrake/interactive.pm:1067 diskdrake/interactive.pm:1293
+#: diskdrake/interactive.pm:1331 diskdrake/interactive.pm:1482 do_pkgs.pm:19
#: do_pkgs.pm:39 do_pkgs.pm:57 do_pkgs.pm:77 harddrake/sound.pm:442
#, c-format
msgid "Warning"
@@ -1311,23 +1298,23 @@ msgstr "Er du sikker på at du ønsker at slette dette monteringspunkt?"
msgid "Server: "
msgstr "Server: "
-#: diskdrake/dav.pm:125 diskdrake/interactive.pm:496
-#: diskdrake/interactive.pm:1303 diskdrake/interactive.pm:1388
+#: diskdrake/dav.pm:125 diskdrake/interactive.pm:498
+#: diskdrake/interactive.pm:1355 diskdrake/interactive.pm:1443
#, c-format
msgid "Mount point: "
msgstr "Monteringssti: "
-#: diskdrake/dav.pm:126 diskdrake/interactive.pm:1395
+#: diskdrake/dav.pm:126 diskdrake/interactive.pm:1450
#, c-format
msgid "Options: %s"
msgstr "Valg: %s"
#: diskdrake/hd_gtk.pm:61 diskdrake/interactive.pm:301
#: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:106
-#: fs/partitioning_wizard.pm:53 fs/partitioning_wizard.pm:235
-#: fs/partitioning_wizard.pm:243 fs/partitioning_wizard.pm:282
-#: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:495
-#: fs/partitioning_wizard.pm:571 fs/partitioning_wizard.pm:574
+#: fs/partitioning_wizard.pm:53 fs/partitioning_wizard.pm:236
+#: fs/partitioning_wizard.pm:244 fs/partitioning_wizard.pm:283
+#: fs/partitioning_wizard.pm:432 fs/partitioning_wizard.pm:496
+#: fs/partitioning_wizard.pm:572 fs/partitioning_wizard.pm:575
#, c-format
msgid "Partitioning"
msgstr "Opdeling af disk"
@@ -1337,8 +1324,8 @@ msgstr "Opdeling af disk"
msgid "Click on a partition, choose a filesystem type then choose an action"
msgstr "Klik på en partition, vælg en filsystemstype, og vælg så en handling"
-#: diskdrake/hd_gtk.pm:110 diskdrake/interactive.pm:1119
-#: diskdrake/interactive.pm:1129 diskdrake/interactive.pm:1182
+#: diskdrake/hd_gtk.pm:110 diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1184 diskdrake/interactive.pm:1237
#, c-format
msgid "Read carefully"
msgstr "Læs omhyggeligt"
@@ -1358,7 +1345,7 @@ msgstr "Afslut"
msgid "Continue"
msgstr "Fortsæt"
-#: diskdrake/hd_gtk.pm:182 fs/partitioning_wizard.pm:547 interactive.pm:653
+#: diskdrake/hd_gtk.pm:182 fs/partitioning_wizard.pm:548 interactive.pm:653
#: interactive/gtk.pm:811 interactive/gtk.pm:829 interactive/gtk.pm:850
#: ugtk2.pm:936
#, c-format
@@ -1386,79 +1373,79 @@ msgstr "Klik på en partition"
msgid "Details"
msgstr "Detaljer"
-#: diskdrake/hd_gtk.pm:294
+#: diskdrake/hd_gtk.pm:292
#, c-format
msgid "No hard drives found"
msgstr "Ingen diskdrev fundet"
-#: diskdrake/hd_gtk.pm:321
+#: diskdrake/hd_gtk.pm:323
#, c-format
msgid "Unknown"
msgstr "Ukendt"
-#: diskdrake/hd_gtk.pm:383
+#: diskdrake/hd_gtk.pm:388
#, c-format
msgid "Ext4"
msgstr "Ext4"
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
#, c-format
msgid "XFS"
msgstr "XFS"
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
#, c-format
msgid "Swap"
msgstr "Swap"
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
#, c-format
msgid "SunOS"
msgstr "SunOS"
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
#, c-format
msgid "HFS"
msgstr "HFS"
-#: diskdrake/hd_gtk.pm:383 fs/partitioning_wizard.pm:401
+#: diskdrake/hd_gtk.pm:388 fs/partitioning_wizard.pm:402
#, c-format
msgid "Windows"
msgstr "Windows"
-#: diskdrake/hd_gtk.pm:384 fs/partitioning_wizard.pm:402 services.pm:184
+#: diskdrake/hd_gtk.pm:389 fs/partitioning_wizard.pm:403 services.pm:184
#, c-format
msgid "Other"
msgstr "Andet"
-#: diskdrake/hd_gtk.pm:384 diskdrake/interactive.pm:1318
-#: fs/partitioning_wizard.pm:402
+#: diskdrake/hd_gtk.pm:389 diskdrake/interactive.pm:1370
+#: fs/partitioning_wizard.pm:403
#, c-format
msgid "Empty"
msgstr "Tom"
-#: diskdrake/hd_gtk.pm:391
+#: diskdrake/hd_gtk.pm:396
#, c-format
msgid "Filesystem types:"
msgstr "Filsystems-typer:"
-#: diskdrake/hd_gtk.pm:412
+#: diskdrake/hd_gtk.pm:417
#, c-format
msgid "This partition is already empty"
msgstr "Denne partition er allerede tom"
-#: diskdrake/hd_gtk.pm:421
+#: diskdrake/hd_gtk.pm:426
#, c-format
msgid "Use ``Unmount'' first"
msgstr "Benyt ``Afmontér'' først"
-#: diskdrake/hd_gtk.pm:421
+#: diskdrake/hd_gtk.pm:426
#, c-format
msgid "Use ``%s'' instead (in expert mode)"
msgstr "Benyt ``%s'' i stedet (i eksperttilstand)"
-#: diskdrake/hd_gtk.pm:421 diskdrake/interactive.pm:405
-#: diskdrake/interactive.pm:591 diskdrake/removable.pm:25
+#: diskdrake/hd_gtk.pm:426 diskdrake/interactive.pm:405
+#: diskdrake/interactive.pm:641 diskdrake/removable.pm:25
#: diskdrake/removable.pm:48
#, c-format
msgid "Type"
@@ -1481,7 +1468,7 @@ msgid "More"
msgstr "Mere"
#: diskdrake/interactive.pm:281 diskdrake/interactive.pm:294
-#: diskdrake/interactive.pm:1226
+#: diskdrake/interactive.pm:568 diskdrake/interactive.pm:1278
#, c-format
msgid "Confirmation"
msgstr "Bekræftelse"
@@ -1506,7 +1493,7 @@ msgstr "Afslut uden at skrive partitionstabellen?"
msgid "Do you want to save /etc/fstab modifications"
msgstr "Ønsker du at gemme /etc/fstab-ændringerne?"
-#: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:282
+#: diskdrake/interactive.pm:301 fs/partitioning_wizard.pm:283
#, c-format
msgid "You need to reboot for the partition table modifications to take place"
msgstr "Du skal genstarte for at aktivere ændringerne i partitionstabellen"
@@ -1582,7 +1569,7 @@ msgstr "Detaljeret information"
msgid "View"
msgstr "Vis"
-#: diskdrake/interactive.pm:408 diskdrake/interactive.pm:768
+#: diskdrake/interactive.pm:408 diskdrake/interactive.pm:830
#, c-format
msgid "Resize"
msgstr "Størrelsesændring"
@@ -1592,12 +1579,12 @@ msgstr "Størrelsesændring"
msgid "Format"
msgstr "Formatér"
-#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:878
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:956
#, c-format
msgid "Add to RAID"
msgstr "Tilføj til RAID"
-#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:899
+#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:975
#, c-format
msgid "Add to LVM"
msgstr "Tilføj til LVM"
@@ -1647,37 +1634,62 @@ msgstr "Opret"
msgid "Failed to mount partition"
msgstr "Kunne ikke montere partition"
-#: diskdrake/interactive.pm:485 diskdrake/interactive.pm:487
+#: diskdrake/interactive.pm:487 diskdrake/interactive.pm:489
#, c-format
msgid "Create a new partition"
msgstr "Opret en ny partition"
-#: diskdrake/interactive.pm:489
+#: diskdrake/interactive.pm:491
#, c-format
msgid "Start sector: "
msgstr "Startsektor: "
-#: diskdrake/interactive.pm:492 diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:494 diskdrake/interactive.pm:1059
#, c-format
msgid "Size in MB: "
msgstr "Størrelse i Mb: "
-#: diskdrake/interactive.pm:494 diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:496 diskdrake/interactive.pm:1060
#, c-format
msgid "Filesystem type: "
msgstr "Filsystemstype: "
-#: diskdrake/interactive.pm:500
+#: diskdrake/interactive.pm:502
#, c-format
msgid "Preference: "
msgstr "Præference: "
-#: diskdrake/interactive.pm:503
+#: diskdrake/interactive.pm:505
#, c-format
msgid "Logical volume name "
msgstr "Logisk arkivnavn "
-#: diskdrake/interactive.pm:523
+#: diskdrake/interactive.pm:507
+#, fuzzy, c-format
+msgid "Encrypt partition"
+msgstr "Krypteringsalgoritme"
+
+#: diskdrake/interactive.pm:508
+#, fuzzy, c-format
+msgid "Encryption key "
+msgstr "Krypteringsnøgle"
+
+#: diskdrake/interactive.pm:509 diskdrake/interactive.pm:1487
+#, c-format
+msgid "Encryption key (again)"
+msgstr "Krypteringsnøgle (igen)"
+
+#: diskdrake/interactive.pm:520 diskdrake/interactive.pm:1483
+#, c-format
+msgid "The encryption keys do not match"
+msgstr "Krypteringsnøglerne stemmer ikke overens"
+
+#: diskdrake/interactive.pm:521
+#, fuzzy, c-format
+msgid "Missing encryption key"
+msgstr "Krypteringsnøgle for filsystem"
+
+#: diskdrake/interactive.pm:541
#, c-format
msgid ""
"You can not create a new partition\n"
@@ -1688,69 +1700,75 @@ msgstr ""
"(fordi du er oppe på det maksimale antal primære partitioner)\n"
"Fjern først en primær partition og opret en udvidet partition."
-#: diskdrake/interactive.pm:553
+#: diskdrake/interactive.pm:568 diskdrake/interactive.pm:1278
+#: fs/partitioning.pm:48
+#, c-format
+msgid "Check bad blocks?"
+msgstr "Led efter beskadigede blokke?"
+
+#: diskdrake/interactive.pm:594
#, c-format
msgid "Remove the loopback file?"
msgstr "Fjern loopback-filen?"
-#: diskdrake/interactive.pm:575
+#: diskdrake/interactive.pm:622
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
msgstr ""
"Efter type-ændring af partition %s vil alle data på denne partition gå tabt"
-#: diskdrake/interactive.pm:588
+#: diskdrake/interactive.pm:638
#, c-format
msgid "Change partition type"
msgstr "Skift partitionstype"
-#: diskdrake/interactive.pm:590 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:640 diskdrake/removable.pm:47
#, c-format
msgid "Which filesystem do you want?"
msgstr "Hvilket filsystem ønsker du at bruge?"
-#: diskdrake/interactive.pm:597
+#: diskdrake/interactive.pm:647
#, c-format
msgid "Switching from %s to %s"
msgstr "Skifter fra %s til %s"
-#: diskdrake/interactive.pm:632
+#: diskdrake/interactive.pm:682
#, c-format
msgid "Set volume label"
msgstr "Sæt volumen-etiket"
-#: diskdrake/interactive.pm:634
+#: diskdrake/interactive.pm:684
#, c-format
msgid "Beware, this will be written to disk as soon as you validate!"
msgstr "Bemærk at dette vil blive skrevet til disk så snart du har valideret!"
-#: diskdrake/interactive.pm:635
+#: diskdrake/interactive.pm:685
#, c-format
msgid "Beware, this will be written to disk only after formatting!"
msgstr "Bemærk at dette først vil blive skrevet til disk efter formatering!"
-#: diskdrake/interactive.pm:637
+#: diskdrake/interactive.pm:687
#, c-format
msgid "Which volume label?"
msgstr "Hvilken volumen-etiket?"
-#: diskdrake/interactive.pm:638
+#: diskdrake/interactive.pm:688
#, c-format
msgid "Label:"
msgstr "Mærkat:"
-#: diskdrake/interactive.pm:659
+#: diskdrake/interactive.pm:709
#, c-format
msgid "Where do you want to mount the loopback file %s?"
msgstr "Hvor ønsker du at montere loopback-filen %s?"
-#: diskdrake/interactive.pm:660
+#: diskdrake/interactive.pm:710
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "Hvor ønsker du at montere partitionen %s?"
-#: diskdrake/interactive.pm:665
+#: diskdrake/interactive.pm:715
#, c-format
msgid ""
"Can not unset mount point as this partition is used for loop back.\n"
@@ -1760,60 +1778,60 @@ msgstr ""
"loopback.\n"
"Fjern loopback først"
-#: diskdrake/interactive.pm:695
+#: diskdrake/interactive.pm:745
#, c-format
msgid "Where do you want to mount %s?"
msgstr "Hvor ønsker du at montere %s?"
-#: diskdrake/interactive.pm:719 diskdrake/interactive.pm:802
-#: fs/partitioning_wizard.pm:128 fs/partitioning_wizard.pm:204
+#: diskdrake/interactive.pm:775 diskdrake/interactive.pm:864
+#: fs/partitioning_wizard.pm:129 fs/partitioning_wizard.pm:205
#, c-format
msgid "Resizing"
msgstr "Ændrer størrelsen"
-#: diskdrake/interactive.pm:719
+#: diskdrake/interactive.pm:775
#, c-format
msgid "Computing FAT filesystem bounds"
msgstr "Udregner FAT-filsystemets grænser"
-#: diskdrake/interactive.pm:755
+#: diskdrake/interactive.pm:817
#, c-format
msgid "This partition is not resizeable"
msgstr "Størrelsen på denne partition kan ikke ændres"
-#: diskdrake/interactive.pm:760
+#: diskdrake/interactive.pm:822
#, c-format
msgid "All data on this partition should be backed-up"
msgstr "Det bør laves en backup af alle data på denne partition"
-#: diskdrake/interactive.pm:762
+#: diskdrake/interactive.pm:824
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
msgstr ""
"Efter ændring af størrelsen af partition %s vil alle data på denne partition "
"gå tabt"
-#: diskdrake/interactive.pm:769
+#: diskdrake/interactive.pm:831
#, c-format
msgid "Choose the new size"
msgstr "Vælg den nye størrelse"
-#: diskdrake/interactive.pm:770
+#: diskdrake/interactive.pm:832
#, c-format
msgid "New size in MB: "
msgstr "Ny størrelse i Mb: "
-#: diskdrake/interactive.pm:771
+#: diskdrake/interactive.pm:833
#, c-format
msgid "Minimum size: %s MB"
msgstr "Minimumsstørrelse: %s MB"
-#: diskdrake/interactive.pm:772
+#: diskdrake/interactive.pm:834
#, c-format
msgid "Maximum size: %s MB"
msgstr "Maksimumsstørrelse: %s MB"
-#: diskdrake/interactive.pm:813 fs/partitioning_wizard.pm:212
+#: diskdrake/interactive.pm:875 fs/partitioning_wizard.pm:213
#, c-format
msgid ""
"To ensure data integrity after resizing the partition(s),\n"
@@ -1822,57 +1840,57 @@ msgstr ""
"For at sikre dataintegritet efter ændring af størrelse på partitioner \n"
"vil filsystemtjek blive kørt ved din næste opstart af Microsoft Windows®"
-#: diskdrake/interactive.pm:861 diskdrake/interactive.pm:1423
+#: diskdrake/interactive.pm:939 diskdrake/interactive.pm:1478
#, c-format
msgid "Filesystem encryption key"
msgstr "Krypteringsnøgle for filsystem"
-#: diskdrake/interactive.pm:862
+#: diskdrake/interactive.pm:940
#, c-format
msgid "Enter your filesystem encryption key"
msgstr "Indtast din krypteringsnøgle for filsystemet"
-#: diskdrake/interactive.pm:863 diskdrake/interactive.pm:1431
+#: diskdrake/interactive.pm:941 diskdrake/interactive.pm:1486
#, c-format
msgid "Encryption key"
msgstr "Krypteringsnøgle"
-#: diskdrake/interactive.pm:870
+#: diskdrake/interactive.pm:948
#, c-format
msgid "Invalid key"
msgstr "Ugyldig nøgle"
-#: diskdrake/interactive.pm:878
+#: diskdrake/interactive.pm:956
#, c-format
msgid "Choose an existing RAID to add to"
msgstr "Vælg en eksisterende RAID som skal udvides"
-#: diskdrake/interactive.pm:880 diskdrake/interactive.pm:901
+#: diskdrake/interactive.pm:958 diskdrake/interactive.pm:977
#, c-format
msgid "new"
msgstr "ny"
-#: diskdrake/interactive.pm:899
+#: diskdrake/interactive.pm:975
#, c-format
msgid "Choose an existing LVM to add to"
msgstr "Vælg en eksisterende LVM som skal udvides"
-#: diskdrake/interactive.pm:911 diskdrake/interactive.pm:920
+#: diskdrake/interactive.pm:987 diskdrake/interactive.pm:996
#, c-format
msgid "LVM name"
msgstr "LVM-navn"
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:988
#, c-format
msgid "Enter a name for the new LVM volume group"
msgstr "Angiv et navn for den nye LVM-volumengruppe"
-#: diskdrake/interactive.pm:917
+#: diskdrake/interactive.pm:993
#, c-format
msgid "\"%s\" already exists"
msgstr "'%s' findes allerede"
-#: diskdrake/interactive.pm:948
+#: diskdrake/interactive.pm:1024
#, c-format
msgid ""
"Physical volume %s is still in use.\n"
@@ -1882,118 +1900,113 @@ msgstr ""
"Ønsker du at flytte brugte fysiske områder på dette volumen til andre "
"volumener?"
-#: diskdrake/interactive.pm:950
+#: diskdrake/interactive.pm:1026
#, c-format
msgid "Moving physical extents"
msgstr "Flytter fysiske områder"
-#: diskdrake/interactive.pm:968
+#: diskdrake/interactive.pm:1044
#, c-format
msgid "This partition can not be used for loopback"
msgstr "Denne partition kan ikke bruges til loopback"
-#: diskdrake/interactive.pm:981
+#: diskdrake/interactive.pm:1057
#, c-format
msgid "Loopback"
msgstr "Loopback"
-#: diskdrake/interactive.pm:982
+#: diskdrake/interactive.pm:1058
#, c-format
msgid "Loopback file name: "
msgstr "Loopback-filnavn: "
-#: diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:1063
#, c-format
msgid "Give a file name"
msgstr "Giv et filnavn"
-#: diskdrake/interactive.pm:990
+#: diskdrake/interactive.pm:1066
#, c-format
msgid "File is already used by another loopback, choose another one"
msgstr "Filen er allerede brugt af en anden loopback, vælg en anden fil"
-#: diskdrake/interactive.pm:991
+#: diskdrake/interactive.pm:1067
#, c-format
msgid "File already exists. Use it?"
msgstr "Filen findes allerede. Skal den bruges?"
-#: diskdrake/interactive.pm:1023 diskdrake/interactive.pm:1026
+#: diskdrake/interactive.pm:1099 diskdrake/interactive.pm:1102
#, c-format
msgid "Mount options"
msgstr "Modulindstillinger"
-#: diskdrake/interactive.pm:1033
+#: diskdrake/interactive.pm:1109
#, c-format
msgid "Various"
msgstr "Diverse"
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1155
#, c-format
msgid "device"
msgstr "enhed"
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1156
#, c-format
msgid "level"
msgstr "niveau"
-#: diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1157
#, c-format
msgid "chunk size in KiB"
msgstr "fragmentstørrelse i KiB"
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1175
#, c-format
msgid "Be careful: this operation is dangerous."
msgstr "Vær forsigtig: denne operation er farlig."
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1190
#, c-format
msgid "Partitioning Type"
msgstr "Type af partitionering"
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1190
#, c-format
msgid "What type of partitioning?"
msgstr "Hvilken slags partitionering?"
-#: diskdrake/interactive.pm:1173
+#: diskdrake/interactive.pm:1228
#, c-format
msgid "You'll need to reboot before the modification can take place"
msgstr "Du skal genstarte maskinen for at aktivere ændringerne"
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1237
#, c-format
msgid "Partition table of drive %s is going to be written to disk"
msgstr "Partitionstabellen for disk %s vil nu blive skrevet på disken"
-#: diskdrake/interactive.pm:1204 fs/format.pm:99 fs/format.pm:106
+#: diskdrake/interactive.pm:1256 fs/format.pm:102 fs/format.pm:109
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partition %s"
-#: diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1269
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
msgstr ""
"Efter formatering af partitionen %s vil alle data på denne partition gå tabt"
-#: diskdrake/interactive.pm:1226 fs/partitioning.pm:48
-#, c-format
-msgid "Check bad blocks?"
-msgstr "Led efter beskadigede blokke?"
-
-#: diskdrake/interactive.pm:1240
+#: diskdrake/interactive.pm:1292
#, c-format
msgid "Move files to the new partition"
msgstr "Flyt filer til den nye partition"
-#: diskdrake/interactive.pm:1240
+#: diskdrake/interactive.pm:1292
#, c-format
msgid "Hide files"
msgstr "Skjul filer"
-#: diskdrake/interactive.pm:1241
+#: diskdrake/interactive.pm:1293
#, c-format
msgid ""
"Directory %s already contains data\n"
@@ -2010,128 +2023,128 @@ msgstr ""
"monteret der eller lade filerne blive der hvor de er (hvilket bevirker at de "
"bliver skjult af indholdet på den monterede partition)"
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1308
#, c-format
msgid "Moving files to the new partition"
msgstr "Flytter filer til den nye partition"
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1312
#, c-format
msgid "Copying %s"
msgstr "Kopierer %s"
-#: diskdrake/interactive.pm:1264
+#: diskdrake/interactive.pm:1316
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: diskdrake/interactive.pm:1278
+#: diskdrake/interactive.pm:1330
#, c-format
msgid "partition %s is now known as %s"
msgstr "partition %s er nu kendt som %s"
-#: diskdrake/interactive.pm:1279
+#: diskdrake/interactive.pm:1331
#, c-format
msgid "Partitions have been renumbered: "
msgstr "Partitioner er blevet omnummererede: "
-#: diskdrake/interactive.pm:1304 diskdrake/interactive.pm:1372
+#: diskdrake/interactive.pm:1356 diskdrake/interactive.pm:1427
#, c-format
msgid "Device: "
msgstr "Enhed: "
-#: diskdrake/interactive.pm:1305
+#: diskdrake/interactive.pm:1357
#, c-format
msgid "Volume label: "
msgstr "Etikette for drev: "
-#: diskdrake/interactive.pm:1306
+#: diskdrake/interactive.pm:1358
#, c-format
msgid "UUID: "
msgstr "UUID: "
-#: diskdrake/interactive.pm:1307
+#: diskdrake/interactive.pm:1359
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS-drevbogstav: %s (bare et gæt)\n"
-#: diskdrake/interactive.pm:1311 diskdrake/interactive.pm:1320
-#: diskdrake/interactive.pm:1391
+#: diskdrake/interactive.pm:1363 diskdrake/interactive.pm:1372
+#: diskdrake/interactive.pm:1446
#, c-format
msgid "Type: "
msgstr "Type: "
-#: diskdrake/interactive.pm:1315 diskdrake/interactive.pm:1376
+#: diskdrake/interactive.pm:1367 diskdrake/interactive.pm:1431
#, c-format
msgid "Name: "
msgstr "Navn: "
-#: diskdrake/interactive.pm:1322
+#: diskdrake/interactive.pm:1374
#, c-format
msgid "Start: sector %s\n"
msgstr "Start: sektor %s\n"
-#: diskdrake/interactive.pm:1323
+#: diskdrake/interactive.pm:1375
#, c-format
msgid "Size: %s"
msgstr "Størrelse: %s"
-#: diskdrake/interactive.pm:1325
+#: diskdrake/interactive.pm:1377
#, c-format
msgid ", %s sectors"
msgstr ", %s sektorer"
-#: diskdrake/interactive.pm:1327
+#: diskdrake/interactive.pm:1379
#, c-format
msgid "Cylinder %d to %d\n"
msgstr "Cylinder %d til %d\n"
-#: diskdrake/interactive.pm:1328
+#: diskdrake/interactive.pm:1380
#, c-format
msgid "Number of logical extents: %d\n"
msgstr "Antal logiske områder: %d\n"
-#: diskdrake/interactive.pm:1329
+#: diskdrake/interactive.pm:1381
#, c-format
msgid "Formatted\n"
msgstr "Formateret\n"
-#: diskdrake/interactive.pm:1330
+#: diskdrake/interactive.pm:1382
#, c-format
msgid "Not formatted\n"
msgstr "Ikke formateret\n"
-#: diskdrake/interactive.pm:1331
+#: diskdrake/interactive.pm:1383
#, c-format
msgid "Mounted\n"
msgstr "Monteret\n"
-#: diskdrake/interactive.pm:1332
+#: diskdrake/interactive.pm:1384
#, c-format
msgid "RAID %s\n"
msgstr "RAID %s\n"
-#: diskdrake/interactive.pm:1334
+#: diskdrake/interactive.pm:1386
#, c-format
msgid "Encrypted"
msgstr "Krypteret"
-#: diskdrake/interactive.pm:1334
+#: diskdrake/interactive.pm:1388
#, c-format
msgid " (mapped on %s)"
msgstr " (mappet på %s)"
-#: diskdrake/interactive.pm:1335
+#: diskdrake/interactive.pm:1389
#, c-format
msgid " (to map on %s)"
msgstr " (til at mappe på %s)"
-#: diskdrake/interactive.pm:1336
+#: diskdrake/interactive.pm:1390
#, c-format
msgid " (inactive)"
msgstr " (inaktiv)"
-#: diskdrake/interactive.pm:1342
+#: diskdrake/interactive.pm:1397
#, c-format
msgid ""
"Loopback file(s):\n"
@@ -2140,7 +2153,7 @@ msgstr ""
"Loopback-fil(er):\n"
" %s\n"
-#: diskdrake/interactive.pm:1343
+#: diskdrake/interactive.pm:1398
#, c-format
msgid ""
"Partition booted by default\n"
@@ -2149,27 +2162,27 @@ msgstr ""
"Partition som opstartes som standard\n"
" (gælder kun MS-DOS-opstart, ikke LILO)\n"
-#: diskdrake/interactive.pm:1345
+#: diskdrake/interactive.pm:1400
#, c-format
msgid "Level %s\n"
msgstr "Niveau %s\n"
-#: diskdrake/interactive.pm:1346
+#: diskdrake/interactive.pm:1401
#, c-format
msgid "Chunk size %d KiB\n"
msgstr "Fragmentstørrelse %d KiB\n"
-#: diskdrake/interactive.pm:1347
+#: diskdrake/interactive.pm:1402
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID-diske %s\n"
-#: diskdrake/interactive.pm:1349
+#: diskdrake/interactive.pm:1404
#, c-format
msgid "Loopback file name: %s"
msgstr "Loopback-filnavn: %s"
-#: diskdrake/interactive.pm:1352
+#: diskdrake/interactive.pm:1407
#, c-format
msgid ""
"\n"
@@ -2182,7 +2195,7 @@ msgstr ""
"en driver-partition. Du skal\n"
"nok bare lade den være.\n"
-#: diskdrake/interactive.pm:1355
+#: diskdrake/interactive.pm:1410
#, c-format
msgid ""
"\n"
@@ -2195,68 +2208,58 @@ msgstr ""
"partition er for at\n"
"dual-boote dit system.\n"
-#: diskdrake/interactive.pm:1364
+#: diskdrake/interactive.pm:1419
#, c-format
msgid "Free space on %s (%s)"
msgstr "Ledig plads på %s (%s)"
-#: diskdrake/interactive.pm:1373
+#: diskdrake/interactive.pm:1428
#, c-format
msgid "Read-only"
msgstr "Skrivebeskyttet"
-#: diskdrake/interactive.pm:1374
+#: diskdrake/interactive.pm:1429
#, c-format
msgid "Size: %s\n"
msgstr "Størrelse: %s\n"
-#: diskdrake/interactive.pm:1375
+#: diskdrake/interactive.pm:1430
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "Opbygning: %s cylindre, %s hoveder, %s sektorer\n"
-#: diskdrake/interactive.pm:1377
+#: diskdrake/interactive.pm:1432
#, c-format
msgid "Medium type: "
msgstr "Medietype: "
-#: diskdrake/interactive.pm:1378
+#: diskdrake/interactive.pm:1433
#, c-format
msgid "LVM-disks %s\n"
msgstr "LVM-diske %s\n"
-#: diskdrake/interactive.pm:1379
+#: diskdrake/interactive.pm:1434
#, c-format
msgid "Partition table type: %s\n"
msgstr "Partitionstabel-type: %s\n"
-#: diskdrake/interactive.pm:1380
+#: diskdrake/interactive.pm:1435
#, c-format
msgid "on channel %d id %d\n"
msgstr "på kanal %d id %d\n"
-#: diskdrake/interactive.pm:1424
+#: diskdrake/interactive.pm:1479
#, c-format
msgid "Choose your filesystem encryption key"
msgstr "Vælg din krypteringsnøgle for filsystemet"
-#: diskdrake/interactive.pm:1427
+#: diskdrake/interactive.pm:1482
#, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr ""
"Denne krypteringsnøgle er for nem at gætte (skal mindst være på %d tegn)"
-#: diskdrake/interactive.pm:1428
-#, c-format
-msgid "The encryption keys do not match"
-msgstr "Krypteringsnøglerne stemmer ikke overens"
-
-#: diskdrake/interactive.pm:1432
-#, c-format
-msgid "Encryption key (again)"
-msgstr "Krypteringsnøgle (igen)"
-
-#: diskdrake/interactive.pm:1434
+#: diskdrake/interactive.pm:1489
#, c-format
msgid "Encryption algorithm"
msgstr "Krypteringsalgoritme"
@@ -2362,32 +2365,32 @@ msgstr ""
"der kan oprettes nye filsystemer. Undersøg din maskine for at finde årsagen "
"til problemet"
-#: fs/any.pm:75 fs/partitioning_wizard.pm:61
+#: fs/any.pm:75 fs/partitioning_wizard.pm:62
#, c-format
msgid "You must have a FAT partition mounted in /boot/efi"
msgstr "Du skal have en FAT-partition monteret under /boot/efi"
-#: fs/format.pm:103
+#: fs/format.pm:106
#, c-format
msgid "Creating and formatting file %s"
msgstr "Opretter og formaterer fil %s"
-#: fs/format.pm:122
+#: fs/format.pm:125
#, c-format
msgid "I do not know how to set label on %s with type %s"
msgstr "Jeg véd ikke hvordan der skal sættes en etikette på %s som type %s"
-#: fs/format.pm:131
+#: fs/format.pm:134
#, c-format
msgid "setting label on %s failed, is it formatted?"
msgstr "Sætning af etikette på %s mislykkedes, er den formateret?"
-#: fs/format.pm:172
+#: fs/format.pm:175
#, c-format
msgid "I do not know how to format %s in type %s"
msgstr "Ved ikke hvordan man formaterer %s som type %s"
-#: fs/format.pm:177 fs/format.pm:179
+#: fs/format.pm:180 fs/format.pm:182
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s formatering af %s mislykkedes"
@@ -2422,22 +2425,17 @@ msgstr "fejl ved afmontering af %s: %s"
msgid "Enabling swap partition %s"
msgstr "Formaterer swap-partition %s"
-#: fs/mount_options.pm:114
-#, c-format
-msgid "Use an encrypted file system"
-msgstr "Brug et krypteret filsystem"
-
-#: fs/mount_options.pm:116
+#: fs/mount_options.pm:113
#, c-format
msgid "Flush write cache on file close"
msgstr "Tøm skrivecache ved fillukning"
-#: fs/mount_options.pm:118
+#: fs/mount_options.pm:115
#, c-format
msgid "Enable group disk quota accounting and optionally enforce limits"
msgstr "Aktivér kontering af gruppediskkvota, og indfør eventuelt grænser"
-#: fs/mount_options.pm:120
+#: fs/mount_options.pm:117
#, c-format
msgid ""
"Do not update inode access times on this file system\n"
@@ -2446,7 +2444,7 @@ msgstr ""
"Opdatér ikke inode tilgangstider på dette filsystem\n"
"(fx for hurtigere adgang på nyhedskøen for at gøre nyhedsservere hurtigere)."
-#: fs/mount_options.pm:123
+#: fs/mount_options.pm:120
#, c-format
msgid ""
"Update inode access times on this filesystem in a more efficient way\n"
@@ -2455,7 +2453,7 @@ msgstr ""
"Opdatér inode tilgangstider på dette filsystem på en mere effektiv måde\n"
"(fx for hurtigere adgang på nyhedskøen for at gøre nyhedsservere hurtigere)."
-#: fs/mount_options.pm:126
+#: fs/mount_options.pm:123
#, c-format
msgid ""
"Can only be mounted explicitly (i.e.,\n"
@@ -2464,12 +2462,12 @@ msgstr ""
"Kan kun monteres eksplicit (dvs.,\n"
"'-a' tilvalget vil ikke bevirke, at filsystemet monteres)."
-#: fs/mount_options.pm:129
+#: fs/mount_options.pm:126
#, c-format
msgid "Do not interpret character or block special devices on the file system."
msgstr "Fortolk ikke tegn- eller blok-specialenheder på filsystemet."
-#: fs/mount_options.pm:131
+#: fs/mount_options.pm:128
#, c-format
msgid ""
"Do not allow execution of any binaries on the mounted\n"
@@ -2480,7 +2478,7 @@ msgstr ""
"filsystem. Denne mulighed kan være nyttig for en server som har \n"
"filsystemer med binære for andre arkitekturer end dets egen."
-#: fs/mount_options.pm:135
+#: fs/mount_options.pm:132
#, c-format
msgid ""
"Do not allow set-user-identifier or set-group-identifier\n"
@@ -2492,42 +2490,42 @@ msgstr ""
"(Dette ser sikkert ud, men er faktisk ret usikkert hvis du har suidperl(1) "
"installeret)."
-#: fs/mount_options.pm:139
+#: fs/mount_options.pm:136
#, c-format
msgid "Mount the file system read-only."
msgstr "Montér filsystem skrivebeskyttet"
-#: fs/mount_options.pm:141
+#: fs/mount_options.pm:138
#, c-format
msgid "All I/O to the file system should be done synchronously."
msgstr "Al I/O til filsystemet bør gøres synkront."
-#: fs/mount_options.pm:143
+#: fs/mount_options.pm:140
#, c-format
msgid "Allow every user to mount and umount the file system."
msgstr "Tillad alle brugere at montere og afmontere filsystemet."
-#: fs/mount_options.pm:145
+#: fs/mount_options.pm:142
#, c-format
msgid "Allow an ordinary user to mount the file system."
msgstr "Tillad en almindelig bruger at montere filsystemet."
-#: fs/mount_options.pm:147
+#: fs/mount_options.pm:144
#, c-format
msgid "Enable user disk quota accounting, and optionally enforce limits"
msgstr "Aktivér kontering af gruppediskkvota, og indfør eventuelt grænser"
-#: fs/mount_options.pm:149
+#: fs/mount_options.pm:146
#, c-format
msgid "Support \"user.\" extended attributes"
msgstr "Understøt 'bruger.'-udvidede attributter"
-#: fs/mount_options.pm:151
+#: fs/mount_options.pm:148
#, c-format
msgid "Give write access to ordinary users"
msgstr "Giv skriveadgang til almindelige brugere"
-#: fs/mount_options.pm:153
+#: fs/mount_options.pm:150
#, c-format
msgid "Give read-only access to ordinary users"
msgstr "Giv skriveadgang til almindelige brugere"
@@ -2582,7 +2580,7 @@ msgstr ""
"vælg en eksisterende).\n"
"Vælg så kommandoen \"Monterings-sti\" og sæt den til `/'"
-#: fs/partitioning_wizard.pm:58
+#: fs/partitioning_wizard.pm:59
#, c-format
msgid ""
"You do not have a swap partition.\n"
@@ -2593,42 +2591,42 @@ msgstr ""
"\n"
"Fortsæt alligevel?"
-#: fs/partitioning_wizard.pm:92
+#: fs/partitioning_wizard.pm:93
#, c-format
msgid "Use free space"
msgstr "Brug fri plads"
-#: fs/partitioning_wizard.pm:94
+#: fs/partitioning_wizard.pm:95
#, c-format
msgid "Not enough free space to allocate new partitions"
msgstr "Ikke nok fri plads til at tildele nye partitioner"
-#: fs/partitioning_wizard.pm:102
+#: fs/partitioning_wizard.pm:103
#, c-format
msgid "Use existing partitions"
msgstr "Brug eksisterende partition"
-#: fs/partitioning_wizard.pm:104
+#: fs/partitioning_wizard.pm:105
#, c-format
msgid "There is no existing partition to use"
msgstr "Der er ingen eksisterende partition der kan bruges"
-#: fs/partitioning_wizard.pm:128
+#: fs/partitioning_wizard.pm:129
#, c-format
msgid "Computing the size of the Microsoft Windows® partition"
msgstr "Beregner størrelsen på Microsoft Windows®-partitionen"
-#: fs/partitioning_wizard.pm:164
+#: fs/partitioning_wizard.pm:165
#, c-format
msgid "Use the free space on a Microsoft Windows® partition"
msgstr "Brug den frie plads på en Microsoft Windows ® partition"
-#: fs/partitioning_wizard.pm:168
+#: fs/partitioning_wizard.pm:169
#, c-format
msgid "Which partition do you want to resize?"
msgstr "Hvilken partition ønsker du at ændre størrelse på?"
-#: fs/partitioning_wizard.pm:171
+#: fs/partitioning_wizard.pm:172
#, c-format
msgid ""
"Your Microsoft Windows® partition is too fragmented. Please reboot your "
@@ -2637,7 +2635,7 @@ msgid ""
msgstr ""
"Din Microsoft Windows® partition er for fragmenteret, kør 'defrag' først"
-#: fs/partitioning_wizard.pm:179
+#: fs/partitioning_wizard.pm:180
#, c-format
msgid ""
"WARNING!\n"
@@ -2672,76 +2670,76 @@ msgstr ""
"Tryk på %s, hvis du er helt sikker."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:188 fs/partitioning_wizard.pm:551
+#: fs/partitioning_wizard.pm:189 fs/partitioning_wizard.pm:552
#: interactive.pm:549 interactive/curses.pm:263 ugtk2.pm:519
#, c-format
msgid "Next"
msgstr "Næste"
-#: fs/partitioning_wizard.pm:194
+#: fs/partitioning_wizard.pm:195
#, c-format
msgid "Partitionning"
msgstr "Opdeling af disk"
-#: fs/partitioning_wizard.pm:194
+#: fs/partitioning_wizard.pm:195
#, c-format
msgid "Which size do you want to keep for Microsoft Windows® on partition %s?"
msgstr ""
"Hvilken størrelse ønsker du at at beholde Microsoft Windows® på partition %s?"
-#: fs/partitioning_wizard.pm:195
+#: fs/partitioning_wizard.pm:196
#, c-format
msgid "Size"
msgstr "Størrelse"
-#: fs/partitioning_wizard.pm:204
+#: fs/partitioning_wizard.pm:205
#, c-format
msgid "Resizing Microsoft Windows® partition"
msgstr "Udregner Microsoft Windows®-filsystemets grænser"
-#: fs/partitioning_wizard.pm:209
+#: fs/partitioning_wizard.pm:210
#, c-format
msgid "FAT resizing failed: %s"
msgstr "FAT størrelsesændring mislykkedes: %s"
-#: fs/partitioning_wizard.pm:225
+#: fs/partitioning_wizard.pm:226
#, c-format
msgid "There is no FAT partition to resize (or not enough space left)"
msgstr ""
"Der er ingen FAT-partitioner at ændre størrelse på (eller ikke nok plads "
"tilbage)"
-#: fs/partitioning_wizard.pm:230
+#: fs/partitioning_wizard.pm:231
#, c-format
msgid "Remove Microsoft Windows®"
msgstr "Fjern Microsoft Windows®"
-#: fs/partitioning_wizard.pm:230
+#: fs/partitioning_wizard.pm:231
#, c-format
msgid "Erase and use entire disk"
msgstr "Slet hele disken og brug den"
-#: fs/partitioning_wizard.pm:234
+#: fs/partitioning_wizard.pm:235
#, c-format
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "Du har mere end et diskdrev, hvilken ønsker du at installere Linux på?"
-#: fs/partitioning_wizard.pm:242 fsedit.pm:600
+#: fs/partitioning_wizard.pm:243 fsedit.pm:610
#, c-format
msgid "ALL existing partitions and their data will be lost on drive %s"
msgstr "Alle eksisterende partitioner og deres data vil gå tabt på drev %s"
-#: fs/partitioning_wizard.pm:252
+#: fs/partitioning_wizard.pm:253
#, c-format
msgid "Custom disk partitioning"
msgstr "Brugerdefineret disk-opdeling"
-#: fs/partitioning_wizard.pm:258
+#: fs/partitioning_wizard.pm:259
#, c-format
msgid "Use fdisk"
msgstr "Brug fdisk"
-#: fs/partitioning_wizard.pm:261
+#: fs/partitioning_wizard.pm:262
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -2750,37 +2748,37 @@ msgstr ""
"Du kan nu partitionere %s.\n"
"Når du er færdig, så husk at gemme med 'w'"
-#: fs/partitioning_wizard.pm:401
+#: fs/partitioning_wizard.pm:402
#, c-format
msgid "Ext2/3/4"
msgstr "Ext2/3/4"
-#: fs/partitioning_wizard.pm:431 fs/partitioning_wizard.pm:571
+#: fs/partitioning_wizard.pm:432 fs/partitioning_wizard.pm:572
#, c-format
msgid "I can not find any room for installing"
msgstr "Kan ikke finde plads til installering"
-#: fs/partitioning_wizard.pm:440 fs/partitioning_wizard.pm:578
+#: fs/partitioning_wizard.pm:441 fs/partitioning_wizard.pm:579
#, c-format
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "DrakX partitionerings-vejlederen fandt de følgende løsninger:"
-#: fs/partitioning_wizard.pm:511
+#: fs/partitioning_wizard.pm:512
#, c-format
msgid "Here is the content of your disk drive "
msgstr "Her er indholdet af dit diskdrev "
-#: fs/partitioning_wizard.pm:588
+#: fs/partitioning_wizard.pm:589
#, c-format
msgid "Partitioning failed: %s"
msgstr "Partitionering mislykkedes: %s"
-#: fs/type.pm:390
+#: fs/type.pm:393
#, c-format
msgid "You can not use JFS for partitions smaller than 16MB"
msgstr "Du kan ikke bruge JFS på partitioner mindre end 16Mb"
-#: fs/type.pm:391
+#: fs/type.pm:394
#, c-format
msgid "You can not use ReiserFS for partitions smaller than 32MB"
msgstr "Du kan ikke bruge ReiserFS på partitioner mindre end 32Mb"
@@ -2850,6 +2848,22 @@ msgstr ""
"Vær sikker på at tilføje en /boot partition"
#: fsedit.pm:437
+#, fuzzy, c-format
+msgid ""
+"You've selected an encrypted partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
+msgstr ""
+"Du har valgt en programmeret RAID-partition som rod (/).\n"
+"Ingen systemopstarter kan håndtere dette uden en /boot partition.\n"
+"Vær sikker på at tilføje en /boot partition"
+
+#: fsedit.pm:443 fsedit.pm:461
+#, c-format
+msgid "You can not use an encrypted file system for mount point %s"
+msgstr "Du kan ikke bruge et krypteret filsystem for monteringspunkt %s"
+
+#: fsedit.pm:447
#, c-format
msgid ""
"You can not use the LVM Logical Volume for mount point %s since it spans "
@@ -2858,7 +2872,7 @@ msgstr ""
"Du kan ikke bruge LVM Logisk Volumen for monteringspunkt %s da det "
"indeholder fysiske volumener"
-#: fsedit.pm:439
+#: fsedit.pm:449
#, c-format
msgid ""
"You've selected the LVM Logical Volume as root (/).\n"
@@ -2871,12 +2885,12 @@ msgstr ""
"omfatter fysiske volumener.\n"
"Du bør oprette en /boot-partition først"
-#: fsedit.pm:443 fsedit.pm:445
+#: fsedit.pm:453 fsedit.pm:455
#, c-format
msgid "This directory should remain within the root filesystem"
msgstr "Dette katalog bør ligge på rod-filsystemet"
-#: fsedit.pm:447 fsedit.pm:449
+#: fsedit.pm:457 fsedit.pm:459
#, c-format
msgid ""
"You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount "
@@ -2885,17 +2899,12 @@ msgstr ""
"Du skal have et rigtigt filsystem (ext2/3/4, reiserfs, xfs eller jfs) til "
"dette monteringspunkt\n"
-#: fsedit.pm:451
-#, c-format
-msgid "You can not use an encrypted file system for mount point %s"
-msgstr "Du kan ikke bruge et krypteret filsystem for monteringspunkt %s"
-
-#: fsedit.pm:516
+#: fsedit.pm:526
#, c-format
msgid "Not enough free space for auto-allocating"
msgstr "Ikke nok fri plads til at tildele nye partitioner automatisk"
-#: fsedit.pm:518
+#: fsedit.pm:528
#, c-format
msgid "Nothing to do"
msgstr "Ingenting at lave"
@@ -3204,7 +3213,7 @@ msgstr ""
"Her kan du vælge et alternativ drivprogram (enten OSS eller ALSA) for "
"lydkortet (%s)"
-#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: here the first %s is either "OSS" or "ALSA",
#. -PO: the second %s is the name of the current driver
#. -PO: and the third %s is the name of the default driver
#: harddrake/sound.pm:412
@@ -7172,6 +7181,21 @@ msgstr ""
msgid "Installation failed"
msgstr "Installation mislykkedes"
+#~ msgid "Restrict command line options"
+#~ msgstr "Begræns kommandolinie-indstillinger"
+
+#~ msgid "restrict"
+#~ msgstr "begræns"
+
+#~ msgid ""
+#~ "Option ``Restrict command line options'' is of no use without a password"
+#~ msgstr ""
+#~ "Indstillingen ``Begræns kommandolinie-indstillinger'' er intet værd uden\n"
+#~ "en adgangskode"
+
+#~ msgid "Use an encrypted file system"
+#~ msgstr "Brug et krypteret filsystem"
+
#~ msgid ""
#~ "To ensure data integrity after resizing the partition(s), \n"
#~ "filesystem checks will be run on your next boot into Microsoft Windows®"