path: root/urpm/media.pm

package urpm::media;

# $Id$

use urpm 'file_from_local_url';
use urpm::msg;
use urpm::util;
use urpm::removable;
use urpm::lock;


our @PER_MEDIA_OPT = qw(
    downloader
    hdlist
    ignore
    key-ids
    list
    name
    noreconfigure
    priority
    priority-upgrade
    removable
    static
    synthesis
    update
    url
    verify-rpm
    virtual
    with_hdlist
);

sub only_media_opts {
    my ($m) = @_;
    my %m = map { $_ => $m->{$_} } grep { defined $m->{$_} } @PER_MEDIA_OPT;
    \%m;
}

sub read_private_netrc {
    my ($urpm) = @_;

    my @words = split(/\s+/, scalar cat_($urpm->{private_netrc}));
    my @l;
    my $e;
    while (@words) {
	my $keyword = shift @words;
	if ($keyword eq 'machine') {
	    push @l, $e = { machine => shift(@words) };
	} elsif ($keyword eq 'default') {
	    push @l, $e = { default => '' };
	} elsif ($keyword eq 'login' || $keyword eq 'password' || $keyword eq 'account') {
	    $e->{$keyword} = shift(@words);
	} else {
	    $urpm->{error}("unknown netrc command $keyword");
	}
    }
    @l;
}

sub parse_url_with_login {
    my ($url) = @_;
    $url =~ m!([^:]*)://([^/:\@]*)(:([^/:\@]*))?\@([^/]*)(.*)! &&
      { proto => $1, login => $2, password => $4, machine => $5, dir => $6 };
}

sub read_config_add_passwords {
    my ($urpm, $config) = @_;

    my @netrc = read_private_netrc($urpm) or return;
    foreach (@{$config->{media}}) {
	my $u = parse_url_with_login($_->{url}) or next;
	if (my ($e) = grep { ($_->{default} || $_->{machine} eq $u->{machine}) && $_->{login} eq $u->{login} } @netrc) {
	    $_->{url} = sprintf('%s://%s:%s@%s%s', $u->{proto}, $u->{login}, $e->{password}, $u->{machine}, $u->{dir});
	} else {
	    $urpm->{log}("no password found for $u->{login}@$u->{machine}");
	}
    }
}

sub remove_passwords_and_write_private_netrc {
    my ($urpm, $config) = @_;

    my @l;
    foreach (@{$config->{media}}) {
	my $u = parse_url_with_login($_->{url}) or next;
	#- check whether a password is visible
	$u->{password} or next;

	push @l, $u;
	$_->{url} = sprintf('%s://%s@%s%s', $u->{proto}, $u->{login}, $u->{machine}, $u->{dir});
    }
    {
	my $fh = urpm::sys::open_safe($urpm, '>', $urpm->{private_netrc}) or return;
	foreach my $u (@l) {
	    printf $fh "machine %s login %s password %s\n", $u->{machine}, $u->{login}, $u->{password};
	}
    }
    chmod 0600, $urpm->{private_netrc};
}

#- handle deprecated way of saving passwords
sub recover_url_from_list {
    my ($urpm, $medium) = @_;

    #- /./ is end of url marker in list file (typically generated by a
    #- find . -name "*.rpm" > list
    #- for exportable list file.
    if (my @probe = map { m!^(.*)/\./! || m!^(.*)/[^/]*$! } cat_(statedir_list($urpm, $medium))) {
	($medium->{url}) = sort { length($a) <=> length($b) } @probe;
	$urpm->{modified} = 1; #- ensure urpmi.cfg is handled using only partially hidden url + netrc, since file list won't be generated anymore
    }
}

#- Loads /etc/urpmi/urpmi.cfg and performs basic checks.
#- Does not handle old format: <name> <url> [with <path_hdlist>]
#- options :
#-    - nocheck_access : don't check presence of hdlist and other files
sub read_config {
    my ($urpm, $b_nocheck_access) = @_;
    return if $urpm->{media}; #- media already loaded
    $urpm->{media} = [];
    my $config = urpm::cfg::load_config($urpm->{config})
	or $urpm->{fatal}(6, $urpm::cfg::err);

    #- global options
    if (my $global = $config->{global}) {
	foreach my $opt (keys %$global) {
	    if (defined $global->{$opt} && !exists $urpm->{options}{$opt}) {
		$urpm->{options}{$opt} = $global->{$opt};
	    }
	}
    }

    #- per-media options

    read_config_add_passwords($urpm, $config);

    foreach my $m (@{$config->{media}}) {
	my $medium = only_media_opts($m);

	if (!$medium->{url}) {
	    #- recover the url the old deprecated way...
	    #- only useful for migration, new urpmi.cfg will use netrc
	    recover_url_from_list($urpm, $medium);
	    $medium->{url} or $urpm->{error}("unable to find url in list file $medium->{name}, medium ignored");
	}

	add_existing_medium($urpm, $medium, $b_nocheck_access);
    }

    eval { require urpm::ldap; urpm::ldap::load_ldap_media($urpm) };

    #- load default values
    foreach (qw(post-clean verify-rpm)) {
	exists $urpm->{options}{$_} or $urpm->{options}{$_} = 1;
    }

    #- read MD5 sums (not in urpmi.cfg but in a separate file)
    foreach (@{$urpm->{media}}) {
	if (my $md5sum = urpm::md5sum::from_MD5SUM("$urpm->{statedir}/MD5SUM", statedir_hdlist_or_synthesis($urpm, $_))) {
	    $_->{md5sum} = $md5sum;
	}
    }

    #- remember global options for write_config
    $urpm->{global_config} = $config->{global};
}

#- if invalid, set {ignore}
sub check_existing_medium {
    my ($urpm, $medium, $b_nocheck_access) = @_;

    if ($medium->{virtual}) {
	#- a virtual medium needs to have an url available without using a list file.
	if ($medium->{hdlist} || $medium->{list}) {
	    $medium->{ignore} = 1;
	    $urpm->{error}(N("virtual medium \"%s\" should not have defined hdlist or list file, medium ignored",
			     $medium->{name}));
	}
	unless ($medium->{url}) {
	    $medium->{ignore} = 1;
	    $urpm->{error}(N("virtual medium \"%s\" should have a clear url, medium ignored",
			     $medium->{name}));
	}
    } else {
	if ($medium->{hdlist}) {
	    #- is this check really needed? keeping just in case
	    $medium->{hdlist} ne 'list' && $medium->{hdlist} ne 'pubkey' or
	      $medium->{ignore} = 1,
		$urpm->{error}(N("invalid hdlist name"));
	}
	if (!$medium->{ignore} && !$medium->{hdlist}) {
	    $medium->{hdlist} = "hdlist.$medium->{name}.cz";
	    -e statedir_hdlist($urpm, $medium) or
	      $medium->{ignore} = 1,
		$urpm->{error}(N("unable to find hdlist file for \"%s\", medium ignored", $medium->{name}));
	}
	if (!$medium->{ignore} && !$medium->{list}) {
	    unless (defined $medium->{url}) {
		$medium->{list} = "list.$medium->{name}";
		unless (-e statedir_list($urpm, $medium)) {
		    $medium->{ignore} = 1,
		      $urpm->{error}(N("unable to find list file for \"%s\", medium ignored", $medium->{name}));
		}
	    }
	}
    }


    #- check the presence of hdlist and list files if necessary.
    if (!$b_nocheck_access && !$medium->{ignore}) {
	if ($medium->{virtual} && -r hdlist_or_synthesis_for_virtual_medium($medium)) {}
	elsif (-r statedir_hdlist($urpm, $medium)) {}
	elsif ($medium->{synthesis} && -r statedir_synthesis($urpm, $medium)) {}
	else {
	    $medium->{ignore} = 1;
	    $urpm->{error}(N("unable to access hdlist file of \"%s\", medium ignored", $medium->{name}));
	}
	if ($medium->{list} && -r statedir_list($urpm, $medium)) {}
	elsif ($medium->{url}) {}
	else {
	    $medium->{ignore} = 1;
	    $urpm->{error}(N("unable to access list file of \"%s\", medium ignored", $medium->{name}));
	}
    }

    foreach my $field ('hdlist', 'list') {
	$medium->{$field} or next;
	if (grep { $_->{$field} eq $medium->{$field} } @{$urpm->{media}}) {
	    $medium->{ignore} = 1;
	    $urpm->{error}(
		$field eq 'hdlist'
		  ? N("medium \"%s\" trying to use an already used hdlist, medium ignored", $medium->{name})
		  : N("medium \"%s\" trying to use an already used list, medium ignored",   $medium->{name}));
	}
    }
}

