package pkgs; # $Id$ use strict; use MDK::Common::System; use URPM; use URPM::Resolve; use URPM::Signature; use common; use install_any; use run_program; use detect_devices; use log; use fs; use loopback; use c; our %preferred = map { $_ => undef } qw(lilo perl-base gstreamer-oss openjade ctags glibc curl sane-backends perl-GTK postfix mdkkdm gcc gcc-cpp gcc-c++ proftpd ghostscript-X vim-minimal kernel db1 db2 libxpm4 zlib1 libncurses5 harddrake cups apache); #- lower bound on the left ( aka 90 means [90-100[ ) our %compssListDesc = ( 5 => N_("must have"), 4 => N_("important"), 3 => N_("very nice"), 2 => N_("nice"), 1 => N_("maybe"), ); #- constant for small transaction. our $limitMinTrans = 13; #- package to ignore, typically in Application CD. OBSOLETED ? my %ignoreBadPkg = ( 'civctp-demo' => 1, 'eus-demo' => 1, 'myth2-demo' => 1, 'heretic2-demo' => 1, 'heroes3-demo' => 1, 'rt2-demo' => 1, ); sub packageMedium { my ($packages, $p) = @_; $p or die "invalid package from\n" . backtrace(); foreach (values %{$packages->{mediums}}) { defined $_->{start} && defined $_->{end} or next; $p->id >= $_->{start} && $p->id <= $_->{end} and return $_; } return {}; } sub cleanHeaders { my ($prefix) = @_; rm_rf("$prefix/tmp/headers") if -e "$prefix/tmp/headers"; } #- get all headers from an hdlist file. sub extractHeaders { my ($prefix, $pkgs, $media) = @_; my %medium2pkgs; cleanHeaders($prefix); foreach (@$pkgs) { foreach my $medium (values %$media) { $_->id >= $medium->{start} && $_->id <= $medium->{end} or next; push @{$medium2pkgs{$medium->{medium}} ||= []}, $_; } } foreach (keys %medium2pkgs) { my $medium = $media->{$_}; eval { require packdrake; my $packer = new packdrake("/tmp/$medium->{hdlist}", quiet => 1); $packer->extract_archive("$prefix/tmp/headers", map { $_->header_filename } @{$medium2pkgs{$_}}); }; } foreach (@$pkgs) { my $f = "$prefix/tmp/headers/" . $_->header_filename; $_->update_header($f) or log::l("unable to open header file $f"), next; log::l("read header file $f"); } } sub isSupplCDMedium($) { my ($medium) = @_; $medium->{method} eq 'cdrom' && $medium->{medium} =~ /^\d+s$/; } #- TODO BEFORE TODO #- size and correction size functions for packages. my $B = 1.20873; my $C = 4.98663; #- doesn't take hdlist's into account as getAvailableSpace will do it. sub correctSize { $B * $_[0] + $C } sub invCorrectSize { ($_[0] - $C) / $B } sub selectedSize { my ($packages) = @_; my $size = 0; my %skip; #- take care of packages selected... foreach (@{$packages->{depslist}}) { if ($_->flag_selected) { $size += $_->size; #- if a package is obsoleted with the same name it should #- have been selected, so a selected new package obsoletes #- all the old package. exists $skip{$_->name} and next; $skip{$_->name} = undef; $size -= $packages->{sizes}{$_->name}; } } #- but remove size of package being obsoleted or removed. foreach (keys %{$packages->{state}{rejected}}) { my ($name) = /(.*)-[^\-]*-[^\-]*$/ or next; exists $skip{$name} and next; $skip{$name} = undef; $size -= $packages->{sizes}{$name}; } $size; } sub correctedSelectedSize { correctSize(selectedSize($_[0]) / sqr(1024)) } sub size2time { my ($x, $max) = @_; my $A = 7e-07; my $limit = min($max * 3 / 4, 9e8); if ($x < $limit) { $A * $x; } else { $x -= $limit; my $B = 6e-16; my $C = 15e-07; $B * $x ** 2 + $C * $x + $A * $limit; } } sub packagesProviding { my ($packages, $name) = @_; map { $packages->{depslist}[$_] } keys %{$packages->{provides}{$name} || {}}; } #- searching and grouping methods. #- package is a reference to list that contains #- a hash to search by name and #- a list to search by id. sub packageByName { my ($packages, $name) = @_; #- search package with given name and compatible with current architecture. #- take the best one found (most up-to-date). my @packages; foreach my $pkg (packagesProviding($packages, $name)) { $pkg->is_arch_compat or next; $pkg->name eq $name or next; push @packages, $pkg; } my $best; foreach (@packages) { if ($best && $best != $_) { $_->compare_pkg($best) > 0 and $best = $_; } else { $best = $_; } } $best or log::l("unknown package `$name'"); $best; } sub packageById { my ($packages, $id) = @_; my $pkg = $packages->{depslist}[$id]; #- do not log as id unsupported are still in depslist. $pkg->is_arch_compat && $pkg; } sub analyse_kernel_name { $_[0] =~ /kernel[^\-]*(-enterprise|-i686-up-4GB|-i586-up-1GB|-p3-smp-64GB|-secure|-smp|-multimedia|-multimedia-smp)?(?:-([^\-]+))?$/; } sub packages2kernels { my ($packages) = @_; map { if (my ($ext, $version) = analyse_kernel_name($_->name)) { { pkg => $_, ext => $ext, version => $version }; } else { log::l("ERROR: unknown package " . $_->name . " providing kernel"); (); } } packagesProviding($packages, 'kernel'); } sub bestKernelPackage { my ($packages) = @_; my @kernels = packages2kernels($packages) or internal_error('no kernel available'); my ($version_BOOT) = c::kernel_version() =~ /^(\d+\.\d+)/; if (my @l = grep { $_->{version} =~ /\Q$version_BOOT/ } @kernels) { #- favour versions corresponding to current BOOT version @kernels = @l; } my @prefered_exts = detect_devices::is_i586() ? '-i586-up-1GB' : (arch() !~ /x86_64|ia64/ && c::dmiDetectMemory() > 4 * 1024) ? ('-enterprise', '-smp') : detect_devices::hasSMP() ? '-smp' : ''; foreach my $prefered_ext (@prefered_exts, '') { if (my @l = grep { $_->{ext} eq $prefered_ext } @kernels) { @kernels = @l; } } log::l("bestKernelPackage (" . join(':', @prefered_exts) . "): " . join(' ', map { $_->{pkg}->name } @kernels) . (@kernels > 1 ? ' (choosing the first)' : '')); $preferred{'kernel-source-' . $kernels[0]{version}} = undef; $kernels[0]{pkg}; } sub packagesOfMedium { my ($packages, $medium) = @_; defined $medium->{start} && defined $medium->{end} ? @{$packages->{depslist}}[$medium->{start} .. $medium->{end}] : (); } sub packagesToInstall { my ($packages) = @_; my @packages; foreach (values %{$packages->{mediums}}) { $_->{selected} or next; log::l("examining packagesToInstall of medium $_->{descr}"); push @packages, grep { $_->flag_selected } packagesOfMedium($packages, $_); } log::l("found " . scalar(@packages) . " packages to install"); @packages; } sub allMediums { my ($packages) = @_; sort { $a <=> $b } keys %{$packages->{mediums}}; } sub mediumDescr { my ($packages, $medium_name) = @_; $packages->{mediums}{$medium_name}{descr}; } sub packageRequest { my ($packages, $pkg) = @_; #- check if the same or better version is installed, #- do not select in such case. $pkg && ($pkg->flag_upgrade || !$pkg->flag_installed) or return; #- check for medium selection, if the medium has not been #- selected, the package cannot be selected. foreach (values %{$packages->{mediums}}) { !$_->{selected} && $pkg->id >= $_->{start} && $pkg->id <= $_->{end} and return; } return { $pkg->id => 1 }; } sub packageCallbackChoices { my ($urpm, $_db, $state, $choices) = @_; if (my $prefer = find { $_->arch ne 'src' && exists $preferred{$_->name} } @$choices) { $prefer; } else { my @l = grep { #- or even if a package requires a specific locales which #- is already selected. find { /locales-/ && do { my $p = packageByName($urpm, $_); $p && $p->flag_available; }; } $_->requires_nosense; } @$choices; if (!@l) { push @l, $choices->[0]; log::l("packageCallbackChoices: default choice from ", join(",", map { $urpm->{depslist}[$_]->name } keys %{$state->{selected}}), " in ", join(",", map { $_->name } @$choices)); } #-log::l("packageCallbackChoices: chosen " . join(" ", map { $_->name } @l)); @l; } } #- selection, unselection of package. sub selectPackage { my ($packages, $pkg, $b_base, $o_otherOnly) = @_; #- select package and dependancies, o_otherOnly may be a reference #- to a hash to indicate package that will strictly be selected #- when value is true, may be selected when value is false (this #- is only used for unselection, not selection) my $state = $packages->{state} ||= {}; my @l = $packages->resolve_requested($packages->{rpmdb}, $state, packageRequest($packages, $pkg) || {}, callback_choices => \&packageCallbackChoices); if ($b_base || $o_otherOnly) { foreach (@l) { $b_base and $_->set_flag_base; $o_otherOnly and $o_otherOnly->{$_->id} = $_->flag_requested; } $o_otherOnly and $packages->disable_selected($packages->{rpmdb}, $state, @l); } 1; } sub unselectPackage($$;$) { my ($packages, $pkg, $o_otherOnly) = @_; #- base package are not unselectable, #- and already unselected package are no more unselectable. $pkg->flag_base and return; $pkg->flag_selected or return; my $state = $packages->{state} ||= {}; log::l("removing selection on package " . $pkg->fullname); my @l = $packages->disable_selected($packages->{rpmdb}, $state, $pkg); log::l(" removed selection on package " . $pkg->fullname . "gives " . join(',', map { scalar $_->fullname } @l)); if ($o_otherOnly) { foreach (@l) { $o_otherOnly->{$_->id} = undef; } log::l(" reselecting removed selection..."); $packages->resolve_requested($packages->{rpmdb}, $state, $o_otherOnly, callback_choices => \&packageCallbackChoices); log::l(" done"); } 1; } sub setPackageSelection($$$) { my ($packages, $pkg, $value) = @_; $value ? selectPackage($packages, $pkg) : unselectPackage($packages, $pkg); } sub unsel
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po index 69c33d6ae..8bbfb416f 100644 --- a/perl-install/share/po/af.po +++ b/perl-install/share/po/af.po @@ -2714,7 +2714,7 @@ msgstr "Die DrakX partisioneringsassistent het die volgende oplossings:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po index 3375f035d..3ddc83d2b 100644 --- a/perl-install/share/po/am.po +++ b/perl-install/share/po/am.po @@ -2593,7 +2593,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po index 16d2bd186..a7d639f96 100644 --- a/perl-install/share/po/ar.po +++ b/perl-install/share/po/ar.po @@ -2714,7 +2714,7 @@ msgstr "عثر معالج التجزئة في DrakX على الحلول التا #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po index 3a2ac4bc4..af773d9a7 100644 --- a/perl-install/share/po/az.po +++ b/perl-install/share/po/az.po @@ -2720,7 +2720,7 @@ msgstr "DrakX bölmələndirmə sehirbazı bu çıxış yollarını tapdı:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po index af114f16c..cd671c7f9 100644 --- a/perl-install/share/po/be.po +++ b/perl-install/share/po/be.po @@ -2618,7 +2618,7 @@ msgstr "Майстар падрыхтоўкі раздзелаў DrakX знай #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po index d41756345..451e8006e 100644 --- a/perl-install/share/po/bg.po +++ b/perl-install/share/po/bg.po @@ -2742,7 +2742,7 @@ msgstr "Помощникът за разделине на дялове на Drak #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po index 229cf04c6..13f5cee91 100644 --- a/perl-install/share/po/bn.po +++ b/perl-install/share/po/bn.po @@ -2728,7 +2728,7 @@ msgstr "DrakX পার্টিশন সহায়ক এই সমস্থ #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po index 3e6a70d6c..b534893a2 100644 --- a/perl-install/share/po/br.po +++ b/perl-install/share/po/br.po @@ -2653,7 +2653,7 @@ msgstr "Kinnig eo deoc'h gant ar skoazeller parzhadur DrakX :" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po index 6f6de5f78..43e55cf10 100644 --- a/perl-install/share/po/bs.po +++ b/perl-install/share/po/bs.po @@ -2765,7 +2765,7 @@ msgstr "DrakX Particioni čarobnjak je našao sljedeća rješenja:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po index a2a30aaf8..eb3535264 100644 --- a/perl-install/share/po/ca.po +++ b/perl-install/share/po/ca.po @@ -2752,7 +2752,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po index 7b3c786cc..99306c1f9 100644 --- a/perl-install/share/po/cs.po +++ b/perl-install/share/po/cs.po @@ -2760,7 +2760,7 @@ msgstr "Průvodce oddíly DrakX našel následující řešení rozdělení disk #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po index 2941eb4eb..53abb1b52 100644 --- a/perl-install/share/po/cy.po +++ b/perl-install/share/po/cy.po @@ -2755,7 +2755,7 @@ msgstr "Mae dewin rhannu DrakX wedi canfod yr atebion canlynol:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po index c190ac856..f17d66512 100644 --- a/perl-install/share/po/da.po +++ b/perl-install/share/po/da.po @@ -2757,7 +2757,7 @@ msgstr "DrakX partitionerings-vejlederen fandt de følgende løsninger:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po index 40c32e45b..4485d8322 100644 --- a/perl-install/share/po/de.po +++ b/perl-install/share/po/de.po @@ -2828,7 +2828,7 @@ msgstr "Der DrakX-Partitionierungsassistent fand folgende Lösung:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po index 26d502b83..571353f2d 100644 --- a/perl-install/share/po/el.po +++ b/perl-install/share/po/el.po @@ -2814,7 +2814,7 @@ msgstr "Ο Οδηγός Κατάτμησης DrakX βρήκε τις παρακ #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po index 8d76dd532..cf682cd66 100644 --- a/perl-install/share/po/eo.po +++ b/perl-install/share/po/eo.po @@ -2677,7 +2677,7 @@ msgstr "La Dispartigsorĉilo de DrakX trovis ĉi tiujn solvojn:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po index 31173e2e6..2c11a33e0 100644 --- a/perl-install/share/po/es.po +++ b/perl-install/share/po/es.po @@ -2785,7 +2785,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po index 3728e70ca..9e93342dc 100644 --- a/perl-install/share/po/et.po +++ b/perl-install/share/po/et.po @@ -2742,7 +2742,7 @@ msgstr "DrakX kettajagamise nõustaja leidis sellised lahendused:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "Partitsioonide jaotus Teie kettal " #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/eu.po b/perl-install/share/po/eu.po index e7eaffcbf..95954df15 100644 --- a/perl-install/share/po/eu.po +++ b/perl-install/share/po/eu.po @@ -2767,7 +2767,7 @@ msgstr "DrakX Partizio-morroiak irtenbide hauek aurkitu ditu:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/fa.po b/perl-install/share/po/fa.po index f1e1d1645..913bad7a9 100644 --- a/perl-install/share/po/fa.po +++ b/perl-install/share/po/fa.po @@ -2739,7 +2739,7 @@ msgstr "جادوگر قسمتبندی درایکایکس راه حله #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/fi.po b/perl-install/share/po/fi.po index fbf266a83..b3ed10e25 100644 --- a/perl-install/share/po/fi.po +++ b/perl-install/share/po/fi.po @@ -2792,7 +2792,7 @@ msgstr "DrakX Osiointivelho löysi seuraavat vaihtoehdot:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "Kiintolevyn sisältö" # mat diff --git a/perl-install/share/po/fr.po b/perl-install/share/po/fr.po index 58c4ae4f4..cacb172b9 100644 --- a/perl-install/share/po/fr.po +++ b/perl-install/share/po/fr.po @@ -2871,7 +2871,7 @@ msgstr "L'assistant de partitionnement a trouvé les solutions suivantes :" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "Voici le contenu de votre disque " #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/fur.po b/perl-install/share/po/fur.po index 286b81d90..2458c8209 100644 --- a/perl-install/share/po/fur.po +++ b/perl-install/share/po/fur.po @@ -2608,7 +2608,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ga.po b/perl-install/share/po/ga.po index e4001da00..069cceb80 100644 --- a/perl-install/share/po/ga.po +++ b/perl-install/share/po/ga.po @@ -2605,7 +2605,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po index 9a723ee07..1be61a005 100644 --- a/perl-install/share/po/gl.po +++ b/perl-install/share/po/gl.po @@ -2765,7 +2765,7 @@ msgstr "O Asistente de Particionamento de DrakX atopou as seguintes solucións:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/he.po b/perl-install/share/po/he.po index e3b45e5e3..0e1dcdb5b 100644 --- a/perl-install/share/po/he.po +++ b/perl-install/share/po/he.po @@ -2718,7 +2718,7 @@ msgstr "אשף החלוקה למחיצות של DrakX מצא את הפתרונו #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/hi.po b/perl-install/share/po/hi.po index 5a7f4d70e..fae610d6e 100644 --- a/perl-install/share/po/hi.po +++ b/perl-install/share/po/hi.po @@ -2715,7 +2715,7 @@ msgstr "ड्रैक-एक्स विभाजनीकरण विज़ा #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/hr.po b/perl-install/share/po/hr.po index a14d35e4e..3c482d545 100644 --- a/perl-install/share/po/hr.po +++ b/perl-install/share/po/hr.po @@ -2712,7 +2712,7 @@ msgstr "DrakX čarobnjak za particioniranje je pronašao slijedeća rješenja:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/hu.po b/perl-install/share/po/hu.po index 7e2316476..53bd66895 100644 --- a/perl-install/share/po/hu.po +++ b/perl-install/share/po/hu.po @@ -2840,7 +2840,7 @@ msgstr "A telepítő partícionálási varázslója a következőket javasolja:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "Ez a merevlemezének a tartalma" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/id.po b/perl-install/share/po/id.po index a8298753b..0af30c34c 100644 --- a/perl-install/share/po/id.po +++ b/perl-install/share/po/id.po @@ -2760,7 +2760,7 @@ msgstr "Panduan Partisi DrakX menemukan solusi-solusi berikut:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po index 9e1587910..13fd13e06 100644 --- a/perl-install/share/po/is.po +++ b/perl-install/share/po/is.po @@ -2749,7 +2749,7 @@ msgstr "DrakX ráðgjafinn fann eftirfarandi lausnir:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ja.po b/perl-install/share/po/ja.po index 1333653db..f42bafce8 100644 --- a/perl-install/share/po/ja.po +++ b/perl-install/share/po/ja.po @@ -2738,7 +2738,7 @@ msgstr "以下の解決法があります:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ko.po b/perl-install/share/po/ko.po index ad66ea9f2..7d0e1e190 100644 --- a/perl-install/share/po/ko.po +++ b/perl-install/share/po/ko.po @@ -2708,7 +2708,7 @@ msgstr "드레이크X 파티션 마법사가 다음의 솔루션을 발견했습 #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ky.po b/perl-install/share/po/ky.po index 66b5202d4..6bbe29a57 100644 --- a/perl-install/share/po/ky.po +++ b/perl-install/share/po/ky.po @@ -2723,7 +2723,7 @@ msgstr "DrakX диск бөлүү устасы төмөнкү чечимдерд #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/libDrakX.pot b/perl-install/share/po/libDrakX.pot index 016725c48..c6ad9f9fc 100644 --- a/perl-install/share/po/libDrakX.pot +++ b/perl-install/share/po/libDrakX.pot @@ -2532,7 +2532,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/lt.po b/perl-install/share/po/lt.po index 5f69a9204..d44ae086f 100644 --- a/perl-install/share/po/lt.po +++ b/perl-install/share/po/lt.po @@ -2654,7 +2654,7 @@ msgstr "DrakX Skirsnių dalinimo meistras rado tokius sprendimus:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ltg.po b/perl-install/share/po/ltg.po index 73a96e50b..e21f13584 100644 --- a/perl-install/share/po/ltg.po +++ b/perl-install/share/po/ltg.po @@ -2695,7 +2695,7 @@ msgstr "DrakX sadaļu veiduošonys paleigs atroda sekojūšus rysynuojumus:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/lv.po b/perl-install/share/po/lv.po index 28657e70d..1a0179c58 100644 --- a/perl-install/share/po/lv.po +++ b/perl-install/share/po/lv.po @@ -2685,7 +2685,7 @@ msgstr "DrakX sadaļu veidošanas meistars atrada sekojošus risinājumus:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/mk.po b/perl-install/share/po/mk.po index afe922623..4d5173fbb 100644 --- a/perl-install/share/po/mk.po +++ b/perl-install/share/po/mk.po @@ -2729,7 +2729,7 @@ msgstr "DrakX партицирачката самовила ги пронајд #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/mn.po b/perl-install/share/po/mn.po index 1fcdef649..5bcb6764e 100644 --- a/perl-install/share/po/mn.po +++ b/perl-install/share/po/mn.po @@ -2595,7 +2595,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ms.po b/perl-install/share/po/ms.po index 4a17f4591..d74db815b 100644 --- a/perl-install/share/po/ms.po +++ b/perl-install/share/po/ms.po @@ -2601,7 +2601,7 @@ msgstr "Pempartisyenan:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/mt.po b/perl-install/share/po/mt.po index e461a6b6e..2d6a2a52e 100644 --- a/perl-install/share/po/mt.po +++ b/perl-install/share/po/mt.po @@ -2746,7 +2746,7 @@ msgstr "Is-saħħar ta' partizzjonament DrakX sab dawn is-soluzzjonijiet:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/nb.po b/perl-install/share/po/nb.po index 447d124ae..69b2facb5 100644 --- a/perl-install/share/po/nb.po +++ b/perl-install/share/po/nb.po @@ -2734,7 +2734,7 @@ msgstr "Partisjonsveiviseren fant følgende løsninger:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "Her er innholdet på harddisken din " #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/nl.po b/perl-install/share/po/nl.po index 560c6d28a..383109d58 100644 --- a/perl-install/share/po/nl.po +++ b/perl-install/share/po/nl.po @@ -2789,7 +2789,7 @@ msgstr "De partitionerings-wizard heeft de volgende oplossingen gevonden:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po index efcb73558..874207349 100644 --- a/perl-install/share/po/nn.po +++ b/perl-install/share/po/nn.po @@ -2733,7 +2733,7 @@ msgstr "Partisjonsvegvisaren fann følgjande løysingar:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/pa_IN.po b/perl-install/share/po/pa_IN.po index f3506388f..ef336a8e1 100644 --- a/perl-install/share/po/pa_IN.po +++ b/perl-install/share/po/pa_IN.po @@ -2694,7 +2694,7 @@ msgstr "DrakX ਵਿਭਾਗੀਕਰਨ ਤਖਤੀ ਨੇ ਹੇਠਲੇ #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/pl.po b/perl-install/share/po/pl.po index 53c03a857..262c47761 100644 --- a/perl-install/share/po/pl.po +++ b/perl-install/share/po/pl.po @@ -2794,7 +2794,7 @@ msgstr "Druid podziału na partycje proponuje następujące rozwiązania:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po index b8324b207..ac49590b6 100644 --- a/perl-install/share/po/pt.po +++ b/perl-install/share/po/pt.po @@ -2792,7 +2792,7 @@ msgstr "O assistente de particionamento DrakX encontrou as seguintes soluções: #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/pt_BR.po b/perl-install/share/po/pt_BR.po index 2ce76e7fd..df814c816 100644 --- a/perl-install/share/po/pt_BR.po +++ b/perl-install/share/po/pt_BR.po @@ -2792,7 +2792,7 @@ msgstr "O particionador DrakX encontrou as seguintes soluções:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ro.po b/perl-install/share/po/ro.po index a1bf3c019..09305e2aa 100644 --- a/perl-install/share/po/ro.po +++ b/perl-install/share/po/ro.po @@ -2821,7 +2821,7 @@ msgstr "Asistentul de partiționare DrakX a găsit următoarele soluții:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po index 1d68c5926..639e52b03 100644 --- a/perl-install/share/po/ru.po +++ b/perl-install/share/po/ru.po @@ -2774,7 +2774,7 @@ msgstr "Мастер разметки диска DrakX предлагает сл #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/sc.po b/perl-install/share/po/sc.po index 51573e7ac..b19810a7a 100644 --- a/perl-install/share/po/sc.po +++ b/perl-install/share/po/sc.po @@ -2668,7 +2668,7 @@ msgstr "" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po index d9e084f2e..32f4cce37 100644 --- a/perl-install/share/po/sk.po +++ b/perl-install/share/po/sk.po @@ -2728,7 +2728,7 @@ msgstr "DrakX sprievodca rozdelením disku zistil tieto možné riešenia:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/sl.po b/perl-install/share/po/sl.po index 414a994d7..c051a6a10 100644 --- a/perl-install/share/po/sl.po +++ b/perl-install/share/po/sl.po @@ -2765,7 +2765,7 @@ msgstr "Čarovnik za razdeljevanje diska je našel naslednje rešitve:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/sq.po b/perl-install/share/po/sq.po index 86d4d3fd9..f35ae9f2c 100644 --- a/perl-install/share/po/sq.po +++ b/perl-install/share/po/sq.po @@ -2730,7 +2730,7 @@ msgstr "DrakX me asistentin shpërndarës ka gjetur këto zgjedhje:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/sr.po b/perl-install/share/po/sr.po index 7364f46ae..446067ddb 100644 --- a/perl-install/share/po/sr.po +++ b/perl-install/share/po/sr.po @@ -2700,7 +2700,7 @@ msgstr "DrakX чаробњак за партиционирање је прона #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/sr@Latn.po b/perl-install/share/po/sr@Latn.po index 9d3aa06c4..bc237a23b 100644 --- a/perl-install/share/po/sr@Latn.po +++ b/perl-install/share/po/sr@Latn.po @@ -2701,7 +2701,7 @@ msgstr "DrakX čarobnjak za particioniranje je pronašao sledeća rešenja:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/sv.po b/perl-install/share/po/sv.po index d45d59e24..e9fde6673 100644 --- a/perl-install/share/po/sv.po +++ b/perl-install/share/po/sv.po @@ -2753,7 +2753,7 @@ msgstr "DrakXs partitioneringsguide hittade följande lösningar:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "Här är innehållet på din hårddisk" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/ta.po b/perl-install/share/po/ta.po index 4e7e568dd..3a285b8e2 100644 --- a/perl-install/share/po/ta.po +++ b/perl-install/share/po/ta.po @@ -2670,7 +2670,7 @@ msgstr "டிரேக்X மாயாவி உங்களுக்கு #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/tg.po b/perl-install/share/po/tg.po index 46527c6e6..f5783eef8 100644 --- a/perl-install/share/po/tg.po +++ b/perl-install/share/po/tg.po @@ -2775,7 +2775,7 @@ msgstr "Устози ҷузъбандии DrakX ба қарорҳои зерин #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po index 60c86ea73..859c19777 100644 --- a/perl-install/share/po/th.po +++ b/perl-install/share/po/th.po @@ -2640,7 +2640,7 @@ msgstr "The DrakX Partitioning wizard เจอทางเลือกดัง #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/tl.po b/perl-install/share/po/tl.po index 50c98eaf1..a5094ac2a 100644 --- a/perl-install/share/po/tl.po +++ b/perl-install/share/po/tl.po @@ -2741,7 +2741,7 @@ msgstr "Nakita ng \"DrakX Partitioning wizard\" ang mga sumusunod na paglutas:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/tr.po b/perl-install/share/po/tr.po index e8ccdd39b..7d49174b4 100644 --- a/perl-install/share/po/tr.po +++ b/perl-install/share/po/tr.po @@ -2754,7 +2754,7 @@ msgstr "DrakX Bölümlendirme sihirbazı şu çözümleri buldu:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "Disk sürücünüzün içeriği buradadır" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/uk.po b/perl-install/share/po/uk.po index d2c6eb082..7190b2410 100644 --- a/perl-install/share/po/uk.po +++ b/perl-install/share/po/uk.po @@ -2775,7 +2775,7 @@ msgstr "Помічник розбивки на розділи DrakX знайшо #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/uz.po b/perl-install/share/po/uz.po index ac00975f4..fba9faf17 100644 --- a/perl-install/share/po/uz.po +++ b/perl-install/share/po/uz.po @@ -2671,7 +2671,7 @@ msgstr "Diskni boʻlish vositasi quyidagi yechimlarni topdi:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/uz@cyrillic.po b/perl-install/share/po/uz@cyrillic.po index 3b9feed92..3b2f8fb81 100644 --- a/perl-install/share/po/uz@cyrillic.po +++ b/perl-install/share/po/uz@cyrillic.po @@ -2664,7 +2664,7 @@ msgstr "Дискни бўлиш воситаси қуйидаги ечимлар #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/vi.po b/perl-install/share/po/vi.po index d8c0b0090..171c0e658 100644 --- a/perl-install/share/po/vi.po +++ b/perl-install/share/po/vi.po @@ -2725,7 +2725,7 @@ msgstr "Đồ thuật phân vùng của DrakX tìm ra các giải pháp như sau #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/wa.po b/perl-install/share/po/wa.po index 62ea45bcb..854ccf1df 100644 --- a/perl-install/share/po/wa.po +++ b/perl-install/share/po/wa.po @@ -2765,7 +2765,7 @@ msgstr "Li Macrea di Pårtixhaedje di DrakX a trové les solucions shuvantes:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po index 437d93f63..27f264ee5 100644 --- a/perl-install/share/po/zh_CN.po +++ b/perl-install/share/po/zh_CN.po @@ -2693,7 +2693,7 @@ msgstr "DrakX 分区向导找到下列解决办法:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po index 44152c6e9..f0d8c67e2 100644 --- a/perl-install/share/po/zh_TW.po +++ b/perl-install/share/po/zh_TW.po @@ -2702,7 +2702,7 @@ msgstr "DrakX 分割精靈找到了下列方案:" #: fs/partitioning_wizard.pm:459 #, c-format -msgid "Here is the content of you disk drive " +msgid "Here is the content of your disk drive " msgstr "" #: fs/partitioning_wizard.pm:535 |