#!/usr/bin/perl # # author Florin Grad (florin@mandrakesoft.com) # # Copyright 2004 Mandrakesoft # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2, as # published by the Free Software Foundation. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # use lib qw(/usr/lib/libDrakX); use standalone; #- warning, standalone must be loaded very first, for 'explanations' use common; use detect_devices; use interactive; use network::network; use log; use c; use network::netconnect; use network::shorewall; use network::ipsec; use Data::Dumper; $::isInstall and die "Not supported during install.\n"; local $_ = join '', @ARGV; $::Wizard_pix_up = "drakvpn.png"; $ugtk2::wm_icon = "drakvpn"; my $direct = /-direct/; my ($kernel_version) = c::kernel_version() =~ /(...)/; log::l("[drakvpn] kernel_version $kernel_version"); $kernel_version >= 2.4 or fatal_quit(N("Sorry, we support only 2.4 and above kernels.")); my $tunnels_file = "/etc/shorewall/tunnels"; my $ipsec_conf = ""; my $racoon_conf = "/etc/racoon/racoon.conf"; my $proc_version = ""; my $ipsec_package = ""; my $in = interactive->vnew('su'); my $shorewall = network::shorewall::read($in, 'silent'); my @section_names; if ($kernel_version > 2.5) { $ipsec_conf = "/etc/ipsec.conf"; } else { $ipsec_conf = "/etc/freeswan/ipsec.conf"; }; my $ipsec = network::ipsec::read_ipsec_conf($ipsec_conf,$kernel_version); my $racoon = network::ipsec::read_racoon_conf($racoon_conf); #print network::ipsec::display_ipsec_conf($ipsec_conf,$ipsec,$kernel_version); $::Wizard_title = N("DrakVPN"); $in->isa('interactive::gtk') and $::isWizard = 1; my $wait_configuring; sub fatal_quit ($) { log::l("[drakvpn] FATAL: $_[0]"); undef $wait_configuring; $in->ask_warn('', $_[0]); quit_global($in, -1); } begin: #- ********************************** #- * 0th step: verify if we are already set up if ($shorewall && any { !/^\s*(?:#|\n)/ } cat_($tunnels_file)) { $::Wizard_no_previous = 1; if (!$shorewall->{disabled}) { my $r = $in->ask_from_list_(N("The VPN connection is enabled."), N("The setup of a VPN connection has already been done. It's currently enabled. What would you like to do?"), [ N_("disable"), N_("reconfigure"), N_("dismiss") ]) or quit_global($in, 0); # FIXME: reconfigure isn't handled if ($r eq "disable") { if (!$::testing) { my $_wait_disabl = $in->wait_message('', N("Disabling VPN...")); network::ipsec::stop_daemons(); } foreach ($ipsec_conf, $tunnels_file) { if (-f $_) { rename($_, "$_.drakvpndisable") or die "Could not rename $_ to $_.drakvpndisable" }; } network::ipsec::sys("/etc/init.d/shorewall restart >/dev/null"); log::l("[drakvpn] Disabled"); $::Wizard_finished = 1; $in->ask_okcancel('', N("The VPN connection is now disabled.")); quit_global($in, 0); } if ($r eq "dismiss") { quit_global($in, 0); } } else { my $r = $in->ask_from_list_(N("VPN connection currently disabled"), N("The setup of a VPN connection has already been done. It's currently disabled. What would you like to do?"), [ N_("enable"), N_("reconfigure"), N_("dismiss") ]); # FIXME: reconfigure isn't handled if ($r eq "enable") { foreach ($ipsec_conf, $tunnels_file) { rename($_, "$_.old") if -f $_; rename("$_.drakvpndisable", $_) or die "Could not find configuration. Please reconfigure."; }; { my $_wait_enabl = $in->wait_message('', N("Enabling VPN...")); network::ipsec::start_daemons(); } log::l("[drakvpn] Enabled"); } $::Wizard_finished = 1; $in->ask_okcancel('', N("The VPN connection is now enabled.")); quit_global($in, 0); if ($r eq "dismiss") { quit_global($in, 0); } } } #- ********************************** #- * 1st step: detect/setup step_ask_confirm: $::Wizard_no_previous = 1; $direct or $in->ask_okcancel(N("Simple VPN setup."), N("You are about to configure your computer to use a VPN connection. With this feature, computers on your local private network and computers on some other remote private networks, can share resources, through their respective firewalls, over the Internet, in a secure manner. The communication over the Internet is encrypted. The local and remote computers look as if they were on the same network. Make sure you have configured your Network/Internet access using drakconnect before going any further."), 1) or goto begin; undef $::Wizard_no_previous; if ($kernel_version < 2.5) { system("/sbin/modprobe ipsec") if -e "/sbin/modprobe"; $proc_version = cat_("/proc/net/ipsec_version") if -e "/proc/net/ipsec_version"; if ($proc_version =~ /super/i) { $ipsec_package = "super-freeswan"; } else { $ipsec_package = "freeswan"; } } else { $ipsec_package = "ipsec-tools"; $proc_version = "ipsec native"; } $direct or $in->ask_okcancel(N("Simple VPN setup."), N("VPN connection. This program is based on the following projects: - FreeSwan: \t\t\thttp://www.freeswan.org/ - Super-FreeSwan: \t\thttp://www.freeswan.ca/ - ipsec-tools: \t\t\thttp://ipsec-tools.sourceforge.net/ - ipsec-howto: \t\thttp://www.ipsec-howto.org - the docs and man pages coming with the %s package Please read AT LEAST the ipsec-howto docs before going any further.",$ipsec_package)) or goto begin; $direct or $in->ask_okcancel(N("Kernel module."), N("The kernel needs to have ipsec support. You're running a %s kernel version. This kernel has '%s' support.", $kernel_version, $proc_version)) or goto begin; step_detectsetup: #my @configured_devices = map { /ifcfg-(\S+)/ } glob('/etc/sysconfig/network-scripts/ifcfg*'); my %aliased_devices; /^\s*alias\s+(eth[0-9])\s+(\S+)/ and $aliased_devices{$1} = $2 foreach cat_("/etc/modules.conf"); my $card_netconnect = network::netconnect::get_net_device() || "eth0"; defined $card_netconnect and log::l("[drakvpn] Information from netconnect: ignore card $card_netconnect"); $in->ask_from('', N("Please enter the name of the interface connected to the internet. Examples: ppp+ for modem or DSL connections, eth0, or eth1 for cable connection, ippp+ for a isdn connection. "), [ { label => N("Net Device"), val => \$card_netconnect, list => [ detect_devices::getNet() ], not_edit => 0 } ]) or goto step_ask_confirm; #- ********************************** #- * 2nd step: configure #$wait_configuring = $in->wait_message(N("Configuring..."), # N("Configuring scripts, installing software, starting servers...")); #- if the kernel has super-freeswan support, remove the freeswan package #- and vice-versa #- if you're using e kernel 2.5 and above with native ipsec support, remove #- both freeswan and super-freeswan packages if (!$::testing && $ipsec_package =~ /super/i && $kernel_version < 2.5) { log::l("[drakvpn] removing the freeswan package"); $in->do_pkgs->remove("freeswan") if -e "/etc/freeswan/ipsec.d/policies/clear"; log::l("[drakvpn] removing the ipsec-tools package"); $in->do_pkgs->remove("ipsec-tools") if -e "/sbin/setkey"; $in->do_pkgs->remove("libipsec-tools0") if -e "/lib/libipsec.so.0"; } elsif (!$::testing && $kernel_version < 2.5) { log::l("[drakvpn] removing the $ipsec_package package"); $in->do_pkgs->remove("super-freeswan") if -e "/usr/lib/ipsec/auto.advroute"; log::l("[drakvpn] removing the ipsec-tools package"); $in->do_pkgs->remove("ipsec-tools") if -e "/sbin/setkey"; $in->do_pkgs->remove("libipsec-tools0") if -e "/sbin/setkey"; } else { log::l("[drakvpn] removing the freeswan AND the super-freeswan packages"); $in->do_pkgs->remove("freeswan") if -e "/etc/freeswan/ipsec.d/policies/clear"; $in->do_pkgs->remove("super-freeswan-doc") if -e "/usr/sbin/ipsec"; $in->do_pkgs->remove("super-freeswan") if -e "/usr/lib/ipsec/auto.advroute"; }; #- install and setup the RPM packages, if needed my %rpm2file; log::l("[drakvpn] install the $ipsec_package and the shorewall rpm packages"); if (!$::testing && $ipsec_package =~ /ipsec-tools/i) { %rpm2file = ($ipsec_package => '/sbin/setkey', shorewall => '/sbin/shorewall'); } else { %rpm2file = ($ipsec_package => '/usr/sbin/ipsec', shorewall => '/sbin/shorewall'); }; #- first: try to install all in one step, if needed if (! ($ipsec_package =~ /super/i && -e "/usr/lib/ipsec/auto.advroute" || $ipsec_package =~ /^freeswan/i && -e "/etc/freeswan/ipsec.d/policies/clear" || $ipsec_package =~ /ipsec-tools/i && -e "/sbin/setkey")) { my @needed_to_install = grep { !-e $rpm2file{$_} } keys %rpm2file; @needed_to_install and $in->do_pkgs->install(@needed_to_install) if !$::testing; #- second: try one by one if failure detected if (!$::testing && any { !-e $rpm2file{$_} } keys %rpm2file) { foreach (keys %rpm2file) { -e $rpm2file{$_} or $in->do_pkgs->install($_); -e $rpm2file{$_} or fatal_quit(N("Problems installing package %s", $_)); } } } undef $wait_configuring; #- configure the $ipsec_conf file #- Add, Remove config|conn entries step_configuration: my $c; my %messages = (ipsec => N("Security Policies"), racoon => N("IKE daemon racoon")); if ($kernel_version > 2.5) { $in->ask_from(N("Configuration file"), N("Configuration step! You need to define the Security Policies and then to configure the automatic key exchange (IKE) daemon. The KAME IKE daemon we're using is called 'racoon'. What would you like to configure?\n"), [ { val => \$c, type => "list", list => [ keys %messages ], format => sub { $messages{$_[0]} } } ]) or goto step_detectsetup; } else { $in->ask_okcancel(N("Configuration file"), N("Next, we will configure the %s file.\n Simply click on Next.\n", $ipsec_conf)) or goto step_detectsetup; $c = "configure"; }; #------------------------------------------------------------------- #---------------------- configure ipsec_conf ----------------------- #------------------------------------------------------------------- if ($c eq "ipsec" || $c eq "configure") { step_configure_ipsec_conf: @section_names = network::ipsec::get_section_names_ipsec_conf($ipsec,$kernel_version) if $ipsec; my $choice = $section_names[0] if $section_names[0]; my $d = $in->ask_from_list(N("%s entries", $ipsec_conf), N("The %s file contents is divided into sections.\n You can now:\n - display, add, edit, or remove sections, then - commit the changes What would you like to do?\n", $ipsec_conf), [ N_("_:display here is a verb\nDisplay"), N_("Add"), N_("Edit"), N_("Remove"), N_("Commit") ]) or goto step_configuration; my $existing_section = ""; #- display $ipsec_conf ------------------------- step_display_ipsec_conf: if ($d eq "display $ipsec_conf" || $d eq "_:display here is a verb\nDisplay") { my $ipsec_exists = 0; foreach my $key (keys %$ipsec) { $ipsec_exists = 1 if $ipsec->{$key}; }; if ($ipsec_exists) { $in->ask_okcancel(N("_:display here is a verb\nDisplay configuration"), network::ipsec::display_ipsec_conf($ipsec,$kernel_version)); goto step_configure_ipsec_conf; } else { $in->ask_okcancel(N("_:display here is a verb\nDisplay configuration"), N("The %s file does not exist.\n This must be a new configuration.\n You'll have to go back and choose 'add'.\n", $ipsec_conf)); goto step_configure_ipsec_conf; } #- add --------------------- } elsif ($d eq "Add") { step_add_section: if ($kernel_version < 2.5) { #- add ---- kernel 2.4 part ------------------------------- my $e = $in->ask_from_list_(N("ipsec.conf entries"), N("The %s file contains different sections.\n Here is its skeleton: 'config setup' 'conn default' 'normal1' 'normal2' \n You can now add one of these sections.\n Choose the section you would like to add.\n", $ipsec_conf), [ N_("config setup"), N_("conn %default"), N_("normal conn"), N_("dismiss") ]) or goto step_configure_ipsec_conf; if ($e eq "config setup") { $existing_section = network::ipsec::already_existing_section_ipsec_conf("config setup", $ipsec, $kernel_version); if ($existing_section eq "already existing") { $in->ask_okcancel(N("Exists!"), N("A section with this name already exists. The section names have to be unique.\n You'll have to go back and add another section or change its name.\n")); goto step_add_section; }; my $config_setup = { 1 => [ "config", "setup" ], 2 => [ "interfaces", "%defaultroute" ], 3 => [ "klipsdebug", "none" ], 4 => [ "plutodebug", "none" ], 5 => [ "plutoload", "%search" ], 6 => [ "plutostart", "%search" ], 7 => [ "uniqueids", "yes" ], }; $in->ask_from('', N("This section has to be on top of your %s file.\n Make sure all other sections follow this config setup section.\n Choose continue or previous when you are done.\n", $ipsec_conf), [ { label => N("interfaces"), val => \$config_setup->{2}[1], type => 'entry' }, { label => N("klipsdebug"), val => \$config_setup->{3}[1], type => 'entry' }, { label => N("plutodebug"), val => \$config_setup->{4}[1], type => 'entry' }, { label => N("plutoload"), val => \$config_setup->{5}[1], type => 'entry' }, { label => N("plutostart"), val => \$config_setup->{6}[1], type => 'entry' }, { label => N("uniqueids"), val => \$config_setup->{7}[1], type => 'entry' }, ] ) or goto step_configure_ipsec_conf; network::ipsec::add_section_ipsec_conf($config_setup, $ipsec); goto step_configure_ipsec_conf; } elsif ($e eq "conn %default") { $existing_section = network::ipsec::already_existing_section_ipsec_conf("conn %default", $ipsec, $kernel_version); if ($existing_section eq "already existing") { $in->ask_okcancel(N("Exists!"), N("A section with this name already exists. The section names have to be unique.\n You'll have to go back and add another section or change its name.\n")); goto step_add_section; }; my $conn_default = { 1 => [ "conn", "%default" ], 2 => [ "pfs", "yes" ], 3 => [ "keyingtries", "1" ], 4 => [ "compress", "yes" ], 5 => [ "disablearrivalcheck", "no" ], 6 => [ "left", "" ], 7 => [ "leftcert", "" ], 8 => [ "leftrsasigkey", "%cert" ], 9 => [ "leftsubnet", "" ], 10 => [ "leftnexthop", "" ], }; $in->ask_from('', N("This is the first section after the config setup one.\n Here you define the default settings. All the other sections will follow this one. The left settings are optional. If don't define them here, globally, you can define them in each section.\n",), [ { label => N("PFS"), val => \$conn_default->{2}[1], type => 'entry' }, { label => N("keyingtries"), val => \$conn_default->{3}[1], type => 'entry' }, { label => N("compress"), val => \$conn_default->{4}[1], type => 'entry' }, { label => N("disablearrivalcheck"), val => \$conn_default->{5}[1], type => 'entry' }, { label => N("left"), val => \$conn_default->{6}[1], type => 'entry' }, { label => N("leftcert"), val => \$conn_default->{7}[1], type => 'entry' }, { label => N("leftrsasigkey"), val => \$conn_default->{8}[1], type => 'entry' }, { label => N("leftsubnet"), val => \$conn_default->{9}[1], type => 'entry' }, { label => N("leftnexthop"), val => \$conn_default->{10}[1], type => 'entry' }, ] ) or goto step_configure_ipsec_conf; network::ipsec::add_section_ipsec_conf($conn_default, $ipsec); goto step_configure_ipsec_conf; } elsif ($e eq "normal conn") { my $normal_conn = { 1 => [ "conn", "my-connection" ], 2 => [ "authby", "rsasig" ], 3 => [ "auto", "start" ], 4 => [ "left", "" ], 5 => [ "leftcert", "" ], 6 => [ "leftrsasigkey", "%cert" ], 7 => [ "leftsubnet", "" ], 8 => [ "leftnexthop", "" ], 9 => [ "right", "" ], 10 => [ "rightcert", "" ], 11 => [ "rightrsasigkey", "%cert" ], 12 => [ "rightsubnet", "" ], 13 => [ "rightnexthop", "" ], }; step_add_normal_conn: $in->ask_from('', N("Your %s file has several sections, or connections.\n You can now add a new section. Choose continue when you are done to write the data.\n", $ipsec_conf), [ { label => N("section name"), val => \$normal_conn->{1}[1], type => 'entry' }, { label => N("authby"), val => \$normal_conn->{2}[1], type => 'entry' }, { label => N("auto"), val => \$normal_conn->{3}[1], type => 'entry' }, { label => N("left"), val => \$normal_conn->{4}[1], type => 'entry' }, { label => N("leftcert"), val => \$normal_conn->{5}[1], type => 'entry' }, { label => N("leftrsasigkey"), val => \$normal_conn->{6}[1], type => 'entry' }, { label => N("leftsubnet"), val => \$normal_conn->{7}[1], type => 'entry' }, { label => N("leftnexthop"), val => \$normal_conn->{8}[1], type => 'entry' }, { label => N("right"), val => \$normal_conn->{9}[1], type => 'entry' }, { label => N("rightcert"), val => \$normal_conn->{10}[1], type => 'entry' }, { label => N("rightrsasigkey"), val => \$normal_conn->{11}[1], type => 'entry' }, { label => N("rightsubnet"), val => \$normal_conn->{12}[1], type => 'entry' }, { label => N("rightnexthop"), val => \$normal_conn->{13}[1], type => 'entry' }, ] ) or goto step_configure_ipsec_conf; $existing_section = network::ipsec::already_existing_section_ipsec_conf($normal_conn->{1}[0] . " " . $normal_conn->{1}[1], $ipsec, $kernel_version); if ($existing_section eq "already existing") { $in->ask_okcancel(N("Exists!"), N("A section with this name already exists. The section names have to be unique.\n You'll have to go back and add another section or change the name of the section.\n")); goto step_add_normal_conn; }; network::ipsec::add_section_ipsec_conf($normal_conn, $ipsec); goto step_configure_ipsec_conf; } } else { #- add ---- kernel 2.6 part ------------------------------- my $section = { command => 'spdadd', src_range => 'src_network_address', dst_range => 'dest_network_address', upperspec => 'any', flag => '-P', direction => 'in or out', ipsec => 'ipsec', protocol => 'esp', mode => 'tunnel', src_dest => 'source-destination', level => 'require' }; step_add_section_ipsec_conf_k26: ask_info3('', N("Add a Security Policy.\n You can now add a Security Policy.\n Choose continue when you are done to write the data.\n"), $section) or goto step_configure_ipsec_conf; # $existing_section = network::ipsec::already_existing_section_ipsec_conf($section->{src_dest}, $ipsec, $kernel_version); # # if ($existing_section eq "already existing") { #$in->ask_okcancel(N("Exists!"), #N("A section with this name already exists. #The section names have to be unique.\n #You'll have to go back and add another section #or change the name of the section.\n")); # goto step_add_section_ipsec_conf_k26; #}; if (!$ipsec->{1}) { put_in_hash($ipsec, { max(keys %$ipsec) + 1 => "#!/sbin/setkey -f" }); put_in_hash($ipsec, { max(keys %$ipsec) + 1 => "flush;" }); put_in_hash($ipsec, { max(keys %$ipsec) + 1 => "spdflush;" }); }; network::ipsec::add_section_ipsec_conf($section, $ipsec); @section_names = network::ipsec::get_section_names_ipsec_conf($ipsec,$kernel_version); goto step_configure_ipsec_conf; }; #- edit --------------------- } elsif ($d eq "Edit") { step_edit_ipsec_conf: $in->ask_from(N("Edit section"), N("Your %s file has several sections or connections.\n You can choose here below the one you want to edit and then click on next.\n", $ipsec_conf), [ { val => \$choice, list => \@section_names, label => N("Section names"), sort => 0, not_edit => 0 } ]) or goto step_configure_ipsec_conf; my $number = network::ipsec::matched_section_key_number_ipsec_conf($choice,$ipsec,$kernel_version); #- edit ---- kernel 2.4 part ------------------------------- if ($kernel_version < 2.5) { if ($choice =~ /^version|block|private|clear|packet/) { $in->ask_okcancel(N("Can't edit!"), N("You cannot edit this section.\n This section is mandatory for Freeswan 2.X. One has to specify version 2.0 on the top of the %s file, and eventually, disable or enable the opportunistic encryption.\n",$ipsec_conf)); goto step_edit_ipsec_conf; } elsif ($choice =~ /^config setup/) { $in->ask_from('', N("Your %s file has several sections.\n You can now edit the config setup section entries. Choose continue when you are done to write the data.\n", $ipsec_conf), [ network::ipsec::dynamic_list($number, $ipsec) ] ) or goto step_configure_ipsec_conf; goto step_configure_ipsec_conf; } elsif ($choice =~ /^conn %default/) { $in->ask_from('', N("Your %s file has several sections or connections.\n You can now edit the default section entries. Choose continue when you are done to write the data.\n", $ipsec_conf), [ network::ipsec::dynamic_list($number, $ipsec) ] ) or goto step_configure_ipsec_conf; goto step_configure_ipsec_conf; } elsif ($choice =~ /^conn/) { $in->ask_from('', N("Your %s file has several sections or connections.\n You can now edit the normal section entries.\n Choose continue when you are done to write the data.\n", $ipsec_conf), [ network::ipsec::dynamic_list($number, $ipsec) ] ) or goto step_configure_ipsec_conf; goto step_configure_ipsec_conf; } else { goto step_configure_ipsec_conf; }; #- edit ---- kernel 2.6 part ------------------------------- } else { ask_info3('', N("Edit a Security Policy.\n You can now edit a Security Policy.\n Choose continue when you are done to write the data.\n"), $ipsec->{$number}) or goto step_configure_ipsec_conf; goto step_configure_ipsec_conf; }; #- remove --------------------- } elsif ($d eq "Remove") { $in->ask_from(N("Remove section"), N("Your %s file has several sections or connections.\n You can choose here below the one you want to remove and then click on next.\n", $ipsec_conf), [ { val => \$choice, list => \@section_names, label => N("Section names"), sort => 0, not_edit => 0 } ]); network::ipsec::remove_section_ipsec_conf($choice,$ipsec,$kernel_version); @section_names = network::ipsec::get_section_names_ipsec_conf($ipsec,$kernel_version) if $ipsec; goto step_configure_ipsec_conf; #- continue and write --------------------- } elsif ($d eq "Commit") { log::l("[drakvpn] Modify the $ipsec_conf file"); network::ipsec::write_ipsec_conf($ipsec_conf, $ipsec,$kernel_version); } #------------------------------------------------------------------- #---------------------- configure racoon_conf ----------------------- #------------------------------------------------------------------- } elsif ($c eq "racoon") { step_configure_racoon_conf: @section_names = network::ipsec::get_section_names_racoon_conf($racoon) if $racoon; my $choice = $section_names[0] if $section_names[0]; my $d = $in->ask_from_list_(N("%s entries", $racoon_conf), N("The racoon.conf file configuration.\n The contents of this file is divided into sections. You can now: - display \t\t (display the file contents) - add \t\t (add one section) - edit \t\t\t (modify parameters of an existing section) - remove \t\t (remove an existing section) - commit \t\t (writes the changes to the real file)"), [ N_("_:display here is a verb\nDisplay"), N_("Add"), N_("Edit"), N_("Remove"), N_("Commit") ]) or goto step_configuration; #- display $racoon_conf ------------------------- step_display_racoon_conf: if ($d eq "_:display here is a verb\nDisplay") { my $racoon_exists = 0; foreach my $key (keys %$racoon) { $racoon_exists = 1 if $racoon->{$key}; }; if ($racoon_exists) { $in->ask_okcancel(N("_:display here is a verb\nDisplay configuration"), network::ipsec::display_racoon_conf($racoon)); goto step_configure_racoon_conf; } else { $in->ask_okcancel(N("_:display here is a verb\nDisplay configuration"), N("The %s file does not exist\n This must be a new configuration.\n You'll have to go back and choose configure.\n", $racoon_conf)); goto step_configure_racoon_conf; } #- add $racoon_conf ------------------------------ } elsif ($d eq "Add") { step_add_section_racoon: #my $existing_section = ""; my $e = $in->ask_from_list_(N("racoonf.conf entries"), N("The 'add' sections step.\n Here below is the racoon.conf file skeleton: \t'path' \t'remote' \t'sainfo' \n Choose the section you would like to add.\n"), [ N_("path"), N_("remote"), N_("sainfo"), N_("dismiss") ]) or goto step_configure_racoon_conf; if ($e eq "path") { my $path_section = { 1 => [ 'path', 'path_type', '"/etc/racoon/certs"' ], }; $in->ask_from('', N("The 'add path' section step.\n The path sections have to be on top of your racoon.conf file.\n Put your mouse over the certificate entry to obtain online help."), [ { label => N("path type"), val => \$path_section->{1}[1], list => [ 'certificate', 'pre_shared_key', 'include' ], help => N("path include path: specifies a path to include a file. See File Inclusion. Example: path include '/etc/racoon' path pre_shared_key file: specifies a file containing pre-shared key(s) for various ID(s). See Pre-shared key File. Example: path pre_shared_key '/etc/racoon/psk.txt' ; path certificate path: racoon(8) will search this directory if a certificate or certificate request is received. Example: path certificate '/etc/cert' ; File Inclusion: include file other configuration files can be included. Example: include \"remote.conf\" ; Pre-shared key File: Pre-shared key file defines a pair of the identifier and the shared secret key which are used at Pre-shared key authentication method in phase 1."), }, { label => N("real file"), val => \$path_section->{1}[2], type => 'entry' }, ] ) or goto step_configure_racoon_conf; network::ipsec::add_section_racoon_conf($path_section, $racoon); } elsif ($e eq "remote") { my $main_remote_section = { 1 => [ 'remote', 'address' ], 2 => [ 'exchange_mode', 'aggressive,main' ], 3 => [ 'generate_policy', 'on' ], 4 => [ 'passive', 'on' ], 5 => [ 'certificate_type', 'x509', '"my_certificate.pem"', '"my_private_key.pem"' ], 6 => [ 'peers_certfile', '"remote.public"' ], 7 => [ 'verify_cert', 'on' ], 8 => [ 'my_identifier', 'asn1dn' ], 9 => [ 'peers_identifier', 'asn1dn' ] }; my $proposal_remote_section = { 1 => [ 'proposal' ], 2 => [ 'encryption_algorithm', '3des' ], 3 => [ 'hash_algorithm', 'md5' ], 4 => [ 'authentication_method', 'rsasig' ], 5 => [ 'dh_group', 'modp1024' ] }; ask_info2('', N("Make sure you already have the path sections on the top of your racoon.conf file. You can now choose the remote settings. Choose continue or previous when you are done.\n"), $main_remote_section, $proposal_remote_section) or goto step_configure_racoon_conf; network::ipsec::add_section_racoon_conf($main_remote_section, $racoon); network::ipsec::add_section_racoon_conf($proposal_remote_section, $racoon); } elsif ($e eq "sainfo") { my $sainfo_section = { 1 => [ 'sainfo', 'address', '192.168.100.2', 'any', 'address', '10.0.0.2', 'any' ], 2 => [ 'pfs_group', '1' ], 3 => [ 'lifetime', 'time', '30', 'sec' ], 4 => [ 'encryption_algorithm', '3des' ], 5 => [ 'authentication_algorithm', 'hmac_sha1' ], 6 => [ 'compression_algorithm', 'deflate' ], }; ask_info('', N("Make sure you already have the path sections on the top of your %s file. You can now choose the sainfo settings. Choose continue or previous when you are done.\n", $racoon_conf), $sainfo_section) or goto step_configure_racoon_conf; network::ipsec::add_section_racoon_conf($sainfo_section, $racoon); } @section_names = network::ipsec::get_section_names_racoon_conf($racoon) if $racoon; goto step_configure_racoon_conf; #- edit $racoon_conf ----------------------------- } elsif ($d eq "Edit") { $in->ask_from(N("Edit section"), N("Your %s file has several sections or connections. You can choose here in the list below the one you want to edit and then click on next.\n", $racoon_conf), [ { val => \$choice, list => \@section_names, label => N("Section names"), sort => 0, not_edit => 0 } ]) or goto step_configure_racoon_conf; my $number = network::ipsec::matched_section_key_number_racoon_conf($choice,$racoon); if ($choice =~ /^remote/) { ask_info2('', N("Your %s file has several sections.\n You can now edit the remote section entries. Choose continue when you are done to write the data.\n", $racoon_conf), $racoon->{$number}, $racoon->{$number+2}) or goto step_configure_racoon_conf; } elsif ($choice =~ /^sainfo/) { ask_info('', N("Your %s file has several sections. You can now edit the sainfo section entries. Choose continue when you are done to write the data.", $racoon_conf), $racoon->{$number}) or goto step_configure_racoon_conf; } elsif ($choice =~ /^path/) { $in->ask_from('', N("This section has to be on top of your %s file.\n Make sure all other sections follow these path sections.\n You can now edit the path entries. Choose continue or previous when you are done.\n", $racoon_conf), [ { label => N("path_type"), val => \$racoon->{$number}{1}[1], list => [ 'certificate', 'pre_shared_key', 'include' ] }, { label => N("real file"), val => \$racoon->{$number}{1}[2], type => 'entry' }, ] ) or goto step_configure_racoon_conf; } goto step_configure_racoon_conf; #- remove $racoon_conf --------------------------- } elsif ($d eq "Remove") { $in->ask_from(N("Remove section"), N("Your %s file has several sections or connections.\n You can choose here below the one you want to remove and then click on next.\n", $racoon_conf), [ { val => \$choice, list => \@section_names, label => N("Section names"), sort => 0, not_edit => 0 } ]); my $number = network::ipsec::matched_section_key_number_racoon_conf($choice,$racoon); network::ipsec::remove_section_racoon_conf($choice,$racoon,$number); @section_names = network::ipsec::get_section_names_racoon_conf($racoon) if $racoon; goto step_configure_racoon_conf; #- write $racoon_conf and continue --------------- } elsif ($d eq "Commit") { log::l("[drakvpn] Modify the $racoon_conf file"); network::ipsec::write_racoon_conf($racoon_conf, $racoon); } } #- start the daemons network::ipsec::start_daemons(); #- bye-bye message undef $wait_configuring; $::Wizard_no_previous = 1; $::Wizard_finished = 1; $in->ask_okcancel(N("Congratulations!"), N("Everything has been configured.\n You may now share resources through the Internet, in a secure way, using a VPN connection. You should make sure that that the tunnels shorewall section is configured.")); log::l("[drakvpn] Installation complete, exiting"); quit_global($in, 0); sub quit_global { my ($in, $exitcode) = @_; $in->exit($exitcode); goto begin } sub ask_info { my ($title, $text, $data) = @_; $in->ask_from($title, $text, [ { label => N("Sainfo source address"), val => \$data->{1}[2], type => 'entry', help => N("sainfo (source_id destination_id | anonymous) { statements } defines the parameters of the IKE phase 2 (IPsec-SA establishment). source_id and destination_id are constructed like: address address [/ prefix] [[port]] ul_proto Examples: \n sainfo anonymous (accepts connections from anywhere) leave blank this entry if you want anonymous sainfo address 203.178.141.209 any address 203.178.141.218 any 203.178.141.209 is the source address sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any 172.16.1.0/24 is the source address") }, { label => N("Sainfo source protocol"), val => \$data->{1}[3], type => 'entry', help => N("sainfo (source_id destination_id | anonymous) { statements } defines the parameters of the IKE phase 2 (IPsec-SA establishment). source_id and destination_id are constructed like: address address [/ prefix] [[port]] ul_proto Examples: \n sainfo anonymous (accepts connections from anywhere) leave blank this entry if you want anonymous sainfo address 203.178.141.209 any address 203.178.141.218 any the first 'any' allows any protocol for the source") }, { label => N("Sainfo destination address"), val => \$data->{1}[5], type => 'entry', help => N("sainfo (source_id destination_id | anonymous) { statements } defines the parameters of the IKE phase 2 (IPsec-SA establishment). source_id and destination_id are constructed like: address address [/ prefix] [[port]] ul_proto Examples: \n sainfo anonymous (accepts connections from anywhere) leave blank this entry if you want anonymous sainfo address 203.178.141.209 any address 203.178.141.218 any 203.178.141.218 is the destination address sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any 172.16.2.0/24 is the destination address") }, { label => N("Sainfo destination protocol"), val => \$data->{1}[6], type => 'entry', help => N("sainfo (source_id destination_id | anonymous) { statements } defines the parameters of the IKE phase 2 (IPsec-SA establishment). source_id and destination_id are constructed like: address address [/ prefix] [[port]] ul_proto Examples: \n sainfo anonymous (accepts connections from anywhere) leave blank this entry if you want anonymous sainfo address 203.178.141.209 any address 203.178.141.218 any the last 'any' allows any protocol for the destination") }, { label => N("PFS group"), val => \$data->{2}[1], list => [ qw(modp768 modp1024 modp1536 1 2 5) ], help => N("define the group of Diffie-Hellman exponentiations. If you do not require PFS then you can omit this directive. Any proposal will be accepted if you do not specify one. group is one of the following: modp768, modp1024, modp1536. Or you can define 1, 2, or 5 as the DH group number.") }, { label => N("Lifetime number"), val => \$data->{3}[2], type => 'entry', help => N("define a lifetime of a certain time which will be pro- posed in the phase 1 negotiations. Any proposal will be accepted, and the attribute(s) will not be proposed to the peer if you do not specify it(them). They can be individually specified in each proposal. Examples: \n lifetime time 1 min; # sec,min,hour lifetime time 1 min; # sec,min,hour lifetime time 30 sec; lifetime time 30 sec; lifetime time 60 sec; lifetime time 12 hour; So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12. ") }, { label => N("Lifetime unit"), val => \$data->{3}[3], list => [ qw(sec min hour) ], help => N("define a lifetime of a certain time which will be pro- posed in the phase 1 negotiations. Any proposal will be accepted, and the attribute(s) will not be proposed to the peer if you do not specify it(them). They can be individually specified in each proposal. Examples: \n lifetime time 1 min; # sec,min,hour lifetime time 1 min; # sec,min,hour lifetime time 30 sec; lifetime time 30 sec; lifetime time 60 sec; lifetime time 12 hour; So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'. ") }, { label => N("Encryption algorithm"), val => \$data->{4}[1], list => [ qw(des 3des des_iv64 des_iv32 rc5 rc4 idea 3idea cast128 blowfish null_enc twofish rijndae) ] }, { label => N("Authentication algorithm"), val => \$data->{5}[1], list => [ qw(des 3des des_iv64 des_iv32 hmac_md5 hmac_sha1 non_auth) ] }, { label => N("Compression algorithm"), val => \$data->{6}[1], list => [ N_("deflate") ], format => \&translate, allow_empty_list => 1 } ]) } sub ask_info2 { my ($title, $text, $main_remote_section, $proposal_remote_section) = @_; $in->ask_from($title, $text,, [ { label => N("Remote"), val => \$main_remote_section->{1}[1], type => 'entry', help => N("remote (address | anonymous) [[port]] { statements } specifies the parameters for IKE phase 1 for each remote node. The default port is 500. If anonymous is specified, the state- ments apply to all peers which do not match any other remote directive.\n Examples: \n remote anonymous remote ::1 [8000]") }, { label => N("Exchange mode"), val => \$main_remote_section->{2}[1], list => [ qw(main,agressive agressive,main) ], help => N("defines the exchange mode for phase 1 when racoon is the initiator. Also it means the acceptable exchange mode when racoon is responder. More than one mode can be specified by separating them with a comma. All of the modes are acceptable. The first exchange mode is what racoon uses when it is the initiator.\n") }, { label => N("Generate policy"), val => \$main_remote_section->{3}[1], list => [ N_("off"), N_("on") ], format => \&translate, help => N("This directive is for the responder. Therefore you should set passive on in order that racoon(8) only becomes a responder. If the responder does not have any policy in SPD during phase 2 negotiation, and the direc- tive is set on, then racoon(8) will choice the first pro- posal in the SA payload from the initiator, and generate policy entries from the proposal. It is useful to nego- tiate with the client which is allocated IP address dynamically. Note that inappropriate policy might be installed into the responder's SPD by the initiator. So that other communication might fail if such policies installed due to some policy mismatches between the ini- tiator and the responder. This directive is ignored in the initiator case. The default value is off.") }, { label => N("Passive"), val => \$main_remote_section->{4}[1], list => [ N_("off"), N_("on") ], format => \&translate, help => N("If you do not want to initiate the negotiation, set this to on. The default value is off. It is useful for a server.") }, { label => N("Certificate type"), val => \$main_remote_section->{5}[1], list => [ 'x509' ], allow_empty_list => 1 }, { label => N("My certfile"), val => \$main_remote_section->{5}[2], type => 'entry', help => N("Name of the certificate") }, { label => N("My private key"), val => \$main_remote_section->{5}[3], type => 'entry', help => N("Name of the private key") }, { label => N("Peers certfile"), val => \$main_remote_section->{6}[1], type => 'entry', help => N("Name of the peers certificate") }, { label => N("Verify cert"), val => \$main_remote_section->{7}[1], list => [ N_("off"), N_("on") ], format => \&translate, help => N("If you do not want to verify the peer's certificate for some reason, set this to off. The default is on.") }, { label => N("My identifier"), val => \$main_remote_section->{8}[1], type => 'entry', help => N("specifies the identifier sent to the remote host and the type to use in the phase 1 negotiation. address, FQDN, user_fqdn, keyid and asn1dn can be used as an idtype. they are used like: my_identifier address [address]; the type is the IP address. This is the default type if you do not specify an identifier to use. my_identifier user_fqdn string; the type is a USER_FQDN (user fully-qualified domain name). my_identifier FQDN string; the type is a FQDN (fully-qualified domain name). my_identifier keyid file; the type is a KEY_ID. my_identifier asn1dn [string]; the type is an ASN.1 distinguished name. If string is omitted, racoon(8) will get DN from Subject field in the certificate.\n Examples: \n my_identifier user_fqdn \"myemail\@mydomain.com\"") }, { label => N("Peers identifier"), val => \$main_remote_section->{9}[1], type => 'entry' }, { label => N("Proposal"), val => \$proposal_remote_section->{1}[0], list => [ 'proposal' ], allow_empty_list => 1 }, { label => N("Encryption algorithm"), val => \$proposal_remote_section->{2}[1], list => [ qw(des 3des blowfish cast128) ], help => N("specify the encryption algorithm used for the phase 1 negotiation. This directive must be defined. algorithm is one of the following: DES, 3DES, blowfish, cast128 for oakley. For other transforms, this statement should not be used.") }, { label => N("Hash algorithm"), val => \$proposal_remote_section->{3}[1], type => 'entry' }, { label => N("Authentication method"), val => \$proposal_remote_section->{4}[1], type => 'entry' }, { label => N("DH group"), val => \$proposal_remote_section->{5}[1], list => [ qw(modp768 modp1024 modp1536 1 2 5) ], }, ]); } sub ask_info3 { my ($title, $text, $section) = @_; $in->ask_from($title, $text,, [ { label => N("Command"), val => \$section->{command}, list => [ 'spdadd' ], allow_empty_list => 1 }, { label => N("Source IP range"), val => \$section->{src_range}, type => 'entry' }, { label => N("Destination IP range"), val => \$section->{dst_range}, type => 'entry' }, { label => N("Upper-layer protocol"), val => \$section->{upperspec}, list => [ N_("any") ], format => \&translate, allow_empty_list => 1 }, { label => N("Flag"), val => \$section->{flag}, list => [ '-P' ], allow_empty_list => 1 }, { label => N("Direction"), val => \$section->{direction}, list => [ 'in', 'out' ] }, { label => N("IPsec policy"), val => \$section->{ipsec}, list => [ N_("ipsec"), N_("discard"), N_("none") ], format => \&translate }, { label => N("Protocol"), val => \$section->{protocol}, list => [ 'esp', 'ah', 'ipcomp' ] }, { label => N("Mode"), val => \$section->{mode}, list => [ N_("tunnel"), N_("transport"), N_("any") ], format => \&translate }, { label => N("Source/destination"), val => \$section->{src_dest}, type => 'entry' }, { label => N("Level"), val => \$section->{level}, list => [ N_("require"), N_("default"), N_("use"), N_("unique") ], format => \&translate }, ]); } %;'/> -rw-r--r--perl-install/install/share/po/zh_TW.po742
71 files changed, 21047 insertions, 19963 deletions
diff --git a/perl-install/install/share/po/DrakX.pot b/perl-install/install/share/po/DrakX.pot
index 908ebd7f4..b21a3013f 100644
--- a/perl-install/install/share/po/DrakX.pot
+++ b/perl-install/install/share/po/DrakX.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 20:13+0200\n"
+"POT-Creation-Date: 2007-10-01 09:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: any.pm:159
+#: any.pm:155
#, c-format
msgid "Do you have further supplementary media?"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:162
+#: any.pm:158
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -32,113 +32,113 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:170
+#: any.pm:166
#, c-format
msgid "CD-ROM"
msgstr ""
-#: any.pm:171
+#: any.pm:167
#, c-format
msgid "Network (HTTP)"
msgstr ""
-#: any.pm:172
+#: any.pm:168
#, c-format
msgid "Network (FTP)"
msgstr ""
-#: any.pm:173
+#: any.pm:169
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:215
+#: any.pm:211
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:221
+#: any.pm:217
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:232
+#: any.pm:228
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:237
+#: any.pm:233
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr ""
-#: any.pm:247
+#: any.pm:243
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:277
+#: any.pm:273
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:278
+#: any.pm:274
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:282
+#: any.pm:278
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:283
+#: any.pm:279
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:287
+#: any.pm:283
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:288
+#: any.pm:284
#, c-format
msgid "Directory"
msgstr ""
-#: any.pm:310
+#: any.pm:306
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:345
+#: any.pm:341
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr ""
-#: any.pm:379
+#: any.pm:375
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:386
+#: any.pm:382
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:428
+#: any.pm:424
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:614
+#: any.pm:610
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -153,7 +153,7 @@ msgid ""
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:637
+#: any.pm:633
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -162,77 +162,77 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:1059
+#: any.pm:1055
#, c-format
msgid "The following disk(s) were renamed:"
msgstr ""
-#: any.pm:1061
+#: any.pm:1057
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "FTP"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "NFS"
msgstr ""
-#: any.pm:1137 steps_interactive.pm:846
+#: any.pm:1133 steps_interactive.pm:922
#, c-format
msgid "Network"
msgstr ""
-#: any.pm:1141
+#: any.pm:1137
#, c-format
msgid "Please choose a media"
msgstr ""
-#: any.pm:1157
+#: any.pm:1153
#, c-format
msgid "File already exists. Overwrite it?"
msgstr ""
-#: any.pm:1161
+#: any.pm:1157
#, c-format
msgid "Permission denied"
msgstr ""
-#: any.pm:1209
+#: any.pm:1205
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1230
+#: any.pm:1226
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1272
+#: any.pm:1269
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr ""
-#: any.pm:1279
+#: any.pm:1277
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
-#: gtk.pm:136
+#: gtk.pm:119
#, c-format
msgid "Installation"
msgstr ""
-#: gtk.pm:139 share/meta-task/compssUsers.pl:54
+#: gtk.pm:122 share/meta-task/compssUsers.pl:42
#, c-format
msgid "Configuration"
msgstr ""
@@ -259,358 +259,365 @@ msgstr ""
msgid "Bringing down the network"
msgstr ""
-#: media.pm:699 media.pm:710
+#: media.pm:703 media.pm:714
#, c-format
msgid "Downloading file %s..."
msgstr ""
-#: media.pm:804
+#: media.pm:808
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:857
+#: media.pm:861
#, c-format
msgid "Copying in progress"
msgstr ""
-#: pkgs.pm:33
+#: pkgs.pm:28
#, c-format
msgid "must have"
msgstr ""
-#: pkgs.pm:34
+#: pkgs.pm:29
#, c-format
msgid "important"
msgstr ""
-#: pkgs.pm:35
+#: pkgs.pm:30
#, c-format
msgid "very nice"
msgstr ""
-#: pkgs.pm:36
+#: pkgs.pm:31
#, c-format
msgid "nice"
msgstr ""
-#: pkgs.pm:37
+#: pkgs.pm:32
#, c-format
msgid "maybe"
msgstr ""
-#: share/meta-task/compssUsers.pl:23
+#: pkgs.pm:245
+#, c-format
+msgid ""
+"Some packages requested by %s cannot be installed:\n"
+"%s"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:11
#, c-format
msgid "Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:21
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:22
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:37
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Multimedia station"
msgstr ""
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:26
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:31
#, c-format
msgid "Internet station"
msgstr ""
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:32
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:37
#, c-format
msgid "Network Computer (client)"
msgstr ""
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:38
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:55
+#: share/meta-task/compssUsers.pl:43
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:59
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Console Tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:60
+#: share/meta-task/compssUsers.pl:48
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:166
-#: share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:155
#, c-format
msgid "Development"
msgstr ""
-#: share/meta-task/compssUsers.pl:65 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
#, c-format
msgid "Documentation"
msgstr ""
-#: share/meta-task/compssUsers.pl:70 share/meta-task/compssUsers.pl:174
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:75 share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:71
#, c-format
msgid "Web Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:72
#, c-format
msgid "Apache"
msgstr ""
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:75
#, c-format
msgid "Groupware"
msgstr ""
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:76
#, c-format
msgid "Kolab Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:92 share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
#, c-format
msgid "Firewall/Router"
msgstr ""
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
#, c-format
msgid "Internet gateway"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Mail/News"
msgstr ""
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:84
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr ""
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:87
#, c-format
msgid "Directory Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "FTP Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:92
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "DNS/NIS"
msgstr ""
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:96
#, c-format
msgid "Domain Name and Network Information Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:99
#, c-format
msgid "File and Printer Sharing Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "NFS Server, Samba server"
msgstr ""
-#: share/meta-task/compssUsers.pl:116 share/meta-task/compssUsers.pl:129
+#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
#, c-format
msgid "Database"
msgstr ""
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:104
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:108
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:109
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:112
#, c-format
msgid "Mail"
msgstr ""
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:113
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:130
+#: share/meta-task/compssUsers.pl:117
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:124
#, c-format
msgid "Network Computer server"
msgstr ""
-#: share/meta-task/compssUsers.pl:138
+#: share/meta-task/compssUsers.pl:125
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:131
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "KDE Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:134
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:138
#, c-format
msgid "GNOME Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:152
+#: share/meta-task/compssUsers.pl:139
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:142
#, c-format
msgid "IceWm Desktop"
msgstr ""
-#: share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:146
#, c-format
msgid "Other Graphical Desktops"
msgstr ""
-#: share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:147
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:170
#, c-format
msgid "Utilities"
msgstr ""
-#: share/meta-task/compssUsers.pl:185 share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
#, c-format
msgid "SSH Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:177
#, c-format
msgid "Webmin"
msgstr ""
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:178
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:195
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Network Utilities/Monitoring"
msgstr ""
-#: share/meta-task/compssUsers.pl:196
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Mandriva Wizards"
msgstr ""
-#: share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:188
#, c-format
msgid "Wizards to configure server"
msgstr ""
@@ -622,7 +629,7 @@ msgid ""
"Continue at your own risk."
msgstr ""
-#: steps.pm:432
+#: steps.pm:433
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -646,46 +653,7 @@ msgstr ""
msgid "<Tab>/<Alt-Tab> between elements"
msgstr ""
-#: steps_gtk.pm:155 steps_gtk.pm:156
-#, c-format
-msgid "Localization"
-msgstr ""
-
-#: steps_gtk.pm:159 steps_list.pm:20
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Installation class"
-msgstr ""
-
-#: steps_gtk.pm:160 steps_gtk.pm:243 steps_interactive.pm:511
-#, c-format
-msgid "Package Group Selection"
-msgstr ""
-
-#: steps_gtk.pm:161 steps_gtk.pm:460 steps_interactive.pm:543
-#, c-format
-msgid "Installing"
-msgstr ""
-
-#: steps_gtk.pm:162 steps_gtk.pm:576 steps_interactive.pm:735
-#, c-format
-msgid "Summary"
-msgstr ""
-
-#: steps_gtk.pm:164 steps_gtk.pm:165 steps_list.pm:30
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Bootloader"
-msgstr ""
-
-#: steps_gtk.pm:166 steps_interactive.pm:644
-#, c-format
-msgid "Updates"
-msgstr ""
-
-#: steps_gtk.pm:213
+#: steps_gtk.pm:189
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -694,173 +662,189 @@ msgid ""
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
-#: steps_gtk.pm:264 steps_interactive.pm:529
+#: steps_gtk.pm:256 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_list.pm:30
+#, c-format
+msgid "Package Group Selection"
+msgstr ""
+
+#: steps_gtk.pm:277 steps_interactive.pm:581
#, c-format
msgid "Individual package selection"
msgstr ""
-#: steps_gtk.pm:268 steps_interactive.pm:454
+#: steps_gtk.pm:299 steps_interactive.pm:507
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
-#: steps_gtk.pm:313
+#: steps_gtk.pm:344
#, c-format
msgid "Bad package"
msgstr ""
-#: steps_gtk.pm:315
+#: steps_gtk.pm:346
#, c-format
msgid "Version: "
msgstr ""
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "Size: "
msgstr ""
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "%d KB\n"
msgstr ""
-#: steps_gtk.pm:317
+#: steps_gtk.pm:348
#, c-format
msgid "Importance: "
msgstr ""
-#: steps_gtk.pm:351
+#: steps_gtk.pm:382
#, c-format
msgid "You can not select/unselect this package"
msgstr ""
-#: steps_gtk.pm:355
+#: steps_gtk.pm:386
#, c-format
msgid "due to missing %s"
msgstr ""
-#: steps_gtk.pm:356
+#: steps_gtk.pm:387
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: steps_gtk.pm:357
+#: steps_gtk.pm:388
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: steps_gtk.pm:358
+#: steps_gtk.pm:389
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: steps_gtk.pm:363
+#: steps_gtk.pm:394
#, c-format
msgid ""
"You can not select this package as there is not enough space left to install "
"it"
msgstr ""
-#: steps_gtk.pm:366
+#: steps_gtk.pm:397
#, c-format
msgid "The following packages are going to be installed"
msgstr ""
-#: steps_gtk.pm:367
+#: steps_gtk.pm:398
#, c-format
msgid "The following packages are going to be removed"
msgstr ""
-#: steps_gtk.pm:392
+#: steps_gtk.pm:423
#, c-format
msgid "This is a mandatory package, it can not be unselected"
msgstr ""
-#: steps_gtk.pm:394
+#: steps_gtk.pm:425
#, c-format
msgid "You can not unselect this package. It is already installed"
msgstr ""
-#: steps_gtk.pm:396
+#: steps_gtk.pm:427
#, c-format
msgid "You can not unselect this package. It must be upgraded"
msgstr ""
-#: steps_gtk.pm:400
+#: steps_gtk.pm:431
#, c-format
msgid "Show automatically selected packages"
msgstr ""
-#: steps_gtk.pm:402 steps_interactive.pm:133
+#: steps_gtk.pm:433
#, c-format
msgid "Install"
msgstr ""
-#: steps_gtk.pm:405
+#: steps_gtk.pm:436
#, c-format
msgid "Load/Save selection"
msgstr ""
-#: steps_gtk.pm:406
+#: steps_gtk.pm:437
#, c-format
msgid "Updating package selection"
msgstr ""
-#: steps_gtk.pm:411
+#: steps_gtk.pm:442
#, c-format
msgid "Minimal install"
msgstr ""
-#: steps_gtk.pm:425
+#: steps_gtk.pm:456
#, c-format
msgid "Software Management"
msgstr ""
-#: steps_gtk.pm:425 steps_interactive.pm:373
+#: steps_gtk.pm:456 steps_interactive.pm:393
#, c-format
msgid "Choose the packages you want to install"
msgstr ""
-#: steps_gtk.pm:487
+#: steps_gtk.pm:473 steps_interactive.pm:595 steps_list.pm:32
+#, c-format
+msgid "Installing"
+msgstr ""
+
+#: steps_gtk.pm:499
#, c-format
msgid "No details"
msgstr ""
-#: steps_gtk.pm:483
+#: steps_gtk.pm:514
#, c-format
msgid "Time remaining "
msgstr ""
-#: steps_gtk.pm:484
+#: steps_gtk.pm:515
#, c-format
msgid "Estimating"
msgstr ""
-#: steps_gtk.pm:511
+#: steps_gtk.pm:542
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] ""
msgstr[1] ""
-#: steps_gtk.pm:589
+#: steps_gtk.pm:588 steps_interactive.pm:782 steps_list.pm:43
+#, c-format
+msgid "Summary"
+msgstr ""
+
+#: steps_gtk.pm:605
#, c-format
msgid "Configure"
msgstr ""
-#: steps_gtk.pm:580 steps_interactive.pm:731 steps_interactive.pm:858
+#: steps_gtk.pm:622 steps_interactive.pm:778 steps_interactive.pm:934
#, c-format
msgid "not configured"
msgstr ""
-#: steps_gtk.pm:612 steps_interactive.pm:268
+#: steps_gtk.pm:658 steps_interactive.pm:278
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:621 steps_interactive.pm:274
+#: steps_gtk.pm:667 steps_interactive.pm:284
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -869,7 +853,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:623 steps_interactive.pm:276
+#: steps_gtk.pm:669 steps_interactive.pm:286
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -889,12 +873,12 @@ msgstr ""
msgid "Here is the full list of available keyboards"
msgstr ""
-#: steps_interactive.pm:128
+#: steps_interactive.pm:129
#, c-format
msgid "Install/Upgrade"
msgstr ""
-#: steps_interactive.pm:129
+#: steps_interactive.pm:130
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
@@ -906,34 +890,44 @@ msgid ""
"Install"
msgstr ""
-#: steps_interactive.pm:137
+#: steps_interactive.pm:136
#, c-format
msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:148
+#: steps_interactive.pm:140
+#, c-format
+msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:144
+#, c-format
+msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:158
#, c-format
msgid "Encryption key for %s"
msgstr ""
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "IDE"
msgstr ""
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "Configuring IDE"
msgstr ""
-#: steps_interactive.pm:221
+#: steps_interactive.pm:231
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:226
+#: steps_interactive.pm:236
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -941,7 +935,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:318
+#: steps_interactive.pm:328
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -950,153 +944,153 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:340
+#: steps_interactive.pm:350
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: steps_interactive.pm:349
+#: steps_interactive.pm:358
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:385
+#: steps_interactive.pm:405
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Load"
msgstr ""
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Save"
msgstr ""
-#: steps_interactive.pm:395
+#: steps_interactive.pm:415
#, c-format
msgid "Bad file"
msgstr ""
-#: steps_interactive.pm:413
+#: steps_interactive.pm:431
#, c-format
msgid "Install Mandriva KDE Desktop"
msgstr ""
-#: steps_interactive.pm:414
+#: steps_interactive.pm:432
#, c-format
msgid "Install Mandriva GNOME Desktop"
msgstr ""
-#: steps_interactive.pm:415
+#: steps_interactive.pm:433
#, c-format
msgid "Custom install"
msgstr ""
-#: steps_interactive.pm:418
+#: steps_interactive.pm:436
#, c-format
msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
msgstr ""
-#: steps_interactive.pm:503
+#: steps_interactive.pm:521
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:483
+#: steps_interactive.pm:536
#, c-format
msgid "Type of install"
msgstr ""
-#: steps_interactive.pm:484
+#: steps_interactive.pm:537
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:487
+#: steps_interactive.pm:540
#, c-format
msgid "With X"
msgstr ""
-#: steps_interactive.pm:488
+#: steps_interactive.pm:541
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:489
+#: steps_interactive.pm:542
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:528
-#, c-format
-msgid "All"
-msgstr ""
-
-#: steps_interactive.pm:544
+#: steps_interactive.pm:596
#, c-format
msgid "Preparing installation"
msgstr ""
-#: steps_interactive.pm:552
+#: steps_interactive.pm:604
#, c-format
msgid "Installing package %s"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "Go on anyway?"
msgstr ""
-#: steps_interactive.pm:580
+#: steps_interactive.pm:632
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:581
+#: steps_interactive.pm:633
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:634
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:635
#, c-format
msgid "Go back to media and packages selection"
msgstr ""
-#: steps_interactive.pm:586
+#: steps_interactive.pm:638
#, c-format
msgid "There was an error installing package %s."
msgstr ""
-#: steps_interactive.pm:604
+#: steps_interactive.pm:656
#, c-format
msgid "Post-install configuration"
msgstr ""
-#: steps_interactive.pm:611
+#: steps_interactive.pm:663
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:645
+#: steps_interactive.pm:691 steps_list.pm:47
+#, c-format
+msgid "Updates"
+msgstr ""
+
+#: steps_interactive.pm:692
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1109,106 +1103,101 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:666
+#: steps_interactive.pm:713
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr ""
-#: steps_interactive.pm:672
+#: steps_interactive.pm:719
#, c-format
msgid "Unable to contact mirror %s"
msgstr ""
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:777
+#: steps_interactive.pm:825
#, c-format
msgid "%s on %s"
msgstr ""
-#: steps_interactive.pm:810 steps_interactive.pm:817 steps_interactive.pm:830
-#: steps_interactive.pm:847 steps_interactive.pm:863 steps_interactive.pm:874
+#: steps_interactive.pm:859 steps_interactive.pm:866 steps_interactive.pm:880
+#: steps_interactive.pm:898 steps_interactive.pm:913
#, c-format
msgid "Hardware"
msgstr ""
-#: steps_interactive.pm:795 steps_interactive.pm:812
+#: steps_interactive.pm:881 steps_interactive.pm:899
#, c-format
msgid "Sound card"
msgstr ""
-#: steps_interactive.pm:815
+#: steps_interactive.pm:902
#, c-format
msgid "Do you have an ISA sound card?"
msgstr ""
-#: steps_interactive.pm:817
+#: steps_interactive.pm:904
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:819
+#: steps_interactive.pm:906
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:828
-#, c-format
-msgid "TV card"
-msgstr ""
-
-#: steps_interactive.pm:839
+#: steps_interactive.pm:914
#, c-format
msgid "Graphical interface"
msgstr ""
-#: steps_interactive.pm:845 steps_interactive.pm:856
+#: steps_interactive.pm:921 steps_interactive.pm:932
#, c-format
msgid "Network & Internet"
msgstr ""
-#: steps_interactive.pm:857
+#: steps_interactive.pm:933
#, c-format
msgid "Proxies"
msgstr ""
-#: steps_interactive.pm:858
+#: steps_interactive.pm:934
#, c-format
msgid "configured"
msgstr ""
-#: steps_interactive.pm:868
+#: steps_interactive.pm:944
#, c-format
msgid "Security Level"
msgstr ""
-#: steps_interactive.pm:882
+#: steps_interactive.pm:963
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "disabled"
msgstr ""
-#: steps_interactive.pm:939
+#: steps_interactive.pm:981
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:973
+#: steps_interactive.pm:1008
#, c-format
msgid "Preparing bootloader..."
msgstr ""
-#: steps_interactive.pm:983
+#: steps_interactive.pm:1018
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1217,36 +1206,36 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:989
+#: steps_interactive.pm:1024
#, c-format
msgid "Do you want to use aboot?"
msgstr ""
-#: steps_interactive.pm:992
+#: steps_interactive.pm:1027
#, c-format
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1039
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1071
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: steps_interactive.pm:1040
+#: steps_interactive.pm:1073
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1084
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1254,22 +1243,22 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1061
+#: steps_interactive.pm:1094
#, c-format
msgid "Congratulations"
msgstr ""
-#: steps_interactive.pm:1065
+#: steps_interactive.pm:1098
#, c-format
msgid "Reboot"
msgstr ""
-#: steps_interactive.pm:1069 steps_interactive.pm:1070
+#: steps_interactive.pm:1102 steps_interactive.pm:1103
#, c-format
msgid "Generate auto install floppy"
msgstr ""
-#: steps_interactive.pm:1071
+#: steps_interactive.pm:1104
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -1279,17 +1268,17 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr ""
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Replay"
msgstr ""
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Automated"
msgstr ""
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1112
#, c-format
msgid "Save packages selection"
msgstr ""
@@ -1302,6 +1291,11 @@ msgid ""
"Language"
msgstr ""
+#: steps_list.pm:16 steps_list.pm:23
+#, c-format
+msgid "Localization"
+msgstr ""
+
#: steps_list.pm:17
#, c-format
msgid ""
@@ -1316,98 +1310,112 @@ msgid ""
"Mouse"
msgstr ""
-#: steps_list.pm:19
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr ""
-#: steps_list.pm:21
+#: steps_list.pm:21 steps_list.pm:22
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Installation class"
+msgstr ""
+
+#: steps_list.pm:23
#, c-format
msgid ""
"_: Keep these entry short\n"
"Keyboard"
msgstr ""
-#: steps_list.pm:22
+#: steps_list.pm:24
#, c-format
msgid ""
"_: Keep these entry short\n"
"Security"
msgstr ""
-#: steps_list.pm:23
+#: steps_list.pm:25
#, c-format
msgid ""
"_: Keep these entry short\n"
"Partitioning"
msgstr ""
-#: steps_list.pm:24
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
"Formatting"
msgstr ""
-#: steps_list.pm:25
+#: steps_list.pm:29
#, c-format
msgid ""
"_: Keep these entry short\n"
"Choosing packages"
msgstr ""
-#: steps_list.pm:26
+#: steps_list.pm:31
#, c-format
msgid ""
"_: Keep these entry short\n"
"Installing"
msgstr ""
-#: steps_list.pm:28
+#: steps_list.pm:34
#, c-format
msgid ""
"_: Keep these entry short\n"
"Users"
msgstr ""
-#: steps_list.pm:29
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr ""
-#: steps_list.pm:31
+#: steps_list.pm:38 steps_list.pm:39
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Bootloader"
+msgstr ""
+
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
"Configure X"
msgstr ""
-#: steps_list.pm:32
+#: steps_list.pm:42
#, c-format
msgid ""
"_: Keep these entry short\n"
"Summary"
msgstr ""
-#: steps_list.pm:33
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
"Services"
msgstr ""
-#: steps_list.pm:34
+#: steps_list.pm:46
#, c-format
msgid ""
"_: Keep these entry short\n"
"Updates"
msgstr ""
-#: steps_list.pm:35
+#: steps_list.pm:48
#, c-format
msgid ""
"_: Keep these entry short\n"
diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po
index cf131051a..abbdaa9d3 100644
--- a/perl-install/install/share/po/af.po
+++ b/perl-install/install/share/po/af.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-af\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 20:13+0200\n"
+"POT-Creation-Date: 2007-10-01 09:12+0200\n"
"PO-Revision-Date: 2005-04-21 17:33+0200\n"
"Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
"Language-Team: Afrikaans\n"
@@ -21,13 +21,13 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: any.pm:159
+#: any.pm:155
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
msgstr "Beskik u oor nog?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:162
+#: any.pm:158
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -36,113 +36,113 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:170
+#: any.pm:166
#, c-format
msgid "CD-ROM"
msgstr "CDROM"
-#: any.pm:171
+#: any.pm:167
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Netwerk %s"
-#: any.pm:172
+#: any.pm:168
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Netwerk %s"
-#: any.pm:173
+#: any.pm:169
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:215
+#: any.pm:211
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:221
+#: any.pm:217
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:232
+#: any.pm:228
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
-#: any.pm:237
+#: any.pm:233
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
-#: any.pm:247
+#: any.pm:243
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Kies 'n spieël waar die pakkette verkry kan word"
-#: any.pm:277
+#: any.pm:273
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:278
+#: any.pm:274
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:282
+#: any.pm:278
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:283
+#: any.pm:279
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:287
+#: any.pm:283
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:288
+#: any.pm:284
#, c-format
msgid "Directory"
msgstr "Gids"
-#: any.pm:310
+#: any.pm:306
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:345
+#: any.pm:341
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Kan nie %s op %s vind nie"
-#: any.pm:379
+#: any.pm:375
#, c-format
msgid "Looking at packages already installed..."
msgstr "Ondersoek pakette wat reeds geïnstalleer is..."
-#: any.pm:386
+#: any.pm:382
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:428
+#: any.pm:424
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Soek vir pakkette om op te gradeer..."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:614
+#: any.pm:610
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -166,7 +166,7 @@ msgstr ""
"Verlang u nog steeds hierdie dienste?\n"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:637
+#: any.pm:633
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -180,77 +180,77 @@ msgstr ""
"Wil u werklik dat ons hulle verwyder?\n"
#
-#: any.pm:1059
+#: any.pm:1055
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: any.pm:1061
+#: any.pm:1057
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "FTP"
msgstr "Ftp"
-#: any.pm:1118
+#: any.pm:1114
#, fuzzy, c-format
msgid "NFS"
msgstr "PFS"
-#: any.pm:1137 steps_interactive.pm:846
+#: any.pm:1133 steps_interactive.pm:922
#, c-format
msgid "Network"
msgstr "Netwerk"
-#: any.pm:1141
+#: any.pm:1137
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Kies asseblief"
-#: any.pm:1157
+#: any.pm:1153
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Lêer bestaan alreeds. Moet dit gebruik word?"
-#: any.pm:1161
+#: any.pm:1157
#, c-format
msgid "Permission denied"
msgstr "Toegang verbied"
-#: any.pm:1209
+#: any.pm:1205
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1230
+#: any.pm:1226
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1272
+#: any.pm:1269
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Kan nie skermfoto's neem voor partisie skep nie"
-#: any.pm:1279
+#: any.pm:1277
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s"
-#: gtk.pm:136
+#: gtk.pm:119
#, fuzzy, c-format
msgid "Installation"
msgstr "Besig met installasie"
-#: gtk.pm:139 share/meta-task/compssUsers.pl:54
+#: gtk.pm:122 share/meta-task/compssUsers.pl:42
#, c-format
msgid "Configuration"
msgstr "Konfigurasie"
@@ -279,57 +279,64 @@ msgstr "Netwerk op pad op"
msgid "Bringing down the network"
msgstr "Netwerk op pad af"
-#: media.pm:699 media.pm:710
+#: media.pm:703 media.pm:714
#, fuzzy, c-format
msgid "Downloading file %s..."
msgstr "Stuur lêers..."
-#: media.pm:804
+#: media.pm:808
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:857
+#: media.pm:861
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Bespeuring aan die gebeur"
-#: pkgs.pm:33
+#: pkgs.pm:28
#, c-format
msgid "must have"
msgstr "benodig"
-#: pkgs.pm:34
+#: pkgs.pm:29
#, c-format
msgid "important"
msgstr "belangrik"
-#: pkgs.pm:35
+#: pkgs.pm:30
#, c-format
msgid "very nice"
msgstr "baie oulik"
-#: pkgs.pm:36
+#: pkgs.pm:31
#, c-format
msgid "nice"
msgstr "oulik"
-#: pkgs.pm:37
+#: pkgs.pm:32
#, c-format
msgid "maybe"
msgstr "moontlik"
-#: share/meta-task/compssUsers.pl:23
+#: pkgs.pm:245
+#, c-format
+msgid ""
+"Some packages requested by %s cannot be installed:\n"
+"%s"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:11
#, c-format
msgid "Workstation"
msgstr "Werkstasie"
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Office Workstation"
msgstr "Kantoorwerkstasie"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -338,7 +345,7 @@ msgstr ""
"Kantoorprogramme: Woordverwerkers(OpenOffice.org Writer, Kword), spreistate "
"(OpenOffice.org Calc, Kspread), PDF-sigprogramme, ens."
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -347,32 +354,32 @@ msgstr ""
"Kantoorprogramme: Woordverwerkers( kword, abiword), spreistate (kspread, "
"gnumeric), PDF-sigprogramme, ens."
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:21
#, c-format
msgid "Game station"
msgstr "Speletjiesrekenaar"
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:22
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
-#: share/meta-task/compssUsers.pl:37
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Multimedia station"
msgstr "Multimediastasie"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:26
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Klank- en videospelers/redigeerders"
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:31
#, c-format
msgid "Internet station"
msgstr "Internetstasie"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:32
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -381,195 +388,195 @@ msgstr ""
"Stel hulpprogramme om e-pos en netnuus te lees en te stuur (mutt, tin) en om "
"ook die web deur te blaai."
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:37
#, c-format
msgid "Network Computer (client)"
msgstr "Netwerkrekenaar (kliënt)"
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:38
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH"
-#: share/meta-task/compssUsers.pl:55
+#: share/meta-task/compssUsers.pl:43
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik"
-#: share/meta-task/compssUsers.pl:59
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Console Tools"
msgstr "Konsole Hulpprogramme"
-#: share/meta-task/compssUsers.pl:60
+#: share/meta-task/compssUsers.pl:48
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
"Redigeerders. teksverwerkers, instruksiedoppe, lêer-nutsprogramme, terminaal-"
"programme"
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:166
-#: share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:155
#, c-format
msgid "Development"
msgstr "Ontwikkeling"
-#: share/meta-task/compssUsers.pl:65 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers"
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
#, c-format
msgid "Documentation"
msgstr "Dokumentasie"
-#: share/meta-task/compssUsers.pl:70 share/meta-task/compssUsers.pl:174
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:75 share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Derdeparty ondersteuning van programme"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:71
#, c-format
msgid "Web Server"
msgstr "Web-bediener"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:72
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:75
#, fuzzy, c-format
msgid "Groupware"
msgstr "Groep:"
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:76
#, c-format
msgid "Kolab Server"
msgstr "Kolab-bediener"
-#: share/meta-task/compssUsers.pl:92 share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
#, c-format
msgid "Firewall/Router"
msgstr "Vuurmuur/Netwerkroteerder"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
#, c-format
msgid "Internet gateway"
msgstr "Internetpoort"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:83
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Lêer/_Nuut"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:84
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix e-pos-bediener"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:87
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Herstel vanaf CD"
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "FTP Server"
msgstr "FTP-bediener"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:92
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:96
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domeinnaam en Netwerk-informasie-bediener (DNS/NIS)"
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:99
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Drukkerbediener"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:100
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba-bediener"
-#: share/meta-task/compssUsers.pl:116 share/meta-task/compssUsers.pl:129
+#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
#, c-format
msgid "Database"
msgstr "Databasis"
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:104
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL of MySQL databasisbediener"
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:108
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:109
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:112
#, c-format
msgid "Mail"
msgstr "e-Pos"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:113
#, c-format
msgid "Postfix mail server"
msgstr "Postfix e-pos-bediener"
-#: share/meta-task/compssUsers.pl:130
+#: share/meta-task/compssUsers.pl:117
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL of MySQL databasisbediener"
-#: share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:124
#, c-format
msgid "Network Computer server"
msgstr "Netwerkrekenaar-bediener"
-#: share/meta-task/compssUsers.pl:138
+#: share/meta-task/compssUsers.pl:125
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:131
#, c-format
msgid "Graphical Environment"
msgstr "Grafiese Omgewing"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "KDE Workstation"
msgstr "KDE Werkstasie"
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:134
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -578,12 +585,12 @@ msgstr ""
"Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
"versameling bygaande hulpprogramme"
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:138
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME-werkstasie"
-#: share/meta-task/compssUsers.pl:152
+#: share/meta-task/compssUsers.pl:139
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -592,57 +599,57 @@ msgstr ""
"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en "
"werkskerm-hulpprogramme"
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:142
#, fuzzy, c-format
msgid "IceWm Desktop"
msgstr "'n Werkstasie"
-#: share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:146
#, c-format
msgid "Other Graphical Desktops"
msgstr "Ander Grafiese Werkskerms"
-#: share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:147
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:170
#, c-format
msgid "Utilities"
msgstr "Nutsprogramme"
-#: share/meta-task/compssUsers.pl:185 share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
#, c-format
msgid "SSH Server"
msgstr "SSH-bediener"
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webkamera"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:178
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Terminal Server Konfigurasie"
-#: share/meta-task/compssUsers.pl:195
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Monitor van Netwerk"
-#: share/meta-task/compssUsers.pl:196
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:187
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>Mandriva Store</b>"
-#: share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:188
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Probleme met die konfigurasie van drukker \" %s\"!"
@@ -656,7 +663,7 @@ msgstr ""
"'n Fout het plaasgevind en ek weet nie hoe om dit veilig te hanteer\n"
"nie. Gaan op u eie risiko voort."
-#: steps.pm:432
+#: steps.pm:433
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -684,46 +691,7 @@ msgstr "Mandriva Linux Installasie %s"
msgid "<Tab>/<Alt-Tab> between elements"
msgstr "<Tab>/<Alt-Tab> tussen elemente"
-#: steps_gtk.pm:155 steps_gtk.pm:156
-#, c-format
-msgid "Localization"
-msgstr ""
-
-#: steps_gtk.pm:159 steps_list.pm:20
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Installation class"
-msgstr ""
-
-#: steps_gtk.pm:160 steps_gtk.pm:243 steps_interactive.pm:511
-#, c-format
-msgid "Package Group Selection"
-msgstr "Kies Pakketgroepe"
-
-#: steps_gtk.pm:161 steps_gtk.pm:460 steps_interactive.pm:543
-#, c-format
-msgid "Installing"
-msgstr "Besig met installasie"
-
-#: steps_gtk.pm:162 steps_gtk.pm:576 steps_interactive.pm:735
-#, c-format
-msgid "Summary"
-msgstr "Opsomming"
-
-#: steps_gtk.pm:164 steps_gtk.pm:165 steps_list.pm:30
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Bootloader"
-msgstr "Herlaaistelsel"
-
-#: steps_gtk.pm:166 steps_interactive.pm:644
-#, c-format
-msgid "Updates"
-msgstr ""
-
-#: steps_gtk.pm:213
+#: steps_gtk.pm:189
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -738,67 +706,73 @@ msgstr ""
"'F1' druk wanneer u vanaf die CDROM herlaai en dan 'text' op die\n"
"instruksielyn intik."
-#: steps_gtk.pm:264 steps_interactive.pm:529
+#: steps_gtk.pm:256 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_list.pm:30
+#, c-format
+msgid "Package Group Selection"
+msgstr "Kies Pakketgroepe"
+
+#: steps_gtk.pm:277 steps_interactive.pm:581
#, c-format
msgid "Individual package selection"
msgstr "Individuele pakket-seleksie"
-#: steps_gtk.pm:268 steps_interactive.pm:454
+#: steps_gtk.pm:299 steps_interactive.pm:507
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Totale grootte: %d / %d MB"
-#: steps_gtk.pm:313
+#: steps_gtk.pm:344
#, c-format
msgid "Bad package"
msgstr "Foutiewe pakket"
-#: steps_gtk.pm:315
+#: steps_gtk.pm:346
#, c-format
msgid "Version: "
msgstr "Weergawe: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "Size: "
msgstr "Grootte: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:317
+#: steps_gtk.pm:348
#, c-format
msgid "Importance: "
msgstr "Belangrikheid: "
-#: steps_gtk.pm:351
+#: steps_gtk.pm:382
#, c-format
msgid "You can not select/unselect this package"
msgstr "U kan nie hierdie pakket selekteer/deselekteer nie"
-#: steps_gtk.pm:355
+#: steps_gtk.pm:386
#, c-format
msgid "due to missing %s"
msgstr "deur %s wat soek is"
-#: steps_gtk.pm:356
+#: steps_gtk.pm:387
#, c-format
msgid "due to unsatisfied %s"
msgstr "deur problematiese %s"
-#: steps_gtk.pm:357
+#: steps_gtk.pm:388
#, c-format
msgid "trying to promote %s"
msgstr "probeer promosie van %s"
-#: steps_gtk.pm:358
+#: steps_gtk.pm:389
#, c-format
msgid "in order to keep %s"
msgstr "om %s te kan behou"
-#: steps_gtk.pm:363
+#: steps_gtk.pm:394
#, c-format
msgid ""
"You can not select this package as there is not enough space left to install "
@@ -807,106 +781,116 @@ msgstr ""
"U kan nie hierdie pakket selekteer nie, omdat daar nie meer spasie "
"beskikbaar is nie"
-#: steps_gtk.pm:366
+#: steps_gtk.pm:397
#, c-format
msgid "The following packages are going to be installed"
msgstr "Ons gaan die volgende pakette installeer"
-#: steps_gtk.pm:367
+#: steps_gtk.pm:398
#, c-format
msgid "The following packages are going to be removed"
msgstr "Die volgende pakkette gaan verwyder word"
-#: steps_gtk.pm:392
+#: steps_gtk.pm:423
#, c-format
msgid "This is a mandatory package, it can not be unselected"
msgstr "Hierdie is 'n verpligte pakket. Dit kan nie uitgehaal word nie."
-#: steps_gtk.pm:394
+#: steps_gtk.pm:425
#, c-format
msgid "You can not unselect this package. It is already installed"
msgstr "U kan nie heirdie pakket verwyder nie. Dis alreeds geïnstalleer"
-#: steps_gtk.pm:396
+#: steps_gtk.pm:427
#, c-format
msgid "You can not unselect this package. It must be upgraded"
msgstr "U kan nie hierdie pakket deselekteer nie. Dit moet opgradeer word."
-#: steps_gtk.pm:400
+#: steps_gtk.pm:431
#, c-format
msgid "Show automatically selected packages"
msgstr "Wys outogeselekteerde pakkette."
-#: steps_gtk.pm:402 steps_interactive.pm:133
+#: steps_gtk.pm:433
#, c-format
msgid "Install"
msgstr "Installasie"
-#: steps_gtk.pm:405
+#: steps_gtk.pm:436
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "Pakketkeuse"
-#: steps_gtk.pm:406
+#: steps_gtk.pm:437
#, c-format
msgid "Updating package selection"
msgstr "Pakketseleksie word opgedateer"
-#: steps_gtk.pm:411
+#: steps_gtk.pm:442
#, c-format
msgid "Minimal install"
msgstr "Minimale installasie"
-#: steps_gtk.pm:425
+#: steps_gtk.pm:456
#, c-format
msgid "Software Management"
msgstr "Sagteware Beheer"
-#: steps_gtk.pm:425 steps_interactive.pm:373
+#: steps_gtk.pm:456 steps_interactive.pm:393
#, c-format
msgid "Choose the packages you want to install"
msgstr "Kies die pakkette wat u wil installeer"
-#: steps_gtk.pm:487
+#: steps_gtk.pm:473 steps_interactive.pm:595 steps_list.pm:32
+#, c-format
+msgid "Installing"
+msgstr "Besig met installasie"
+
+#: steps_gtk.pm:499
#, c-format
msgid "No details"
msgstr "Geen Detail"
-#: steps_gtk.pm:483
+#: steps_gtk.pm:514
#, c-format
msgid "Time remaining "
msgstr "Tyd oor "
-#: steps_gtk.pm:484
+#: steps_gtk.pm:515
#, c-format
msgid "Estimating"
msgstr "Skatting"
-#: steps_gtk.pm:511
+#: steps_gtk.pm:542
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d pakket"
msgstr[1] "%d pakkette"
-#: steps_gtk.pm:589
+#: steps_gtk.pm:588 steps_interactive.pm:782 steps_list.pm:43
+#, c-format
+msgid "Summary"
+msgstr "Opsomming"
+
+#: steps_gtk.pm:605
#, c-format
msgid "Configure"
msgstr "Konfigureer"
-#: steps_gtk.pm:580 steps_interactive.pm:731 steps_interactive.pm:858
+#: steps_gtk.pm:622 steps_interactive.pm:778 steps_interactive.pm:934
#, c-format
msgid "not configured"
msgstr "nie gekonfigureer nie"
-#: steps_gtk.pm:612 steps_interactive.pm:268
+#: steps_gtk.pm:658 steps_interactive.pm:278
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:621 steps_interactive.pm:274
+#: steps_gtk.pm:667 steps_interactive.pm:284
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -915,7 +899,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:623 steps_interactive.pm:276
+#: steps_gtk.pm:669 steps_interactive.pm:286
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -935,12 +919,12 @@ msgstr "Kies asseblief u sleutelborduitleg."
msgid "Here is the full list of available keyboards"
msgstr "Hier is die volle lys van beskikbare lande"
-#: steps_interactive.pm:128
+#: steps_interactive.pm:129
#, c-format
msgid "Install/Upgrade"
msgstr "Installeer/Opgradeer"
-#: steps_interactive.pm:129
+#: steps_interactive.pm:130
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Is hierdie 'n installasie of opgradering?"
@@ -952,27 +936,37 @@ msgid ""
"Install"
msgstr "Installasie"
-#: steps_interactive.pm:137
+#: steps_interactive.pm:136
#, c-format
msgid "Upgrade %s"
msgstr "Opgradeer %s"
-#: steps_interactive.pm:148
+#: steps_interactive.pm:140
+#, c-format
+msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:144
+#, c-format
+msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:158
#, c-format
msgid "Encryption key for %s"
msgstr "Enkripsie-sleutel vir %s"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "Configuring IDE"
msgstr "IDE word opgestel"
-#: steps_interactive.pm:221
+#: steps_interactive.pm:231
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -982,7 +976,7 @@ msgstr ""
"sal herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
"herlaai."
-#: steps_interactive.pm:226
+#: steps_interactive.pm:236
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -993,7 +987,7 @@ msgstr ""
"sal herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
"herlaai."
-#: steps_interactive.pm:318
+#: steps_interactive.pm:328
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1007,19 +1001,19 @@ msgstr ""
"nie\n"
"hieroor beskik nie, druk Kanselleer om installasies vanaf dié CDROM te vermy."
-#: steps_interactive.pm:340
+#: steps_interactive.pm:350
#, c-format
msgid "Looking for available packages..."
msgstr "Soek vir beskikbare pakkette"
-#: steps_interactive.pm:349
+#: steps_interactive.pm:358
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:385
+#: steps_interactive.pm:405
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1028,52 +1022,52 @@ msgstr ""
"Kies asb. die laai of stoor pakketkeuse op die floppie.\n"
"Die formaat is dieselfde as outoinstallasie-genereerde floppies."
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Load"
msgstr "Las"
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Save"
msgstr "Stoor"
-#: steps_interactive.pm:395
+#: steps_interactive.pm:415
#, fuzzy, c-format
msgid "Bad file"
msgstr "Laai lêer"
-#: steps_interactive.pm:413
+#: steps_interactive.pm:431
#, c-format
msgid "Install Mandriva KDE Desktop"
msgstr ""
-#: steps_interactive.pm:414
+#: steps_interactive.pm:432
#, c-format
msgid "Install Mandriva GNOME Desktop"
msgstr ""
-#: steps_interactive.pm:415
+#: steps_interactive.pm:433
#, fuzzy, c-format
msgid "Custom install"
msgstr "Minimale installasie"
-#: steps_interactive.pm:418
+#: steps_interactive.pm:436
#, c-format
msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
msgstr ""
-#: steps_interactive.pm:503
+#: steps_interactive.pm:521
#, c-format
msgid "Selected size is larger than available space"
msgstr "Geselekteerde grootte is groter as beskikbare spasie."
-#: steps_interactive.pm:483
+#: steps_interactive.pm:536
#, c-format
msgid "Type of install"
msgstr "Tipe installasie"
-#: steps_interactive.pm:484
+#: steps_interactive.pm:537
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1082,82 +1076,82 @@ msgstr ""
"U het glad nie 'n groep pakkette gekies nie.\n"
"Kies asseblief die tipe minimale installasie:"
-#: steps_interactive.pm:487
+#: steps_interactive.pm:540
#, c-format
msgid "With X"
msgstr "Met X"
-#: steps_interactive.pm:488
+#: steps_interactive.pm:541
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Met basiese dokumentasie (word aanbeveel!)"
-#: steps_interactive.pm:489
+#: steps_interactive.pm:542
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Absolute minimale installasie (geen urpmi!)"
-#: steps_interactive.pm:528
-#, c-format
-msgid "All"
-msgstr "Alles"
-
-#: steps_interactive.pm:544
+#: steps_interactive.pm:596
#, c-format
msgid "Preparing installation"
msgstr "Berei installasie voor"
-#: steps_interactive.pm:552
+#: steps_interactive.pm:604
#, c-format
msgid "Installing package %s"
msgstr "Installeer pakket %s"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "There was an error ordering packages:"
msgstr "Daar was 'n fout met pakkette:"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "Go on anyway?"
msgstr "Gaan steeds voort?"
-#: steps_interactive.pm:580
+#: steps_interactive.pm:632
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:581
+#: steps_interactive.pm:633
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:634
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:635
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Stoor pakketseleksie"
-#: steps_interactive.pm:586
+#: steps_interactive.pm:638
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Daar was 'n fout met die installasie van die pakkette:"
-#: steps_interactive.pm:604
+#: steps_interactive.pm:656
#, c-format
msgid "Post-install configuration"
msgstr "Post-installasiekonfigurasie"
-#: steps_interactive.pm:611
+#: steps_interactive.pm:663
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:645
+#: steps_interactive.pm:691 steps_list.pm:47
+#, c-format
+msgid "Updates"
+msgstr ""
+
+#: steps_interactive.pm:692
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1177,107 +1171,102 @@ msgstr ""
"\n"
"Wil u dit nou installeer?"
-#: steps_interactive.pm:666
+#: steps_interactive.pm:713
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "Spieël word gekontak vir die lys van pakkette..."
-#: steps_interactive.pm:672
+#: steps_interactive.pm:719
#, c-format
msgid "Unable to contact mirror %s"
msgstr "Kon nie die spieëlwebplek %s kontak nie"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:777
+#: steps_interactive.pm:825
#, c-format
msgid "%s on %s"
msgstr "%s op %s"
-#: steps_interactive.pm:810 steps_interactive.pm:817 steps_interactive.pm:830
-#: steps_interactive.pm:847 steps_interactive.pm:863 steps_interactive.pm:874
+#: steps_interactive.pm:859 steps_interactive.pm:866 steps_interactive.pm:880
+#: steps_interactive.pm:898 steps_interactive.pm:913
#, c-format
msgid "Hardware"
msgstr "Hardeware"
-#: steps_interactive.pm:795 steps_interactive.pm:812
+#: steps_interactive.pm:881 steps_interactive.pm:899
#, c-format
msgid "Sound card"
msgstr "Klankkaart"
-#: steps_interactive.pm:815
+#: steps_interactive.pm:902
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Beskik u oor 'n ISA klankkaart?"
-#: steps_interactive.pm:817
+#: steps_interactive.pm:904
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "Loop \"sndconfig\" na die installasie om u klankkaart te konfigureer"
-#: steps_interactive.pm:819
+#: steps_interactive.pm:906
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Geen klankkaart opgespoor nie. Probeer \"harddrake\" na die installasie"
-#: steps_interactive.pm:828
-#, c-format
-msgid "TV card"
-msgstr "TV-kaart"
-
-#: steps_interactive.pm:839
+#: steps_interactive.pm:914
#, c-format
msgid "Graphical interface"
msgstr "Grafiese-koppelvlak"
-#: steps_interactive.pm:845 steps_interactive.pm:856
+#: steps_interactive.pm:921 steps_interactive.pm:932
#, c-format
msgid "Network & Internet"
msgstr "Netwerk & Internet"
-#: steps_interactive.pm:857
+#: steps_interactive.pm:933
#, c-format
msgid "Proxies"
msgstr "Instaan bedieners"
-#: steps_interactive.pm:858
+#: steps_interactive.pm:934
#, c-format
msgid "configured"
msgstr "gekonfigureer"
-#: steps_interactive.pm:868
+#: steps_interactive.pm:944
#, c-format
msgid "Security Level"
msgstr "Sekuriteitsvlak"
-#: steps_interactive.pm:882
+#: steps_interactive.pm:963
#, c-format
msgid "Firewall"
msgstr "Vuurmuur"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "activated"
msgstr "ge-aktiveer"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "disabled"
msgstr "ge-deaktiveer"
-#: steps_interactive.pm:939
+#: steps_interactive.pm:981
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "U het nog nie 'X' opgestel nie. Verlang u dit regtig?"
-#: steps_interactive.pm:973
+#: steps_interactive.pm:1008
#, c-format
msgid "Preparing bootloader..."
msgstr "Herlaaistelsel word voorberei..."
-#: steps_interactive.pm:983
+#: steps_interactive.pm:1018
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1290,12 +1279,12 @@ msgstr ""
"Ons sal voortgaan met die installasie, maar u sal\n"
"BootX of 'n ander manier moet gedruik om u rekenaar te selflaai"
-#: steps_interactive.pm:989
+#: steps_interactive.pm:1024
#, c-format
msgid "Do you want to use aboot?"
msgstr "Wil u aboot gebruik?"
-#: steps_interactive.pm:992
+#: steps_interactive.pm:1027
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -1304,7 +1293,7 @@ msgstr ""
"Die 'aboot' installasie het gefaal. Wil u 'n installasie afwurg al\n"
"word die eerste partisie vernietig?"
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1039
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1313,17 +1302,17 @@ msgstr ""
"Met hierdie sekuriteitsvlak word toegang na lêers op die Windows partisie "
"vernou na slegs die administrateur"
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1071
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sit 'n leë floppie in aandrywer %s"
-#: steps_interactive.pm:1040
+#: steps_interactive.pm:1073
#, c-format
msgid "Creating auto install floppy..."
msgstr "Outoinstallasieskyf word geskep."
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1084
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1334,22 +1323,22 @@ msgstr ""
"\n"
"Wil u werklik nou eindig?"
-#: steps_interactive.pm:1061
+#: steps_interactive.pm:1094
#, c-format
msgid "Congratulations"
msgstr "Geluk"
-#: steps_interactive.pm:1065
+#: steps_interactive.pm:1098
#, c-format
msgid "Reboot"
msgstr "Herlaai"
-#: steps_interactive.pm:1069 steps_interactive.pm:1070
+#: steps_interactive.pm:1102 steps_interactive.pm:1103
#, c-format
msgid "Generate auto install floppy"
msgstr "Skep outoinstallasieskyf"
-#: steps_interactive.pm:1071
+#: steps_interactive.pm:1104
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -1364,17 +1353,17 @@ msgstr ""
"\n"
"U mag verkies om hierdie installasie elders te herhaal.\n"
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Replay"
msgstr "Herspeel"
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Automated"
msgstr "Outomaties"
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1112
#, c-format
msgid "Save packages selection"
msgstr "Stoor pakketseleksie"
@@ -1387,6 +1376,11 @@ msgid ""
"Language"
msgstr "Taal"
+#: steps_list.pm:16 steps_list.pm:23
+#, c-format
+msgid "Localization"
+msgstr ""
+
#: steps_list.pm:17
#, c-format
msgid ""
@@ -1401,104 +1395,124 @@ msgid ""
"Mouse"
msgstr "Muis"
-#: steps_list.pm:19
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr "Hardeskyf-speuring."
-#: steps_list.pm:21
+#: steps_list.pm:21 steps_list.pm:22
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Installation class"
+msgstr ""
+
+#: steps_list.pm:23
#, c-format
msgid ""
"_: Keep these entry short\n"
"Keyboard"
msgstr "Sleutelbord"
-#: steps_list.pm:22
+#: steps_list.pm:24
#, c-format
msgid ""
"_: Keep these entry short\n"
"Security"
msgstr "Sekuriteit"
-#: steps_list.pm:23
+#: steps_list.pm:25
#, c-format
msgid ""
"_: Keep these entry short\n"
"Partitioning"
msgstr "Partisionering"
-#: steps_list.pm:24
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
"Formatting"
msgstr ""
-#: steps_list.pm:25
+#: steps_list.pm:29
#, c-format
msgid ""
"_: Keep these entry short\n"
"Choosing packages"
msgstr ""
-#: steps_list.pm:26
+#: steps_list.pm:31
#, c-format
msgid ""
"_: Keep these entry short\n"
"Installing"
msgstr "Besig met installasie"
-#: steps_list.pm:28
+#: steps_list.pm:34
#, c-format
msgid ""
"_: Keep these entry short\n"
"Users"
msgstr "Gebruikers"
-#: steps_list.pm:29
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr "Netwerk"
-#: steps_list.pm:31
+#: steps_list.pm:38 steps_list.pm:39
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Bootloader"
+msgstr "Herlaaistelsel"
+
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
"Configure X"
msgstr "Stel X op"
-#: steps_list.pm:32
+#: steps_list.pm:42
#, c-format
msgid ""
"_: Keep these entry short\n"
"Summary"
msgstr "Opsomming"
-#: steps_list.pm:33
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
"Services"
msgstr "Dienste"
-#: steps_list.pm:34
+#: steps_list.pm:46
#, c-format
msgid ""
"_: Keep these entry short\n"
"Updates"
msgstr ""
-#: steps_list.pm:35
+#: steps_list.pm:48
#, c-format
msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "Verlaat"
+#~ msgid "All"
+#~ msgstr "Alles"
+
+#~ msgid "TV card"
+#~ msgstr "TV-kaart"
+
#~ msgid "Boot"
#~ msgstr "Selflaai"
diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po
index 417a97ea9..eb2ef5f6b 100644
--- a/perl-install/install/share/po/am.po
+++ b/perl-install/install/share/po/am.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 20:13+0200\n"
+"POT-Creation-Date: 2007-10-01 09:12+0200\n"
"PO-Revision-Date: 2004-06-01 03:36+0100\n"
"Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
"Language-Team: Amharic <am-translate@geez.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: any.pm:159
+#: any.pm:155
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
msgstr "ሌላ አለ?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:162
+#: any.pm:158
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -29,113 +29,113 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:170
+#: any.pm:166
#, c-format
msgid "CD-ROM"
msgstr "ሲዲ-ሮም"
-#: any.pm:171
+#: any.pm:167
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "መረብ"
-#: any.pm:172
+#: any.pm:168
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "መረብ"
-#: any.pm:173
+#: any.pm:169
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:215
+#: any.pm:211
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:221
+#: any.pm:217
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:232
+#: any.pm:228
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:237
+#: any.pm:233
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr ""
-#: any.pm:247
+#: any.pm:243
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:277
+#: any.pm:273
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:278
+#: any.pm:274
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:282
+#: any.pm:278
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:283
+#: any.pm:279
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:287
+#: any.pm:283
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:288
+#: any.pm:284
#, c-format
msgid "Directory"
msgstr "ዶሴ"
-#: any.pm:310
+#: any.pm:306
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:345
+#: any.pm:341
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
-#: any.pm:379
+#: any.pm:375
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:386
+#: any.pm:382
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:428
+#: any.pm:424
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:614
+#: any.pm:610
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -150,7 +150,7 @@ msgid ""
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:637
+#: any.pm:633
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -159,77 +159,77 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:1059
+#: any.pm:1055
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው"
-#: any.pm:1061
+#: any.pm:1057
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1137 steps_interactive.pm:846
+#: any.pm:1133 steps_interactive.pm:922
#, c-format
msgid "Network"
msgstr "መረብ"
-#: any.pm:1141
+#: any.pm:1137
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "እባክዎ ያለ ሰነድን ይምረጡ"
-#: any.pm:1157
+#: any.pm:1153
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "ፋይሉ በፊትም ነበር። ልጠቀምበት?"
-#: any.pm:1161
+#: any.pm:1157
#, c-format
msgid "Permission denied"
msgstr "ፈቃድ አልተሰጠም"
-#: any.pm:1209
+#: any.pm:1205
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1230
+#: any.pm:1226
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "ፋይል ተጭኗል %s"
-#: any.pm:1272
+#: any.pm:1269
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr ""
-#: any.pm:1279
+#: any.pm:1277
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
-#: gtk.pm:136
+#: gtk.pm:119
#, fuzzy, c-format
msgid "Installation"
msgstr "በመትከል ላይ"
-#: gtk.pm:139 share/meta-task/compssUsers.pl:54
+#: gtk.pm:122 share/meta-task/compssUsers.pl:42
#, c-format
msgid "Configuration"
msgstr "ስየማ"
@@ -256,358 +256,365 @@ msgstr "መረቡን በማቀራረብ ላይ"
msgid "Bringing down the network"
msgstr "መረቡን በማለያየት ላይ"
-#: media.pm:699 media.pm:710
+#: media.pm:703 media.pm:714
#, fuzzy, c-format
msgid "Downloading file %s..."
msgstr "የቅርብ ጊዜ ፋይሎች"
-#: media.pm:804
+#: media.pm:808
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:857
+#: media.pm:861
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "የተሻሻለ ዊድጌት ፍጠር"
-#: pkgs.pm:33
+#: pkgs.pm:28
#, c-format
msgid "must have"
msgstr ""
-#: pkgs.pm:34
+#: pkgs.pm:29
#, c-format
msgid "important"
msgstr "አስፈላጊ"
-#: pkgs.pm:35
+#: pkgs.pm:30
#, c-format
msgid "very nice"
msgstr "በጣም ጥሩ"
-#: pkgs.pm:36
+#: pkgs.pm:31
#, c-format
msgid "nice"
msgstr "ጥሩ"
-#: pkgs.pm:37
+#: pkgs.pm:32
#, c-format
msgid "maybe"
msgstr "ምናልባት"
-#: share/meta-task/compssUsers.pl:23
+#: pkgs.pm:245
+#, c-format
+msgid ""
+"Some packages requested by %s cannot be installed:\n"
+"%s"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:11
#, c-format
msgid "Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:21
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:22
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:37
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Multimedia station"
msgstr ""
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:26
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:31
#, c-format
msgid "Internet station"
msgstr ""
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:32
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:37
#, c-format
msgid "Network Computer (client)"
msgstr ""
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:38
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:55
+#: share/meta-task/compssUsers.pl:43
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:59
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Console Tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:60
+#: share/meta-task/compssUsers.pl:48
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:166
-#: share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:155
#, c-format
msgid "Development"
msgstr "እድገት"
-#: share/meta-task/compssUsers.pl:65 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
#, c-format
msgid "Documentation"
msgstr "ማስረጃ"
-#: share/meta-task/compssUsers.pl:70 share/meta-task/compssUsers.pl:174
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:75 share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:71
#, c-format
msgid "Web Server"
msgstr "የመረብ ሰርቨር"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:72
#, fuzzy, c-format
msgid "Apache"
msgstr "መተላለፊያ"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:75
#, fuzzy, c-format
msgid "Groupware"
msgstr "የውይይት መድረክ"
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:76
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "የሳምባ ተጠሪ"
-#: share/meta-task/compssUsers.pl:92 share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
#, c-format
msgid "Firewall/Router"
msgstr ""
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
#, c-format
msgid "Internet gateway"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:83
#, fuzzy, c-format
msgid "Mail/News"
msgstr "አዲስ ፋይል።"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:84
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "የመልዕክት ተጠሪ ሚስጢራዊ ቃል ያስፈልጋል"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:87
#, fuzzy, c-format
msgid "Directory Server"
msgstr "በዝርዝር ውስጥ ዶሴ ጨምር"
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "FTP Server"
msgstr "የFTP ተጠሪ"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:92
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:96
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "የዘርፍ ስም ሰርቨር"
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:99
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "የማተሚያ ሰርቨር"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:100
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "የሳምባ ሰርቨር"
-#: share/meta-task/compssUsers.pl:116 share/meta-task/compssUsers.pl:129
+#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
#, c-format
msgid "Database"
msgstr "ዳታቤዝ"
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:104
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:108
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:109
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:112
#, c-format
msgid "Mail"
msgstr "ፖስታ"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:113
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:130
+#: share/meta-task/compssUsers.pl:117
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:124
#, c-format
msgid "Network Computer server"
msgstr ""
-#: share/meta-task/compssUsers.pl:138
+#: share/meta-task/compssUsers.pl:125
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:131
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "KDE Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:134
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:138
#, c-format
msgid "GNOME Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:152
+#: share/meta-task/compssUsers.pl:139
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:142
#, fuzzy, c-format
msgid "IceWm Desktop"
msgstr "ሰሌዳ"
-#: share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:146
#, c-format
msgid "Other Graphical Desktops"
msgstr ""
-#: share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:147
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:170
#, fuzzy, c-format
msgid "Utilities"
msgstr "ፊሊፒንስ"
-#: share/meta-task/compssUsers.pl:185 share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
#, fuzzy, c-format
msgid "SSH Server"
msgstr "ስለተጠሪ መረጃ"
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "Webmin"
msgstr "ዌብ-ካም"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:178
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "ቀዳሚ ተጠሪ ይጠቀም"
-#: share/meta-task/compssUsers.pl:195
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Name=መረብ"
-#: share/meta-task/compssUsers.pl:196
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:187
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>የMandriva Linux ባለሞያ</b>"
-#: share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:188
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "የባሕር-መዝገብ እሴት '%s' ወደ '%s' እንደገና መሰየም አልተቻለም።"
@@ -619,7 +626,7 @@ msgid ""
"Continue at your own risk."
msgstr ""
-#: steps.pm:432
+#: steps.pm:433
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -643,46 +650,7 @@ msgstr "የMandriva Linux ተከላ %s"
msgid "<Tab>/<Alt-Tab> between elements"
msgstr ""
-#: steps_gtk.pm:155 steps_gtk.pm:156
-#, c-format
-msgid "Localization"
-msgstr ""
-
-#: steps_gtk.pm:159 steps_list.pm:20
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Installation class"
-msgstr ""
-
-#: steps_gtk.pm:160 steps_gtk.pm:243 steps_interactive.pm:511
-#, c-format
-msgid "Package Group Selection"
-msgstr "የጥቅል ቡድን ምርጫ"
-
-#: steps_gtk.pm:161 steps_gtk.pm:460 steps_interactive.pm:543
-#, c-format
-msgid "Installing"
-msgstr "በመትከል ላይ"
-
-#: steps_gtk.pm:162 steps_gtk.pm:576 steps_interactive.pm:735
-#, c-format
-msgid "Summary"
-msgstr "ማጠቃለያ"
-
-#: steps_gtk.pm:164 steps_gtk.pm:165 steps_list.pm:30
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Bootloader"
-msgstr "አስጀማሪያ"
-
-#: steps_gtk.pm:166 steps_interactive.pm:644
-#, c-format
-msgid "Updates"
-msgstr "አሻሻዎች"
-
-#: steps_gtk.pm:213
+#: steps_gtk.pm:189
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -691,173 +659,189 @@ msgid ""
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
-#: steps_gtk.pm:264 steps_interactive.pm:529
+#: steps_gtk.pm:256 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_list.pm:30
+#, c-format
+msgid "Package Group Selection"
+msgstr "የጥቅል ቡድን ምርጫ"
+
+#: steps_gtk.pm:277 steps_interactive.pm:581
#, c-format
msgid "Individual package selection"
msgstr "የነጠላ ጥቅል ምርጫ"
-#: steps_gtk.pm:268 steps_interactive.pm:454
+#: steps_gtk.pm:299 steps_interactive.pm:507
#, c-format
msgid "Total size: %d / %d MB"
msgstr "አጠቃላይ መጠን: %d / %d MB"
-#: steps_gtk.pm:313
+#: steps_gtk.pm:344
#, c-format
msgid "Bad package"
msgstr "ትክክል ያልሆነ ጥቅል"
-#: steps_gtk.pm:315
+#: steps_gtk.pm:346
#, c-format
msgid "Version: "
msgstr "ዝርያ: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "Size: "
msgstr "መጠን: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:317
+#: steps_gtk.pm:348
#, c-format
msgid "Importance: "
msgstr "አስፈላጊነት: "
-#: steps_gtk.pm:351
+#: steps_gtk.pm:382
#, c-format
msgid "You can not select/unselect this package"
msgstr "ይህን ጥቅል መምረጥ/አለመምረጥ አይችሉም"
-#: steps_gtk.pm:355
+#: steps_gtk.pm:386
#, c-format
msgid "due to missing %s"
msgstr "%s ባለመገኘቱ ምክንያት"
-#: steps_gtk.pm:356
+#: steps_gtk.pm:387
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s አጥጋቢ ባለመሆኑ ምክንያት"
-#: steps_gtk.pm:357
+#: steps_gtk.pm:388
#, c-format
msgid "trying to promote %s"
msgstr "%sን ለማስተዋወቅ በመሞከር ላይ"
-#: steps_gtk.pm:358
+#: steps_gtk.pm:389
#, c-format
msgid "in order to keep %s"
msgstr "%sን ለማቆየት"
-#: steps_gtk.pm:363
+#: steps_gtk.pm:394
#, c-format
msgid ""
"You can not select this package as there is not enough space left to install "
"it"
msgstr ""
-#: steps_gtk.pm:366
+#: steps_gtk.pm:397
#, c-format
msgid "The following packages are going to be installed"
msgstr "የሚከተሉት ጥቅሎች ሊተከሉ ነው"
-#: steps_gtk.pm:367
+#: steps_gtk.pm:398
#, c-format
msgid "The following packages are going to be removed"
msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው"
-#: steps_gtk.pm:392
+#: steps_gtk.pm:423
#, c-format
msgid "This is a mandatory package, it can not be unselected"
msgstr ""
-#: steps_gtk.pm:394
+#: steps_gtk.pm:425
#, c-format
msgid "You can not unselect this package. It is already installed"
msgstr "ይህንን ጥቅል መምረጥ አይችሉም። ቀደም ብሎ ተተክሏል።"
-#: steps_gtk.pm:396
+#: steps_gtk.pm:427
#, c-format
msgid "You can not unselect this package. It must be upgraded"
msgstr ""
-#: steps_gtk.pm:400
+#: steps_gtk.pm:431
#, c-format
msgid "Show automatically selected packages"
msgstr ""
-#: steps_gtk.pm:402 steps_interactive.pm:133
+#: steps_gtk.pm:433
#, c-format
msgid "Install"
msgstr "ትከል"
-#: steps_gtk.pm:405
+#: steps_gtk.pm:436
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "የጥቅል ምርጫ"
-#: steps_gtk.pm:406
+#: steps_gtk.pm:437
#, c-format
msgid "Updating package selection"
msgstr "የጥቅል ምርጫ በማሻሻል ላይ"
-#: steps_gtk.pm:411
+#: steps_gtk.pm:442
#, c-format
msgid "Minimal install"
msgstr "አነስተኛ ተከላ"
-#: steps_gtk.pm:425
+#: steps_gtk.pm:456
#, c-format
msgid "Software Management"
msgstr ""
-#: steps_gtk.pm:425 steps_interactive.pm:373
+#: steps_gtk.pm:456 steps_interactive.pm:393
#, c-format
msgid "Choose the packages you want to install"
msgstr "ለመትከል የሚፈልጉትን ጥቅል ይምረጡ"
-#: steps_gtk.pm:487
+#: steps_gtk.pm:473 steps_interactive.pm:595 steps_list.pm:32
+#, c-format
+msgid "Installing"
+msgstr "በመትከል ላይ"
+
+#: steps_gtk.pm:499
#, c-format
msgid "No details"
msgstr "ያለ ዝርዝሮች"
-#: steps_gtk.pm:483
+#: steps_gtk.pm:514
#, c-format
msgid "Time remaining "
msgstr " ይቀራል"
-#: steps_gtk.pm:484
+#: steps_gtk.pm:515
#, c-format
msgid "Estimating"
msgstr "በግምት"
-#: steps_gtk.pm:511
+#: steps_gtk.pm:542
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d ጥቅሎች"
msgstr[1] "%d ጥቅሎች"
-#: steps_gtk.pm:589
+#: steps_gtk.pm:588 steps_interactive.pm:782 steps_list.pm:43
+#, c-format
+msgid "Summary"
+msgstr "ማጠቃለያ"
+
+#: steps_gtk.pm:605
#, c-format
msgid "Configure"
msgstr "ለውጥ"
-#: steps_gtk.pm:580 steps_interactive.pm:731 steps_interactive.pm:858
+#: steps_gtk.pm:622 steps_interactive.pm:778 steps_interactive.pm:934
#, c-format
msgid "not configured"
msgstr "አልተስተካከለም"
-#: steps_gtk.pm:612 steps_interactive.pm:268
+#: steps_gtk.pm:658 steps_interactive.pm:278
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:621 steps_interactive.pm:274
+#: steps_gtk.pm:667 steps_interactive.pm:284
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -866,7 +850,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:623 steps_interactive.pm:276
+#: steps_gtk.pm:669 steps_interactive.pm:286
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -886,12 +870,12 @@ msgstr ""
msgid "Here is the full list of available keyboards"
msgstr ""
-#: steps_interactive.pm:128
+#: steps_interactive.pm:129
#, c-format
msgid "Install/Upgrade"
msgstr "ትከል/አሳድግ"
-#: steps_interactive.pm:129
+#: steps_interactive.pm:130
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
@@ -903,34 +887,44 @@ msgid ""
"Install"
msgstr "ትከል"
-#: steps_interactive.pm:137
+#: steps_interactive.pm:136
#, c-format
msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:148
+#: steps_interactive.pm:140
+#, c-format
+msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:144
+#, c-format
+msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:158
#, c-format
msgid "Encryption key for %s"
msgstr "የ%s ሚስጢራዊ መገልበጫ ቁልፍ"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "Configuring IDE"
msgstr "IDEን በማስተካከል ላይ"
-#: steps_interactive.pm:221
+#: steps_interactive.pm:231
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:226
+#: steps_interactive.pm:236
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -938,7 +932,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:318
+#: steps_interactive.pm:328
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -947,153 +941,153 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:340
+#: steps_interactive.pm:350
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: steps_interactive.pm:349
+#: steps_interactive.pm:358
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:385
+#: steps_interactive.pm:405
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Load"
msgstr "ጫን"
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Save"
msgstr "አስቀምጥ"
-#: steps_interactive.pm:395
+#: steps_interactive.pm:415
#, fuzzy, c-format
msgid "Bad file"
msgstr "1 ፋይል"
-#: steps_interactive.pm:413
+#: steps_interactive.pm:431
#, c-format
msgid "Install Mandriva KDE Desktop"
msgstr ""
-#: steps_interactive.pm:414
+#: steps_interactive.pm:432
#, c-format
msgid "Install Mandriva GNOME Desktop"
msgstr ""
-#: steps_interactive.pm:415
+#: steps_interactive.pm:433
#, fuzzy, c-format
msgid "Custom install"
msgstr "አነስተኛ ተከላ"
-#: steps_interactive.pm:418
+#: steps_interactive.pm:436
#, c-format
msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
msgstr ""
-#: steps_interactive.pm:503
+#: steps_interactive.pm:521
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:483
+#: steps_interactive.pm:536
#, c-format
msgid "Type of install"
msgstr "የተከላው አይነት"
-#: steps_interactive.pm:484
+#: steps_interactive.pm:537
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:487
+#: steps_interactive.pm:540
#, c-format
msgid "With X"
msgstr "በX"
-#: steps_interactive.pm:488
+#: steps_interactive.pm:541
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:489
+#: steps_interactive.pm:542
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:528
-#, c-format
-msgid "All"
-msgstr "ሁሉንም"
-
-#: steps_interactive.pm:544
+#: steps_interactive.pm:596
#, c-format
msgid "Preparing installation"
msgstr "ተከላ በማዘጋጀት ላይ"
-#: steps_interactive.pm:552
+#: steps_interactive.pm:604
#, c-format
msgid "Installing package %s"
msgstr "የ%s ጥቅል በመትከል ላይ"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "Go on anyway?"
msgstr "ለማንኛውም ቀጥል?"
-#: steps_interactive.pm:580
+#: steps_interactive.pm:632
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:581
+#: steps_interactive.pm:633
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:634
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:635
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "የጥቅሎችን ምርጫ አስቀምጥ"
-#: steps_interactive.pm:586
+#: steps_interactive.pm:638
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "የ%s ጥቅል በመትከል ላይ"
-#: steps_interactive.pm:604
+#: steps_interactive.pm:656
#, c-format
msgid "Post-install configuration"
msgstr "Post-install configuration"
-#: steps_interactive.pm:611
+#: steps_interactive.pm:663
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:645
+#: steps_interactive.pm:691 steps_list.pm:47
+#, c-format
+msgid "Updates"
+msgstr "አሻሻዎች"
+
+#: steps_interactive.pm:692
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1106,106 +1100,101 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:666
+#: steps_interactive.pm:713
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr ""
-#: steps_interactive.pm:672
+#: steps_interactive.pm:719
#, c-format
msgid "Unable to contact mirror %s"
msgstr "ከአንጸባራቂ %s ጋር መገናኘት አልተቻለም"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:777
+#: steps_interactive.pm:825
#, c-format
msgid "%s on %s"
msgstr "%s %s ላይ ነው"
-#: steps_interactive.pm:810 steps_interactive.pm:817 steps_interactive.pm:830
-#: steps_interactive.pm:847 steps_interactive.pm:863 steps_interactive.pm:874
+#: steps_interactive.pm:859 steps_interactive.pm:866 steps_interactive.pm:880
+#: steps_interactive.pm:898 steps_interactive.pm:913
#, c-format
msgid "Hardware"
msgstr "ሀርድዌር"
-#: steps_interactive.pm:795 steps_interactive.pm:812
+#: steps_interactive.pm:881 steps_interactive.pm:899
#, c-format
msgid "Sound card"
msgstr "የድምፅ ካርድ"
-#: steps_interactive.pm:815
+#: steps_interactive.pm:902
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "የISA ድምጽ ካርድ አለዎት?"
-#: steps_interactive.pm:817
+#: steps_interactive.pm:904
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:819
+#: steps_interactive.pm:906
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:828
-#, c-format
-msgid "TV card"
-msgstr "የቲቪ ካርድ"
-
-#: steps_interactive.pm:839
+#: steps_interactive.pm:914
#, c-format
msgid "Graphical interface"
msgstr "ንድፋዊ እይታ"
-#: steps_interactive.pm:845 steps_interactive.pm:856
+#: steps_interactive.pm:921 steps_interactive.pm:932
#, c-format
msgid "Network & Internet"
msgstr "መረብ እና ኢንተርኔት"
-#: steps_interactive.pm:857
+#: steps_interactive.pm:933
#, c-format
msgid "Proxies"
msgstr "ወኪሎች"
-#: steps_interactive.pm:858
+#: steps_interactive.pm:934
#, c-format
msgid "configured"
msgstr "ተስተካክሏል"
-#: steps_interactive.pm:868
+#: steps_interactive.pm:944
#, c-format
msgid "Security Level"
msgstr "የደህንነት ደረጃ"
-#: steps_interactive.pm:882
+#: steps_interactive.pm:963
#, c-format
msgid "Firewall"
msgstr "የእሳት ግድግዳ"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "activated"
msgstr "መስራት ጀምሯል"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "disabled"
msgstr "መስራት አቁሟል"
-#: steps_interactive.pm:939
+#: steps_interactive.pm:981
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:973
+#: steps_interactive.pm:1008
#, c-format
msgid "Preparing bootloader..."
msgstr "አስጀማሪ በማዘጋጀት ላይ..."
-#: steps_interactive.pm:983
+#: steps_interactive.pm:1018
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1214,36 +1203,36 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:989
+#: steps_interactive.pm:1024
#, fuzzy, c-format
msgid "Do you want to use aboot?"
msgstr "ስራ-እቅዱን መሠረዝ ይፈልጋሉ?"
-#: steps_interactive.pm:992
+#: steps_interactive.pm:1027
#, c-format
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1039
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1071
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: steps_interactive.pm:1040
+#: steps_interactive.pm:1073
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1084
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1251,22 +1240,22 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1061
+#: steps_interactive.pm:1094
#, c-format
msgid "Congratulations"
msgstr "እንኳን ደስ ያለዎ!"
-#: steps_interactive.pm:1065
+#: steps_interactive.pm:1098
#, c-format
msgid "Reboot"
msgstr "እንደገና ጀምር"
-#: steps_interactive.pm:1069 steps_interactive.pm:1070
+#: steps_interactive.pm:1102 steps_interactive.pm:1103
#, c-format
msgid "Generate auto install floppy"
msgstr ""
-#: steps_interactive.pm:1071
+#: steps_interactive.pm:1104
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -1276,17 +1265,17 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr ""
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Replay"
msgstr ""
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Automated"
msgstr ""
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1112
#, c-format
msgid "Save packages selection"
msgstr "የጥቅሎችን ምርጫ አስቀምጥ"
@@ -1299,6 +1288,11 @@ msgid ""
"Language"
msgstr "ቋንቋ"
+#: steps_list.pm:16 steps_list.pm:23
+#, c-format
+msgid "Localization"
+msgstr ""
+
#: steps_list.pm:17
#, c-format
msgid ""
@@ -1313,104 +1307,124 @@ msgid ""
"Mouse"
msgstr "መጠቆሚያ"
-#: steps_list.pm:19
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr ""
-#: steps_list.pm:21
+#: steps_list.pm:21 steps_list.pm:22
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Installation class"
+msgstr ""
+
+#: steps_list.pm:23
#, c-format
msgid ""
"_: Keep these entry short\n"
"Keyboard"
msgstr "መተየቢያ"
-#: steps_list.pm:22
+#: steps_list.pm:24
#, c-format
msgid ""
"_: Keep these entry short\n"
"Security"
msgstr "ደህንነት"
-#: steps_list.pm:23
+#: steps_list.pm:25
#, c-format
msgid ""
"_: Keep these entry short\n"
"Partitioning"
msgstr ""
-#: steps_list.pm:24
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
"Formatting"
msgstr ""
-#: steps_list.pm:25
+#: steps_list.pm:29
#, c-format
msgid ""
"_: Keep these entry short\n"
"Choosing packages"
msgstr ""
-#: steps_list.pm:26
+#: steps_list.pm:31
#, c-format
msgid ""
"_: Keep these entry short\n"
"Installing"
msgstr "በመትከል ላይ"
-#: steps_list.pm:28
+#: steps_list.pm:34
#, c-format
msgid ""
"_: Keep these entry short\n"
"Users"
msgstr "ተጠቃሚዎች"
-#: steps_list.pm:29
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr "መረብ"
-#: steps_list.pm:31
+#: steps_list.pm:38 steps_list.pm:39
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Bootloader"
+msgstr "አስጀማሪያ"
+
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
"Configure X"
msgstr "Xን ሰይም"
-#: steps_list.pm:32
+#: steps_list.pm:42
#, c-format
msgid ""
"_: Keep these entry short\n"
"Summary"
msgstr "ማጠቃለያ"
-#: steps_list.pm:33
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
"Services"
msgstr "አገልግሎት"
-#: steps_list.pm:34
+#: steps_list.pm:46
#, c-format
msgid ""
"_: Keep these entry short\n"
"Updates"
msgstr "አሻሻዎች"
-#: steps_list.pm:35
+#: steps_list.pm:48
#, c-format
msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "ውጣ"
+#~ msgid "All"
+#~ msgstr "ሁሉንም"
+
+#~ msgid "TV card"
+#~ msgstr "የቲቪ ካርድ"
+
#~ msgid "Boot"
#~ msgstr "ጀምር"
diff --git a/perl-install/install/share/po/ar.po b/perl-install/install/share/po/ar.po
index 962d71244..3cbe7de4c 100644
--- a/perl-install/install/share/po/ar.po
+++ b/perl-install/install/share/po/ar.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 20:13+0200\n"
+"POT-Creation-Date: 2007-10-01 09:12+0200\n"
"PO-Revision-Date: 2005-03-03 01:06+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
"3\n"
-#: any.pm:159
+#: any.pm:155
#, c-format
msgid "Do you have further supplementary media?"
msgstr "هل لديك أوساط إضافيّة أخرى؟"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:162
+#: any.pm:158
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -36,44 +36,44 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:170
+#: any.pm:166
#, c-format
msgid "CD-ROM"
msgstr "القرص المدمج"
-#: any.pm:171
+#: any.pm:167
#, c-format
msgid "Network (HTTP)"
msgstr "الشبكة (HTTP)"
-#: any.pm:172
+#: any.pm:168
#, c-format
msgid "Network (FTP)"
msgstr "الشبكة (FTP)"
-#: any.pm:173
+#: any.pm:169
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:215
+#: any.pm:211
#, c-format
msgid "URL of the mirror?"
msgstr "عنوان URL للمرآة؟"
-#: any.pm:221
+#: any.pm:217
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:232
+#: any.pm:228
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"جاري الإتصال بموقع ماندريبا لينكس للحصول على قائمة بالمرايا المتوفرة..."
-#: any.pm:237
+#: any.pm:233
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -81,70 +81,70 @@ msgid ""
msgstr ""
"جاري الإتصال بموقع ماندريبا لينكس للحصول على قائمة بالمرايا المتوفرة..."
-#: any.pm:247
+#: any.pm:243
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "اختيار مرآة سيتم من خلالها تنزيل الحزم"
-#: any.pm:277
+#: any.pm:273
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:278
+#: any.pm:274
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:282
+#: any.pm:278
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:283
+#: any.pm:279
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:287
+#: any.pm:283
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:288
+#: any.pm:284
#, c-format
msgid "Directory"
msgstr "الدليل"
-#: any.pm:310
+#: any.pm:306
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:345
+#: any.pm:341
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "لم يمكن العثور على ملف hdlist على هذه المرآة. تأكد من صحة الموقع."
-#: any.pm:379
+#: any.pm:375
#, c-format
msgid "Looking at packages already installed..."
msgstr "التعرف على الحزم المثبتة مسبقاً..."
-#: any.pm:386
+#: any.pm:382
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:428
+#: any.pm:424
#, c-format
msgid "Finding packages to upgrade..."
msgstr "البحث عن الحزم التي ستتم ترقيتها..."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:614
+#: any.pm:610
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -168,7 +168,7 @@ msgstr ""
"هل أنت متأكد أنك تريد تثبيت هذه الخادمات الآن؟\n"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:637
+#: any.pm:633
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -181,77 +181,77 @@ msgstr ""
"\n"
"هل تريد حذف هذه الحزم فعلاً؟\n"
-#: any.pm:1059
+#: any.pm:1055
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "تمّ تغيير أسماء القرص التّالي أو الأقراص التّالية:"
-#: any.pm:1061
+#: any.pm:1057
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (المسمّى %s سابقاً)"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1137 steps_interactive.pm:846
+#: any.pm:1133 steps_interactive.pm:922
#, c-format
msgid "Network"
msgstr "الشبكة"
-#: any.pm:1141
+#: any.pm:1137
#, c-format
msgid "Please choose a media"
msgstr "الرجاء اختيار وسط"
-#: any.pm:1157
+#: any.pm:1153
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "الملف موجود مسبقاً. هل تريد الكتابة عليه؟"
-#: any.pm:1161
+#: any.pm:1157
#, c-format
msgid "Permission denied"
msgstr "غير مسموح لك بذلك"
-#: any.pm:1209
+#: any.pm:1205
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1230
+#: any.pm:1226
#, c-format
msgid "Bad media %s"
msgstr "الوسط %s سيء"
-#: any.pm:1272
+#: any.pm:1269
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "لا يمكنني عمل لقطات للشاشة قبل التجزئة"
-#: any.pm:1279
+#: any.pm:1277
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "ستكون لقطات الشاشة موجودة بعد التثبيت في %s"
-#: gtk.pm:136
+#: gtk.pm:119
#, fuzzy, c-format
msgid "Installation"
msgstr "التثبيت"
-#: gtk.pm:139 share/meta-task/compssUsers.pl:54
+#: gtk.pm:122 share/meta-task/compssUsers.pl:42
#, c-format
msgid "Configuration"
msgstr "التهيئة"
@@ -280,57 +280,64 @@ msgstr "جاري تشغيل الشبكة"
msgid "Bringing down the network"
msgstr "جاري اغلاق الشبكة"
-#: media.pm:699 media.pm:710
+#: media.pm:703 media.pm:714
#, fuzzy, c-format
msgid "Downloading file %s..."
msgstr "جاري ارسال الملفات..."
-#: media.pm:804
+#: media.pm:808
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:857
+#: media.pm:861
#, c-format
msgid "Copying in progress"
msgstr "جاري النسخ"
-#: pkgs.pm:33
+#: pkgs.pm:28
#, c-format
msgid "must have"
msgstr "يجب أن يكون لديك"
-#: pkgs.pm:34
+#: pkgs.pm:29
#, c-format
msgid "important"
msgstr "مهم"
-#: pkgs.pm:35
+#: pkgs.pm:30
#, c-format
msgid "very nice"
msgstr "ظريف جداً"
-#: pkgs.pm:36
+#: pkgs.pm:31
#, c-format
msgid "nice"
msgstr "ظريف"
-#: pkgs.pm:37
+#: pkgs.pm:32
#, c-format
msgid "maybe"
msgstr "ربما"
-#: share/meta-task/compssUsers.pl:23
+#: pkgs.pm:245
+#, c-format
+msgid ""
+"Some packages requested by %s cannot be installed:\n"
+"%s"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:11
#, c-format
msgid "Workstation"
msgstr "محطة عمل"
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Office Workstation"
msgstr "محطّة عمل مكتبية"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -339,7 +346,7 @@ msgstr ""
"برامج مكتبية: معالجة الكلمات (OpenOffice.org Writer، Kword(، الجداول "
"الحسابية (OpenOffice.org Calc، Kspread( ، برامج عرض pdf، الخ"
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -348,32 +355,32 @@ msgstr ""
"برامج مكتبية: معالجة الكلمات (kword، abiword(، الجداول الحسابية (kspread، "
"gnumeric) ، برامج عرض pdf، الخ"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:21
#, c-format
msgid "Game station"
msgstr "محطّة ألعاب"
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:22
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "برامج التسلية: ألعاب فيديو، ألعاب لوحات، ألعاب استراتيجية، الخ"
-#: share/meta-task/compssUsers.pl:37
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Multimedia station"
msgstr "محطة وسائط متعدّدة"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:26
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "برامج تحرير/تشغيل الفيديو و الصوت"
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:31
#, c-format
msgid "Internet station"
msgstr "محطّة إنترنت"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:32
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -382,193 +389,193 @@ msgstr ""
"مجموعة من الأدوات لقراءة و إرسال البريد و الأخبار (mutt، tin..( و لتصفح "
"الإنترنت"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:37
#, c-format
msgid "Network Computer (client)"
msgstr "جهاز شبكة (عميل)"
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:38
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "عملاء لبروتوكولات مختلفة مثل ssh"
-#: share/meta-task/compssUsers.pl:55
+#: share/meta-task/compssUsers.pl:43
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "أدوات لتسهيل إعداد جهازك"
-#: share/meta-task/compssUsers.pl:59
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Console Tools"
msgstr "أدوات الطرفيّات"
-#: share/meta-task/compssUsers.pl:60
+#: share/meta-task/compssUsers.pl:48
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "محررات نصوص، صَدَفات، أدوات ملفات، طرفيات"
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:166
-#: share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:155
#, c-format
msgid "Development"
msgstr "تطوير"
-#: share/meta-task/compssUsers.pl:65 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "برامج و مكتبات تطوير C و C++"
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
#, c-format
msgid "Documentation"
msgstr "التّوثيق"
-#: share/meta-task/compssUsers.pl:70 share/meta-task/compssUsers.pl:174
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "كتب ومذكرات Howto حول لينكس و البرامج الحرة"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:75 share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "القاعدة القياسيّة للينكس (LSB). دعم تطبيقات الأطراف الثالثة"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:71
#, c-format
msgid "Web Server"
msgstr "خادم الوب"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:72
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:75
#, c-format
msgid "Groupware"
msgstr "برامج المجموعات"
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:76
#, c-format
msgid "Kolab Server"
msgstr "خادم Kolab"
-#: share/meta-task/compssUsers.pl:92 share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
#, c-format
msgid "Firewall/Router"
msgstr "جدار ناري/موجِّه"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
#, c-format
msgid "Internet gateway"
msgstr "بوابة الإنترنت"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Mail/News"
msgstr "بريد/أخبار"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:84
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "خادم بريد Postfix، خادم أخبار Inn"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:87
#, c-format
msgid "Directory Server"
msgstr "خادم مجلّدات"
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "FTP Server"
msgstr "الخادم FTP"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:92
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:96
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "خادم أسماء النّطاقات ومعلومات الشّبكة"
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:99
#, c-format
msgid "File and Printer Sharing Server"
msgstr "خادم مشاركة الملفّات والطّابعات"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "NFS Server, Samba server"
msgstr "خادم NFS، خادم Samba"
-#: share/meta-task/compssUsers.pl:116 share/meta-task/compssUsers.pl:129
+#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
#, c-format
msgid "Database"
msgstr "قواعد البيانات"
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:104
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "خادم قواعد بيانات PostgreSQL و MySQL"
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:108
#, c-format
msgid "Web/FTP"
msgstr "وب/FTP"
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:109
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache، Pro-ftpd"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:112
#, c-format
msgid "Mail"
msgstr "البريد"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:113
#, c-format
msgid "Postfix mail server"
msgstr "خادم البريد Postfix"
-#: share/meta-task/compssUsers.pl:130
+#: share/meta-task/compssUsers.pl:117
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "خادم قواعد البيانات PostgreSQL أو MySQL"
-#: share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:124
#, c-format
msgid "Network Computer server"
msgstr "خادم شبكات"
-#: share/meta-task/compssUsers.pl:138
+#: share/meta-task/compssUsers.pl:125
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "خادم NFS، خادم SMB، خادم بروكسي، خادم ssh"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:131
#, c-format
msgid "Graphical Environment"
msgstr "بيئات رسومية"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "KDE Workstation"
msgstr "محطّة عمل كيدي"
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:134
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -576,12 +583,12 @@ msgid ""
msgstr ""
"بيئة سطح مكتب كيدي، البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:138
#, c-format
msgid "GNOME Workstation"
msgstr "محطّة عمل جينوم"
-#: share/meta-task/compssUsers.pl:152
+#: share/meta-task/compssUsers.pl:139
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -590,57 +597,57 @@ msgstr ""
"بيئة رسومية مع مجموعة من التطبيقات و أدوات سطح المكتب المناسبة للمستخدمين "
"العاديين"
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:142
#, fuzzy, c-format
msgid "IceWm Desktop"
msgstr "Plucker Desktop"
-#: share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:146
#, c-format
msgid "Other Graphical Desktops"
msgstr "أسطح مكتب رسومية أخرى"
-#: share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:147
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm، Window Maker، Enlightenment، Fvwm، الخ"
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:170
#, c-format
msgid "Utilities"
msgstr "منافع"
-#: share/meta-task/compssUsers.pl:185 share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
#, c-format
msgid "SSH Server"
msgstr "خادم SSH"
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:177
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:178
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "خادم التّهيئة البعيدة Webmin"
-#: share/meta-task/compssUsers.pl:195
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "منافع شبكة/مراقبة"
-#: share/meta-task/compssUsers.pl:196
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "أدوات مراقبة، محاسبة عمليّات، tcpdump، nmap، ..."
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Mandriva Wizards"
msgstr "مرشدو ماندريبا"
-#: share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:188
#, c-format
msgid "Wizards to configure server"
msgstr "مرشدو تهيئة الخادم"
@@ -654,7 +661,7 @@ msgstr ""
"ظهر خطأ و لا أعرف كيف أتعامل معه بأسلوب جيد.\n"
"تابع على مسؤوليتك."
-#: steps.pm:432
+#: steps.pm:433
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -681,46 +688,7 @@ msgstr "تثبيت ماندريبا لينكس %s"
msgid "<Tab>/<Alt-Tab> between elements"
msgstr "<Tab>/<Alt-Tab> بين العناصر"
-#: steps_gtk.pm:155 steps_gtk.pm:156
-#, c-format
-msgid "Localization"
-msgstr ""
-
-#: steps_gtk.pm:159 steps_list.pm:20
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Installation class"
-msgstr ""
-
-#: steps_gtk.pm:160 steps_gtk.pm:243 steps_interactive.pm:511
-#, c-format
-msgid "Package Group Selection"
-msgstr "اختيار مجموعات الحزم"
-
-#: steps_gtk.pm:161 steps_gtk.pm:460 steps_interactive.pm:543
-#, c-format
-msgid "Installing"
-msgstr "التثبيت"
-
-#: steps_gtk.pm:162 steps_gtk.pm:576 steps_interactive.pm:735
-#, c-format
-msgid "Summary"
-msgstr "ملخص"
-
-#: steps_gtk.pm:164 steps_gtk.pm:165 steps_list.pm:30
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Bootloader"
-msgstr "محمّل الإقلاع"
-
-#: steps_gtk.pm:166 steps_interactive.pm:644
-#, c-format
-msgid "Updates"
-msgstr "التحديثات"
-
-#: steps_gtk.pm:213
+#: steps_gtk.pm:189
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -733,149 +701,160 @@ msgstr ""
"الغرض،\n"
"اضغط `F1' عند الإقلاع من القرص المدمج، و اكتب `text'."
-#: steps_gtk.pm:264 steps_interactive.pm:529
+#: steps_gtk.pm:256 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_list.pm:30
+#, c-format
+msgid "Package Group Selection"
+msgstr "اختيار مجموعات الحزم"
+
+#: steps_gtk.pm:277 steps_interactive.pm:581
#, c-format
msgid "Individual package selection"
msgstr "اختيار مفرد للحزم"
-#: steps_gtk.pm:268 steps_interactive.pm:454
+#: steps_gtk.pm:299 steps_interactive.pm:507
#, c-format
msgid "Total size: %d / %d MB"
msgstr "الحجم الإجمالي: %d / %d م.ب."
-#: steps_gtk.pm:313
+#: steps_gtk.pm:344
#, c-format
msgid "Bad package"
msgstr "حزمة سيئة"
-#: steps_gtk.pm:315
+#: steps_gtk.pm:346
#, c-format
msgid "Version: "
msgstr "النسخة:"
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "Size: "
msgstr "الحجم: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "%d KB\n"
msgstr "%d ك.ب.\n"
-#: steps_gtk.pm:317
+#: steps_gtk.pm:348
#, c-format
msgid "Importance: "
msgstr "الأهمية:"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:382
#, c-format
msgid "You can not select/unselect this package"
msgstr "لا يمكنك اختيار/ازالة اختيار هذه الحزمة"
-#: steps_gtk.pm:355
+#: steps_gtk.pm:386
#, c-format
msgid "due to missing %s"
msgstr "بسبب غياب %s"
-#: steps_gtk.pm:356
+#: steps_gtk.pm:387
#, c-format
msgid "due to unsatisfied %s"
msgstr "بسبب عدم إرضاء %s"
-#: steps_gtk.pm:357
+#: steps_gtk.pm:388
#, c-format
msgid "trying to promote %s"
msgstr "السعي إلى ترويج %s"
-#: steps_gtk.pm:358
+#: steps_gtk.pm:389
#, c-format
msgid "in order to keep %s"
msgstr "من أجل حفظ %s"
-#: steps_gtk.pm:363
+#: steps_gtk.pm:394
#, c-format
msgid ""
"You can not select this package as there is not enough space left to install "
"it"
msgstr "لا يمكنك اختيار هذه الحزمة لأنه لا يوجد مساحة كافية متبقية لتثبيتها"
-#: steps_gtk.pm:366
+#: steps_gtk.pm:397
#, c-format
msgid "The following packages are going to be installed"
msgstr "سيتم تثبيت الحزم التالية"
-#: steps_gtk.pm:367
+#: steps_gtk.pm:398
#, c-format
msgid "The following packages are going to be removed"
msgstr "سيتم حذف الحزم التالية"
-#: steps_gtk.pm:392
+#: steps_gtk.pm:423
#, c-format
msgid "This is a mandatory package, it can not be unselected"
msgstr "هذه الحزمة الزامية، لا يمكن عدم اختيارها"
-#: steps_gtk.pm:394
+#: steps_gtk.pm:425
#, c-format
msgid "You can not unselect this package. It is already installed"
msgstr "لا يمكن إزالة اختيار هذه الحزم. انها مثبتة مسبقاً"
-#: steps_gtk.pm:396
+#: steps_gtk.pm:427
#, c-format
msgid "You can not unselect this package. It must be upgraded"
msgstr "لا يمكنك إزالة اختيار هذه الحزمة. يجب ترقيتها"
-#: steps_gtk.pm:400
+#: steps_gtk.pm:431
#, c-format
msgid "Show automatically selected packages"
msgstr "إظهار الحزم المختارة ألياً"
-#: steps_gtk.pm:402 steps_interactive.pm:133
+#: steps_gtk.pm:433
#, c-format
msgid "Install"
msgstr "تثبيت"
-#: steps_gtk.pm:405
+#: steps_gtk.pm:436
#, c-format
msgid "Load/Save selection"
msgstr "تحميل/حفظ الاختيار"
-#: steps_gtk.pm:406
+#: steps_gtk.pm:437
#, c-format
msgid "Updating package selection"
msgstr "تحديث اختيار الحزم"
-#: steps_gtk.pm:411
+#: steps_gtk.pm:442
#, c-format
msgid "Minimal install"
msgstr "تثبيت مصغّر"
-#: steps_gtk.pm:425
+#: steps_gtk.pm:456
#, c-format
msgid "Software Management"
msgstr "إدارة البرامج"
-#: steps_gtk.pm:425 steps_interactive.pm:373
+#: steps_gtk.pm:456 steps_interactive.pm:393
#, c-format
msgid "Choose the packages you want to install"
msgstr "اختر الحزم التي تريد تثبيتها"
-#: steps_gtk.pm:487
+#: steps_gtk.pm:473 steps_interactive.pm:595 steps_list.pm:32
+#, c-format
+msgid "Installing"
+msgstr "التثبيت"
+
+#: steps_gtk.pm:499
#, c-format
msgid "No details"
msgstr "لا تفاصيل"
-#: steps_gtk.pm:483
+#: steps_gtk.pm:514
#, c-format
msgid "Time remaining "
msgstr "الوقت المتبقي"
-#: steps_gtk.pm:484
+#: steps_gtk.pm:515
#, c-format
msgid "Estimating"
msgstr "الحساب التقريبي"
-#: steps_gtk.pm:511
+#: steps_gtk.pm:542
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
@@ -884,17 +863,22 @@ msgstr[1] "%d حزم"
msgstr[2] "%d حزم"
msgstr[3] "%d حزم"
-#: steps_gtk.pm:589
+#: steps_gtk.pm:588 steps_interactive.pm:782 steps_list.pm:43
+#, c-format
+msgid "Summary"
+msgstr "ملخص"
+
+#: steps_gtk.pm:605
#, c-format
msgid "Configure"
msgstr "تهيئة"
-#: steps_gtk.pm:580 steps_interactive.pm:731 steps_interactive.pm:858
+#: steps_gtk.pm:622 steps_interactive.pm:778 steps_interactive.pm:934
#, c-format
msgid "not configured"
msgstr "غير مهيّأ"
-#: steps_gtk.pm:612 steps_interactive.pm:268
+#: steps_gtk.pm:658 steps_interactive.pm:278
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -903,7 +887,7 @@ msgstr ""
"تم العثور على وسط التثبيت التالي.\n"
"إن كنت تريد تخطي بعضها، يمكنك إزالة اختيارها الآن."
-#: steps_gtk.pm:621 steps_interactive.pm:274
+#: steps_gtk.pm:667 steps_interactive.pm:284
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -915,7 +899,7 @@ msgstr ""
"سيكمل التثبيت بعد ذلك من القرص الصلب وستبقى الحزم متوفرة حالما يتم تثبيت "
"النظام بالكامل."
-#: steps_gtk.pm:623 steps_interactive.pm:276
+#: steps_gtk.pm:669 steps_interactive.pm:286
#, c-format
msgid "Copy whole CDs"
msgstr "نسخ الأقراص بالكامل"
@@ -935,12 +919,12 @@ msgstr "الرجاء اختيار لوحة المفاتيح."
msgid "Here is the full list of available keyboards"
msgstr "هذه هي القائمة الكاملة لكلّ لوحات المفاتيح المتوفّرة"
-#: steps_interactive.pm:128
+#: steps_interactive.pm:129
#, c-format
msgid "Install/Upgrade"
msgstr "تثبيت/ترقية"
-#: steps_interactive.pm:129
+#: steps_interactive.pm:130
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "هل هذا تثبيت أم ترقية؟"
@@ -952,27 +936,37 @@ msgid ""
"Install"
msgstr "تثبيت"
-#: steps_interactive.pm:137
+#: steps_interactive.pm:136
#, c-format
msgid "Upgrade %s"
msgstr "ترقية %s"
-#: steps_interactive.pm:148
+#: steps_interactive.pm:140
+#, c-format
+msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:144
+#, c-format
+msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:158
#, c-format
msgid "Encryption key for %s"
msgstr "مفتاح التشفير لـ %s"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "Configuring IDE"
msgstr "جاري تهيئة IDE"
-#: steps_interactive.pm:221
+#: steps_interactive.pm:231
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -981,7 +975,7 @@ msgstr ""
"ليس هناك مساحة حرّة لواحد ميجابات من bootstrap! سوف يستمرّ التّثبيت، لكن لإقلاع "
"نظامك، سوف تحتاج لإنشاء تجزيء bootstrap في DiskDrake"
-#: steps_interactive.pm:226
+#: steps_interactive.pm:236
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -991,7 +985,7 @@ msgstr ""
"تحتاج إلى إنشاء PPC PReP Boot bootstrap! ستكمل عملية التثبيت، ولكن لإقلاع "
"نظامك، أنت بحاجة إلى إنشاء تجزيء bootstrap من خلال DiskDrake"
-#: steps_interactive.pm:318
+#: steps_interactive.pm:328
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1004,19 +998,19 @@ msgstr ""
"تنتهي.\n"
"إن لم يكن القرص لديك، اضغط على إلغاء لتجّنب التثبيت من هذا القرص المدمج."
-#: steps_interactive.pm:340
+#: steps_interactive.pm:350
#, c-format
msgid "Looking for available packages..."
msgstr "العثور على الحزم المتوفرة..."
-#: steps_interactive.pm:349
+#: steps_interactive.pm:358
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:385
+#: steps_interactive.pm:405
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1025,52 +1019,52 @@ msgstr ""
"الرجاء اختيار حفظ أو تحميل اختياراتك للحزم.\n"
"النسق مشابه لملفات التثبيت الآلي المولّدة."
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Load"
msgstr "تحميل"
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Save"
msgstr "حفظ"
-#: steps_interactive.pm:395
+#: steps_interactive.pm:415
#, c-format
msgid "Bad file"
msgstr "ملف سيء"
-#: steps_interactive.pm:413
+#: steps_interactive.pm:431
#, c-format
msgid "Install Mandriva KDE Desktop"
msgstr ""
-#: steps_interactive.pm:414
+#: steps_interactive.pm:432
#, c-format
msgid "Install Mandriva GNOME Desktop"
msgstr ""
-#: steps_interactive.pm:415
+#: steps_interactive.pm:433
#, fuzzy, c-format
msgid "Custom install"
msgstr "تثبيت مصغّر"
-#: steps_interactive.pm:418
+#: steps_interactive.pm:436
#, c-format
msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
msgstr ""
-#: steps_interactive.pm:503
+#: steps_interactive.pm:521
#, c-format
msgid "Selected size is larger than available space"
msgstr "الحجم المختار أكبر من المساحة المتوفرة"
-#: steps_interactive.pm:483
+#: steps_interactive.pm:536
#, c-format
msgid "Type of install"
msgstr "نوع التثبيت"
-#: steps_interactive.pm:484
+#: steps_interactive.pm:537
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1079,82 +1073,82 @@ msgstr ""
"لم تختر أي مجموعة من الحزم.\n"
"الرجاء اختيار التثبيت المصغر الذي تريده:"
-#: steps_interactive.pm:487
+#: steps_interactive.pm:540
#, c-format
msgid "With X"
msgstr "مع X"
-#: steps_interactive.pm:488
+#: steps_interactive.pm:541
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "مع وثائق المساعدة الأساسية (مفضّل)"
-#: steps_interactive.pm:489
+#: steps_interactive.pm:542
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "تثبيت مصغّر فعلاً (خصوصاً بدون urpmi)"
-#: steps_interactive.pm:528
-#, c-format
-msgid "All"
-msgstr "الكل"
-
-#: steps_interactive.pm:544
+#: steps_interactive.pm:596
#, c-format
msgid "Preparing installation"
msgstr "التحضير للتثبيت"
-#: steps_interactive.pm:552
+#: steps_interactive.pm:604
#, c-format
msgid "Installing package %s"
msgstr "جاري تثبيت الحزمة %s"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "There was an error ordering packages:"
msgstr "كان هناك خطأ في ترتيب الحزم:"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "Go on anyway?"
msgstr "هل تريد المتابعة على أي حال؟"
-#: steps_interactive.pm:580
+#: steps_interactive.pm:632
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:581
+#: steps_interactive.pm:633
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:634
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:635
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "حفظ اختيار الحزم"
-#: steps_interactive.pm:586
+#: steps_interactive.pm:638
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "كان هناك خطأ في تثبيت الحزم:"
-#: steps_interactive.pm:604
+#: steps_interactive.pm:656
#, c-format
msgid "Post-install configuration"
msgstr "تهيئة ما بعد التثبيت"
-#: steps_interactive.pm:611
+#: steps_interactive.pm:663
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:645
+#: steps_interactive.pm:691 steps_list.pm:47
+#, c-format
+msgid "Updates"
+msgstr "التحديثات"
+
+#: steps_interactive.pm:692
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1175,39 +1169,39 @@ msgstr ""
"\n"
"هل تريد تنزيل هذه التحديثات ؟"
-#: steps_interactive.pm:666
+#: steps_interactive.pm:713
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "جاري الإتصال بالمرآة للحصول على قائمة بالحزم المتوفرة..."
-#: steps_interactive.pm:672
+#: steps_interactive.pm:719
#, c-format
msgid "Unable to contact mirror %s"
msgstr "تعذر الإتصال بالمرآة %s"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:777
+#: steps_interactive.pm:825
#, c-format
msgid "%s on %s"
msgstr "%s على %s"
-#: steps_interactive.pm:810 steps_interactive.pm:817 steps_interactive.pm:830
-#: steps_interactive.pm:847 steps_interactive.pm:863 steps_interactive.pm:874
+#: steps_interactive.pm:859 steps_interactive.pm:866 steps_interactive.pm:880
+#: steps_interactive.pm:898 steps_interactive.pm:913
#, c-format
msgid "Hardware"
msgstr "العتاد"
-#: steps_interactive.pm:795 steps_interactive.pm:812
+#: steps_interactive.pm:881 steps_interactive.pm:899
#, c-format
msgid "Sound card"
msgstr "بطاقة الصوت"
-#: steps_interactive.pm:815
+#: steps_interactive.pm:902
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "هل لديك بطاقة صوت ISA؟"
-#: steps_interactive.pm:817
+#: steps_interactive.pm:904
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1215,67 +1209,62 @@ msgid ""
msgstr ""
"شغّل \"alsaconf\" أو \"sndconfig\" بعد التّثبيت لتهيئة بطاقة الصّوت الخاصّة بك"
-#: steps_interactive.pm:819
+#: steps_interactive.pm:906
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "لم يعثر على بطاقة الصوت. حاول تشغيل \"harddrake\" بعد التثبيت"
-#: steps_interactive.pm:828
-#, c-format
-msgid "TV card"
-msgstr "بطاقة التلفاز"
-
-#: steps_interactive.pm:839
+#: steps_interactive.pm:914
#, c-format
msgid "Graphical interface"
msgstr "الواجهة الرسومية"
-#: steps_interactive.pm:845 steps_interactive.pm:856
+#: steps_interactive.pm:921 steps_interactive.pm:932
#, c-format
msgid "Network & Internet"
msgstr "الشبكة والإنترنت"
-#: steps_interactive.pm:857
+#: steps_interactive.pm:933
#, c-format
msgid "Proxies"
msgstr "البروكسيات"
-#: steps_interactive.pm:858
+#: steps_interactive.pm:934
#, c-format
msgid "configured"
msgstr "مُهيّء"
-#: steps_interactive.pm:868
+#: steps_interactive.pm:944
#, c-format
msgid "Security Level"
msgstr "مستوى الأمن"
-#: steps_interactive.pm:882
+#: steps_interactive.pm:963
#, c-format
msgid "Firewall"
msgstr "جدار ناري"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "activated"
msgstr "مُنشّط"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "disabled"
msgstr "مُعطّل"
-#: steps_interactive.pm:939
+#: steps_interactive.pm:981
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "لم تقم بتهيئة خادم X. هل أنت متأكد أنك تريد ذلك؟"
-#: steps_interactive.pm:973
+#: steps_interactive.pm:1008
#, c-format
msgid "Preparing bootloader..."
msgstr "جاري تحضير محمّل الإقلاع..."
-#: steps_interactive.pm:983
+#: steps_interactive.pm:1018
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1287,12 +1276,12 @@ msgstr ""
"مع نظامك. ستكمل عملية التثبيت، ولكنك بحاجة إلى استخدام BootX أو طريقة ما "
"أخرى لإقلاع نظامك. مُعطى النواة لنظام الملفات الجذر هو: root=%s"
-#: steps_interactive.pm:989
+#: steps_interactive.pm:1024
#, c-format
msgid "Do you want to use aboot?"
msgstr "هل تريد استخدام aboot؟"
-#: steps_interactive.pm:992
+#: steps_interactive.pm:1027
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -1301,7 +1290,7 @@ msgstr ""
"خطأ أثناء تثبيت aboot، \n"
"حاول الإجبار على التثبيت حتى و لو أدي ذلك لتدمير التجزيء الأول؟"
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1039
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1310,17 +1299,17 @@ msgstr ""
"في هذا المستوى الأمني، الوصول إلى الملفّات بتجزيء ويندوز سيكون مقصوراً على "
"المدير."
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1071
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "أدخل قرص مرن فارغ في السواقة %s"
-#: steps_interactive.pm:1040
+#: steps_interactive.pm:1073
#, c-format
msgid "Creating auto install floppy..."
msgstr "جاري إنشاء قرص التثبيت الآلي..."
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1084
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1331,22 +1320,22 @@ msgstr ""
"\n"
"هل تريد الخروج الآن فعلاً؟"
-#: steps_interactive.pm:1061
+#: steps_interactive.pm:1094
#, c-format
msgid "Congratulations"
msgstr "تهانينا"
-#: steps_interactive.pm:1065
+#: steps_interactive.pm:1098
#, c-format
msgid "Reboot"
msgstr "إعادة التشغيل"
-#: steps_interactive.pm:1069 steps_interactive.pm:1070
+#: steps_interactive.pm:1102 steps_interactive.pm:1103
#, c-format
msgid "Generate auto install floppy"
msgstr "إنشاء قرص تثبيت آلي"
-#: steps_interactive.pm:1071
+#: steps_interactive.pm:1104
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -1361,17 +1350,17 @@ msgstr ""
"\n"
"ربما تفضل إعادة عملية التثبيت.\n"
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Replay"
msgstr "إعادة"
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Automated"
msgstr "آلي"
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1112
#, c-format
msgid "Save packages selection"
msgstr "حفظ اختيار الحزم"
@@ -1384,6 +1373,11 @@ msgid ""
"Language"
msgstr "اللّغة"
+#: steps_list.pm:16 steps_list.pm:23
+#, c-format
+msgid "Localization"
+msgstr ""
+
#: steps_list.pm:17
#, c-format
msgid ""
@@ -1398,104 +1392,124 @@ msgid ""
"Mouse"
msgstr "الماوس"
-#: steps_list.pm:19
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr "اكتشاف القرص الصّلب"
-#: steps_list.pm:21
+#: steps_list.pm:21 steps_list.pm:22
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Installation class"
+msgstr ""
+
+#: steps_list.pm:23
#, c-format
msgid ""
"_: Keep these entry short\n"
"Keyboard"
msgstr "لوحة المفاتيح"
-#: steps_list.pm:22
+#: steps_list.pm:24
#, c-format
msgid ""
"_: Keep these entry short\n"
"Security"
msgstr "الأمن"
-#: steps_list.pm:23
+#: steps_list.pm:25
#, c-format
msgid ""
"_: Keep these entry short\n"
"Partitioning"
msgstr "التجزئة"
-#: steps_list.pm:24
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
"Formatting"
msgstr ""
-#: steps_list.pm:25
+#: steps_list.pm:29
#, c-format
msgid ""
"_: Keep these entry short\n"
"Choosing packages"
msgstr ""
-#: steps_list.pm:26
+#: steps_list.pm:31
#, c-format
msgid ""
"_: Keep these entry short\n"
"Installing"
msgstr "التثبيت"
-#: steps_list.pm:28
+#: steps_list.pm:34
#, c-format
msgid ""
"_: Keep these entry short\n"
"Users"
msgstr "المستخدمون"
-#: steps_list.pm:29
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr "الشبكات"
-#: steps_list.pm:31
+#: steps_list.pm:38 steps_list.pm:39
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Bootloader"
+msgstr "محمّل الإقلاع"
+
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
"Configure X"
msgstr "تهيئة X"
-#: steps_list.pm:32
+#: steps_list.pm:42
#, c-format
msgid ""
"_: Keep these entry short\n"
"Summary"
msgstr "ملخص"
-#: steps_list.pm:33
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
"Services"
msgstr "الخدمات"
-#: steps_list.pm:34
+#: steps_list.pm:46
#, c-format
msgid ""
"_: Keep these entry short\n"
"Updates"
msgstr "التحديثات"
-#: steps_list.pm:35
+#: steps_list.pm:48
#, c-format
msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "خروج"
+#~ msgid "All"
+#~ msgstr "الكل"
+
+#~ msgid "TV card"
+#~ msgstr "بطاقة التلفاز"
+
#~ msgid "Boot"
#~ msgstr "الإقلاع"
diff --git a/perl-install/install/share/po/az.po b/perl-install/install/share/po/az.po
index ad322f126..5ca9439c5 100644
--- a/perl-install/install/share/po/az.po
+++ b/perl-install/install/share/po/az.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-az\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 20:13+0200\n"
+"POT-Creation-Date: 2007-10-01 09:12+0200\n"
"PO-Revision-Date: 2005-03-31 14:21+0200\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -20,13 +20,13 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: any.pm:159
+#: any.pm:155
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
msgstr "Başqası var?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:162
+#: any.pm:158
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -35,37 +35,37 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:170
+#: any.pm:166
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:171
+#: any.pm:167
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Şəbəkə %s"
-#: any.pm:172
+#: any.pm:168
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Şəbəkə %s"
-#: any.pm:173
+#: any.pm:169
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:215
+#: any.pm:211
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:221
+#: any.pm:217
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:232
+#: any.pm:228
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -73,7 +73,7 @@ msgstr ""
"Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
"qurulur..."
-#: any.pm:237
+#: any.pm:233
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -82,70 +82,70 @@ msgstr ""
"Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
"qurulur..."
-#: any.pm:247
+#: any.pm:243
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Paketleri almaq üçün bir əks ünvanı seçin"
-#: any.pm:277
+#: any.pm:273
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:278
+#: any.pm:274
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:282
+#: any.pm:278
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:283
+#: any.pm:279
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:287
+#: any.pm:283
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:288
+#: any.pm:284
#, c-format
msgid "Directory"
msgstr "Qovluq"
-#: any.pm:310
+#: any.pm:306
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:345
+#: any.pm:341
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "%s, %s üstündə tapıla bilmir"
-#: any.pm:379
+#: any.pm:375
#, c-format
msgid "Looking at packages already installed..."
msgstr "Qurulu olan paketlər yoxlanır..."
-#: any.pm:386
+#: any.pm:382
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:428
+#: any.pm:424
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Güncəllənəcək paketlar tapılır"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:614
+#: any.pm:610
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -169,7 +169,7 @@ msgstr ""
"Bu vericiləri həqiqətən də qurmaq istəyirsiniz?\n"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:637
+#: any.pm:633
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -182,77 +182,77 @@ msgstr ""
"\n"
"Bu paketləri həqiqətən də silmək istəyirsiniz?\n"
-#: any.pm:1059
+#: any.pm:1055
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Aşağıdakı paketlər qurulmalıdır:\n"
-#: any.pm:1061
+#: any.pm:1057
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1137 steps_interactive.pm:846
+#: any.pm:1133 steps_interactive.pm:922
#, c-format
msgid "Network"
msgstr "Şəbəkə"
-#: any.pm:1141
+#: any.pm:1137
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Xahiş edirik seçin"
-#: any.pm:1157
+#: any.pm:1153
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fayl onsuz da mövcuddur. Üstünə yazım?"
-#: any.pm:1161
+#: any.pm:1157
#, c-format
msgid "Permission denied"
msgstr "Səlahiyyət yoxdur"
-#: any.pm:1209
+#: any.pm:1205
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1230
+#: any.pm:1226
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "%s medyası əlavə edildi"
-#: any.pm:1272
+#: any.pm:1269
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Bölmələmədən əvvəl görüntü alına bilməz"
-#: any.pm:1279
+#: any.pm:1277
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ekran görüntüləri qurulumdan sonra %s mövqeyində olacaqdır"
-#: gtk.pm:136
+#: gtk.pm:119
#, fuzzy, c-format
msgid "Installation"
msgstr "Qurulur"
-#: gtk.pm:139 share/meta-task/compssUsers.pl:54
+#: gtk.pm:122 share/meta-task/compssUsers.pl:42
#, c-format
msgid "Configuration"
msgstr "Quraşdırma"
@@ -282,57 +282,64 @@ msgstr "Şəbəkə fəallaşdırılır"
msgid "Bringing down the network"
msgstr "Şəbəkə dayandırılır"
-#: media.pm:699 media.pm:710
+#: media.pm:703 media.pm:714
#, fuzzy, c-format
msgid "Downloading file %s..."
msgstr "Fayllar göndərilir..."
-#: media.pm:804
+#: media.pm:808
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:857
+#: media.pm:861
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Təsbit etmə fəaliyyətdədir"
-#: pkgs.pm:33
+#: pkgs.pm:28
#, c-format
msgid "must have"
msgstr "sınamağa dəyər"
-#: pkgs.pm:34
+#: pkgs.pm:29
#, c-format
msgid "important"
msgstr "vacib"
-#: pkgs.pm:35
+#: pkgs.pm:30
#, c-format
msgid "very nice"
msgstr "çox ə'la"
-#: pkgs.pm:36
+#: pkgs.pm:31
#, c-format
msgid "nice"
msgstr "ə'la"
-#: pkgs.pm:37
+#: pkgs.pm:32
#, c-format
msgid "maybe"
msgstr "bəlkə"
-#: share/meta-task/compssUsers.pl:23
+#: pkgs.pm:245
+#, c-format
+msgid ""
+"Some packages requested by %s cannot be installed:\n"
+"%s"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:11
#, c-format
msgid "Workstation"
msgstr "İş Stansiyası"
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Office Workstation"
msgstr "Ofis İş Stansiyası"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -341,7 +348,7 @@ msgstr ""
"İdarə proqramları: kəlmə işləyənlər (OpenOffice.org Writer, Kword), "
"hesablayıcılar və pdf göstəriciləri, vs."
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -350,32 +357,32 @@ msgstr ""
"İdarə proqramları: kəlmə işləyənlər (kword, abiword), hesablayıcılar və pdf "
"göstəriciləri, vs."
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:21
#, c-format
msgid "Game station"
msgstr "Oyun stansiyası"
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:22
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs"
-#: share/meta-task/compssUsers.pl:37
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Multimedia station"
msgstr "Multimedya stansiyası"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:26
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Səs və video çalınması/düzəliş proqramları"
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:31
#, c-format
msgid "Internet station"
msgstr "İnternet stansiyası"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:32
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -384,205 +391,205 @@ msgstr ""
"Elektronik məktub və xəbər oxuyucu vasitələr dəstəsi (pine, mutt, tin..) və "
"Veb səyyahları"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:37
#, c-format
msgid "Network Computer (client)"
msgstr "Şəbəkə Kompüteri (alıcı)"
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:38
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "SSH daxil bir çox protokolların alıcıları"
-#: share/meta-task/compssUsers.pl:55
+#: share/meta-task/compssUsers.pl:43
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Kompüter qurğularını asandlaşdıran vasitələr"
-#: share/meta-task/compssUsers.pl:59
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Console Tools"
msgstr "Konsol Vasitələri"
-#: share/meta-task/compssUsers.pl:60
+#: share/meta-task/compssUsers.pl:48
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:166
-#: share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:155
#, c-format
msgid "Development"
msgstr "İnkişaf"
-#: share/meta-task/compssUsers.pl:65 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
#, c-format
msgid "Documentation"
msgstr "Sənədlər"
-#: share/meta-task/compssUsers.pl:70 share/meta-task/compssUsers.pl:174
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linuks və sərbəst proqram tə'minatı haqqında Kitablar və Howtolar"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:75 share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standartları Bazası. Üçüncü partiya tə'minat dəstəyi"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:71
#, c-format
msgid "Web Server"
msgstr "Veb Vericisi"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:72
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:75
#, fuzzy, c-format
msgid "Groupware"
msgstr "Qrup"
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:76
#, c-format
msgid "Kolab Server"
msgstr "Kolab Vericisi"
-#: share/meta-task/compssUsers.pl:92 share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
#, c-format
msgid "Firewall/Router"
msgstr "Atəş Divarı/İstiqamətləndirici"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
#, c-format
msgid "Internet gateway"
msgstr "İnternet keçidi"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:83
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Fayl/_Təze"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:84
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix poçt vericisi"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:87
#, fuzzy, c-format
msgid "Directory Server"
msgstr "CD'dən Geri Yüklə"
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:91
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NTP Verici"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:92
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:95
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:96
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domen Adı Vericisi"
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:99
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Çapçı Vericisi"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:100
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba vericisi"
-#: share/meta-task/compssUsers.pl:116 share/meta-task/compssUsers.pl:129
+#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
#, c-format
msgid "Database"
msgstr "Mə'lumat Bazası"
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:104
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:108
#, c-format
msgid "Web/FTP"
msgstr "Veb/FTP"
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:109
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:112
#, c-format
msgid "Mail"
msgstr "Poçt"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:113
#, c-format
msgid "Postfix mail server"
msgstr "Postfix poçt vericisi"
-#: share/meta-task/compssUsers.pl:130
+#: share/meta-task/compssUsers.pl:117
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
-#: share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:124
#, c-format
msgid "Network Computer server"
msgstr "Şəbəkə Kompüter vericisi"
-#: share/meta-task/compssUsers.pl:138
+#: share/meta-task/compssUsers.pl:125
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS vericisi, SMB vericisi, Vəkil vericisi, SSH verici"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:131
#, c-format
msgid "Graphical Environment"
msgstr "Qrafiki Mühit"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "KDE Workstation"
msgstr "KDE iş stansiyası"
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:134
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:138
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME iş stansiyası"
-#: share/meta-task/compssUsers.pl:152
+#: share/meta-task/compssUsers.pl:139
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -590,57 +597,57 @@ msgid ""
msgstr ""
"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:142
#, fuzzy, c-format
msgid "IceWm Desktop"
msgstr "Masa üstü"
-#: share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:146
#, c-format
msgid "Other Graphical Desktops"
msgstr "Başqa qrafiki ara üzlər"
-#: share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:147
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:170
#, c-format
msgid "Utilities"
msgstr "Vasitələr"
-#: share/meta-task/compssUsers.pl:185 share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
#, c-format
msgid "SSH Server"
msgstr "SSH Vericisi"
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "Webmin"
msgstr "Veb kamerası"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:178
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Terminal Server Quraşdırılması"
-#: share/meta-task/compssUsers.pl:195
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Şəbəkə İzlənməsi"
-#: share/meta-task/compssUsers.pl:196
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:187
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>Mandriva Store</b>"
-#: share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:188
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "\"%s\" çapçısı quraşdırıla bilmədi!"
@@ -654,7 +661,7 @@ msgstr ""
"Bir xəta oldu, yalnız necə düzəldiləcəyi bilinmir.\n"
"Davam edin, riski sizə aitdir!"
-#: steps.pm:432
+#: steps.pm:433
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -682,46 +689,7 @@ msgstr "Mandriva Linux Qurulumu %s"
msgid "<Tab>/<Alt-Tab> between elements"
msgstr "<Tab>/<Alt-Tab> irəli/geri"
-#: steps_gtk.pm:155 steps_gtk.pm:156
-#, c-format
-msgid "Localization"
-msgstr ""
-
-#: steps_gtk.pm:159 steps_list.pm:20
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Installation class"
-msgstr ""
-
-#: steps_gtk.pm:160 steps_gtk.pm:243 steps_interactive.pm:511
-#, c-format
-msgid "Package Group Selection"
-msgstr "Paket Qruplarının Seçimi"
-
-#: steps_gtk.pm:161 steps_gtk.pm:460 steps_interactive.pm:543
-#, c-format
-msgid "Installing"
-msgstr "Qurulur"
-
-#: steps_gtk.pm:162 steps_gtk.pm:576 steps_interactive.pm:735
-#, c-format
-msgid "Summary"
-msgstr "İcmal"
-
-#: steps_gtk.pm:164 steps_gtk.pm:165 steps_list.pm:30
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Bootloader"
-msgstr "Açılış yükləyicisi"
-
-#: steps_gtk.pm:166 steps_interactive.pm:644
-#, c-format
-msgid "Updates"
-msgstr "Yeniləmələr"
-
-#: steps_gtk.pm:213
+#: steps_gtk.pm:189
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -735,172 +703,188 @@ msgstr ""
"dəCDROMdan başlatdığınız zaman,\n"
" 'F1'ə basın və 'text' yazaraq enter'ə basın."
-#: steps_gtk.pm:264 steps_interactive.pm:529
+#: steps_gtk.pm:256 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_list.pm:30
+#, c-format
+msgid "Package Group Selection"
+msgstr "Paket Qruplarının Seçimi"
+
+#: steps_gtk.pm:277 steps_interactive.pm:581
#, c-format
msgid "Individual package selection"
msgstr "Fərdi paket seçimi"
-#: steps_gtk.pm:268 steps_interactive.pm:454
+#: steps_gtk.pm:299 steps_interactive.pm:507
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ümumi böyüklük: %d / %d Mb"
-#: steps_gtk.pm:313
+#: steps_gtk.pm:344
#, c-format
msgid "Bad package"
msgstr "Xətalı paket"
-#: steps_gtk.pm:315
+#: steps_gtk.pm:346
#, c-format
msgid "Version: "
msgstr "Buraxılış: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "Size: "
msgstr "Böyüklük: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:317
+#: steps_gtk.pm:348
#, c-format
msgid "Importance: "
msgstr "Əhəmiyyət:"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:382
#, c-format
msgid "You can not select/unselect this package"
msgstr "Bu paketi seçə bilməzsiniz/sistemdən çıxarda bilməzsınız"
-#: steps_gtk.pm:355
+#: steps_gtk.pm:386
#, c-format
msgid "due to missing %s"
msgstr "%s əksik olduğuna görə"
-#: steps_gtk.pm:356
+#: steps_gtk.pm:387
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s razı qalmadığına görə"
-#: steps_gtk.pm:357
+#: steps_gtk.pm:388
#, c-format
msgid "trying to promote %s"
msgstr "%s irəliləndirməyə çalışılır"
-#: steps_gtk.pm:358
+#: steps_gtk.pm:389
#, c-format
msgid "in order to keep %s"
msgstr "%s-i saxlamaq üçün"
-#: steps_gtk.pm:363
+#: steps_gtk.pm:394
#, c-format
msgid ""
"You can not select this package as there is not enough space left to install "
"it"
msgstr "Bu paketi seçə bilməzsiniz, çünki qurmaq üçün yer çatmır."
-#: steps_gtk.pm:366
+#: steps_gtk.pm:397
#, c-format
msgid "The following packages are going to be installed"
msgstr "Aşağıdakı paketlər qurulacaq"
-#: steps_gtk.pm:367
+#: steps_gtk.pm:398
#, c-format
msgid "The following packages are going to be removed"
msgstr "Aşağıdakı paketlər sistemdən silinəcəklər"
-#: steps_gtk.pm:392
+#: steps_gtk.pm:423
#, c-format
msgid "This is a mandatory package, it can not be unselected"
msgstr "Bu lazımlı bir paketdir, sistemdən çıxardıla bilməz"
-#: steps_gtk.pm:394
+#: steps_gtk.pm:425
#, c-format
msgid "You can not unselect this package. It is already installed"
msgstr "Bu paketi sistemdən çıxarda bilməzsınız. Artıq qurulmuşdur."
-#: steps_gtk.pm:396
+#: steps_gtk.pm:427
#, c-format
msgid "You can not unselect this package. It must be upgraded"
msgstr "Bu paketi sistemdən çıxarda bilməzsiniz. Yenilənməlidir"
-#: steps_gtk.pm:400
+#: steps_gtk.pm:431
#, c-format
msgid "Show automatically selected packages"
msgstr "Avtomatik seçili paketləri göstər"
-#: steps_gtk.pm:402 steps_interactive.pm:133
+#: steps_gtk.pm:433
#, c-format
msgid "Install"
msgstr "Qur"
-#: steps_gtk.pm:405
+#: steps_gtk.pm:436
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "Seçili olanı qeyd et"
-#: steps_gtk.pm:406
+#: steps_gtk.pm:437
#, c-format
msgid "Updating package selection"
msgstr "Paket seçkiləri yenilənir"
-#: steps_gtk.pm:411
+#: steps_gtk.pm:442
#, c-format
msgid "Minimal install"
msgstr "Minimal qurulum"
-#: steps_gtk.pm:425
+#: steps_gtk.pm:456
#, c-format
msgid "Software Management"
msgstr "Proqram Tə'minatı İdarəsi"
-#: steps_gtk.pm:425 steps_interactive.pm:373
+#: steps_gtk.pm:456 steps_interactive.pm:393
#, c-format
msgid "Choose the packages you want to install"
msgstr "Qurmaq istədiyiniz paketləri seçin"
-#: steps_gtk.pm:487
+#: steps_gtk.pm:473 steps_interactive.pm:595 steps_list.pm:32
+#, c-format
+msgid "Installing"
+msgstr "Qurulur"
+
+#: steps_gtk.pm:499
#, c-format
msgid "No details"
msgstr "Təfsilatsız"
-#: steps_gtk.pm:483
+#: steps_gtk.pm:514
#, c-format
msgid "Time remaining "
msgstr "Qalan müddət"
-#: steps_gtk.pm:484
+#: steps_gtk.pm:515
#, c-format
msgid "Estimating"
msgstr "Təxmini olaraq hesaplanır"
-#: steps_gtk.pm:511
+#: steps_gtk.pm:542
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d paket"
-#: steps_gtk.pm:589
+#: steps_gtk.pm:588 steps_interactive.pm:782 steps_list.pm:43
+#, c-format
+msgid "Summary"
+msgstr "İcmal"
+
+#: steps_gtk.pm:605
#, c-format
msgid "Configure"
msgstr "Qur"
-#: steps_gtk.pm:580 steps_interactive.pm:731 steps_interactive.pm:858
+#: steps_gtk.pm:622 steps_interactive.pm:778 steps_interactive.pm:934
#, c-format
msgid "not configured"
msgstr "quraşdırılmayıb"
-#: steps_gtk.pm:612 steps_interactive.pm:268
+#: steps_gtk.pm:658 steps_interactive.pm:278
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:621 steps_interactive.pm:274
+#: steps_gtk.pm:667 steps_interactive.pm:284
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -909,7 +893,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:623 steps_interactive.pm:276
+#: steps_gtk.pm:669 steps_interactive.pm:286
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -929,12 +913,12 @@ msgstr "Xahiş edirik, klaviatura düzülüşünüzü seçin."
msgid "Here is the full list of available keyboards"
msgstr "Bütün mövcud ölkələrinn siyahısı"
-#: steps_interactive.pm:128
+#: steps_interactive.pm:129
#, c-format
msgid "Install/Upgrade"
msgstr "Qurulum/Yeniləmə"
-#: steps_interactive.pm:129
+#: steps_interactive.pm:130
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Bu bir qurulum, yoxsa yeniləmədir?"
@@ -946,27 +930,37 @@ msgid ""
"Install"
msgstr "Qur"
-#: steps_interactive.pm:137
+#: steps_interactive.pm:136
#, c-format
msgid "Upgrade %s"
msgstr "%s-i yenilə"
-#: steps_interactive.pm:148
+#: steps_interactive.pm:140
+#, c-format
+msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:144
+#, c-format
+msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:158
#, c-format
msgid "Encryption key for %s"
msgstr "%s üçün şifrələmə açarı"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "IDE"
msgstr "İDE"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "Configuring IDE"
msgstr "İDE qapıları qurulur"
-#: steps_interactive.pm:221
+#: steps_interactive.pm:231
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -975,7 +969,7 @@ msgstr ""
"1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
"bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
-#: steps_interactive.pm:226
+#: steps_interactive.pm:236
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -985,7 +979,7 @@ msgstr ""
"1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
"bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
-#: steps_interactive.pm:318
+#: steps_interactive.pm:328
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1000,19 +994,19 @@ msgstr ""
"Əgər CD-ROM əlinizdə deyilsə, bu CD-Rom'dan qurmamaq üçün Ləğv Et düyməsinə "
"basın."
-#: steps_interactive.pm:340
+#: steps_interactive.pm:350
#, c-format
msgid "Looking for available packages..."
msgstr "Mövcud olan paketlər axtarılır."
-#: steps_interactive.pm:349
+#: steps_interactive.pm:358
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:385
+#: steps_interactive.pm:405
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1021,52 +1015,52 @@ msgstr ""
"Xahiş edirik, paket seçkilərini disketə qeyd et/disketdən yüklə\n"
"seçənəyini seçin."
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Load"
msgstr "Yüklə"
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Save"
msgstr "Qeyd Et"
-#: steps_interactive.pm:395
+#: steps_interactive.pm:415
#, c-format
msgid "Bad file"
msgstr "Səhv fayl"
-#: steps_interactive.pm:413
+#: steps_interactive.pm:431
#, c-format
msgid "Install Mandriva KDE Desktop"
msgstr ""
-#: steps_interactive.pm:414
+#: steps_interactive.pm:432
#, c-format
msgid "Install Mandriva GNOME Desktop"
msgstr ""
-#: steps_interactive.pm:415
+#: steps_interactive.pm:433
#, fuzzy, c-format
msgid "Custom install"
msgstr "Minimal qurulum"
-#: steps_interactive.pm:418
+#: steps_interactive.pm:436
#, c-format
msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
msgstr ""
-#: steps_interactive.pm:503
+#: steps_interactive.pm:521
#, c-format
msgid "Selected size is larger than available space"
msgstr "Seçili böyüklük var olandan daha böyükdür"
-#: steps_interactive.pm:483
+#: steps_interactive.pm:536
#, c-format
msgid "Type of install"
msgstr "Qurulum növü"
-#: steps_interactive.pm:484
+#: steps_interactive.pm:537
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1075,82 +1069,82 @@ msgstr ""
"Heç bir paket qrupunu seçmədiniz.\n"
"Xahiş edirik, istədiyiniz ən kiçik qurulumu seçin:"
-#: steps_interactive.pm:487
+#: steps_interactive.pm:540
#, c-format
msgid "With X"
msgstr "X ilə"
-#: steps_interactive.pm:488
+#: steps_interactive.pm:541
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Əsas sənədlərlə birlikdə (məsləhət edilən!)"
-#: steps_interactive.pm:489
+#: steps_interactive.pm:542
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Həqiqətən minimal qurulum (xüsusilə urpmi olmasın)"
-#: steps_interactive.pm:528
-#, c-format
-msgid "All"
-msgstr "Hamısı"
-
-#: steps_interactive.pm:544
+#: steps_interactive.pm:596
#, c-format
msgid "Preparing installation"
msgstr "Qurulum hazırlanır"
-#: steps_interactive.pm:552
+#: steps_interactive.pm:604
#, c-format
msgid "Installing package %s"
msgstr "%s paketi qurulur"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "There was an error ordering packages:"
msgstr "Paketləri istərkən xəta yarandı:"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "Go on anyway?"
msgstr "Yenə də davam edək?"
-#: steps_interactive.pm:580
+#: steps_interactive.pm:632
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:581
+#: steps_interactive.pm:633
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:634
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:635
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Paket seçkilərini qeyd et"
-#: steps_interactive.pm:586
+#: steps_interactive.pm:638
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Paketlər qurulurkən bir xəta oldu:"
-#: steps_interactive.pm:604
+#: steps_interactive.pm:656
#, c-format
msgid "Post-install configuration"
msgstr "Qurulum sonrası qurğular"
-#: steps_interactive.pm:611
+#: steps_interactive.pm:663
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:645
+#: steps_interactive.pm:691 steps_list.pm:47
+#, c-format
+msgid "Updates"
+msgstr "Yeniləmələr"
+
+#: steps_interactive.pm:692
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1172,39 +1166,39 @@ msgstr ""
"\n"
"Yeniləmələri qurmaq istəyirsiniz ?"
-#: steps_interactive.pm:666
+#: steps_interactive.pm:713
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "Əks ünvanına bağlantı qurulur"
-#: steps_interactive.pm:672
+#: steps_interactive.pm:719
#, c-format
msgid "Unable to contact mirror %s"
msgstr "%s əksi ilə rabitə qurula bilmir"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:777
+#: steps_interactive.pm:825
#, c-format
msgid "%s on %s"
msgstr "%2$s üstündə %1$s"
-#: steps_interactive.pm:810 steps_interactive.pm:817 steps_interactive.pm:830
-#: steps_interactive.pm:847 steps_interactive.pm:863 steps_interactive.pm:874
+#: steps_interactive.pm:859 steps_interactive.pm:866 steps_interactive.pm:880
+#: steps_interactive.pm:898 steps_interactive.pm:913
#, c-format
msgid "Hardware"
msgstr "Avadanlıq"
-#: steps_interactive.pm:795 steps_interactive.pm:812
+#: steps_interactive.pm:881 steps_interactive.pm:899
#, c-format
msgid "Sound card"
msgstr "Səs kartı"
-#: steps_interactive.pm:815
+#: steps_interactive.pm:902
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Heç İSA səs kartınız var?"
-#: steps_interactive.pm:817
+#: steps_interactive.pm:904
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1212,67 +1206,62 @@ msgid ""
msgstr ""
"Qurulumdan sonra səs kartınızı qurğulamaq üçün \"sndconfig\" əmrini icra edin"
-#: steps_interactive.pm:819
+#: steps_interactive.pm:906
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Səs kartı tapılmadı. Qurulumdan sonra \"harddrake\"ni işə salın"
-#: steps_interactive.pm:828
-#, c-format
-msgid "TV card"
-msgstr "TV kartı"
-
-#: steps_interactive.pm:839
+#: steps_interactive.pm:914
#, c-format
msgid "Graphical interface"
msgstr "Qrafiki ara üz"
-#: steps_interactive.pm:845 steps_interactive.pm:856
+#: steps_interactive.pm:921 steps_interactive.pm:932
#, c-format
msgid "Network & Internet"
msgstr "Şəbəkə və İnternet"
-#: steps_interactive.pm:857
+#: steps_interactive.pm:933
#, c-format
msgid "Proxies"
msgstr "Vəkil vericiləri"
-#: steps_interactive.pm:858
+#: steps_interactive.pm:934
#, c-format
msgid "configured"
msgstr "quraşdırılıb"
-#: steps_interactive.pm:868
+#: steps_interactive.pm:944
#, c-format
msgid "Security Level"
msgstr "Təhlükəsizlik Səviyyəsi"
-#: steps_interactive.pm:882
+#: steps_interactive.pm:963
#, c-format
msgid "Firewall"
msgstr "Atəş Divarı"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "activated"
msgstr "fəal"
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "disabled"
msgstr "qeyri-fəal"
-#: steps_interactive.pm:939
+#: steps_interactive.pm:981
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Siz X-i quraşdırmadınız. Bundan əminsinizmi?"
-#: steps_interactive.pm:973
+#: steps_interactive.pm:1008
#, c-format
msgid "Preparing bootloader..."
msgstr "Açılış yükləyici hazırlanır"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:1018
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1285,12 +1274,12 @@ msgstr ""
"Qurulum davam edəcək ancaq kompüterinizi aça bilmək üçün\n"
" BootX ya da başqa vasitədən istifadə etməlisiniz"
-#: steps_interactive.pm:989
+#: steps_interactive.pm:1024
#, c-format
msgid "Do you want to use aboot?"
msgstr "aboot istifadə etmək istəyirsiniz?"
-#: steps_interactive.pm:992
+#: steps_interactive.pm:1027
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -1299,24 +1288,24 @@ msgstr ""
"aboot qurulumunda xata, \n"
"ilk disk bölməsini yox etsə belə yenə də qurulmasını istəyirsiniz?"
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1039
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1071
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s sürücüsünə boş bir disket yerləşdirin"
-#: steps_interactive.pm:1040
+#: steps_interactive.pm:1073
#, c-format
msgid "Creating auto install floppy..."
msgstr "Avtomatik qurulum disketi hazırlanır"
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1084
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1327,22 +1316,22 @@ msgstr ""
"\n"
"Həqiqətən də çıxmaq istəyirsiniz?"
-#: steps_interactive.pm:1061
+#: steps_interactive.pm:1094
#, c-format
msgid "Congratulations"
msgstr "Təbriklər"
-#: steps_interactive.pm:1065
+#: steps_interactive.pm:1098
#, c-format
msgid "Reboot"
msgstr "Yenidən başlat"
-#: steps_interactive.pm:1069 steps_interactive.pm:1070
+#: steps_interactive.pm:1102 steps_interactive.pm:1103
#, c-format
msgid "Generate auto install floppy"
msgstr "Avtomatik qurulum disketi hazırla"
-#: steps_interactive.pm:1071
+#: steps_interactive.pm:1104
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -1357,17 +1346,17 @@ msgstr ""
"\n"
"Gələcəkdə bu qurulumu təkrarlamaq istəyə bilərsiniz.\n"
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Replay"
msgstr "Təkrarla"
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Automated"
msgstr "Avtomatlaşdırılmış"
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1112
#, c-format
msgid "Save packages selection"
msgstr "Paket seçkilərini qeyd et"
@@ -1380,6 +1369,11 @@ msgid ""
"Language"
msgstr "Dil"
+#: steps_list.pm:16 steps_list.pm:23
+#, c-format
+msgid "Localization"
+msgstr ""
+
#: steps_list.pm:17
#, c-format
msgid ""
@@ -1394,104 +1388,124 @@ msgid ""
"Mouse"
msgstr "Siçan"
-#: steps_list.pm:19
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr "Sabit disklərin aşkar edilməsi"
-#: steps_list.pm:21
+#: steps_list.pm:21 steps_list.pm:22
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Installation class"
+msgstr ""
+
+#: steps_list.pm:23
#, c-format
msgid ""
"_: Keep these entry short\n"
"Keyboard"
msgstr "Klaviatura"
-#: steps_list.pm:22
+#: steps_list.pm:24
#, c-format
msgid ""
"_: Keep these entry short\n"
"Security"
msgstr "Təhlükəsizlik"
-#: steps_list.pm:23
+#: steps_list.pm:25
#, c-format
msgid ""
"_: Keep these entry short\n"
"Partitioning"
msgstr "Bölmələndirmə"
-#: steps_list.pm:24
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
"Formatting"
msgstr ""
-#: steps_list.pm:25
+#: steps_list.pm:29
#, c-format
msgid ""
"_: Keep these entry short\n"
"Choosing packages"
msgstr ""
-#: steps_list.pm:26
+#: steps_list.pm:31
#, c-format
msgid ""
"_: Keep these entry short\n"
"Installing"
msgstr "Qurulur"
-#: steps_list.pm:28
+#: steps_list.pm:34
#, c-format
msgid ""
"_: Keep these entry short\n"
"Users"
msgstr "İstifadəçilər"
-#: steps_list.pm:29
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr "Şəbəkə"
-#: steps_list.pm:31
+#: steps_list.pm:38 steps_list.pm:39
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Bootloader"
+msgstr "Açılış yükləyicisi"
+
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
"Configure X"
msgstr "X quraşdırılması"
-#: steps_list.pm:32
+#: steps_list.pm:42
#, c-format
msgid ""
"_: Keep these entry short\n"
"Summary"
msgstr "İcmal"
-#: steps_list.pm:33
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
"Services"
msgstr "Xidmətlər"
-#: steps_list.pm:34
+#: steps_list.pm:46
#, c-format
msgid ""
"_: Keep these entry short\n"
"Updates"
msgstr "Yeniləmələr"
-#: steps_list.pm:35
+#: steps_list.pm:48
#, c-format
msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "Çıxış"
+#~ msgid "All"
+#~ msgstr "Hamısı"
+
+#~ msgid "TV card"
+#~ msgstr "TV kartı"
+
#~ msgid "Boot"
#~ msgstr "Açılış"
diff --git a/perl-install/install/share/po/be.po b/perl-install/install/share/po/be.po
index d707c96e3..cd0dd713b 100644
--- a/perl-install/install/share/po/be.po
+++ b/perl-install/install/share/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 20:13+0200\n"
+"POT-Creation-Date: 2007-10-01 09:12+0200\n"
"PO-Revision-Date: 2000-09-24 12:30 +0100\n"
"Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
"Language-Team: be\n"
@@ -14,13 +14,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: any.pm:159
+#: any.pm:155
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
msgstr "Ці ёсць у вас іншы?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:162
+#: any.pm:158
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -29,113 +29,113 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:170
+#: any.pm:166
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:171
+#: any.pm:167
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Сетка"
-#: any.pm:172
+#: any.pm:168
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Сетка"
-#: any.pm:173
+#: any.pm:169
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:215
+#: any.pm:211
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:221
+#: any.pm:217
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:232
+#: any.pm:228
#, fuzzy, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
-#: any.pm:237
+#: any.pm:233
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
-#: any.pm:247
+#: any.pm:243
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Выбар люстра для атрымання пакетаў"
-#: any.pm:277
+#: any.pm:273
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:278
+#: any.pm:274
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:282
+#: any.pm:278
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:283
+#: any.pm:279
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:287
+#: any.pm:283
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:288
+#: any.pm:284
#, c-format
msgid "Directory"
msgstr "Каталёг"
-#: any.pm:310
+#: any.pm:306
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:345
+#: any.pm:341
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Не знойздены праграмы\n"
-#: any.pm:379
+#: any.pm:375
#, fuzzy, c-format
msgid "Looking at packages already installed..."
msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны"
-#: any.pm:386
+#: any.pm:382
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:428
+#: any.pm:424
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Пошук пакетаў для абнаўлення"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:614
+#: any.pm:610
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -150,7 +150,7 @@ msgid ""
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:637
+#: any.pm:633
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -159,77 +159,77 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:1059
+#: any.pm:1055
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Наступныя пакеты будуць даданы да сістэмы"
-#: any.pm:1061
+#: any.pm:1057
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1118
+#: any.pm:1114
#, fuzzy, c-format
msgid "NFS"
msgstr "ФС"
-#: any.pm:1137 steps_interactive.pm:846
+#: any.pm:1133 steps_interactive.pm:922
#, c-format
msgid "Network"
msgstr "Сетка"
-#: any.pm:1141
+#: any.pm:1137
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Калі ласка выбярыце відарыс відэа"
-#: any.pm:1157
+#: any.pm:1153
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл ужо йснуе. Перапісаць?"
-#: any.pm:1161
+#: any.pm:1157
#, c-format
msgid "Permission denied"
msgstr "Адмоўлена ў доступе"
-#: any.pm:1209
+#: any.pm:1205
#, fuzzy, c-format
msgid "Bad NFS name"
msgstr "Бяз назвы"
-#: any.pm:1230
+#: any.pm:1226
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "Загружаецца файл %s"
-#: any.pm:1272
+#: any.pm:1269
#, fuzzy, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Дадаць раздзел немагчыма"
-#: any.pm:1279
+#: any.pm:1277
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
-#: gtk.pm:136
+#: gtk.pm:119
#, fuzzy, c-format
msgid "Installation"
msgstr "Усталёўваем"
-#: gtk.pm:139 share/meta-task/compssUsers.pl:54
+#: gtk.pm:122 share/meta-task/compssUsers.pl:42
#, c-format
msgid "Configuration"
msgstr "Канфігурацыя"
@@ -258,57 +258,64 @@ msgstr "Далучэнне да сеткі"
msgid "Bringing down the network"
msgstr "Адлучэнне ад сеткі"
-#: media.pm:699 media.pm:710
+#: media.pm:703 media.pm:714
#, fuzzy, c-format
msgid "Downloading file %s..."
msgstr "Вызначэнне прыладаў..."
-#: media.pm:804
+#: media.pm:808
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:857
+#: media.pm:861
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Стварэньне меню ўжо запушчана"
-#: pkgs.pm:33
+#: pkgs.pm:28
#, c-format
msgid "must have"
msgstr "павінны мець"
-#: pkgs.pm:34
+#: pkgs.pm:29
#, c-format
msgid "important"
msgstr "важна"
-#: pkgs.pm:35
+#: pkgs.pm:30
#, c-format
msgid "very nice"
msgstr "вельмі добра"
-#: pkgs.pm:36
+#: pkgs.pm:31
#, c-format
msgid "nice"
msgstr "добра"
-#: pkgs.pm:37
+#: pkgs.pm:32
#, c-format
msgid "maybe"
msgstr "можа быць"
-#: share/meta-task/compssUsers.pl:23
+#: pkgs.pm:245
+#, c-format
+msgid ""
+"Some packages requested by %s cannot be installed:\n"
+"%s"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:11
#, fuzzy, c-format
msgid "Workstation"
msgstr "Канфігурацыя"
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:13
#, fuzzy, c-format
msgid "Office Workstation"
msgstr "Працоўныя мейсцы"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -317,7 +324,7 @@ msgstr ""
"Офісныя праграмы: працэсары словаў (OpenOffice.org Writer, Kword), "
"электроныя табліцы, аглядальнікі pdf-файлаў, і г.д."
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -326,225 +333,225 @@ msgstr ""
"Офісныя праграмы: працэсары словаў (kword, abiword), электроныя табліцы, "
"аглядальнікі pdf-файлаў, і г.д."
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:21
#, fuzzy, c-format
msgid "Game station"
msgstr "Аўтэнтыфікацыя"
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:22
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забаўляльныя праграмы: аркады, стратэгіі і г.д."
-#: share/meta-task/compssUsers.pl:37
+#: share/meta-task/compssUsers.pl:25
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Мульцімедыя"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:26
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Рэдактары і прайгравальнікі гуку і відэа"
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:31
#, fuzzy, c-format
msgid "Internet station"
msgstr "Інтэрнэт"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:32
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:37
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Сеткавы прынтэр (TCP/Socket)"
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:38
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:55
+#: share/meta-task/compssUsers.pl:43
#, fuzzy, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ці жадаеце пратэсціраваць настройкі?"
-#: share/meta-task/compssUsers.pl:59
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Console Tools"
msgstr "Кансольныя інструментальныя сродкі"
-#: share/meta-task/compssUsers.pl:60
+#: share/meta-task/compssUsers.pl:48
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Рэдактары, абалонкі, тэрміналы"
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:166
-#: share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:155
#, c-format
msgid "Development"
msgstr "Распрацоўка"
-#: share/meta-task/compssUsers.pl:65 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Бібліятэкі і праграмы для распрацоўкі на С і С++"
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
#, c-format
msgid "Documentation"
msgstr "Дакумэнтацыя"
-#: share/meta-task/compssUsers.pl:70 share/meta-task/compssUsers.pl:174
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "нігі і Howto па Linux і Free Software"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:75 share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:71
#, fuzzy, c-format
msgid "Web Server"
msgstr "Сервак"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:72
#, fuzzy, c-format
msgid "Apache"
msgstr "Шлях:"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:75
#, fuzzy, c-format
msgid "Groupware"
msgstr "Групы"
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:76
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:92 share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
#, fuzzy, c-format
msgid "Firewall/Router"
msgstr "Рэстарт"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
#, fuzzy, c-format
msgid "Internet gateway"
msgstr "Інтэрнэт"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:83
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Файл/_Стварыць"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:84
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr ""
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:87
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Каталог %s Так"
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:91
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:92
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "DNS/NIS"
msgstr ""
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:96
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Імя дамену"
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:99
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Сервер друку"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:100
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "X сэервер"
-#: share/meta-task/compssUsers.pl:116 share/meta-task/compssUsers.pl:129
+#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
#, c-format
msgid "Database"
msgstr "База даньняў"
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:104
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:108
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:109
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:112
#, c-format
msgid "Mail"
msgstr "Пошта"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:113
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:130
+#: share/meta-task/compssUsers.pl:117
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:124
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Сеткавыя інтэрфэйсы"
-#: share/meta-task/compssUsers.pl:138
+#: share/meta-task/compssUsers.pl:125
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:131
#, fuzzy, c-format
msgid "Graphical Environment"
msgstr "Абалонка"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:133
#, fuzzy, c-format
msgid "KDE Workstation"
msgstr "Канфігурацыя"
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:134
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -553,12 +560,12 @@ msgstr ""
"The K Desktop Environment - асноўнае графічнае асяродзе з калекцыяй "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:138
#, fuzzy, c-format
msgid "GNOME Workstation"
msgstr "Інфармацыя аб памяці"
-#: share/meta-task/compssUsers.pl:152
+#: share/meta-task/compssUsers.pl:139
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -567,57 +574,57 @@ msgstr ""
"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:142
#, fuzzy, c-format
msgid "IceWm Desktop"
msgstr "Працоўны стол"
-#: share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:146
#, c-format
msgid "Other Graphical Desktops"
msgstr "Іншыя графічныя Працоўныя сталы"
-#: share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:147
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:170
#, c-format
msgid "Utilities"
msgstr "Карыснасьці"
-#: share/meta-task/compssUsers.pl:185 share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
#, fuzzy, c-format
msgid "SSH Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "Webmin"
msgstr "Прылады"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:178
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Сістэмнае адміністраваньне"
-#: share/meta-task/compssUsers.pl:195
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Канфігурацыя сеткі"
-#: share/meta-task/compssUsers.pl:196
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:187
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Цэнтар кіраваньня"
-#: share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:188
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Немагчыма выдаліць \"%s\": %s."
@@ -631,7 +638,7 @@ msgstr ""
"Узнікла памылка, якую не атрымліваецца карэктна апрацаваць,\n"
"таму працягвайце на сваю рызыку."
-#: steps.pm:432
+#: steps.pm:433
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -659,46 +666,7 @@ msgstr "Усталяванне Mandriva Linux %s"
msgid "<Tab>/<Alt-Tab> between elements"
msgstr "<Tab>/<Alt-Tab> паміж элементамі"
-#: steps_gtk.pm:155 steps_gtk.pm:156
-#, c-format
-msgid "Localization"
-msgstr ""
-
-#: steps_gtk.pm:159 steps_list.pm:20
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Installation class"
-msgstr ""
-
-#: steps_gtk.pm:160 steps_gtk.pm:243 steps_interactive.pm:511
-#, c-format
-msgid "Package Group Selection"
-msgstr "Выбар групы пакетаў"
-
-#: steps_gtk.pm:161 steps_gtk.pm:460 steps_interactive.pm:543
-#, c-format
-msgid "Installing"
-msgstr "Усталёўваем"
-
-#: steps_gtk.pm:162 steps_gtk.pm:576 steps_interactive.pm:735
-#, c-format
-msgid "Summary"
-msgstr "Агульныя зьвесткі"
-
-#: steps_gtk.pm:164 steps_gtk.pm:165 steps_list.pm:30
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Bootloader"
-msgstr ""
-
-#: steps_gtk.pm:166 steps_interactive.pm:644
-#, c-format
-msgid "Updates"
-msgstr ""
-
-#: steps_gtk.pm:213
+#: steps_gtk.pm:189
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -711,67 +679,73 @@ msgstr ""
"праграму ўсталявання. Для гэтага націсніце ‛F1’ у час загрузкі, а потым\n"
"набярыце ‛text’ і націсніце <ENTER>."
-#: steps_gtk.pm:264 steps_interactive.pm:529
+#: steps_gtk.pm:256 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_list.pm:30
+#, c-format
+msgid "Package Group Selection"
+msgstr "Выбар групы пакетаў"
+
+#: steps_gtk.pm:277 steps_interactive.pm:581
#, c-format
msgid "Individual package selection"
msgstr "Асабісты выбар пакетаў"
-#: steps_gtk.pm:268 steps_interactive.pm:454
+#: steps_gtk.pm:299 steps_interactive.pm:507
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Агульны памер: %d / %d Мб"
-#: steps_gtk.pm:313
+#: steps_gtk.pm:344
#, c-format
msgid "Bad package"
msgstr "Дрэнны пакет"
-#: steps_gtk.pm:315
+#: steps_gtk.pm:346
#, c-format
msgid "Version: "
msgstr "Вэрсія: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "Size: "
msgstr "Памер: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "%d KB\n"
msgstr ""
-#: steps_gtk.pm:317
+#: steps_gtk.pm:348
#, fuzzy, c-format
msgid "Importance: "
msgstr "важна"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:382
#, c-format
msgid "You can not select/unselect this package"
msgstr "Вы не можаце вылучаць і адмяняць вылучэнне гэтага пакету"
-#: steps_gtk.pm:355
+#: steps_gtk.pm:386
#, c-format
msgid "due to missing %s"
msgstr ""
-#: steps_gtk.pm:356
+#: steps_gtk.pm:387
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: steps_gtk.pm:357
+#: steps_gtk.pm:388
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: steps_gtk.pm:358
+#: steps_gtk.pm:389
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Уласьцівасьці акна"
-#: steps_gtk.pm:363
+#: steps_gtk.pm:394
#, c-format
msgid ""
"You can not select this package as there is not enough space left to install "
@@ -779,106 +753,116 @@ msgid ""
msgstr ""
"Вы не можаце выбраць гэты пакет, таму як не хапае месца для яго ўсталявання"
-#: steps_gtk.pm:366
+#: steps_gtk.pm:397
#, c-format
msgid "The following packages are going to be installed"
msgstr "Наступныя пакеты будуць даданы да сістэмы"
-#: steps_gtk.pm:367
+#: steps_gtk.pm:398
#, c-format
msgid "The following packages are going to be removed"
msgstr "Наступныя пакеты будуць выдалены"
-#: steps_gtk.pm:392
+#: steps_gtk.pm:423
#, c-format
msgid "This is a mandatory package, it can not be unselected"
msgstr "Гэта абавязковы пакет, яго вылучэнне нельга адмяніць"
-#: steps_gtk.pm:394
+#: steps_gtk.pm:425
#, c-format
msgid "You can not unselect this package. It is already installed"
msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны"
-#: steps_gtk.pm:396
+#: steps_gtk.pm:427
#, c-format
msgid "You can not unselect this package. It must be upgraded"
msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Яго патрэбна абнавіць"
-#: steps_gtk.pm:400
+#: steps_gtk.pm:431
#, c-format
msgid "Show automatically selected packages"
msgstr ""
-#: steps_gtk.pm:402 steps_interactive.pm:133
+#: steps_gtk.pm:433
#, c-format
msgid "Install"
msgstr "Усталёўка"
-#: steps_gtk.pm:405
+#: steps_gtk.pm:436
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "Перанесьці вылучэньне"
-#: steps_gtk.pm:406
+#: steps_gtk.pm:437
#, fuzzy, c-format
msgid "Updating package selection"
msgstr "Асабісты выбар пакетаў"
-#: steps_gtk.pm:411
+#: steps_gtk.pm:442
#, fuzzy, c-format
msgid "Minimal install"
msgstr "Ахоўнік экрану"
-#: steps_gtk.pm:425
+#: steps_gtk.pm:456
#, c-format
msgid "Software Management"
msgstr ""
-#: steps_gtk.pm:425 steps_interactive.pm:373
+#: steps_gtk.pm:456 steps_interactive.pm:393
#, c-format
msgid "Choose the packages you want to install"
msgstr "Выбар пакетаў для ўсталявання"
-#: steps_gtk.pm:487
+#: steps_gtk.pm:473 steps_interactive.pm:595 steps_list.pm:32
+#, c-format
+msgid "Installing"
+msgstr "Усталёўваем"
+
+#: steps_gtk.pm:499
#, fuzzy, c-format
msgid "No details"
msgstr "Падрабязнасці"
-#: steps_gtk.pm:483
+#: steps_gtk.pm:514
#, c-format
msgid "Time remaining "
msgstr "Засталося часу "
-#: steps_gtk.pm:484
+#: steps_gtk.pm:515
#, c-format
msgid "Estimating"
msgstr "Чакаецца"
-#: steps_gtk.pm:511
+#: steps_gtk.pm:542
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d пакетаў"
msgstr[1] "%d пакетаў"
-#: steps_gtk.pm:589
+#: steps_gtk.pm:588 steps_interactive.pm:782 steps_list.pm:43
+#, c-format
+msgid "Summary"
+msgstr "Агульныя зьвесткі"
+
+#: steps_gtk.pm:605
#, c-format
msgid "Configure"
msgstr "Настройка"
-#: steps_gtk.pm:580 steps_interactive.pm:731 steps_interactive.pm:858
+#: steps_gtk.pm:622 steps_interactive.pm:778 steps_interactive.pm:934
#, fuzzy, c-format
msgid "not configured"
msgstr "Настроіць панэль"
-#: steps_gtk.pm:612 steps_interactive.pm:268
+#: steps_gtk.pm:658 steps_interactive.pm:278
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:621 steps_interactive.pm:274
+#: steps_gtk.pm:667 steps_interactive.pm:284
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -887,7 +871,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:623 steps_interactive.pm:276
+#: steps_gtk.pm:669 steps_interactive.pm:286
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -907,12 +891,12 @@ msgstr "Калі ласка, абярыце тып клавіятуры."
msgid "Here is the full list of available keyboards"
msgstr ""
-#: steps_interactive.pm:128
+#: steps_interactive.pm:129
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "Усталёўваем"
-#: steps_interactive.pm:129
+#: steps_interactive.pm:130
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
@@ -924,34 +908,44 @@ msgid ""
"Install"
msgstr "Усталёўка"
-#: steps_interactive.pm:137
+#: steps_interactive.pm:136
#, c-format
msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:148
+#: steps_interactive.pm:140
+#, c-format
+msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:144
+#, c-format
+msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:158
#, c-format
msgid "Encryption key for %s"
msgstr ""
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "Configuring IDE"
msgstr "Настройка IDE"
-#: steps_interactive.pm:221
+#: steps_interactive.pm:231
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:226
+#: steps_interactive.pm:236
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -959,7 +953,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:318
+#: steps_interactive.pm:328
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -974,153 +968,153 @@ msgstr ""
"Калі вы не маеце яго, націсніце Адмяніць, каб адмяніць усталяванне з гэтага "
"Cd."
-#: steps_interactive.pm:340
+#: steps_interactive.pm:350
#, c-format
msgid "Looking for available packages..."
msgstr "Прагляд даступных пакетаў"
-#: steps_interactive.pm:349
+#: steps_interactive.pm:358
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:385
+#: steps_interactive.pm:405
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Load"
msgstr "Загрузка"
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Save"
msgstr "Захаваць"
-#: steps_interactive.pm:395
+#: steps_interactive.pm:415
#, fuzzy, c-format
msgid "Bad file"
msgstr "Загрузка файла"
-#: steps_interactive.pm:413
+#: steps_interactive.pm:431
#, c-format
msgid "Install Mandriva KDE Desktop"
msgstr ""
-#: steps_interactive.pm:414
+#: steps_interactive.pm:432
#, c-format
msgid "Install Mandriva GNOME Desktop"
msgstr ""
-#: steps_interactive.pm:415
+#: steps_interactive.pm:433
#, fuzzy, c-format
msgid "Custom install"
msgstr "Ахоўнік экрану"
-#: steps_interactive.pm:418
+#: steps_interactive.pm:436
#, c-format
msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
msgstr ""
-#: steps_interactive.pm:503
+#: steps_interactive.pm:521
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:483
+#: steps_interactive.pm:536
#, c-format
msgid "Type of install"
msgstr ""
-#: steps_interactive.pm:484
+#: steps_interactive.pm:537
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:487
+#: steps_interactive.pm:540
#, c-format
msgid "With X"
msgstr ""
-#: steps_interactive.pm:488
+#: steps_interactive.pm:541
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:489
+#: steps_interactive.pm:542
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:528
-#, c-format
-msgid "All"
-msgstr "Усё"
-
-#: steps_interactive.pm:544
+#: steps_interactive.pm:596
#, c-format
msgid "Preparing installation"
msgstr "Падрыхтоўка ўсталяваньня"
-#: steps_interactive.pm:552
+#: steps_interactive.pm:604
#, c-format
msgid "Installing package %s"
msgstr "Усталяванне пакету %s"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "There was an error ordering packages:"
msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "Go on anyway?"
msgstr "Усё роўна працягваць?"
-#: steps_interactive.pm:580
+#: steps_interactive.pm:632
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:581
+#: steps_interactive.pm:633
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:634
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:635
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Асабісты выбар пакетаў"
-#: steps_interactive.pm:586
+#: steps_interactive.pm:638
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
-#: steps_interactive.pm:604
+#: steps_interactive.pm:656
#, c-format
msgid "Post-install configuration"
msgstr "Настройка пасля ўсталявання"
-#: steps_interactive.pm:611
+#: steps_interactive.pm:663
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:645
+#: steps_interactive.pm:691 steps_list.pm:47
+#, c-format
+msgid "Updates"
+msgstr ""
+
+#: steps_interactive.pm:692
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1133,106 +1127,101 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:666
+#: steps_interactive.pm:713
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
-#: steps_interactive.pm:672
+#: steps_interactive.pm:719
#, fuzzy, c-format
msgid "Unable to contact mirror %s"
msgstr "Немагчыма адчыніць файл %s\n"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:777
+#: steps_interactive.pm:825
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:810 steps_interactive.pm:817 steps_interactive.pm:830
-#: steps_interactive.pm:847 steps_interactive.pm:863 steps_interactive.pm:874
+#: steps_interactive.pm:859 steps_interactive.pm:866 steps_interactive.pm:880
+#: steps_interactive.pm:898 steps_interactive.pm:913
#, c-format
msgid "Hardware"
msgstr "Абсталяваньне"
-#: steps_interactive.pm:795 steps_interactive.pm:812
+#: steps_interactive.pm:881 steps_interactive.pm:899
#, fuzzy, c-format
msgid "Sound card"
msgstr "Праграма гуказапісу"
-#: steps_interactive.pm:815
+#: steps_interactive.pm:902
#, fuzzy, c-format
msgid "Do you have an ISA sound card?"
msgstr "Ці ёсць у вас іншы?"
-#: steps_interactive.pm:817
+#: steps_interactive.pm:904
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:819
+#: steps_interactive.pm:906
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:828
-#, c-format
-msgid "TV card"
-msgstr ""
-
-#: steps_interactive.pm:839
+#: steps_interactive.pm:914
#, fuzzy, c-format
msgid "Graphical interface"
msgstr "Запуск X пры старце сістэмы"
-#: steps_interactive.pm:845 steps_interactive.pm:856
+#: steps_interactive.pm:921 steps_interactive.pm:932
#, fuzzy, c-format
msgid "Network & Internet"
msgstr "Сеткавы інтэрфейс"
-#: steps_interactive.pm:857
+#: steps_interactive.pm:933
#, fuzzy, c-format
msgid "Proxies"
msgstr "Проксі"
-#: steps_interactive.pm:858
+#: steps_interactive.pm:934
#, fuzzy, c-format
msgid "configured"
msgstr "Настроіць панэль"
-#: steps_interactive.pm:868
+#: steps_interactive.pm:944
#, c-format
msgid "Security Level"
msgstr "Узровень бясьпекі"
-#: steps_interactive.pm:882
+#: steps_interactive.pm:963
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:886
+#: steps_interactive.pm:967
#, c-format
msgid "disabled"
msgstr "выключаны"
-#: steps_interactive.pm:939
+#: steps_interactive.pm:981
#, fuzzy, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Меню не было захавана. Ці сапраўды вы жадаеце выйсці?"
-#: steps_interactive.pm:973
+#: steps_interactive.pm:1008
#, c-format
msgid "Preparing bootloader..."
msgstr "Падрыхтоўка загрузчыка"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:1018
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1241,12 +1230,12 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:989
+#: steps_interactive.pm:1024
#, c-format
msgid "Do you want to use aboot?"
msgstr "Вы жадаеце выкарыстоўваць aboot?"
-#: steps_interactive.pm:992
+#: steps_interactive.pm:1027
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -1255,24 +1244,24 @@ msgstr ""
"Памылка ўсталявання aboot, \n"
"спрабаваць усталёўваць, негледзячы на магчымасць парушэння першага разделу?"
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1039
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1038
+#: steps_interactive.pm:1071
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Устаўце дыскету ў дыскавод %s"
-#: steps_interactive.pm:1040
+#: steps_interactive.pm:1073
#, c-format
msgid "Creating auto install floppy..."
msgstr "Стварэнне дыскеты для ўсталявання"
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1084
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1282,22 +1271,22 @@ msgstr ""
"Некаторыя крокі не завершаны.\n"
"Вы сапраўды жадаеце выйсці зараз?"
-#: steps_interactive.pm:1061
+#: steps_interactive.pm:1094
#, fuzzy, c-format
msgid "Congratulations"
msgstr "Прыміце віншаванні!"
-#: steps_interactive.pm:1065
+#: steps_interactive.pm:1098
#, c-format
msgid "Reboot"
msgstr "Перазагрузка"
-#: steps_interactive.pm:1069 steps_interactive.pm:1070
+#: steps_interactive.pm:1102 steps_interactive.pm:1103
#, fuzzy, c-format
msgid "Generate auto install floppy"
msgstr "Стварэнне дыскеты для ўсталявання"
-#: steps_interactive.pm:1071
+#: steps_interactive.pm:1104
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -1307,17 +1296,17 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr ""
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, fuzzy, c-format
msgid "Replay"
msgstr "Граць"
-#: steps_interactive.pm:1076
+#: steps_interactive.pm:1109
#, c-format
msgid "Automated"
msgstr "Аўтаматычны"
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1112
#, fuzzy, c-format
msgid "Save packages selection"
msgstr "Асабісты выбар пакетаў"
@@ -1330,6 +1319,11 @@ msgid ""
"Language"
msgstr "Выбар мовы"
+#: steps_list.pm:16 steps_list.pm:23
+#, c-format
+msgid "Localization"
+msgstr ""
+
#: steps_list.pm:17
#, c-format
msgid ""
@@ -1344,104 +1338,121 @@ msgid ""
"Mouse"
msgstr "Мыш"
-#: steps_list.pm:19
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr "Вызначэнне жорсткага дыску"
-#: steps_list.pm:21
+#: steps_list.pm:21 steps_list.pm:22
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Installation class"
+msgstr ""
+
+#: steps_list.pm:23
#, c-format
msgid ""
"_: Keep these entry short\n"
"Keyboard"
msgstr "Клавіятура"
-#: steps_list.pm:22
+#: steps_list.pm:24
#, c-format
msgid ""
"_: Keep these entry short\n"
"Security"
msgstr "Бясьпека"
-#: steps_list.pm:23
+#: steps_list.pm:25
#, c-format
msgid ""
"_: Keep these entry short\n"
"Partitioning"
msgstr ""
-#: steps_list.pm:24
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
"Formatting"
msgstr ""
-#: steps_list.pm:25
+#: steps_list.pm:29
#, c-format
msgid ""
"_: Keep these entry short\n"
"Choosing packages"
msgstr ""
-#: steps_list.pm:26
+#: steps_list.pm:31
#, c-format
msgid ""
"_: Keep these entry short\n"
"Installing"
msgstr "Усталёўваем"
-#: steps_list.pm:28
+#: steps_list.pm:34
#, c-format
msgid ""
"_: Keep these entry short\n"
"Users"
msgstr "Карыстальнікі"
-#: steps_list.pm:29
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr ""
-#: steps_list.pm:31
+#: steps_list.pm:38 steps_list.pm:39
+#, c-format
+msgid ""
+"_: Keep these entry short\n"
+"Bootloader"
+msgstr ""
+
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
"Configure X"
msgstr "Настройка X Window"
-#: steps_list.pm:32
+#: steps_list.pm:42
#, c-format
msgid ""
"_: Keep these entry short\n"
"Summary"
msgstr "Агульныя зьвесткі"
-#: steps_list.pm:33
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
"Services"
msgstr "Сэрвісы"
-#: steps_list.pm:34
+#: steps_list.pm:46
#, c-format
msgid ""
"_: Keep these entry short\n"
"Updates"
msgstr ""
-#: steps_list.pm:35
+#: steps_list.pm:48
#, c-format
msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "Выход"
+#~ msgid "All"
+#~ msgstr "Усё"
+
#, fuzzy
#~ msgid "Boot"
#~ msgstr "Манітор"
diff --git a/perl-install/install/share/po/bg.po b/perl-install/install/share/po/bg.po
index e774a60a6..9736abf07 100644
--- a/perl-install/install/share/po/bg.po
+++ b/perl-install/install/share/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 20:13+0200\n"
+"POT-Creation-Date: 2007-10-01 09:12+0200\n"
"PO-Revision-Date: 2004-09-15 13:27+0200\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -20,13 +20,13 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: any.pm:159
+#: any.pm:155
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
msgstr "Имате ли друг(и) ?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:162
+#: any.pm:158
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -35,37 +35,37 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:170
+#: any.pm:166
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:171
+#: any.pm:167
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Мрежа %s"
-#: any.pm:172
+#: any.pm:168
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Мрежа %s"
-#: any.pm:173
+#: any.pm:169
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:215
+#: any.pm:211
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:221
+#: any.pm:217
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:232
+#: any.pm:228
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -73,7 +73,7 @@ msgstr ""
"Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
"огледални сървъри..."
-#: any.pm:237
+#: any.pm:233
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -82,70 +82,70 @@ msgstr ""
"Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
"огледални сървъри..."
-#: any.pm:247
+#: any.pm:243
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Изберете огледален сървър,от който да получите пакетите"
-#: any.pm:277
+#: any.pm:273
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:278
+#: any.pm:274
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:282
+#: any.pm:278
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:283
+#: any.pm:279
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:287
+#: any.pm:283
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:288
+#: any.pm:284
#, c-format
msgid "Directory"
msgstr "Директория"
-#: any.pm:310
+#: any.pm:306
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:345
+#: any.pm:341
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Не мога да намеря %s на %s"
-#: any.pm:379
+#: any.pm:375
#, c-format
msgid "Looking at packages already installed..."
msgstr "Търси във вече инсталираните пакети..."
-#: any.pm:386
+#: any.pm:382
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:428
+#: any.pm:424
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Търся пакети за обновяване"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:614
+#: any.pm:610
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -169,7 +169,7 @@ msgstr ""
"Наистина ли искате да инсталирате тези сървъри ?\n"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:637
+#: any.pm:633
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -183,77 +183,77 @@ msgstr ""
"\n"
"Действително ли искате да изтриете тези пакети?\n"
-#: any.pm:1059
+#: any.pm:1055
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Следните пакети ще трябва да се инсталират:\n"
-#: any.pm:1061
+#: any.pm:1057
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1118
+#: any.pm:1114
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1137 steps_interactive.pm:846
+#: any.pm:1133 steps_interactive.pm:922
#, c-format
msgid "Network"
msgstr "Мрежа"
-#: any.pm:1141
+#: any.pm:1137
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Моля изберете"
-#: any.pm:1157
+#: any.pm:1153
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файлът съществува. Да бъде ли презаписан?"
-#: any.pm:1161
+#: any.pm:1157
#, c-format
msgid "Permission denied"
msgstr "Лисват права"
-#: any.pm:1209
+#: any.pm:1205
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1230
+#: any.pm:1226
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "добавен източник %s"
-#: any.pm:1272
+#: any.pm:1269
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Не мога да направя моментна \"снимка\" преди разделянето на диска "
-#: any.pm:1279
+#: any.pm:1277
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Снимки ще бъдат налични след инсталиране в %s"
-#: gtk.pm:136
+#: gtk.pm:119
#, fuzzy, c-format
msgid "Installation"
msgstr "Инсталирам"
-#: gtk.pm:139 share/meta-task/compssUsers.pl:54
+#: gtk.pm:122 share/meta-task/compssUsers.pl:42
#, c-format
msgid "Configuration"
msgstr "Настройка"
@@ -283,57 +283,64 @@ msgstr "Включвам мрежата"
msgid "Bringing down the network"
msgstr "Изключване на мрежата"
-#: media.pm:699 media.pm:710
+#: media.pm:703 media.pm:714
#, fuzzy, c-format
msgid "Downloading file %s..."
msgstr "Изпращам файлове..."
-#: media.pm:804
+#: media.pm:808
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:857
+#: media.pm:861
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Откриване в прогрес"
-#: pkgs.pm:33
+#: pkgs.pm:28
#, c-format
msgid "must have"
msgstr "нужен"
-#: pkgs.pm:34
+#: pkgs.pm:29
#, c-format
msgid "important"
msgstr "важен"
-#: pkgs.pm:35
+#: pkgs.pm:30
#, c-format
msgid "very nice"
msgstr "много добър"
-#: pkgs.pm:36
+#: pkgs.pm:31
#, c-format
msgid "nice"
msgstr "добър"
-#: pkgs.pm:37
+#: pkgs.pm:32
#, c-format
msgid "maybe"
msgstr "става"
-#: share/meta-task/compssUsers.pl:23
+#: pkgs.pm:245
+#, c-format
+msgid ""
+"Some packages requested by %s cannot be installed:\n"
+"%s"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:11
#, c-format
msgid "Workstation"
msgstr "Работна станция"
-#: share/meta-task/compssUsers.pl:25
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Office Workstation"
msgstr "Офисна работна станция"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -342,7 +349,7 @@ msgstr ""
"Офис програми: word-процесори (OpenOffice.org Writer, Kword), таблици "
"(OpenOffice.org Calc, Kspread), преглед на PDF, и т.н."
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -351,32 +358,32 @@ msgstr ""
"Офис програми: word-процесори (kword, abiword), таблици (kspread, gnumeric), "
"преглед на PDF, и т.н."
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:21
#, c-format
msgid "Game station"
msgstr "Игрална станция"
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:22
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забавни програми: аркадни игри, игри на маса, стратегии и т.н."
-#: share/meta-task/compssUsers.pl:37
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Multimedia station"
msgstr "Мутимедийна станция"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:26
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Програми за пускане/поправяне на звук и видео"
-#: share/meta-task/compssUsers.pl:43
+#: share/meta-task/compssUsers.pl:31
#, c-format
msgid "Internet station"
msgstr "Интернет станция"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:32
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -385,193 +392,193 @@ msgstr ""
"Набор от инструменти за четене и изпращане на поща и новини (pine, mutt, "
"tin..) и за обикаляне из Мрежата"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:37
#, c-format
msgid "Network Computer (client)"
msgstr "Мрежов компютър (клиент)"
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:38
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Клиенти за различни протоколи включително SSH"
-#: share/meta-task/compssUsers.pl:55
+#: share/meta-task/compssUsers.pl:43
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Инструменти за улесняване настройката на компютъра ви"
-#: share/meta-task/compssUsers.pl:59
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Console Tools"
msgstr "Конзолни инструменти"
-#: share/meta-task/compssUsers.pl:60
+#: share/meta-task/compssUsers.pl:48
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Редактори, шелове, файлови инстрименти, терминали"
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:166
-#: share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:155
#, c-format
msgid "Development"
msgstr "Разработка"
-#: share/meta-task/compssUsers.pl:65 share/meta-task/compssUsers.pl:169
+#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Библиотеки за разработка на C и C++, програми и include файлове"
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
#, c-format
msgid "Documentation"
msgstr "Документация"
-#: share/meta-task/compssUsers.pl:70 share/meta-task/compssUsers.pl:174
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Книги и HOTWO-та за Linux и свободния софтуер"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:75 share/meta-task/compssUsers.pl:178
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:71
#, c-format
msgid "Web Server"
msgstr "Web Сървър"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:72
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:75
#, c-format
msgid "Groupware"
msgstr "Групуер"
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:76
#, c-format
msgid "Kolab Server"
msgstr "Kolab Сървър"
-#: share/meta-task/compssUsers.pl:92 share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
#, c-format
msgid "Firewall/Router"
msgstr "Сървър, Firewall/Рутер"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
#, c-format
msgid "Internet gateway"
msgstr "Интернет gateway"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:83
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Файл/_Нов"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:84
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix пощенски сървър"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:87
#, c-format
msgid "Directory Server"
msgstr "Сървър с директории"
-#: share/meta-task/compssUsers.pl:104
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "FTP Server"
msgstr "FTP сървър"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:92
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:108
+#: share/meta-task/compssUsers.pl:95
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "FND/NIS"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:96
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Име на домейн и Мрежов Информационен Сървър"
-#: share/meta-task/compssUsers.pl:112
+#: share/meta-task/compssUsers.pl:99
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Сървър на принтера"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:100
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba Сървър"
-#: share/meta-task/compssUsers.pl:116 share/meta-task/compssUsers.pl:129
+#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
#, c-format
msgid "Database"
msgstr "Сървър, Бази-данни"
-#: share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:104
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL или MySQL сървър за бази-данни"
-#: share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:108
#, c-format
msgid "Web/FTP"
msgstr "Сървър, Web/FTP"
-#: share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:109
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache и Pro-ftpd"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:112
#, c-format
msgid "Mail"
msgstr "Е-поща"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:113
#, c-format
msgid "Postfix mail server"
msgstr "Postfix пощенски сървър"
-#: share/meta-task/compssUsers.pl:130
+#: share/meta-task/compssUsers.pl:117
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL или MySQL сървър за бази-данни"
-#: share/meta-task/compssUsers.pl:137
+#: share/meta-task/compssUsers.pl:124
#, c-format
msgid "Network Computer server"
msgstr "Мрежов компютър, сървър"
-#: share/meta-task/compssUsers.pl:138
+#: share/meta-task/compssUsers.pl:125
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS сървър, SMB сървър, Proxy сървър, SSH сървър"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:131
#, c-format
msgid "Graphical Environment"
msgstr "Графична среда"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "KDE Workstation"
msgstr "KDE работна станция"
-#: share/meta-task/compssUsers.pl:147
+#: share/meta-task/compssUsers.pl:134
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -580,12 +587,12 @@ msgstr ""
"The K Desktop Environment, проста среда с колекция от придружаващи "
"инструменти"
-#: share/meta-task/compssUsers.pl:151
+#: share/meta-task/compssUsers.pl:138
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome работна станция"
-#: share/meta-task/compssUsers.pl:152
+#: share/meta-task/compssUsers.pl:139
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -593,57 +600,57 @@ msgid ""
msgstr ""
"Графична среда с потребителски набор от приложения и desktop инструменти"
-#: share/meta-task/compssUsers.pl:155
+#: share/meta-task/compssUsers.pl:142
#, fuzzy, c-format
msgid "IceWm Desktop"
msgstr "настолен компютър"
-#: share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:146
#, c-format
msgid "Other Graphical Desktops"
msgstr "Други графични desktop-и"
-#: share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:147
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm и т.н."
-#: share/meta-task/compssUsers.pl:183
+#: share/meta-task/compssUsers.pl:170
#, c-format
msgid "Utilities"
msgstr "Помощни програми"
-#: share/meta-task/compssUsers.pl:185 share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
#, c-format
msgid "SSH Server"
msgstr "SSH Сървър"
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webmin Обслужване"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:178
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
-#: share/meta-task/compssUsers.pl:195
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Мониторинг на мрежата"
-#: share/meta-task/compssUsers.pl:196
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:187
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Контролен център на Mandriva Linux"
-#: share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:188
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "ННеуспешна настройка на принтер \"%s\"!"
@@ -657,7 +664,7 @@ msgstr ""
"Появи се грешка, но не знам как да се справя с нея деликатно.\n"
"Можете да продължите на свой риск."
-#: steps.pm:432
+#: steps.pm:433
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -685,46 +692,7 @@ msgstr "Инсталация на Mandriva Linux %s"
msgid "<Tab>/<Alt-Tab> between elements"
msgstr "<Tab>/<Alt-Tab> между елементите"
-#: steps_gtk.pm:155 steps_gtk.pm:156
-#, c-format
-msgid "Localization"
-msgstr ""
-
-#: steps_gtk.pm:159 steps_list.pm:20
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Installation class"
-msgstr ""
-
-#: steps_gtk.pm:160 steps_gtk.pm:243 steps_interactive.pm:511
-#, c-format
-msgid "Package Group Selection"
-msgstr "Избор на група пакети"
-
-#: steps_gtk.pm:161 steps_gtk.pm:460 steps_interactive.pm:543
-#, c-format
-msgid "Installing"
-msgstr "Инсталирам"
-
-#: steps_gtk.pm:162 steps_gtk.pm:576 steps_interactive.pm:735
-#, c-format
-msgid "Summary"
-msgstr "Обобщение"
-
-#: steps_gtk.pm:164 steps_gtk.pm:165 steps_list.pm:30
-#, c-format
-msgid ""
-"_: Keep these entry short\n"
-"Bootloader"
-msgstr "Bootloader"
-
-#: steps_gtk.pm:166 steps_interactive.pm:644
-#, c-format
-msgid "Updates"
-msgstr "Обновяване"
-
-#: steps_gtk.pm:213
+#: steps_gtk.pm:189
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -737,67 +705,73 @@ msgstr ""
"Зацелта,\n"
"натиснете 'F1', когато стартирате от CDROM и въведете 'теьт'."
-#: steps_gtk.pm:264 steps_interactive.pm:529
+#: steps_gtk.pm:256 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_list.pm:30
+#, c-format
+msgid "Package Group Selection"
+msgstr "Избор на група пакети"
+
+#: steps_gtk.pm:277 steps_interactive.pm:581
#, c-format
msgid "Individual package selection"
msgstr "Избиране на пакети един по един"
-#: steps_gtk.pm:268 steps_interactive.pm:454
+#: steps_gtk.pm:299 steps_interactive.pm:507
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Обща големина: %d / %d MB"
-#: steps_gtk.pm:313
+#: steps_gtk.pm:344
#, c-format
msgid "Bad package"
msgstr "Лош пакет"
-#: steps_gtk.pm:315
+#: steps_gtk.pm:346
#, c-format
msgid "Version: "
msgstr "Версия: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "Size: "
msgstr "Размер: "
-#: steps_gtk.pm:316
+#: steps_gtk.pm:347
#, c-format
msgid "%d KB\n"
msgstr "%d КБ\n"
-#: steps_gtk.pm:317
+#: steps_gtk.pm:348
#, c-format
msgid "Importance: "
msgstr "Важност:"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:382
#, c-format
msgid "You can not select/unselect this package"
msgstr "Не можете да отбележете/деотбележете този пакет"
-#: steps_gtk.pm:355
+#: steps_gtk.pm:386
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "липсва kdesu"
-#: steps_gtk.pm:356
+#: steps_gtk.pm:387
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради неопределен %s"
-#: steps_gtk.pm:357
+#: steps_gtk.pm:388
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: steps_gtk.pm:358
+#: steps_gtk.pm:389
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: steps_gtk.pm:363
+#: steps_gtk.pm:394
#, c-format
msgid ""
"You can not select this package as there is not enough space left to install "
@@ -806,106 +780,116 @@ msgstr ""
"Не можете да оставите пакета немаркиран, защото нямате място да го "
"инсталирате"
-#: steps_gtk.pm:366
+#: steps_gtk.pm:397
#, c-format
msgid "The following packages are going to be installed"
msgstr "Следните пакети ще бъдат инсталирани"
-#: steps_gtk.pm:367
+#: steps_gtk.pm:398
#, c-format
msgid "The following packages are going to be removed"
msgstr "Следните пакети ще бъдат премахнати"
-#: steps_gtk.pm:392
+#: steps_gtk.pm:423
#, c-format
msgid "This is a mandatory package, it can not be unselected"
msgstr "Това е нужен пакет, не може да бъде немаркиран"
-#: steps_gtk.pm:394
+#: steps_gtk.pm:425
#, c-format
msgid "You can not unselect this package. It is already installed"
msgstr "Не можете да оставите този пакет немаркиран. Той вече е инсталиран"
-#: steps_gtk.pm:396
+#: steps_gtk.pm:427
#, c-format
msgid "You can not unselect this package. It must be upgraded"
msgstr "Не можете да изключите този пакет. Той трябва да бъде обновен"
-#: steps_gtk.pm:400
+#: steps_gtk.pm:431
#, c-format
msgid "Show automatically selected packages"
msgstr "Покажи автоматично отбелязаните пакети"
-#: steps_gtk.pm:402 steps_interactive.pm:133
+#: steps_gtk.pm:433
#, c-format
msgid "Install"
msgstr "Инсталирай"
-#: steps_gtk.pm:405
+#: steps_gtk.pm:436
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "Избор на пакети"
-#: steps_gtk.pm:406
+#: steps_gtk.pm:437
#, c-format
msgid "Updating package selection"
msgstr "Обновяване на избора на пакети"
-#: steps_gtk.pm:411
+#: steps_gtk.pm:442
#, c-format
msgid "Minimal install"
msgstr "Миминална инсталация"
-#: steps_gtk.pm:425
+#: steps_gtk.pm:456
#, c-format
msgid "Software Management"
msgstr "Управление на софтуера"
-#: steps_gtk.pm:425 steps_interactive.pm:373
+#: steps_gtk.pm:456 steps_interactive.pm:393
#, c-format
msgid "Choose the packages you want to install"
msgstr "Изберете пакетите, които искате да инсталирате"
-#: steps_gtk.pm:487
+#: steps_gtk.pm:473 steps_interactive.pm:595 steps_list.pm:32
+#, c-format
+msgid "Installing"
+msgstr "Инсталирам"
+
+#: steps_gtk.pm:499
#, c-format
msgid "No details"
msgstr "Без подробности"
-#: steps_gtk.pm:483
+#: steps_gtk.pm:514
#, c-format
msgid "Time remaining "
msgstr "Оставащо време "
-#: steps_gtk.pm:484
+#: steps_gtk.pm:515
#, c-format
msgid "Estimating"
msgstr "Пресмятане"
-#: steps_gtk.pm:511
+#: steps_gtk.pm:542
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d пакета"
msgstr[1] "%d пакета"
-#: steps_gtk.pm:589
+#: steps_gtk.pm:588 steps_interactive.pm:782 steps_list.pm:43
+#, c-format
+msgid "Summary"
+msgstr "Обобщение"
+
+#: steps_gtk.pm:605
#, c-format
msgid "Configure"
msgstr "Настрока"
-#: steps_gtk.pm:580 steps_interactive.pm:731 steps_interactive.pm:858
+#: steps_gtk.pm:622 steps_interactive.pm:778 steps_interactive.pm:934
#, c-format
msgid "not configured"
msgstr "не е конфигуриран"
-#: steps_gtk.pm:612 steps_interactive.pm:268
+#: steps_gtk.pm:658 steps_interactive.pm:278
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:621 steps_interactive.pm:274
+#: steps_gtk.pm:667 steps_interactive.pm:284
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -914,7 +898,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:623 steps_interactive.pm:276
+#: steps_gtk.pm:669 steps_interactive.pm:286
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -934,12 +918,12 @@ msgstr "Моля, изберете подреждане на клавиатур
msgid "Here is the full list of available keyboards"
msgstr "Ето пълен списък на достръпните страни"
-#: steps_interactive.pm:128
+#: steps_interactive.pm:129
#, c-format
msgid "Install/Upgrade"
msgstr "Инсталирай/Обнови"
-#: steps_interactive.pm:129
+#: steps_interactive.pm:130
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Това нова инсталация ли е или обновяване ?"
@@ -951,27 +935,37 @@ msgid ""
"Install"
msgstr "Инсталирай"
-#: steps_interactive.pm:137
+#: steps_interactive.pm:136
#, c-format
msgid "Upgrade %s"
msgstr "Обновява %s"
-#: steps_interactive.pm:148
+#: steps_interactive.pm:140
+#, c-format
+msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:144
+#, c-format
+msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgstr ""
+
+#: steps_interactive.pm:158
#, c-format
msgid "Encryption key for %s"
msgstr "Ключ за криптиране на %s"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:184
+#: steps_interactive.pm:194
#, c-format
msgid "Configuring IDE"
msgstr "Настройка на IDE"
-#: steps_interactive.pm:221
+#: steps_interactive.pm:231
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -981,7 +975,7 @@ msgstr ""
"за да стартирате системата си, ще трябва да създадете стартиращо поле в "
"DiskDrake"
-#: steps_interactive.pm:226
+#: steps_interactive.pm:236
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -992,7 +986,7 @@ msgstr ""
"за да стартирате системата си, ще трябва да създадете стартиращо поле в "
"DiskDrake"
-#: steps_interactive.pm:318
+#: steps_interactive.pm:328
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1007,19 +1001,19 @@ msgstr ""
"Ако го нямате, натиснете Отмяна, за да избегнете инсталирането от този CD-"
"ROM."
-#: steps_interactive.pm:340
+#: steps_interactive.pm:350
#, c-format
msgid "Looking for available packages..."
msgstr "Търся налични пакети..."
-#: steps_interactive.pm:349
+#: steps_interactive.pm:358
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:385
+#: steps_interactive.pm:405
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1028,52 +1022,52 @@ msgstr ""
"Може изберете зареждане или запис на избора на пакети на флопи.\n"
"Форматът е същият като auto_install генерираните дискети."
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Load"
msgstr "Натовареност"
-#: steps_interactive.pm:387
+#: steps_interactive.pm:407
#, c-format
msgid "Save"
msgstr "Запазва"
-#: steps_interactive.pm:395
+#: steps_interactive.pm:415
#, fuzzy, c-format
msgid "Bad file"
msgstr "Зареждане на файл"
-#: steps_interactive.pm:413
+#: steps_interactive.pm:431
#, c-format
msgid "Install Mandriva KDE Desktop"
msgstr ""
-#: steps_interactive.pm:414
+#: steps_interactive.pm:432
#, c-format
msgid "Install Mandriva GNOME Desktop"
msgstr ""
-#: steps_interactive.pm:415
+#: steps_interactive.pm:433
#, fuzzy, c-format
msgid "Custom install"
msgstr "Миминална инсталация"
-#: steps_interactive.pm:418
+#: steps_interactive.pm:436
#, c-format
msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
msgstr ""
-#: steps_interactive.pm:503
+#: steps_interactive.pm:521
#, c-format
msgid "Selected size is larger than available space"
msgstr "Избраната големина е по-голяма от достъпното пространство"
-#: steps_interactive.pm:483
+#: steps_interactive.pm:536
#, c-format
msgid "Type of install"
msgstr "Тип инсталация"
-#: steps_interactive.pm:484
+#: steps_interactive.pm:537
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1082,82 +1076,82 @@ msgstr ""
"Вие не сте избрали никаква група от пакети.\n"
"Моля, изберете минималната инсталация кояти искате:"
-#: steps_interactive.pm:487
+#: steps_interactive.pm:540
#, c-format
msgid "With X"
msgstr "С X"
-#: steps_interactive.pm:488
+#: steps_interactive.pm:541
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "С базова документация (препоръчва се!)"
-#: steps_interactive.pm:489
+#: steps_interactive.pm:542
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Наистина минимална инсталация (особенно без urpmi)"
-#: steps_interactive.pm:528
-#, c-format
-msgid "All"
-msgstr "Всички"
-
-#: steps_interactive.pm:544
+#: steps_interactive.pm:596
#, c-format
msgid "Preparing installation"
msgstr "Подготвям инсталацията"
-#: steps_interactive.pm:552
+#: steps_interactive.pm:604
#, c-format
msgid "Installing package %s"
msgstr "Инсталиране на пакета %s"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "There was an error ordering packages:"
msgstr "Появи се грешка при поръчването на пакетите:"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:628
#, c-format
msgid "Go on anyway?"
msgstr "Да продължа ли все пак ?"
-#: steps_interactive.pm:580
+#: steps_interactive.pm:632
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:581
+#: steps_interactive.pm:633
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:634
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:635
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Запази избор на пакети"
-#: steps_interactive.pm:586
+#: steps_interactive.pm:638
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Появи се грешка при инсталиране на пакетите:"
-#: steps_interactive.pm:604
+#: steps_interactive.pm:656
#, c-format
msgid "Post-install configuration"
msgstr "След инсталационна настройка"
-#: steps_interactive.pm:611
+#: steps_interactive.pm:663
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:645
+#: steps_interactive.pm:691 steps_list.pm:47
+#, c-format
+msgid "Updates"
+msgstr "Обновяване"
+
+#: steps_interactive.pm:692
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1170,39 +1164,39 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:666
+#: steps_interactive.pm:713