#- probe medium to be used, take old medium into account too.
sub add_existing_medium {
    my ($urpm, $medium, $b_nocheck_access) = @_;

    if (name2medium($urpm, $medium->{name})) {
	$urpm->{error}(N("trying to override existing medium \"%s\", skipping", $medium->{name}));
	return;
    }

    check_existing_medium($urpm, $medium, $b_nocheck_access);

    #- probe removable device.
    probe_removable_device($urpm, $medium);

    #- clear URLs for trailing /es.
    $medium->{url} and $medium->{url} =~ s|(.*?)/*$|$1|;

    push @{$urpm->{media}}, $medium;
}

sub file_from_file_url {
    my ($url) = @_;
    $url =~ m!^(?:file:/)?(/.*)! && $1;
}

sub _hdlist_dir {
    my ($medium) = @_;
    my $base = file_from_file_url($medium->{url}) || $medium->{url};
    $medium->{with_hdlist} && reduce_pathname("$base/$medium->{with_hdlist}/..");
}
sub _url_with_hdlist {
    my ($medium) = @_;

    my $base = file_from_file_url($medium->{url}) || $medium->{url};
    $medium->{with_hdlist} && reduce_pathname("$base/$medium->{with_hdlist}");
}
sub hdlist_or_synthesis_for_virtual_medium {
    my ($medium) = @_;
    file_from_file_url($medium->{url}) && _url_with_hdlist($medium);
}

sub statedir_hdlist_or_synthesis {
    my ($urpm, $medium) = @_;
    $medium->{hdlist} && "$urpm->{statedir}/" . ($medium->{synthesis} ? 'synthesis.' : '') . $medium->{hdlist};
}
sub statedir_hdlist {
    my ($urpm, $medium) = @_;
    $medium->{hdlist} && "$urpm->{statedir}/$medium->{hdlist}";
}
sub statedir_synthesis {
    my ($urpm, $medium) = @_;
    $medium->{hdlist} && "$urpm->{statedir}/synthesis.$medium->{hdlist}";
}
sub statedir_list {
    my ($urpm, $medium) = @_;
    $medium->{list} && "$urpm->{statedir}/$medium->{list}";
}
sub statedir_descriptions {
    my ($urpm, $medium) = @_;
    $medium->{name} && "$urpm->{statedir}/descriptions.$medium->{name}";
}
sub statedir_names {
    my ($urpm, $medium) = @_;
    $medium->{name} && "$urpm->{statedir}/names.$medium->{name}";
}
sub cachedir_hdlist {
    my ($urpm, $medium) = @_;
    $medium->{hdlist} && "$urpm->{cachedir}/partial/$medium->{hdlist}";
}
sub cachedir_list {
    my ($urpm, $medium) = @_;
    $medium->{list} && "$urpm->{cachedir}/partial/$medium->{list}";
}

sub name2medium {
    my ($urpm, $name) = @_;
    my ($medium) = grep { $_->{name} eq $name } @{$urpm->{media}};
    $medium;
}

#- probe device associated with a removable device.
sub probe_removable_device {
    my ($urpm, $medium) = @_;

    if ($medium->{url} && $medium->{url} =~ /^removable/) {
	#- try to find device name in url scheme, this is deprecated, use medium option "removable" instead
	if ($medium->{url} =~ /^removable_?([^_:]*)/) {
	    $medium->{removable} ||= $1 && "/dev/$1";
	}
    } else {
	delete $medium->{removable};
	return;
    }

    #- try to find device to open/close for removable medium.
    if (my $dir = file_from_local_url($medium->{url})) {
	my %infos;
	my @mntpoints = urpm::sys::find_mntpoints($dir, \%infos);
	if (@mntpoints > 1) {	#- return value is suitable for an hash.
	    $urpm->{log}(N("too many mount points for removable medium \"%s\"", $medium->{name}));
	    $urpm->{log}(N("taking removable device as \"%s\"", join ',', map { $infos{$_}{device} } @mntpoints));
	}
	if (urpm::removable::is_iso($medium->{removable})) {
	    $urpm->{log}(N("Medium \"%s\" is an ISO image, will be mounted on-the-fly", $medium->{name}));
	} elsif (@mntpoints) {
	    if ($medium->{removable} && $medium->{removable} ne $infos{$mntpoints[-1]}{device}) {
		$urpm->{log}(N("using different removable device [%s] for \"%s\"",
			       $infos{$mntpoints[-1]}{device}, $medium->{name}));
	    }
	    $medium->{removable} = $infos{$mntpoints[-1]}{device};
	} else {
	    $urpm->{error}(N("unable to retrieve pathname for removable medium \"%s\"", $medium->{name}));
	}
    } else {
	$urpm->{error}(N("unable to retrieve pathname for removable medium \"%s\"", $medium->{name}));
    }
}


sub write_MD5SUM {
    my ($urpm) = @_;

    #- write MD5SUM file
    my $fh = urpm::sys::open_safe($urpm, '>', "$urpm->{statedir}/MD5SUM") or return 0;
    foreach my $medium (grep { $_->{md5sum} } @{$urpm->{media}}) {
	my $s = basename(statedir_hdlist_or_synthesis($urpm, $medium));
	print $fh "$medium->{md5sum}  $s\n";
    }

    $urpm->{log}(N("wrote %s", "$urpm->{statedir}/MD5SUM"));

    delete $urpm->{md5sum_modified};
}

#- Writes the urpmi.cfg file.
sub write_urpmi_cfg {
    my ($urpm) = @_;

    #- avoid trashing exiting configuration if it wasn't loaded
    $urpm->{media} or return;

    my $config = {
	#- global config options found in the config file, without the ones
	#- set from the command-line
	global => $urpm->{global_config},
	media => [ map { only_media_opts($_) } grep { !$_->{external} } @{$urpm->{media}} ],
    };
    remove_passwords_and_write_private_netrc($urpm, $config);

    urpm::cfg::dump_config($urpm->{config}, $config)
	or $urpm->{fatal}(6, N("unable to write config file [%s]", $urpm->{config}));

    $urpm->{log}(N("wrote config file [%s]", $urpm->{config}));

    #- everything should be synced now.
    delete $urpm->{modified};
}

sub write_config {
    my ($urpm) = @_;

    write_urpmi_cfg($urpm);
    write_MD5SUM($urpm);
}

#- read urpmi.cfg file as well as necessary synthesis files
#- options :
#-	root
#-	cmdline_skiplist
#-      nocheck_access (used by read_config)
#-
#-	callback (urpmf)
#-	need_hdlist (for urpmf: to be able to have info not available in synthesis)
#-	nodepslist (for urpmq: we don't need the hdlist/synthesis)
#-	no_skiplist (urpmf)
#-      no_second_pass (urpmf)
#-
#-	synthesis (use this synthesis file, and only this synthesis file)
#-
#-	usedistrib (otherwise uses urpmi.cfg)
#-	parallel
#-	  media
#-	  excludemedia
#-	  sortmedia
#-
#-	  update
#-	  searchmedia
sub configure {
    my ($urpm, %options) = @_;

    clean($urpm);

    $options{parallel} && $options{usedistrib} and $urpm->{fatal}(1, N("Can't use parallel mode with use-distrib mode"));

    if ($options{parallel}) {
	require urpm::parallel;
	urpm::parallel::configure($urpm, $options{parallel});

	if (!$options{media} && $urpm->{parallel_handler}{media}) {
	    $options{media} = $urpm->{parallel_handler}{media};
	    $urpm->{log}->(N("using associated media for parallel mode: %s", $options{media}));
	}
    } else {
	#- nb: can't have both parallel and root
	$urpm->{root} = $options{root};
    }

    $urpm->{root} && ! -c "$urpm->{root}/dev/null"
	and $urpm->{error}(N("there doesn't seem to be devices in the chroot in \"%s\"", $urpm->{root}));

    if ($options{synthesis}) {
	if ($options{synthesis} ne 'none') {
	    #- synthesis take precedence over media, update options.
	    $options{media} || $options{excludemedia} || $options{sortmedia} || $options{update} || $options{usedistrib} || $options{parallel} and
	      $urpm->{fatal}(1, N("--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"));
	    $urpm->parse_synthesis($options{synthesis});
	    #- synthesis disables the split of transaction (too risky and not useful).
	    $urpm->{options}{'split-length'} = 0;
	}
    } else {
        if ($options{usedistrib}) {
            $urpm->{media} = [];
            add_distrib_media($urpm, "Virtual", $options{usedistrib}, %options, 'virtual' => 1);
        } else {
	    read_config($urpm, $options{nocheck_access});
	    if (!$options{media} && $urpm->{options}{'default-media'}) {
		$options{media} = $urpm->{options}{'default-media'};
	    }
        }
	if ($options{media}) {
	    delete $_->{modified} foreach @{$urpm->{media} || []};
	    select_media($urpm, split /,/, $options{media});
	    foreach (grep { !$_->{modified} } @{$urpm->{media} || []}) {
		#- this is only a local ignore that will not be saved.
		$_->{tempignore} = $_->{ignore} = 1;
	    }
	}
	if ($options{searchmedia}) {
	   select_media($urpm, $options{searchmedia}); #- Ensure this media has been selected
	   if (my $medium = name2medium($urpm, $options{searchmedia})) {
	       $medium->{ignore} and $urpm->{fatal}("searchmedia is ignored");
	       $medium->{searchmedia} = 1;
	   }
	}
	if ($options{excludemedia}) {
	    delete $_->{modified} foreach @{$urpm->{media} || []};
	    foreach (select_media_by_name($urpm, [ split /,/, $options{excludemedia} ])) {
		$_->{modified} = 1;
		#- this is only a local ignore that will not be saved.
		$_->{tempignore} = $_->{ignore} = 1;
	    }
	}
	if ($options{sortmedia}) {
	    my @sorted_media = map { select_media_by_name($urpm, [$_]) } split(/,/, $options{sortmedia});
	    my @remaining = difference2($urpm->{media}, \@sorted_media);
	    $urpm->{media} = [ @sorted_media, @remaining ];
	}
	_parse_media($urpm, 0, \%options) if !$options{nodepslist};
    }
    #- determine package to withdraw (from skip.list file) only if something should be withdrawn.
    if (!$options{nodepslist}) {
	_compute_flags_for_skiplist($urpm, $options{cmdline_skiplist}) if !$options{no_skiplist};
	_compute_flags_for_instlist($urpm);
    }
}

sub _parse_media {
    my ($urpm, $is_second_pass, $options) = @_;

    my $need_second_pass;
    foreach (grep { !$_->{ignore} && (!$options->{update} || $_->{update}) } @{$urpm->{media} || []}) {
	our $currentmedia = $_; #- hack for urpmf
	delete @$_{qw(start end)};
	if ($_->{virtual}) {
		if ($_->{synthesis}) {
		    _parse_synthesis($urpm, $_,
				     hdlist_or_synthesis_for_virtual_medium($_), $options->{callback});
		} else {
		    $need_second_pass = 1 if !$is_second_pass && !$options->{no_second_pass};
		    _parse_hdlist($urpm, $_,
				  hdlist_or_synthesis_for_virtual_medium($_),
				  $options->{callback},
			      );
		}
	} else {
	    if ($options->{need_hdlist} && file_size(statedir_hdlist($urpm, $_)) > 32) {
		_parse_hdlist($urpm, $_, statedir_hdlist($urpm, $_), $options->{callback});
	    } else {
		if (!_parse_synthesis($urpm, $_,
				      statedir_synthesis($urpm, $_),
				      $options->{callback})) {
		    _parse_hdlist($urpm, $_, statedir_hdlist($urpm, $_), $options->{callback});
		}
	    }
	}
	unless ($_->{ignore}) {
	    _check_after_reading_hdlist_or_synthesis($urpm, $_);
	}
	unless ($_->{ignore}) {
	    if ($_->{searchmedia}) {
		($urpm->{searchmedia}{start}, $urpm->{searchmedia}{end}) = ($_->{start}, $_->{end});
		$urpm->{log}(N("Search start: %s end: %s",
			       $urpm->{searchmedia}{start}, $urpm->{searchmedia}{end}));
		delete $_->{searchmedia};
	    }
	}
    }

    if ($need_second_pass) {
	require URPM::Build;
	$urpm->{log}(N("performing second pass to compute dependencies\n"));
	$urpm->unresolved_provides_clean;
	_parse_media($urpm, 1, $options);
    }
}

sub _compute_flags_for_skiplist {
    my ($urpm, $cmdline_skiplist) = @_;
    my %uniq;
    $urpm->compute_flags(
	get_packages_list($urpm->{skiplist}, $cmdline_skiplist),
	skip => 1,
	callback => sub {
	    my ($urpm, $pkg) = @_;
	    $pkg->is_arch_compat && ! exists $uniq{$pkg->fullname} or return;
	    $uniq{$pkg->fullname} = undef;
	    $urpm->{log}(N("skipping package %s", scalar($pkg->fullname)));
	},
    );
}

sub _compute_flags_for_instlist {
    my ($urpm) = @_;

    my %uniq;
    $urpm->compute_flags(
	get_packages_list($urpm->{instlist}),
	disable_obsolete => 1,
	callback => sub {
	    my ($urpm, $pkg) = @_;
	    $pkg->is_arch_compat && ! exists $uniq{$pkg->fullname} or return;
	    $uniq{$pkg->fullname} = undef;
	    $urpm->{log}(N("would install instead of upgrade package %s", scalar($pkg->fullname)));
	},
    );

}

#- add a new medium, sync the config file accordingly.
#- returns the new medium's name. (might be different from the requested
#- name if index_name was specified)
#- options: ignore, index_name, nolock, synthesis, update, virtual
sub add_medium {
    my ($urpm, $name, $url, $with_hdlist, %options) = @_;

    #- make sure configuration has been read.
    $urpm->{media} or die "caller should have used ->read_config or ->configure first";

    #- if a medium with that name has already been found, we have to exit now
    my $medium;
    if (defined $options{index_name}) {
	my $i = $options{index_name};
	do {
	    ++$i;
	    $medium = name2medium($urpm, $name . $i);
	} while $medium;
	$name .= $i;
    } else {
	$medium = name2medium($urpm, $name);
    }
    $medium and $urpm->{fatal}(5, N("medium \"%s\" already exists", $medium->{name}));

    $url =~ s,/*$,,; #- clear URLs for trailing /es.

    #- creating the medium info.
    $medium = { name => $name, 
		url => $url, 
		modified => 1, 
		update => $options{update}, 
		ignore => $options{ignore},
		synthesis => $options{synthesis},
	    };
    if ($options{virtual}) {
	file_from_file_url($url) or $urpm->{fatal}(1, N("virtual medium needs to be local"));
	$medium->{virtual} = 1;
    } else {
	$medium->{hdlist} = "hdlist.$name.cz";
	probe_removable_device($urpm, $medium);
    }

    $with_hdlist and $medium->{with_hdlist} = $with_hdlist;

    #- local media have priority, other are added at the end.
    my $inserted;
    if (file_from_file_url($url)) {
	#- insert before first remote medium
	@{$urpm->{media}} = map {  
	    if (!file_from_file_url($_->{url}) && !$inserted) {
		$inserted = 1;
		$urpm->{log}(N("added medium %s before remote medium %s", $name, $_->{name}));
		$medium, $_;
	    } else { $_ }
	} @{$urpm->{media}};
    }
    if (!$inserted) {
	$urpm->{log}(N("added medium %s", $name));
	push @{$urpm->{media}}, $medium;
    }

    $urpm->{modified} = 1;

    $name;
}

#- add distribution media, according to url given.
#- returns the list of names of added media.
#- options :
#- - initial_number : when adding several numbered media, start with this number
#- - probe_with : if eq 'synthesis', use synthesis instead of hdlists
#- - ask_media : callback to know whether each media should be added
#- other options are passed to add_medium(): ignore, nolock, virtual
sub add_distrib_media {
    my ($urpm, $name, $url, %options) = @_;

    #- make sure configuration has been read.
    $urpm->{media} or die "caller should have used ->read_config or ->configure first";

    my $distribconf;

    if (my $dir = file_from_local_url($url)) {
	urpm::removable::try_mounting($urpm, $dir)
	    or $urpm->{error}(N("unable to mount the distribution medium")), return ();
	$distribconf = MDV::Distribconf->new($dir, undef);
	$distribconf->load
	    or $urpm->{error}(N("this location doesn't seem to contain any distribution")), return ();
    } else {
	unlink "$urpm->{cachedir}/partial/media.cfg";

	$distribconf = MDV::Distribconf->new($url, undef);
	$distribconf->settree('mandriva');

	$urpm->{log}(N("retrieving media.cfg file..."));
	if (urpm::download::sync($urpm, undef,
				 [ reduce_pathname($distribconf->getfullpath(undef, 'infodir') . '/media.cfg') ],
				 quiet => 1)) {
	    $urpm->{log}(N("...retrieving done"));
	    $distribconf->parse_mediacfg("$urpm->{cachedir}/partial/media.cfg")
		or $urpm->{error}(N("unable to parse media.cfg")), return();
	} else {
	    $urpm->{error}(N("...retrieving failed: %s", $@));
	    $urpm->{error}(N("unable to access the distribution medium (no media.cfg file found)"));
	    return ();
	}
    }

    #- cosmetic update of name if it contains spaces.
    $name =~ /\s/ and $name .= ' ';

    my @newnames;
    #- at this point, we have found a media.cfg file, so parse it
    #- and create all necessary media according to it.
    my $medium_index = $options{initial_number} || 1;

    foreach my $media ($distribconf->listmedia) {
        my $skip = 0;
	# if one of those values is set, by default, we skip adding the media
	foreach (qw(noauto)) {
	    $distribconf->getvalue($media, $_) and do {
		$skip = 1;
		last;
	    };
	}
        if ($options{ask_media}) {
            if ($options{ask_media}->(
                $distribconf->getvalue($media, 'name'),
                !$skip,
            )) {
                $skip = 0;
            } else {
                $skip = 1;
            }
        }
        $skip and next;

        my $media_name = $distribconf->getvalue($media, 'name') || '';
	my $is_update_media = $distribconf->getvalue($media, 'updates_for');

	push @newnames, add_medium($urpm,
	    $name ? "$media_name ($name$medium_index)" : $media_name,
	    reduce_pathname($distribconf->getfullpath($media, 'path')),
	    offset_pathname(
		$url,
		$distribconf->getpath($media, 'path'),
	    ) . '/' . $distribconf->getpath($media, $options{probe_with} eq 'synthesis' ? 'synthesis' : 'hdlist'),
	    index_name => $name ? undef : 0,
	    %options,
	    synthesis => $options{probe_with} eq 'synthesis',
	    # the following override %options
	    update => $is_update_media ? 1 : undef,
	);
	++$medium_index;
    }
    return @newnames;
}

#- deprecated, use select_media_by_name instead
sub select_media {
    my $urpm = shift;
    my $options = {};
    if (ref $_[0]) { $options = shift }
    foreach (select_media_by_name($urpm, [ @_ ], $options->{strict_match})) {
	#- select medium by setting the modified flag, do not check ignore.
	$_->{modified} = 1;
    }
}

sub select_media_by_name {
    my ($urpm, $names, $b_strict_match) = @_;

    my %wanted = map { $_ => 1 } @$names;

    #- first the exact matches
    my @l = grep { delete $wanted{$_->{name}} } @{$urpm->{media}};

    #- check if some arguments don't correspond to the medium name.
    #- in such case, try to find the unique medium (or list candidate
    #- media found).
    foreach (keys %wanted) {
	my $q = quotemeta;
	my (@found, @foundi);
	my $regex  = $b_strict_match ? qr/^$q$/  : qr/$q/;
	my $regexi = $b_strict_match ? qr/^$q$/i : qr/$q/i;
	foreach my $medium (@{$urpm->{media}}) {
	    $medium->{name} =~ $regex  and push @found, $medium;
	    $medium->{name} =~ $regexi and push @foundi, $medium;
	}
	@found = @foundi if !@found;

	if (@found == 0) {
	    $urpm->{error}(N("trying to select nonexistent medium \"%s\"", $_));
	} else {
	    if (@found > 1) {
		$urpm->{log}(N("selecting multiple media: %s", join(", ", map { qq("$_->{name}") } @found)));
	    }
	    #- changed behaviour to select all occurences by default.
	    push @l, @found;
	}
    }
    @l;
}

#- deprecated, use remove_media instead
sub remove_selected_media {
    my ($urpm) = @_;

    remove_media($urpm, [ grep { $_->{modified} } @{$urpm->{media}} ]);
}

sub remove_media {
    my ($urpm, $to_remove) = @_;

    foreach my $medium (@$to_remove) {
	$urpm->{log}(N("removing medium \"%s\"", $medium->{name}));

	#- mark to re-write configuration.
	$urpm->{modified} = 1;

	#- remove files associated with this medium.
	unlink grep { $_ } map { $_->($urpm, $medium) } \&statedir_hdlist, \&statedir_list, \&statedir_synthesis, \&statedir_descriptions, \&statedir_names;

	#- remove proxy settings for this media
	urpm::download::remove_proxy_media($medium->{name});
    }

    $urpm->{media} = [ difference2($urpm->{media}, $to_remove) ];
}

#- return list of synthesis or hdlist reference to probe.
sub _probe_with_try_list {
    my ($probe_with) = @_;

    my @probe_synthesis = (
	"media_info/synthesis.hdlist.cz",
	"synthesis.hdlist.cz",
    );
    my @probe_hdlist = (
	"media_info/hdlist.cz",
	"hdlist.cz",
    );
    $probe_with =~ /synthesis/
      ? (@probe_synthesis, @probe_hdlist)
      : (@probe_hdlist, @probe_synthesis);
}

sub may_reconfig_urpmi {
    my ($urpm, $medium) = @_;

    my $f;
    if (my $dir = file_from_file_url($medium->{url})) {
	$f = reduce_pathname("$dir/reconfig.urpmi");
    } else {
	unlink($f = "$urpm->{cachedir}/partial/reconfig.urpmi");
	urpm::download::sync($urpm, $medium, [ reduce_pathname("$medium->{url}/reconfig.urpmi") ], quiet => 1);
    }
    if (-s $f) {
	reconfig_urpmi($urpm, $f, $medium->{name});
    }
    unlink $f if !file_from_file_url($medium->{url});
}

#- read a reconfiguration file for urpmi, and reconfigure media accordingly
#- $rfile is the reconfiguration file (local), $name is the media name
#-
#- the format is similar to the RewriteRule of mod_rewrite, so:
#-    PATTERN REPLACEMENT [FLAG]
#- where FLAG can be L or N
#-
#- example of reconfig.urpmi:
#-    # this is an urpmi reconfiguration file
#-    /cooker /cooker/$ARCH
sub reconfig_urpmi {
    my ($urpm, $rfile, $name) = @_;
    -r $rfile or return;

    $urpm->{log}(N("reconfiguring urpmi for media \"%s\"", $name));

    my ($magic, @lines) = cat_($rfile);
    #- the first line of reconfig.urpmi must be magic, to be sure it's not an error file
    $magic =~ /^# this is an urpmi reconfiguration file/ or return undef;

    my @replacements;
    foreach (@lines) {
	chomp;
	s/^\s*//; s/#.*$//; s/\s*$//;
	$_ or next;
	my ($p, $r, $f) = split /\s+/, $_, 3;
	push @replacements, [ quotemeta $p, $r, $f || 1 ];
    }

    my $reconfigured = 0;
    my @reconfigurable = qw(url with_hdlist);

    my $medium = name2medium($urpm, $name) or return;
    my %orig = %$medium;

  URLS:
    foreach my $k (@reconfigurable) {
	foreach my $r (@replacements) {
	    if ($medium->{$k} =~ s/$r->[0]/$r->[1]/) {
		$reconfigured = 1;
		#- Flags stolen from mod_rewrite: L(ast), N(ext)
		if ($r->[2] =~ /L/) {
		    last;
		} elsif ($r->[2] =~ /N/) { #- dangerous option
		    redo URLS;
		}
	    }
	}
	#- check that the new url exists before committing changes (local mirrors)
	my $file = file_from_local_url($medium->{$k});
	if ($file && !-e $file) {
	    %$medium = %orig;
	    $reconfigured = 0;
	    $urpm->{log}(N("...reconfiguration failed"));
	    return;
	}
    }

    if ($reconfigured) {
	$urpm->{log}(N("reconfiguration done"));
	write_config($urpm);
    }
    $reconfigured;
}

sub _guess_hdlist_suffix {
    my ($url) = @_;
    $url =~ m!\bmedia/(\w+)/*\Z! && $1;
}

sub _hdlist_suffix {
    my ($medium) = @_;
    $medium->{with_hdlist} =~ /hdlist(.*?)(?:\.src)?\.cz$/ ? $1 : '';
}

sub _parse_hdlist_or_synthesis__when_not_modified {
    my ($urpm, $medium) = @_;

    delete @$medium{qw(start end)};
    if ($medium->{virtual}) {
	_parse_maybe_hdlist_or_synthesis($urpm, $medium, hdlist_or_synthesis_for_virtual_medium($medium));
    } else {
	if (!_parse_synthesis($urpm, $medium, statedir_synthesis($urpm, $medium))) {
	    _parse_hdlist($urpm, $medium, statedir_hdlist($urpm, $medium));
	}
    }
    unless ($medium->{ignore}) {
	_check_after_reading_hdlist_or_synthesis($urpm, $medium);
    }
}

sub _parse_hdlist_or_synthesis__virtual {
    my ($urpm, $medium) = @_;

    delete $medium->{modified};
    $medium-"you will have less free space under\n"
-"\t  Microsoft Windows to store your data or install new software.\n"
-"\n"
-"\n"
-"\t* Expert mode: if you want to partition manually your hard drive, you can "
-"choose this option. Be careful before\n"
-"\t  choosing this solution. It is powerful but it is very dangerous. You can "
-"lose all your data very easily. So,\n"
-"\t  don't choose this solution unless you know what you are doing."
+"GNU/Linux manages time in GMT (Greenwich Manage Time) and translates it in\n"
+"local time according to the time zone you selected."
 msgstr ""
+"GNU/Linux beheer tyd in GMT (Greenwichmeridiaantyd) en vertaal dit dan\n"
+"in u lokale tyd volgends die gekose tydsone."
 
-#: ../../help.pm_.c:160
+#: ../../help.pm_.c:192
 msgid ""
-"At this point, you need to choose what\n"
-"partition(s) to use to install your new Linux-Mandrake system. If "
-"partitions\n"
-"have been already defined (from a previous installation of GNU/Linux or "
-"from\n"
-"another partitioning tool), you can use existing partitions. In other "
-"cases,\n"
-"hard drive partitions must be defined.\n"
-"\n"
-"\n"
-"To create partitions, you must first select a hard drive. You can select "
-"the\n"
-"disk for partitioning by clicking on \"hda\" for the first IDE drive, \"hdb"
-"\" for\n"
-"the second or \"sda\" for the first SCSI drive and so on.\n"
-"\n"
-"\n"
-"To partition the selected hard drive, you can use these options:\n"
-"\n"
-"   * Clear all: this option deletes all partitions available on the selected "
-"hard drive.\n"
-"\n"
-"\n"
-"   * Auto allocate: this option allows you to automatically create Ext2 and "
-"swap partitions in free space of your\n"
-"     hard drive.\n"
-"\n"
-"\n"
-"   * Rescue partition table: if your partition table is damaged, you can try "
-"to recover it using this option. Please\n"
-"     be careful and remember that it can fail.\n"
-"\n"
-"\n"
-"   * Undo: you can use this option to cancel your changes.\n"
-"\n"
-"\n"
-"   * Reload: you can use this option if you wish to undo all changes and "
-"load your initial partitions table\n"
-"\n"
-"\n"
-"   * Wizard: If you wish to use a wizard to partition your hard drive, you "
-"can use this option. It is recommended if\n"
-"     you do not have a good knowledge in partitioning.\n"
-"\n"
-"\n"
-"   * Restore from floppy: if you have saved your partition table on a floppy "
-"during a previous installation, you can\n"
-"     recover it using this option.\n"
-"\n"
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphics environments (KDE, Gnome, AfterStep,\n"
+"WindowMaker...) bundled with Mandrake Linux rely. In this section, DrakX\n"
+"will try to configure X automatically.\n"
 "\n"
-"   * Save on floppy: if you wish to save your partition table on a floppy to "
-"be able to recover it, you can use this\n"
-"     option. It is strongly recommended to use this option\n"
+"It is extremely rare for it to fail, unless the hardware is very old (or\n"
+"very new). If it succeeds, it will start X automatically with the best\n"
+"resolution possible depending on the size of the monitor. A window will\n"
+"then appear and ask you if you can see it.\n"
 "\n"
+"If you are doing an \"Expert\" install, you will enter the X configuration\n"
+"wizard. See the corresponding section of the manual for more information\n"
+"about this wizard.\n"
 "\n"
-"   * Done: when you have finished partitioning your hard drive, use this "
-"option to save your changes.\n"
-"\n"
-"\n"
-"For information, you can reach any option using the keyboard: navigate "
-"trough the partitions using Tab and Up/Down arrows.\n"
-"\n"
-"\n"
-"When a partition is selected, you can use:\n"
-"\n"
-"           * Ctrl-c to create a new partition (when a empty partition is "
-"selected)\n"
-"\n"
-"           * Ctrl-d to delete a partition\n"
-"\n"
-"           * Ctrl-m to set the mount point\n"
-"           \n"
-"\n"
-"           \n"
-"If you are installing on a PPC Machine, you will want to create a small HFS "
-"'bootstrap' partition of at least 1MB for use\n"
-"by the yaboot bootloader. If you opt to make the partition a bit larger, say "
-"50MB, you may find it a useful place to store \n"
-"a spare kernel and ramdisk image for emergency boot situations."
+"If you can see the message and answer \"Yes\", then DrakX will proceed to\n"
+"the next step. If you cannot see the message, it simply means that the\n"
+"configuration was wrong and the test will automatically end after 10\n"
+"seconds, restoring the screen."
 msgstr ""
 
-#: ../../help.pm_.c:224
+#: ../../help.pm_.c:212
 msgid ""
-"Above are listed the existing Linux partitions detected on\n"
-"your hard drive. You can keep choices make by the wizard, they are good for "
-"a\n"
-"common usage. If you change these choices, you must at least define a root\n"
-"partition (\"/\"). Don't choose a too little partition or you will not be "
-"able\n"
-"to install enough software. If you want store your data on a separate "
-"partition,\n"
-"you need also to choose a \"/home\" (only possible if you have more than "
-"one\n"
-"Linux partition available).\n"
-"\n"
-"\n"
-"For information, each partition is listed as follows: \"Name\", \"Capacity"
-"\".\n"
-"\n"
-"\n"
-"\"Name\" is coded as follow: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
-"\n"
-"\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and "
-"\"sd\"\n"
-"if it is an SCSI hard drive.\n"
-"\n"
-"\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE "
-"hard drives:\n"
-"\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
-"\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
-"\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+"The first time you try the X configuration, you may not be very satisfied\n"
+"with its display (screen is too small, shifted left or right...). Hence,\n"
+"even if X starts up correctly, DrakX then asks you if the configuration\n"
+"suits you. It will also propose to change it by displaying a list of valid\n"
+"modes it could find, asking you to select one.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
-"\n"
-"\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc..."
+"As a last resort, if you still cannot get X to work, choose \"Change\n"
+"graphics card\", select \"Unlisted card\", and when prompted on which\n"
+"server you want, choose \"FBDev\". This is a failsafe option which works\n"
+"with any modern graphics card. Then choose \"Test again\" to be sure."
 msgstr ""
 
-#: ../../help.pm_.c:258
+#: ../../help.pm_.c:224
 msgid ""
-"Choose the hard drive you want to erase to install your\n"
-"new Linux-Mandrake partition. Be careful, all data present on it will be "
-"lost\n"
-"and will not be recoverable."
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
 msgstr ""
 
-#: ../../help.pm_.c:263
+#: ../../help.pm_.c:231
 msgid ""
-"Click on \"OK\" if you want to delete all data and\n"
-"partitions present on this hard drive. Be careful, after clicking on \"OK\", "
-"you\n"
-"will not be able to recover any data and partitions present on this hard "
-"drive,\n"
-"including any Windows data.\n"
+"The Mandrake Linux CDROM has a built-in rescue mode. You can access it by\n"
+"booting from the CDROM, press the >>F1<< key at boot and type >>rescue<< at\n"
+"the prompt. But in case your computer cannot boot from the CDROM, you\n"
+"should come back to this step for help in at least two situations:\n"
 "\n"
+" * when installing the boot loader, DrakX will rewrite the boot sector "
+"(MBR)\n"
+"of your main disk (unless you are using another boot manager) so that you\n"
+"can start up with either Windows or GNU/Linux (assuming you have Windows in\n"
+"your system). If you need to reinstall Windows, the Microsoft install\n"
+"process will rewrite the boot sector, and then you will not be able to\n"
+"start GNU/Linux!\n"
 "\n"
-"Click on \"Cancel\" to cancel this operation without losing any data and\n"
-"partitions present on this hard drive."
+" * if a problem arises and you cannot start up GNU/Linux from the hard "
+"disk,\n"
+"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+"contains a fair number of system tools for restoring a system, which has\n"
+"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
+"password, or any other reason.\n"
+"\n"
+"When you click on this step, you will be asked to enter a disk inside the\n"
+"drive. The floppy disk you will insert must be empty or contain data which\n"
+"you do not need. You will not have to format it since DrakX will rewrite\n"
+"the whole disk."
 msgstr ""
 
-#: ../../help.pm_.c:273
+#: ../../help.pm_.c:255
 msgid ""
-"More than one Microsoft Windows partition have been\n"
-"detected on your hard drive. Please choose the one you want resize to "
-"install\n"
-"your new Linux-Mandrake operating system.\n"
+"At this point you need to choose where on your hard drive to install your\n"
+"Mandrake Linux operating system. If your hard drive is empty or if an\n"
+"existing operating system is using all the space available, you will need\n"
+"to partition it. Basically, partitioning a hard drive consists of logically\n"
+"dividing it to create space to install your new Mandrake Linux system.\n"
 "\n"
+"Because the effects of the partitioning process are usually irreversible,\n"
+"partitioning can be intimidating and stressful if you are an inexperienced\n"
+"user. Fortunately, there is a wizard which simplifies this process. Before\n"
+"beginning, please consult the manual and take your time.\n"
 "\n"
-"For information, each partition is listed as follow; \"Linux name\", "
-"\"Windows\n"
-"name\" \"Capacity\".\n"
-"\n"
-"\"Linux name\" is coded as follow: \"hard drive type\", \"hard drive number"
-"\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"If you are running the install in Expert mode, you will enter DiskDrake,\n"
+"the Mandrake Linux partitioning tool, which allows you to fine-tune your\n"
+"partitions. See the DiskDrake chapter of the manual. From the installation\n"
+"interface, you can use the wizards as described here by clicking the\n"
+"\"Wizard\" button of the dialog.\n"
 "\n"
+"If partitions have already been defined, either from a previous\n"
+"installation or from another partitioning tool, simply select those to\n"
+"install your Linux system.\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and \"sd"
-"\"\n"
-"if it is an SCSI hard drive.\n"
+"If partitions are not defined, you will need to create them using the\n"
+"wizard. Depending on your hard drive configuration, several options are\n"
+"available:\n"
 "\n"
+" * \"Use free space\": this option will simply lead to an automatic\n"
+"partitioning of your blank drive(s). You will not be prompted further.\n"
 "\n"
-"\"Hard drive number\" is always a letter putted after \"hd\" or \"sd\". With "
-"IDE hard drives:\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option.\n"
 "\n"
-"   * \"a\" means \"master hard drive on the primary IDE controller\",\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do that, you can delete your\n"
+"Microsoft Windows partition and data (see \"Erase entire disk\" or \"Expert\n"
+"mode\" solutions) or resize your Microsoft Windows partition. Resizing can\n"
+"be performed without the loss of any data. This solution is recommended if\n"
+"you want to use both Mandrake Linux and Microsoft Windows on same computer.\n"
 "\n"
-"   * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
+"   Before choosing this option, please understand that after this "
+"procedure,\n"
+"the size of your Microsoft Windows partition will be smaller than at the\n"
+"present time. You will have less free space under Microsoft Windows to\n"
+"store your data or to install new software.\n"
 "\n"
-"   * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful with this solution because you will\n"
+"not be able to revert your choice after confirmation.\n"
 "\n"
-"   * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"With SCSI hard drives, a \"a\" means \"primary hard drive\", a \"b\" means "
-"\"secondary hard drive\", etc.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first "
-"disk\n"
-"or partition is called \"C:\")."
+" * \"Expert mode\": choose this option if you want to manually partition\n"
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
 msgstr ""
 
-#: ../../help.pm_.c:306
-msgid "Please be patient. This operation can take several minutes."
-msgstr ""
-
-#: ../../help.pm_.c:309
+#: ../../help.pm_.c:319
 msgid ""
-"Any partitions that have been newly defined must be\n"
-"formatted for use (formatting meaning creating a filesystem).\n"
-"\n"
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"OK\" to reboot the system. You can start\n"
+"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
+"soon as the computer has booted up again.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to "
-"erase\n"
-"the data they contain. If you wish do that, please also select the "
-"partitions\n"
-"you want to format.\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"which will automatically perform a whole installation without the help of\n"
+"an operator, similar to the installation you just configured.\n"
 "\n"
-"Please note that it is not necessary to reformat all pre-existing "
-"partitions.\n"
-"You must reformat the partitions containing the operating system (such as \"/"
-"\",\n"
-"\"/usr\" or \"/var\") but do you no have to reformat partitions containing "
-"data\n"
-"that you wish to keep (typically /home).\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
+"    * \"Replay\". This is a partially automated install as the partitioning\n"
+"step (and only this one) remains interactive.\n"
 "\n"
-"Please be careful selecting partitions, after formatting, all data will be\n"
-"deleted and you will not be able to recover any of them.\n"
+"    * \"Automated\". Fully automated install: the hard disk is completely\n"
+"rewritten, all data is lost.\n"
 "\n"
+"   This feature is very handy when installing a great number of similar\n"
+"machines. See the Auto install section at our web site.\n"
 "\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
-"\n"
+" * \"Save packages selection\"(*): saves the packages selection as made\n"
+"previously. Then, when doing another installation, insert the floppy inside\n"
+"the driver and run the installation going to the help screen by pressing on\n"
+"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose other partitions to install your "
-"new\n"
-"Linux-Mandrake operating system."
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
 msgstr ""
 
-#: ../../help.pm_.c:335
-#, fuzzy
+#: ../../help.pm_.c:350
 msgid ""
-"You may now select the group of packages you wish to\n"
-"install or upgrade.\n"
+"Any partitions that have been newly defined must be formatted for use\n"
+"(formatting means creating a file system).\n"
 "\n"
+"At this time, you may wish to reformat some already existing partitions to\n"
+"erase any data they contain. If you wish to do that, please select those\n"
+"partitions as well.\n"
 "\n"
-"DrakX will then check whether you have enough room to install them all. If "
-"not,\n"
-"it will warn you about it. If you want to go on anyway, it will proceed onto "
-"the\n"
-"installation of all selected groups but will drop some packages of lesser\n"
-"interest. At the bottom of the list you can select the option \n"
-"\"Individual package selection\"; in this case you will have to browse "
-"through\n"
-"more than 1000 packages..."
-msgstr ""
-"U kan nou die pakketgroepe kies wat u wil installeer of opgradeer.\n"
-"\n"
-"DrakX sal dan kyk of daar genoegsame spasie is vir die volledige "
-"installasie.\n"
-"Indien nie sal u verwittig word. Indien u voortgaan, sal van die minder "
-"belangrike\n"
-"pakkette nie installeer word nie.Heel onder kan u die opsie \"Individuele "
-"pakketkeuses\"\n"
-"kies waarna u deur meer as 'n 1000 pakkette sal moet blaai....."
-
-#: ../../help.pm_.c:347
-msgid ""
-"You can now choose individually all the packages you\n"
-"wish to install.\n"
-"\n"
+"Please note that it is not necessary to reformat all pre-existing\n"
+"partitions. You must reformat the partitions containing the operating\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
+"reformat partitions containing data that you wish to keep (typically\n"
+"\"/home\").\n"
 "\n"
-"You can expand or collapse the tree by clicking on options in the left "
-"corner of\n"
-"the packages window.\n"
+"Please be careful when selecting partitions. After formatting, all data on\n"
+"the selected partitions will be deleted and you will not be able to recover\n"
+"any of them.\n"
 "\n"
+"Click on \"OK\" when you are ready to format partitions.\n"
 "\n"
-"If you prefer to see packages sorted in alphabetic order, click on the icon\n"
-"\"Toggle flat and group sorted\".\n"
-"\n"
+"Click on \"Cancel\" if you want to choose another partition for your new\n"
+"Mandrake Linux operating system installation.\n"
 "\n"
-"If you want not to be warned on dependencies, click on \"Automatic\n"
-"dependencies\". If you do this, note that unselecting one package may "
-"silently\n"
-"unselect several other packages which depend on it."
-msgstr ""
-
-#: ../../help.pm_.c:364
-#, fuzzy
-msgid ""
-"If you have all the CDs in the list above, click Ok. If you have\n"
-"none of those CDs, click Cancel. If only some CDs are missing, unselect "
-"them,\n"
-"then click Ok."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disc."
 msgstr ""
-"Indienu al die CDs in die bogenoemde lys het, kliek OK.\n"
-"Indien u geen het nie, kliek Kanselleer.\n"
-"Indien sekere CDs weg is, onselekteer hulle en kliek dan OK."
 
-#: ../../help.pm_.c:369
+#: ../../help.pm_.c:376
 msgid ""
-"Your new Linux-Mandrake operating system is currently being\n"
-"installed. This operation should take a few minutes (it depends on size you\n"
-"choose to install and the speed of your computer).\n"
-"\n"
+"Your new Mandrake Linux operating system is currently being installed.\n"
+"Depending on the number of packages you will be installing and the speed of\n"
+"your computer, this operation could take from a few minutes to a\n"
+"significant amount of time.\n"
 "\n"
 "Please be patient."
 msgstr ""
 
-#: ../../help.pm_.c:377
-msgid ""
-"You can now test your mouse. Use buttons and wheel to verify\n"
-"if settings are good. If not, you can click on \"Cancel\" to choose another\n"
-"driver."
-msgstr ""
-
-#: ../../help.pm_.c:382
+#: ../../help.pm_.c:384
 #, fuzzy
 msgid ""
-"Please select the correct port. For example, the COM1\n"
-"port under MS Windows is named ttyS0 under GNU/Linux."
+"Before continuing you should read carefully the terms of the license. It\n"
+"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
+"all the terms in it, click on the \"Refuse\" button which will immediately\n"
+"terminate the installation. To continue with the installation, click the\n"
+"\"Accept\" button."
 msgstr ""
-"Kies asb. die korrekte poort. Onthou dat COM1 onder MS Windows \n"
-"ttyS0 onder GNU/Linux is."
+"Voordat u voortgaan, lees asb die lisensieterme noukeurig deur. Dit dek\n"
+"die hele Mandrake Lnux distirbusie, and indien u nie saamstem met al die\n"
+"terme daarin bevat nie, kliek om die Weier knoppie. Dit sal onmiddelik die\n"
+"installasie stop sit. Om met die installasie voort te gaan kliek op die "
+"Aanvaar\n"
+"knoppie."
 
-#: ../../help.pm_.c:386
+#: ../../help.pm_.c:391
 msgid ""
-"If you wish to connect your computer to the Internet or\n"
-"to a local network please choose the correct option. Please turn on your "
-"device\n"
-"before choosing the correct option to let DrakX detect it automatically.\n"
+"At this point, it is time to choose the security level desired for the\n"
+"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
+"the data stored in it is crucial, the higher the security level should be.\n"
+"However, a higher security level is generally obtained at the expenses of\n"
+"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"get more information about the meaning of these levels.\n"
 "\n"
-"\n"
-"If you do not have any connection to the Internet or a local network, "
-"choose\n"
-"\"Disable networking\".\n"
-"\n"
-"\n"
-"If you wish to configure the network later after installation or if you "
-"have\n"
-"finished to configure your network connection, choose \"Done\"."
+"If you do not know what to choose, keep the default option."
 msgstr ""
 
-#: ../../help.pm_.c:399
+#: ../../help.pm_.c:401
 msgid ""
-"No modem has been detected. Please select the serial port on which it is "
-"plugged.\n"
+"At this point, you need to choose what partition(s) will be used for the\n"
+"installation of your Mandrake Linux system. If partitions have been already\n"
+"defined, either from a previous installation of GNU/Linux or from another\n"
+"partitioning tool, you can use existing partitions. Otherwise hard drive\n"
+"partitions must be defined.\n"
 "\n"
+"To create partitions, you must first select a hard drive. You can select\n"
+"the disk for partitioning by clicking on \"hda\" for the first IDE drive,\n"
+"\"hdb\" for the second, \"sda\" for the first SCSI drive and so on.\n"
 "\n"
-"For information, the first serial port (called \"COM1\" under Microsoft\n"
-"Windows) is called \"ttyS0\" under Linux."
-msgstr ""
-
-#: ../../help.pm_.c:406
-msgid ""
-"You may now enter dialup options. If you don't know\n"
-"or are not sure what to enter, the correct informations can be obtained "
-"from\n"
-"your Internet Service Provider. If you do not enter the DNS (name server)\n"
-"information here, this information will be obtained from your Internet "
-"Service\n"
-"Provider at connection time."
-msgstr ""
-
-#: ../../help.pm_.c:413
-msgid ""
-"If your modem is an external modem, please turn on it now to let DrakX "
-"detect it automatically."
-msgstr ""
-
-#: ../../help.pm_.c:416
-msgid "Please turn on your modem and choose the correct one."
-msgstr ""
-
-#: ../../help.pm_.c:419
-msgid ""
-"If you are not sure if informations above are\n"
-"correct or if you don't know or are not sure what to enter, the correct\n"
-"informations can be obtained from your Internet Service Provider. If you do "
-"not\n"
-"enter the DNS (name server) information here, this information will be "
-"obtained\n"
-"from your Internet Service Provider at connection time."
-msgstr ""
-
-#: ../../help.pm_.c:426
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, the correct informations can be\n"
-"obtained from your Internet Service Provider."
-msgstr ""
-"U kan nou die opbelopsie invul. Indien u\n"
-"twyfel kry die korrekte inligting van u ISP."
-
-#: ../../help.pm_.c:431
-#, fuzzy
-msgid ""
-"You may now configure your network device.\n"
+"To partition the selected hard drive, you can use these options:\n"
 "\n"
-"   * IP address: if you don't know or are not sure what to enter, ask your "
-"network administrator.\n"
-"     You should not enter an IP address if you select the option \"Automatic "
-"IP\" below.\n"
+" * \"Clear all\": this option deletes all partitions on the selected hard\n"
+"drive.\n"
 "\n"
-"   * Netmask: \"255.255.255.0\" is generally a good choice. If you don't "
-"know or are not sure what to enter,\n"
-"     ask your network administrator.\n"
+" * \"Auto allocate\": this option allows you to automatically create Ext2\n"
+"and swap partitions in free space of your hard drive.\n"
 "\n"
-"   * Automatic IP: if your network uses BOOTP or DHCP protocol, select this "
-"option. If selected, no value is needed in\n"
-"    \"IP address\". If you don't know or are not sure if you need to select "
-"this option, ask your network administrator."
-msgstr ""
-"Sleutel in:\n"
+" * \"Rescue partition table\": if your partition table is damaged, you can\n"
+"try to recover it using this option. Please be careful and remember that it\n"
+"can fail.\n"
 "\n"
-"  - IP-adres: Indien u dit nie weet nie vra u netwerkadministrateur of ISP.\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
+" * \"Reload\": you can use this option if you wish to undo all changes and\n"
+"load your initial partitions table.\n"
 "\n"
-"  - Netmasker: \"255.255.255.0\" is gewoonlik 'n goeie keuse. Indien u "
-"twyfel,\n"
-"     vra die netwerkadministrateur of ISP.\n"
+" * \"Wizard\": use this option if you wish to use a wizard to partition "
+"your\n"
+"hard drive. This is recommended if you do not have a good knowledge of\n"
+"partitioning.\n"
 "\n"
+" * \"Restore from floppy\": this option will allow you to restore a\n"
+"previously saved partition table from floppy disk.\n"
 "\n"
-"  - Outomatiese IP: Indien u netwerk bootp of dhcp protokolle ondersteun, "
-"kies\n"
-"     hierdie opsie. In so 'n geval is 'n IP-adresinskrywing nie nodig nie. "
-"Indien u\n"
-"     twyfel, vra die netwerkadministrateur of ISP.\n"
-
-#: ../../help.pm_.c:443
-#, fuzzy
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, ask your network administrator."
-msgstr ""
-"Indien u netwerk NIS gebruik, kies \"Gebruik NIS\". Indien u twyfel vra\n"
-"die netwerkadministrateur."
-
-#: ../../help.pm_.c:447
-msgid ""
-"You may now enter your host name if needed. If you\n"
-"don't know or are not sure what to enter, leave blank."
-msgstr ""
-
-#: ../../help.pm_.c:451
-msgid ""
-"You may now enter dialup options. If you're not sure what to enter, the\n"
-"correct information can be obtained from your ISP."
-msgstr ""
-"U kan nou die opbelopsie invul. Indien u\n"
-"twyfel kry die korrekte inligting van u ISP."
-
-#: ../../help.pm_.c:455
-msgid ""
-"If you will use proxies, please configure them now. If you don't know if\n"
-"you should use proxies, ask your network administrator or your ISP."
-msgstr ""
-"Indien u instaanbedieners wil gebruik, stel hulle hier op.. Indien u twyfel "
-"vra\n"
-"die netwerkadministrateur of ISP."
-
-#: ../../help.pm_.c:459
-#, fuzzy
-msgid ""
-"You can install cryptographic package if your internet connection has been\n"
-"set up correctly. First choose a mirror where you wish to download packages "
-"and\n"
-"after that select the packages to install.\n"
+" * \"Save to floppy\": saves the partition table to a floppy. Useful for\n"
+"later partition-table recovery if necessary. It is strongly recommended to\n"
+"perform this step.\n"
 "\n"
+" * \"Done\": when you have finished partitioning your hard drive, this will\n"
+"save your changes back to disc.\n"
 "\n"
-"Note you have to select mirror and cryptographic packages according\n"
-"to your legislation."
-msgstr ""
-"U kan 'n kriptografiese pakket installeer indien u internetkonneksie reg "
-"opgestel is.\n"
-"Kies eers die spieël waar u die pakket vanaf wil aflaai en kies dan die "
-"pakkette\n"
-"om te installeer.\n"
+"Note: you can reach any option using the keyboard. Navigate through the\n"
+"partitions using [Tab] and [Up/Down] arrows.\n"
 "\n"
-"Let wel: U moet 'n spieël en pakkette selekteer n.a.l plaaslike wetgewing."
-
-#: ../../help.pm_.c:468
-msgid "You can now select your timezone according to where you live."
-msgstr ""
-
-#: ../../help.pm_.c:471
-#, fuzzy
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Manage\n"
-"Time) and translates it in local time according to the time zone you have\n"
-"selected.\n"
+"When a partition is selected, you can use:\n"
 "\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
-"If you use Microsoft Windows on this computer, choose \"No\"."
-msgstr ""
-"U kan nou u tydsone kies.\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
-"GNU/Linux beheer tyd in GMT (Greenwichmeridiaantyd) en vertaal dit dan\n"
-"in u lokale tyd volgends die gekose tydsone."
+"If you are installing on a PPC machine, you will want to create a small HFS\n"
+"\"bootstrap\" partition of at least 1MB which will be used by the yaboot\n"
+"boot loader. If you opt to make the partition a bit larger, say 50MB, you\n"
+"may find it a useful place to store a spare kernel and ramdisk images for\n"
+"emergency boot situations."
+msgstr ""
 
-#: ../../help.pm_.c:479
-#, fuzzy
+#: ../../help.pm_.c:460
 msgid ""
-"You may now choose which services you want to start at boot time.\n"
+"More than one Microsoft Windows partition has been detected on your hard\n"
+"drive. Please choose the one you want resize in order to install your new\n"
+"Mandrake Linux operating system.\n"
 "\n"
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\n"
 "\n"
-"When your mouse comes over an item, a small balloon help will popup which\n"
-"describes the role of the service.\n"
+"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
 "\n"
+"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
+"\"sd\" if it is a SCSI hard drive.\n"
 "\n"
-"Be very careful in this step if you intend to use your machine as a server: "
-"you\n"
-"will probably want not to start any services that you don't need. Please\n"
-"remember that several services can be dangerous if they are enable on a "
-"server.\n"
-"In general, select only the services that you really need."
-msgstr ""
-"U kan nou dienste kies wat by herlaaityd moet afskop.\n"
-"Wanneer u die muis oor 'n item beweeg, sal 'n klein ballon opspring\n"
-"wat die rol van die diens verduidelik.\n"
-"\n"
-"Wees versigtig met hierdie stap. Indien u beplan om dié rekenaar as 'n\n"
-"bediener te gebruik wil u nie dienste afskop wat u nie gaan gebruik nie."
-
-#: ../../help.pm_.c:492
-msgid ""
-"You can configure a local printer (connected to your computer) or remote\n"
-"printer (accessible via a Unix, Netware or Microsoft Windows network)."
-msgstr ""
-
-#: ../../help.pm_.c:496
-msgid ""
-"If you wish to be able to print, please choose one printing system between\n"
-"CUPS and LPR.\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard drives:\n"
 "\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\",\n"
 "\n"
-"CUPS is a new, powerful and flexible printing system for Unix systems (CUPS\n"
-"means \"Common Unix Printing System\"). It is the default printing system "
-"in\n"
-"Linux-Mandrake.\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\",\n"
 "\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\",\n"
 "\n"
-"LPR is the old printing system used in previous Linux-Mandrake "
-"distributions.\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
 "\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc.\n"
 "\n"
-"If you don't have printer, click on \"None\"."
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
 
-#: ../../help.pm_.c:511
-msgid ""
-"GNU/Linux can deal with many types of printer. Each of these types requires\n"
-"a different setup.\n"
-"\n"
-"\n"
-"If your printer is physically connected to your computer, select \"Local\n"
-"printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Unix machine, select\n"
-"\"Remote printer\".\n"
-"\n"
-"\n"
-"If you want to access a printer located on a remote Microsoft Windows "
-"machine\n"
-"(or on Unix machine using SMB protocol), select \"SMB/Windows 95/98/NT\"."
+#: ../../help.pm_.c:491
+msgid "Please be patient. This operation can take several minutes."
 msgstr ""
 
-#: ../../help.pm_.c:527
+#: ../../help.pm_.c:494
+#, fuzzy
 msgid ""
-"Please turn on your printer before continuing to let DrakX detect it.\n"
-"\n"
-"You have to enter some informations here.\n"
-"\n"
+"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
+"installation or if you want to have greater control (\"Expert\"). You also\n"
+"have the choice of performing a new install or an upgrade of an existing\n"
+"Mandrake Linux system. Clicking \"Install\" will completely wipe out the\n"
+"old system. Select \"Upgrade\" if you are upgrading or repairing an\n"
+"existing system.\n"
 "\n"
-"   * Name of printer: the print spooler uses \"lp\" as default printer name. "
-"So, you must have a printer named \"lp\".\n"
-"     If you have only one printer, you can use several names for it. You "
-"just need to separate them by a pipe\n"
-"     character (a \"|\"). So, if you prefer a more meaningful name, you have "
-"to put it first, eg: \"My printer|lp\".\n"
-"     The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Please choose \"Install\" if there are no previous version of Mandrake\n"
+"Linux installed or if you wish to boot between various operating systems.\n"
 "\n"
+"Please choose \"Update\" if you wish to update or repair an already\n"
+"installed version of Mandrake Linux.\n"
 "\n"
-"   * Description: this is optional but can be useful if several printers are "
-"connected to your computer or if you allow\n"
-"     other computers to access to this printer.\n"
+"Depending on your knowledge of GNU/Linux, please choose one of the\n"
+"following to install or update your Mandrake Linux operating system:\n"
 "\n"
+" * Recommended: choose this if you have never installed a GNU/Linux\n"
+"operating system. The installation will be very easy and you will only be\n"
+"asked a few questions.\n"
 "\n"
-"   * Location: if you want to put some information on your\n"
-"     printer location, put it here (you are free to write what\n"
-"     you want, for example \"2nd floor\").\n"
-msgstr ""
+" * Expert: if you have a good knowledge of GNU/Linux, you can choose this\n"
+"installation class. The expert installation will allow you to perform a\n"
+"highly customized installation. Answering some of the questions can be\n"
+"difficult if you do not have a good knowledge of GNU/Linux so do not choose\n"
+"this unless you know what you are doing."
+msgstr "Kies asb. "
 
-#: ../../help.pm_.c:548
+#: ../../help.pm_.c:521
 msgid ""
-"You need to enter some informations here.\n"
-"\n"
-"\n"
-"   * Name of queue: the print spooler uses \"lp\" as default printer name. "
-"So, you need have a printer named \"lp\".\n"
-"    If you have only one printer, you can use several names for it. You just "
-"need to separate them by a pipe\n"
-"    character (a \"|\"). So, if you prefer to have a more meaningful name, "
-"you have to put it first, eg: \"My printer|lp\".\n"
-"    The printer having \"lp\" in its name(s) will be the default printer.\n"
+"Normally, DrakX selects the right keyboard for you (depending on the\n"
+"language you have chosen) and you will not even see this step. However, you\n"
+"might not have a keyboard that corresponds exactly to your language: for\n"
+"example, if you are an English speaking Swiss person, you may still want\n"
+"your keyboard to be a Swiss keyboard. Or if you speak English but are\n"
+"located in Quebec, you may find yourself in the same situation. In both\n"
+"cases, you will have to go back to this installation step and select an\n"
+"appropriate keyboard from the list.\n"
 "\n"
-"  \n"
-"   * Spool directory: it is in this directory that printing jobs are stored. "
-"Keep the default choice\n"
-"     if you don't know what to use\n"
-"\n"
-"\n"
-"   * Printer Connection: If your printer is physically connected to your "
-"computer, select \"Local printer\".\n"
-"     If you want to access a printer located on a remote Unix machine, "
-"select \"Remote lpd printer\".\n"
-"\n"
-"\n"
-"     If you want to access a printer located on a remote Microsoft Windows "
-"machine (or on Unix machine using SMB\n"
-"     protocol), select \"SMB/Windows 95/98/NT\".\n"
-"\n"
-"\n"
-"     If you want to acces a printer located on NetWare network, select "
-"\"NetWare\".\n"
+"Click on the \"More\" button to be presented with the complete list of\n"
+"supported keyboards."
 msgstr ""
 
-#: ../../help.pm_.c:573
+#: ../../help.pm_.c:534
 msgid ""
-"Your printer has not been detected. Please enter the name of the device on\n"
-"which it is connected.\n"
+"Please choose your preferred language for installation and system usage.\n"
 "\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation. Selecting other languages\n"
+"will install the language-specific files for system documentation and\n"
+"applications. For example, if you will host users from Spain on your\n"
+"machine, select English as the main language in the tree view and in the\n"
+"Advanced section click on the grey star corresponding to \"Spanish|Spain\".\n"
 "\n"
-"For information, most printers are connected on the first parallel port. "
-"This\n"
-"one is called \"/dev/lp0\" under GNU/Linux and \"LPT1\" under Microsoft "
-"Windows."
+"Note that multiple languages may be installed. Once you have selected any\n"
+"additional locales click the \"OK\" button to continue."
 msgstr ""
 
-#: ../../help.pm_.c:581
-msgid "You must now select your printer in the above list."
-msgstr ""
-
-#: ../../help.pm_.c:584
+#: ../../help.pm_.c:547
 msgid ""
-"Please select the right options according to your printer.\n"
-"Please see its documentation if you don't know what choose here.\n"
+"By default, DrakX assumes you have a two-button mouse and will set it up\n"
+"for third-button emulation. DrakX will automatically know whether it is a\n"
+"PS/2, serial or USB mouse.\n"
 "\n"
+"If you wish to specify a different type of mouse select the appropriate\n"
+"type from the list provided.\n"
 "\n"
-"You will be able to test your configuration in next step and you will be "
-"able to modify it if it doesn't work as you want."
+"If you choose a mouse other than the default you will be presented with a\n"
+"mouse test screen. Use the buttons and wheel to verify that the settings\n"
+"are good. If the mouse is not working correctly press the space bar or\n"
+"RETURN to \"Cancel\" and choose again."
 msgstr ""
 
-#: ../../help.pm_.c:591
+#: ../../help.pm_.c:560
 #, fuzzy
 msgid ""
-"You can now enter the root password for your Linux-Mandrake system.\n"
-"The password must be entered twice to verify that both password entries are "
-"identical.\n"
-"\n"
-"\n"
-"Root is the system's administrator and is the only user allowed to modify "
-"the\n"
-"system configuration. Therefore, choose this password carefully. \n"
-"Unauthorized use of the root account can be extemely dangerous to the "
-"integrity\n"
-"of the system, its data and other system connected to it.\n"
-"\n"
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under GNU/Linux."
+msgstr ""
+"Kies asb. die korrekte poort. Onthou dat COM1 onder MS Windows \n"
+"ttyS0 onder GNU/Linux is."
+
+#: ../../help.pm_.c:564
+msgid ""
+"This is the most crucial decision point for the security of your GNU/Linux\n"
+"system: you have to enter the \"root\" password. \"root\" is the system\n"
+"administrator and is the only one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"root\".\n"
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. It should never be written down.\n"
+"characters long. Never write down the \"root\" password - it makes it too\n"
+"easy to compromise a system.\n"
 "\n"
+"However, please do not make the password too long or complicated because\n"
+"you must be able to remember it without too much effort.\n"
 "\n"
-"Do not make the password too long or complicated, though: you must be able "
-"to\n"
-"remember it without too much effort."
-msgstr ""
-"U kan nou die 'root' wagwoord voorsien vir u Linux-Mandrake stelsel.\n"
-"Die wagworod moet twee keer ingevoer word en te verfiëer dat dit\n"
-"korrek is.\n"
+"The password will not be displayed on screen as you type it in. Hence, you\n"
+"will have to type the password twice to reduce the chance of a typing\n"
+"error. If you do happen to make the same typing error twice, this\n"
+"\"incorrect\" password will have to be used the first time you connect.\n"
 "\n"
+"In expert mode, you will be asked if you will be connecting to an\n"
+"authentication server, like NIS or LDAP.\n"
 "\n"
-"Root is die administrateur van die stelsel en is die enigste gebruiker\n"
-"wat toegelaat wiord om die stelselkonfigurasie te verander. In dié lig,\n"
-"kies asb. die wagwoord sorgvuldig. Ongemagtigde gebruik van die root\n"
-"rekening kan uitermatiglik nadelig wees vir die integriteit van die\n"
-"stelsel. Die wagwoord moet alfanumeries wees en ten minste 8 karakters\n"
-"lank. MOENIE die wagwoord êrens neerskryf nie. Moet dit nie te lank of te\n"
-"ingwikkeld maak nie, u moet dit met min moeite onthou."
-
-#: ../../help.pm_.c:609
-msgid ""
-"To enable a more secure system, you should select \"Use shadow file\" and\n"
-"\"Use MD5 passwords\"."
-msgstr ""
-"Om 'n veiliger stelsel te bou, moet u \"Gebruik skadulêer\" \n"
-"en \"Gebruik MD5 wagwoorde\" kies."
-
-#: ../../help.pm_.c:613
-msgid ""
-"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
-"network administrator."
+"If your network uses LDAP (or NIS) protocol for authentication, select\n"
+"\"LDAP\" (or \"NIS\") as authentication. If you do not know, ask your\n"
+"network administrator.\n"
+"\n"
+"If your computer is not connected to any administrated network, you will\n"
+"want to choose \"Local files\" for authentication."
 msgstr ""
-"Indien u netwerk NIS gebruik, kies \"Gebruik NIS\". Indien u twyfel vra\n"
-"die netwerkadministrateur."
 
-#: ../../help.pm_.c:617
+#: ../../help.pm_.c:600
 msgid ""
-"You may now create one or more \"regular\" user account(s), as\n"
-"opposed to the \"privileged\" user account, root. You can create\n"
-"one or more account(s) for each person you want to allow to use\n"
-"the computer. Note that each user account will have its own\n"
-"preferences (graphical environment, program settings, etc.)\n"
-"and its own \"home directory\", in which these preferences are\n"
-"stored.\n"
+"LILO and GRUB are boot loaders for GNU/Linux. This stage, normally, is\n"
+"totally automated. In fact, DrakX analyzes the disk boot sector and acts\n"
+"accordingly, depending on what it finds here:\n"
 "\n"
+" * if Windows boot sector is found, it will replace it with a GRUB/LILO "
+"boot\n"
+"sector. Hence, you will be able to load either GNU/Linux or another OS;\n"
 "\n"
-"First of all, create an account for yourself! Even if you will be the only "
-"user\n"
-"of the machine, you may NOT connect as root for daily use of the system: "
-"it's a\n"
-"very high security risk. Making the system unusable is very often a typo "
-"away.\n"
+" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
+"one;\n"
 "\n"
+"If in doubt, DrakX will display a dialog with various options.\n"
 "\n"
-"Therefore, you should connect to the system using the user account\n"
-"you will have created here, and login as root only for administration\n"
-"and maintenance purposes."
-msgstr ""
-"U mag nou een of meer gewone gebruikersrekeninge skep. Dit is in\n"
-"teenstelling met die bevoorregte 'root' rekening. Elke gebruikersrekening\n"
-"sal oor sy eie voorkeure (grafiese omgewing, programstelling, ens.) en\n"
-"tuisgids (waar hierdie instellings gestoor word) beskik.\n"
+" * \"Boot loader to use\": you have three choices:\n"
 "\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"Derhalwe moet u in die stelsel intkeen met u eie gebruikerskode en slegs\n"
-"'root' gebruik vir administratiewe doeleindes.\n"
+"    * \"GRUB\": if you prefer GRUB (text menu).\n"
 "\n"
-"Skep eerstens 'n rekening vir uself. Selfs indien u die enigste gebruiker\n"
-"op die stelsel sal wees, moet u NIE as 'root' vir u daaglikse gebruik\n"
-"inteken NIE. 'n Onbruikbare stelsel kan net een tikfout ver weg wees.\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu "
+"interface.\n"
 "\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the boot loader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\").\n"
 "\n"
-"Derhalwe moet u aanteken met die gebruikerskode wat u hier skep en 'root'\n"
-"net vir admintratiewe doeleindes gebruik."
-
-#: ../../help.pm_.c:636
-msgid ""
-"Creating a boot disk is strongly recommended. If you can't\n"
-"boot your computer, it's the only way to rescue your system without\n"
-"reinstalling it."
-msgstr ""
-
-#: ../../help.pm_.c:641
-msgid ""
-"You need to indicate where you wish\n"
-"to place the information required to boot to GNU/Linux.\n"
+" * \"Delay before booting the default image\": when rebooting the computer,\n"
+"this is the delay granted to the user to choose - in the boot loader menu,\n"
+"another boot entry than the default one.\n"
 "\n"
+"!! Beware that if you choose not to install a boot loader (by selecting\n"
+"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
+"Linux system! Also be sure you know what you do before changing any of the\n"
+"options. !!\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of\n"
-"drive (MBR)\"."
-msgstr ""
-"U moet aandui waar u die informasie om Linux te herlaai, wil plaas.\n"
+"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
+"options, which are reserved to the expert user.\n"
 "\n"
+"Mandrake Linux installs its own boot loader, which will let you boot either\n"
+"GNU/Linux or any other operating systems which you have on your system.\n"
 "\n"
-"Behalwe as u werklik weet wat u doen moet u \"Eerste sektor van skyf (MBR)\" "
-"kies."
-
-#: ../../help.pm_.c:649
-msgid ""
-"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
+"If there is another operating system installed on your machine, it will be\n"
+"automatically added to the boot menu. Here, you can choose to fine-tune the\n"
+"existing options. Double-clicking on an existing entry allows you to change\n"
+"its parameters or remove it; \"Add\" creates a new entry; and \"Done\" goes\n"
+"on to the next installation step."
 msgstr ""
-"Indien u spesifiek anders weet, is die gewone keuse \"/dev/hda\"\n"
-"(primêre meester IDE-skyf) of \"/dev/sda\" (eerste SCSI-skyf)."
 
-#: ../../help.pm_.c:653
+#: ../../help.pm_.c:647
+#, fuzzy
 msgid ""
-"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"LILO (the LInux LOader) and GRUB are boot loaders: they are able to boot\n"
 "either GNU/Linux or any other operating system present on your computer.\n"
 "Normally, these other operating systems are correctly detected and\n"
 "installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"screen. Be careful to choose the correct parameters.\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
+"You may also not want to give access to these other operating systems to\n"
+"anyone. In which case, you can delete the corresponding entries. But then,\n"
+"you will need a boot disk in order to boot those other operating systems!"
 msgstr ""
 "LILO (Die LInux LOader) en Grub is herlaaistelsels. Beide kan GNU/Linux of "
 "enige ander\n"
@@ -2935,379 +2820,243 @@ msgstr ""
 "inskrywings kan uitvee. Maar dan het u die nodige herlaaiskywe nodig om die\n"
 "betrokke bedryfstelsels te laai."
 
-#: ../../help.pm_.c:665
+#: ../../help.pm_.c:658
 #, fuzzy
 msgid ""
-"LILO and grub main options are:\n"
-"  - Boot device: Sets the name of the device (e.g. a hard disk\n"
-"partition) that contains the boot sector. Unless you know specifically\n"
-"otherwise, choose \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero.\n"
+"You must indicate where you wish to place the information required to boot\n"
+"to GNU/Linux.\n"
 "\n"
+"Unless you know exactly what you are doing, choose \"First sector of drive\n"
+"(MBR)\"."
+msgstr ""
+"U moet aandui waar u die informasie om Linux te herlaai, wil plaas.\n"
 "\n"
-"  - Video mode: This specifies the VGA text mode that should be selected\n"
-"when booting. The following values are available: \n"
-"\n"
-"    * normal: select normal 80x25 text mode.\n"
 "\n"
-"    * <number>:  use the corresponding text mode.\n"
+"Behalwe as u werklik weet wat u doen moet u \"Eerste sektor van skyf (MBR)\" "
+"kies."
+
+#: ../../help.pm_.c:665
+msgid ""
+"Here we select a printing system for your computer to use. Other OSes may\n"
+"offer you one, but Mandrake offers three.\n"
 "\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have "
+"a\n"
+"direct connection to your printer and you want to be able to panic out of\n"
+"printer jams, and you do not have any networked printers. It will handle\n"
+"only very simple network cases and is somewhat slow for networks. Pick\n"
+"\"pdq\" if this is your maiden voyage to GNU/Linux. You can change your\n"
+"choices after install by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button.\n"
+"\n"
+" * \"CUPS\" - ``Common Unix Printing System'' is excellent at printing to\n"
+"your local printer and also halfway round the planet. It is simple and can\n"
+"act like a server or a client for the ancient \"lpd\" printing system, so\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+"graphical front-ends for printing or choosing printer options.\n"
+"\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
+"approximately the same things the others can do, but it will print to\n"
+"printers mounted on a Novell Network, because it supports IPX protocol, and\n"
+"it can print directly to shell commands. If you have need of Novell or\n"
+"printing to commands without using a separate pipe construct, use lprNG.\n"
+"Otherwise, CUPS is preferable as it is simpler and better at working over\n"
+"networks."
+msgstr ""
+
+#: ../../help.pm_.c:693
+#, fuzzy
+msgid ""
+"DrakX is now detecting any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI card(s) on your system. If a SCSI card\n"
+"is found DrakX will automatically install the appropriate driver.\n"
+"\n"
+"Because hardware detection will sometimes not detect a piece of hardware\n"
+"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
+"if you know that there is a SCSI card installed in your machine. You will\n"
+"be presented a list of SCSI cards to choose from. Click \"No\" if you have\n"
+"no SCSI hardware. If you are unsure you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info\" and clicking\n"
+"\"OK\". Examine the list of hardware and then click on the \"OK\" button to\n"
+"return to the SCSI interface question.\n"
 "\n"
-"  - Clean \"/tmp\" at each boot: if you want delete all files and "
-"directories\n"
-"stored in \"/tmp\" when you boot your system, select this option.\n"
+"If you have to manually specify your adapter, DrakX will ask if you want to\n"
+"specify options for it. You should allow DrakX to probe the hardware for\n"
+"the card-specific options that the hardware needs to initialize. This\n"
+"usually works well.\n"
+"\n"
+"If DrakX is not able to probe for the options that need to be passed, you\n"
+"will need to manually provide options to the driver. Please review the\n"
+"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"hardware\") for hints on retrieving the parameters required from hardware\n"
+"documentation, from the manufacturer's web site (if you have Internet\n"
+"access) or from Microsoft Windows (if you used this hardware with Windows\n"
+"on your system)."
+msgstr ""
+"DrakX sal probeer om vir PCI SCSI-kaarte te soek.\n"
+"Indien DrakX 'n SCSI-kaart bespeur en weet watter drywer omte gebruik sal "
+"dit outomaties installeer word.\n"
 "\n"
+"Indien u nie oor 'n SCSI-kaart, beskik nie of  oor  'n ISA SCSI-kaart of 'n "
+"PCI SCSI-kaart beskik wat DrakX nie kan herken nie, sal u gevra word of daar "
+"enige SCSI-kaarte in diestelsel is. Indien daar geen is nie kliek op 'Nee', "
+"andersins op 'Ja'. U sal dan uit'n drywerlys kan kies.\n"
 "\n"
-"  - Precise RAM if needed: unfortunately, there is no standard method to ask "
-"the\n"
-"BIOS about the amount of RAM present in your computer. As consequence, Linux "
-"may\n"
-"fail to detect your amount of RAM correctly. If this is the case, you can\n"
-"specify the correct amount or RAM here. Please note that a difference of 2 "
-"or 4\n"
-"MB between detected memory and memory present in your system is normal."
-msgstr ""
-"LILO en Grub hoof opsies is:\n"
-"  - Herlaaitoestel: Stel die naam van die toestel (bv. hardeskyfpartisie\n"
-"     wat die herlaaisektor bevat. Indien u spesifiek anders weet\n"
-"     kies \"/dev/hda\".\n"
-"\n"
-"\n"
-"  - Wagperiode voor verstekbedryfstelsel gelaai word. Kies die syfer in\n"
-"     tiendes van 'n sekonde at die herlaaistelsel moet wag.\n"
-"     Hierdie is handig op stelsels wat onmiddelik die hardeskyf skop na die\n"
-"     sleutelbord geaktiveer is. Die herlaaistelsel sal nie wag nie indien "
-"die\n"
-"     wagperiode nul is.\n"
 "\n"
+"Indien u self 'n drywer moes spesifiseer, sal DrakX u ook vra vir enige "
+"spesifiekeopsies.\n"
+"U kan egter DrakX toelaat om self die hardeware te ondervra. DIt werk "
+"gewoonlik die beste.\n"
 "\n"
-"  - Videomode: Kies die spesifieke VGA teksmode wat gebruik moet word met\n"
-"      herlaai. Die volgende waardes is beskikbaar:\n"
-"      * normaal: selekteer normale 80x25 mode.\n"
-"      * syfer: die ooreenstemmende teksmode."
+"Lees die installasie inligting hoe om hierdie tipe inligting m.b.v. die "
+"Windows-bedryfstelsel te bekom.\n"
+"U kan dit ook vanaf die internet onttrek indien u sulke toegang het."
 
-#: ../../help.pm_.c:697
+#: ../../help.pm_.c:720
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
+"You can add additional entries for yaboot, either for other operating\n"
+"systems, alternate kernels, or for an emergency boot image.\n"
 "\n"
+"For other OS's, the entry consists only of a label and the root partition.\n"
 "\n"
-"Yaboot main options are:\n"
+"For Linux, there are a few possible options:\n"
 "\n"
+" * Label: this is simply the name you will have to type at the yaboot "
+"prompt\n"
+"to select this boot option.\n"
 "\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
+" * Root: the \"root\" device or \"/\" for your Linux installation.\n"
 "\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
+" * Append: on Apple hardware, the kernel append option is used quite often\n"
+"to assist in initializing video hardware, or to enable keyboard mouse\n"
+"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
+"Apple mouse. The following are some examples:\n"
 "\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"hda=autotune\n"
 "\n"
-"  - Open Firmware Delay: Unlike LILO, there are two delays available with \n"
-"yaboot.  The first delay is measured in seconds and at this point you can \n"
-"choose between CD, OF boot, MacOS, or Linux.\n"
-"\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+" * Initrd: this option can be used either to load initial modules, before\n"
+"the boot device is available, or to load a ramdisk image for an emergency\n"
+"boot situation.\n"
 "\n"
+" * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you\n"
+"need to allocate a large ramdisk, this option can be used.\n"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\n"
+" * Read-write: normally the \"root\" partition is initially brought up in\n"
+"read-only, to allow a file system check before the system becomes \"live\".\n"
+"Here, you can override this option.\n"
 "\n"
+" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
+"problematic, you can select this option to boot in \"novideo\" mode, with\n"
+"native frame buffer support.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
-"\n"
-"\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
+"also be highlighted with a \"*\", if you press [Tab] to see the boot\n"
+"selections."
 msgstr ""
 
-#: ../../help.pm_.c:738
+#: ../../help.pm_.c:765
 msgid ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
-"\n"
-"For Linux, there are a few possible options: \n"
-"\n"
-"\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
-"\n"
+"Yaboot is a boot loader for NewWorld MacIntosh hardware. It is able to boot\n"
+"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
+"these other operating systems are correctly detected and installed. If this\n"
+"is not the case, you can add an entry by hand in this screen. Be careful as\n"
+"to choose the correct parameters.\n"
 "\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
-"\n"
-"\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
+"Yaboot's main options are:\n"
 "\n"
+" * Init Message: a simple text message that is displayed before the boot\n"
+"prompt.\n"
 "\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
+" * Boot Device: indicate where you want to place the information required "
 "to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
-"hda=autotune\n"
-"\n"
-"\t\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
-"\n"
-"\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
-"\n"
+"boot to GNU/Linux. Generally, you setup a bootstrap partition earlier to\n"
+"hold this information.\n"
 "\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\n"
+" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
+"yaboot. The first delay is measured in seconds and at this point, you can\n"
+"choose between CD, OF boot, MacOS or Linux.\n"
 "\n"
+" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
+"After selecting Linux, you will have this delay in 0.1 second before your\n"
+"default kernel description is selected.\n"
 "\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\n"
+" * Enable CD Boot?: checking this option allows you to choose \"C\" for CD\n"
+"at the first boot prompt.\n"
 "\n"
+" * Enable OF Boot?: checking this option allows you to choose \"N\" for "
+"Open\n"
+"Firmware at the first boot prompt.\n"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
 
-#: ../../help.pm_.c:793
+#: ../../help.pm_.c:798
 msgid ""
-"SILO is a bootloader for SPARC: it is able to boot\n"
-"either GNU/Linux or any other operating system present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
+"Here are presented various parameters concerning your machine. Depending on\n"
+"your installed hardware, you may - or not, see the following entries:\n"
 "\n"
-"You may also want not to give access to these other operating systems to\n"
-"anyone, in which case you can delete the corresponding entries. But\n"
-"in this case, you will need a boot disk in order to boot them!"
-msgstr ""
-"SILO 'n herlaaiprogram vir SPARC. Dir kan GNU/Linux of enige ander\n"
-"bedryfstelsel wat op u rekenar teenwoordig is, laai. Gewoonlik word hierdie\n"
-"bedryfstelsels reg bespeur en bygevoeg. Indien nie, kan u 'n inskrywing "
-"maak\n"
-"op hierdie skerm. Maak seker u kies die korrekte paramters.\n"
-"\n"
-"\n"
-"U mag dalk toegang tot ander bedryfstelsels beperk, in welke geval u die "
-"nodige\n"
-"inskrywings kan uitvee. Maar dan het u die nodige herlaaiskywe nodig om die\n"
-"betrokke bedryfstelsels te laai."
-
-#: ../../help.pm_.c:805
-msgid ""
-"SILO main options are:\n"
-"  - Bootloader installation: Indicate where you want to place the\n"
-"information required to boot to GNU/Linux. Unless you know exactly\n"
-"what you are doing, choose \"First sector of drive (MBR)\".\n"
+" * \"Mouse\": mouse check the current mouse configuration and click on the\n"
+"button to change it if necessary.\n"
 "\n"
+" * \"Keyboard\": keyboard check the current keyboard map configuration and\n"
+"click on the button to change that if necessary.\n"
 "\n"
-"  - Delay before booting default image: Specifies the number in tenths\n"
-"of a second the boot loader should wait before booting the first image.\n"
-"This is useful on systems that immediately boot from the hard disk after\n"
-"enabling the keyboard. The boot loader doesn't wait if \"delay\" is\n"
-"omitted or is set to zero."
-msgstr ""
-"SILO hoofkeuses is:\n"
-"  - Herlaaitoestel: Waar wil u die inligting om GNU/Linux te laai plaas? Die "
-"beste is\n"
-"gewoonlik om \"Eerste hardeskyfsektor (MBR)\" te kies.\n"
+" * \"Timezone\": time zoneDrakX, by default, guesses your time zone from "
+"the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in.\n"
 "\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard.\n"
 "\n"
-"  - Wagperiode voor verstekbedryfstelsel gelaai word. Kies die syfer in\n"
-"     tiendes van 'n sekonde at die herlaaistelsel moet wag.\n"
-"     Hierdie is handig op stelsels wat onmiddelik die hardeskyf skop na die\n"
-"     sleutelbord geaktiveer is. Die herlaaistelsel sal nie wag nie indien "
-"die\n"
-"     wagperiode nul is."
-
-#: ../../help.pm_.c:818
-msgid ""
-"Now it's time to configure the X Window System, which is the\n"
-"core of the GNU/Linux GUI (Graphical User Interface). For this purpose,\n"
-"you must configure your video card and monitor. Most of these\n"
-"steps are automated, though, therefore your work may only consist\n"
-"of verifying what has been done and accept the settings :)\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. No modification possible at installation time.\n"
 "\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. No modification possible at installation time.\n"
 "\n"
-"When the configuration is over, X will be started (unless you\n"
-"ask DrakX not to) so that you can check and see if the\n"
-"settings suit you. If they don't, you can come back and\n"
-"change them, as many times as necessary."
+" * \"ISDN card\": if an ISDN card is detected on your system, it is\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated to it."
 msgstr ""
-"Dit is tyd om die X-vensterstelsel op te stel. Hierdie is die kern van\n"
-"die GNU/Linux grafiese omgewing. Vir hierdie doeleindes, moet u 'n "
-"videokaart\n"
-"en monitor kies. Meeste van hierdie stappe is outomaties en u moet net\n"
-"verifiëer of dit korrek is.\n"
-"\n"
-"\n"
-"Na konfigurasie sal X outmaties gelaai word, behalwe as u DrakX andersins\n"
-"aansê. Indien die stelling u nie pas nie, kom terug en verander so veel\n"
-"keer soos nodig."
 
-#: ../../help.pm_.c:831
+#: ../../help.pm_.c:827
 msgid ""
-"If something is wrong in X configuration, use these options to correctly\n"
-"configure the X Window System."
+"Choose the hard drive you want to erase to install your new Mandrake Linux\n"
+"partition. Be careful, all data present on it will be lost and will not be\n"
+"recoverable!"
 msgstr ""
-"Indien iets verkeerd is in die X-konfigurasie, gebruik hierdie opsies om\n"
-"die X-vensterstelsel reg op te stel."
 
-#: ../../help.pm_.c:835
+#: ../../help.pm_.c:832
 msgid ""
-"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
-"\"No\"."
-msgstr ""
-"Indien u verkies om 'n grafiese intekenarea te kry, kies \"Ja\", andersins "
-"\"Nee\"."
-
-#: ../../help.pm_.c:839
-msgid ""
-"You can choose a security level for your system. Please refer to the manual "
-"for complete\n"
-"  information. Basically, if you don't know what to choose, keep the default "
-"option.\n"
-msgstr ""
-
-#: ../../help.pm_.c:844
-msgid ""
-"Your system is going to reboot.\n"
+"Click on \"OK\" if you want to delete all data and partitions present on\n"
+"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
+"to recover any data and partitions present on this hard drive, including\n"
+"any Windows data.\n"
 "\n"
-"After rebooting, your new Linux Mandrake system will load automatically.\n"
-"If you want to boot into another existing operating system, please read\n"
-"the additional instructions."
+"Click on \"Cancel\" to cancel this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"U stelsel gaan nou herlaai.\n"
-"\n"
-"U nuwe Linux-Mandrake stelsel sal outomaties laai. Indien u 'n ander\n"
-" bedryfstelsel wil laai, lees die ekstra instruksies noukeurig deur."
-
-#: ../../install2.pm_.c:37
-msgid "Choose your language"
-msgstr "Kies u taal"
-
-#: ../../install2.pm_.c:38
-msgid "Select installation class"
-msgstr "Kies installasieklas"
-
-#: ../../install2.pm_.c:39
-msgid "Hard drive detection"
-msgstr "Hardeskyfdeteksie."
-
-#: ../../install2.pm_.c:40
-msgid "Configure mouse"
-msgstr "Stel muistoestel op"
-
-#: ../../install2.pm_.c:41
-msgid "Choose your keyboard"
-msgstr "Kies u sleutelbord"
-
-#: ../../install2.pm_.c:42
-#, fuzzy
-msgid "Security"
-msgstr "krul"
-
-#: ../../install2.pm_.c:43
-msgid "Setup filesystems"
-msgstr "Stel lêerstelsels op"
-
-#: ../../install2.pm_.c:44
-msgid "Format partitions"
-msgstr "Formateer partisies"
-
-#: ../../install2.pm_.c:45
-msgid "Choose packages to install"
-msgstr "Kies pakkette om te installeer"
-
-#: ../../install2.pm_.c:46
-msgid "Install system"
-msgstr "Installeer stelsel"
-
-#: ../../install2.pm_.c:47 ../../install_steps_interactive.pm_.c:894
-#: ../../install_steps_interactive.pm_.c:895
-msgid "Set root password"
-msgstr "Kies 'root' se wagwoord"
-
-#: ../../install2.pm_.c:48
-msgid "Add a user"
-msgstr "Voeg 'n gebruiker by"
 
-#: ../../install2.pm_.c:49
-msgid "Configure networking"
-msgstr "Stel netwerk op"
-
-#: ../../install2.pm_.c:51 ../../install_steps_interactive.pm_.c:818
-msgid "Summary"
+#: ../../install2.pm_.c:114
+#, c-format
+msgid ""
+"Can't access kernel modules corresponding to your kernel (file %s is missing)"
 msgstr ""
 
-#: ../../install2.pm_.c:52
-msgid "Configure services"
-msgstr "Konfigureer dienste"
-
-#: ../../install2.pm_.c:54
-msgid "Create a bootdisk"
-msgstr "Maar 'n herlaaiskyf"
-
-#: ../../install2.pm_.c:56
-msgid "Install bootloader"
-msgstr "Installeer herlaaistelsel"
-
-#: ../../install2.pm_.c:57
-msgid "Configure X"
-msgstr "Stel X op"
-
-#: ../../install2.pm_.c:58
-msgid "Exit install"
-msgstr "Verlaay installasie"
-
-#: ../../install_any.pm_.c:402
+#: ../../install_any.pm_.c:421
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -3322,52 +3071,41 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: ../../install_any.pm_.c:433
+#: ../../install_any.pm_.c:457
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Kan nie uitsaau sonder 'n NIS-domein nie"
 
-#: ../../install_any.pm_.c:676
-#, fuzzy, c-format
+#: ../../install_any.pm_.c:793
+#, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Sit 'n skyf in aandrywer %s"
+msgstr "Sit 'n FAT-geformatteerde skyf in aandrywer %s"
 
-#: ../../install_any.pm_.c:680
+#: ../../install_any.pm_.c:797
 msgid "This floppy is not FAT formatted"
-msgstr ""
+msgstr "Hierdie floppie is nie in FAT-formaat nie"
 
-#: ../../install_any.pm_.c:690
+#: ../../install_any.pm_.c:809
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
+"Om hierdie gestoorde pakketkeuse te gebruik, herlaai die installasie met "
+"\"linux defcfg=floppy\""
 
-#: ../../install_any.pm_.c:712
-msgid "Error reading file $f"
-msgstr "Fout met lees van lêer $f"
+#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:737
+#, c-format
+msgid "Error reading file %s"
+msgstr "Fout met die les van lêer %s"
 
-#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:310
-#: ../../interactive.pm_.c:99 ../../interactive.pm_.c:114
-#: ../../interactive.pm_.c:269 ../../interactive_newt.pm_.c:166
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:356
-#: ../../my_gtk.pm_.c:617 ../../my_gtk.pm_.c:640
+#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:325
+#: ../../interactive.pm_.c:107 ../../interactive.pm_.c:122
+#: ../../interactive.pm_.c:286 ../../interactive.pm_.c:308
+#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:415
+#: ../../my_gtk.pm_.c:716 ../../my_gtk.pm_.c:738
 msgid "Ok"
 msgstr "OK"
 
-#
-#: ../../install_gtk.pm_.c:423
-msgid "Please test the mouse"
-msgstr "Toets asb. die muis"
-
-#
-#: ../../install_gtk.pm_.c:424 ../../standalone/mousedrake_.c:132
-#, fuzzy
-msgid "To activate the mouse,"
-msgstr "Toets asb. die muis"
-
-#: ../../install_gtk.pm_.c:425 ../../standalone/mousedrake_.c:133
-msgid "MOVE YOUR WHEEL!"
-msgstr ""
-
 #: ../../install_interactive.pm_.c:23
 #, c-format
 msgid ""
@@ -3377,7 +3115,7 @@ msgstr ""
 "Sekere hardeware op u rekenaar benodig geslote drywers.\n"
 " U kan inligting hieroorvind by %s"
 
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:44
 msgid ""
 "You must have a root partition.\n"
 "For this, create a partition (or click on an existing one).\n"
@@ -3387,11 +3125,11 @@ msgstr ""
 "Skep 'n partisie of kliek op 'n bestaande een.\n"
 "Kies dan Hegpunt en stel dit dan '/'."
 
-#: ../../install_interactive.pm_.c:46 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:49 ../../install_steps_graphical.pm_.c:259
 msgid "You must have a swap partition"
 msgstr "U moet oor 'n ruilpartisie beskik"
 
-#: ../../install_interactive.pm_.c:47 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:50 ../../install_steps_graphical.pm_.c:261
 msgid ""
 "You don't have a swap partition\n"
 "\n"
@@ -3401,56 +3139,59 @@ msgstr ""
 "\n"
 "Wil u steeds voortgaan?"
 
-#: ../../install_interactive.pm_.c:68
+#: ../../install_interactive.pm_.c:53 ../../install_steps.pm_.c:165
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "U moet oor 'n FAT partisie wat as /boot/efi geheg is, beskik"
+
+#: ../../install_interactive.pm_.c:76
 msgid "Use free space"
 msgstr "Gebruik beskikbare spasie"
 
-#: ../../install_interactive.pm_.c:70
+#: ../../install_interactive.pm_.c:78
 msgid "Not enough free space to allocate new partitions"
 msgstr "Nie genoeg spasi