From 33b813ce44c7bafeb2a36b66fd004f8d94a2cbe4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Feb 2014 17:35:33 +0100 Subject: move isatty() check into InitOutput() --- apt-private/private-output.cc | 3 +++ cmdline/apt-get.cc | 4 ---- cmdline/apt.cc | 2 -- test/integration/test-apt-cli-upgrade | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 2ae112af4..420ca14d5 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -30,6 +30,9 @@ unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */ bool InitOutput() /*{{{*/ { + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) + _config->Set("quiet","1"); + c0out.rdbuf(cout.rdbuf()); c1out.rdbuf(cout.rdbuf()); c2out.rdbuf(cout.rdbuf()); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6bff6e7de..1019ff325 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1736,10 +1736,6 @@ int main(int argc,const char *argv[]) /*{{{*/ // see if we are in simulate mode CheckSimulateMode(CmdL); - // Deal with stdout not being a tty - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); - // Setup the output streams InitOutput(); diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 6fe25e3f3..6ad470faa 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -156,8 +156,6 @@ int main(int argc, const char *argv[]) /*{{{*/ << std::endl << std::endl; } - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); // See if the help should be shown if (_config->FindB("help") == true || diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade index 163a55576..21ce69413 100755 --- a/test/integration/test-apt-cli-upgrade +++ b/test/integration/test-apt-cli-upgrade @@ -16,8 +16,7 @@ setupaptarchive APTARCHIVE=$(readlink -f ./aptarchive) # default is to allow new dependencies -testequal "Calculating upgrade... Done -The following NEW packages will be installed: +testequal "The following NEW packages will be installed: foo-new-dependency The following packages will be upgraded: foo @@ -28,7 +27,6 @@ Conf foo-new-dependency (2.0 unstable [all]) Conf foo (2.0 unstable [all])" apt upgrade -qq -s # ensure -testequal "Calculating upgrade... Done -The following packages have been kept back: +testequal "The following packages have been kept back: foo 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs -- cgit v1.2.3 From a7250ed08e4761dd40870ea7350ca2c83457e890 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 6 Feb 2014 20:48:52 +0100 Subject: fix remaining testcase-bugs from my armel box Git-Dch: Ignore --- test/integration/test-apt-get-autoremove | 10 +-- .../test-architecture-specification-parsing | 82 ++++++++++++---------- ...ight-loop-configure-with-unpacking-new-packages | 29 ++++++-- 3 files changed, 70 insertions(+), 51 deletions(-) diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove index 68ea1c574..acde4b096 100755 --- a/test/integration/test-apt-get-autoremove +++ b/test/integration/test-apt-get-autoremove @@ -42,12 +42,12 @@ testsuccess aptget autoremove -y testdpkgnotinstalled 'po-debconf' testmarkedauto -sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -testfileequal 'rootdir/var/log/apt/history.log' ' -Install: unrelated:i386 (1), debhelper:i386 (8.0.0), po-debconf:i386 (1.0.16, automatic) - +sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e 's#), #)\nInstall: #g' | sort -u > apt-history.log +testfileequal 'apt-history.log' ' +Install: debhelper:i386 (8.0.0) +Install: po-debconf:i386 (1.0.16, automatic) +Install: unrelated:i386 (1) Remove: debhelper:i386 (8.0.0) - Remove: po-debconf:i386 (1.0.16)' testsuccess aptget install debhelper -y diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing index 2741509a7..a43354871 100755 --- a/test/integration/test-architecture-specification-parsing +++ b/test/integration/test-architecture-specification-parsing @@ -4,102 +4,106 @@ set -e TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture 'amd64' 'armel' -buildsimplenativepackage 'pkg-arch-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !amd64] -Depends: foo [amd64 !amd64]' -buildsimplenativepackage 'pkg-arch-no-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!amd64 amd64] -Depends: foo [!amd64 amd64]' -buildsimplenativepackage 'pkg-arch-foo-unrelated-no' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!kfreebsd-any amd64] -Depends: foo [!kfreebsd-any amd64]' -buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !kfreebsd-any] -Depends: foo [amd64 !kfreebsd-any]' -buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armhf], bar [arm] -Depends: foo [armhf], bar [arm]' +# we need this construct here as it isn't really possible to fake native arch for dpkg-* tools +NATIVE="$(command dpkg --print-architecture)" +configarchitecture "${NATIVE}" 'armel' + +buildsimplenativepackage 'pkg-arch-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !${NATIVE}] +Depends: foo [${NATIVE} !${NATIVE}]" +buildsimplenativepackage 'pkg-arch-no-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!${NATIVE} ${NATIVE}] +Depends: foo [!${NATIVE} ${NATIVE}]" +buildsimplenativepackage 'pkg-arch-foo-unrelated-no' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!kfreebsd-any ${NATIVE}] +Depends: foo [!kfreebsd-any ${NATIVE}]" +buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !kfreebsd-any] +Depends: foo [${NATIVE} !kfreebsd-any]" +buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armeb], bar [arm] +Depends: foo [armeb], bar [arm]' -buildsimplenativepackage 'foo' 'amd64' '1.0' 'stable' +buildsimplenativepackage 'foo' "$NATIVE" '1.0' 'stable' insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign' setupaptarchive -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following extra packages will be installed: foo The following NEW packages will be installed: foo pkg-arch-foo 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Inst pkg-arch-foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64]) -Conf pkg-arch-foo (1.0 stable [amd64])' aptget install pkg-arch-foo -s +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: pkg-arch-no-foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst pkg-arch-no-foo (1.0 stable [amd64]) -Conf pkg-arch-no-foo (1.0 stable [amd64])' aptget install pkg-arch-no-foo -s +Inst pkg-arch-no-foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following extra packages will be installed: foo The following NEW packages will be installed: foo pkg-arch-foo-unrelated-no 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Inst pkg-arch-foo-unrelated-no (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64]) -Conf pkg-arch-foo-unrelated-no (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no -s +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following extra packages will be installed: foo The following NEW packages will be installed: foo pkg-arch-foo-unrelated-no2 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Inst pkg-arch-foo-unrelated-no2 (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64]) -Conf pkg-arch-foo-unrelated-no2 (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no2 -s +Inst foo (1.0 stable [${NATIVE}]) +Inst pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}]) +Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo -s +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s testequal 'Reading package lists... Building dependency tree... 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no -s +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s -testequal 'Reading package lists... +testequal "Reading package lists... Building dependency tree... The following NEW packages will be installed: foo 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. -Inst foo (1.0 stable [amd64]) -Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no2 -s +Inst foo (1.0 stable [${NATIVE}]) +Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s testequal 'Reading package lists... Building dependency tree... 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s # this is not really testing APT - more that dpkg is in line with us +configarchitecture 'amd64' 'armel' testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages index 7f3b05e59..5856cd744 100755 --- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages +++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages @@ -15,19 +15,18 @@ Breaks: libreoffice-core (>= 3+), libreoffice-core (<= 3~), libreoffice-style-ga insertinstalledpackage 'libreoffice-style-galaxy' 'amd64' '3' 'Depends: libreoffice-core Provides: libreoffice-style' -buildsimplenativepackage 'libreoffice' 'amd64' '4' 'sid' 'Depends: libreoffice-core (= 4)' -buildsimplenativepackage 'libreoffice-core' 'amd64' '4' 'sid' 'Depends: libreoffice-common (>= 4) +insertpackage 'sid' 'libreoffice' 'amd64' '4' 'Depends: libreoffice-core (= 4)' +insertpackage 'sid' 'libreoffice-core' 'amd64' '4' 'Depends: libreoffice-common (>= 4) Breaks: libreoffice-common (<< 4), libreoffice-style-galaxy (<< 4)' -buildsimplenativepackage 'libreoffice-common' 'all' '4' 'sid' 'Depends: libreoffice-style, ure +insertpackage 'sid' 'libreoffice-common' 'all' '4' 'Depends: libreoffice-style, ure Breaks: libreoffice-core (>= 4+), libreoffice-core (<= 4~), libreoffice-style-galaxy (>= 4+), libreoffice-style-galaxy (<= 4~)' -buildsimplenativepackage 'libreoffice-style-galaxy' 'amd64' '4' 'sid' 'Depends: libreoffice-core +insertpackage 'sid' 'libreoffice-style-galaxy' 'amd64' '4' 'Depends: libreoffice-core Provides: libreoffice-style' - -buildsimplenativepackage 'ure' 'amd64' '4' 'sid' +insertpackage 'sid' 'ure' 'amd64' '4' setupaptarchive -testequal 'Reading package lists... +testequalor2 'Reading package lists... Building dependency tree... The following NEW packages will be installed: ure @@ -43,4 +42,20 @@ Conf ure (4 sid [amd64]) Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice-common (4 sid [all]) Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice (4 sid [amd64])' 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + ure +The following packages will be upgraded: + libreoffice libreoffice-common libreoffice-core libreoffice-style-galaxy +4 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst libreoffice [3] (4 sid [amd64]) [] +Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 ] +Inst libreoffice-common [3] (4 sid [all]) [] +Inst ure (4 sid [amd64]) +Conf ure (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) +Conf libreoffice-common (4 sid [all]) +Conf libreoffice-core (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s -- cgit v1.2.3 From 6008b79adf1d7ea5607fab87a355d664c8725026 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 6 Feb 2014 21:46:29 +0100 Subject: simplify code to make compilers happy Does the same as before, but is a bit simpler on the logic for humans as well as compilers. scan-build complained about it at least with: "Result of operation is garbage or undefined" Reported-By: scan-build --- apt-pkg/contrib/fileutl.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 37155b688..71ac9c73f 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1594,11 +1594,17 @@ unsigned long long FileFd::Tell() unsigned long long FileFd::FileSize() { struct stat Buf; - if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) - return FileFdErrno("fstat","Unable to determine the file size"); + + bool ispipe = (d != NULL && d->pipe == true); + if (ispipe == false) + { + if (fstat(iFd,&Buf) != 0) + return FileFdErrno("fstat","Unable to determine the file size"); + ispipe = S_ISFIFO(Buf.st_mode); + } // for compressor pipes st_size is undefined and at 'best' zero - if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) + if (ispipe == true) { // we set it here, too, as we get the info here for free // in theory the Open-methods should take care of it already -- cgit v1.2.3 From e1195cf603e74568325fa1fa8f9fcb63259aeb2c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 6 Feb 2014 21:59:11 +0100 Subject: update libapt-pkg.symbols file --- debian/libapt-pkg4.12.symbols | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index af43a7b07..40a68e5b3 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1459,7 +1459,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1 - (c++)"APT::Progress::PackageManagerFancy::Start()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1 @@ -1483,7 +1482,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string, std::allocator >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1 - (c++)"APT::Progress::PackageManager::Start()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string, std::allocator >, unsigned int, unsigned int, std::basic_string, std::allocator >)@Base" 0.9.13~exp1 (c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1 @@ -1512,6 +1510,23 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"vtable for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1 (c++)"vtable for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1 (c++)"vtable for APT::Progress::PackageManagerText@Base" 0.9.13~exp1 + (c++)"APT::Progress::PackageManagerFancy::instances@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManagerFancy::Start(int)@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManagerFancy::staticSIGWINCH(int)@Base" 0.9.14.2 + (c++)"APT::Progress::PackageManager::Start(int)@Base" 0.9.14.2 +### client-side merged pdiffs + (c++)"pkgAcqIndexMergeDiffs::DescURI()@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::Done(std::basic_string, std::allocator >, unsigned long long, std::basic_string, std::allocator >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::Failed(std::basic_string, std::allocator >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs()@Base" 0.9.14.3~exp1 + (c++)"pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire*, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, HashString const&, DiffInfo const&, std::vector > const*)@Base" 0.9.14.3~exp1 + (c++)"typeinfo for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 + (c++)"typeinfo name for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 + (c++)"vtable for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1 +### deb822 sources.list format + (c++)"pkgSourceList::ParseFileDeb822(std::basic_string, std::allocator >)@Base" 0.9.14.3~exp1 + (c++)"pkgSourceList::ParseFileOldStyle(std::basic_string, std::allocator >)@Base" 0.9.14.3~exp1 + (c++)"pkgSourceList::Type::ParseStanza(std::vector >&, pkgTagSection&, int, FileFd&)@Base" 0.9.14.3~exp1 ### mixed stuff (c++)"GetListOfFilesInDir(std::basic_string, std::allocator > const&, bool)@Base" 0.8.16~exp13 (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10 @@ -1570,6 +1585,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashString::FromFile(std::basic_string, std::allocator >)@Base" 0.9.13.1 (c++)"HashString::GetHashForFile(std::basic_string, std::allocator >) const@Base" 0.9.13.1 (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 + (c++)"GetTempDir()@Base" 0.9.14.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 ### gcc artefacts -- cgit v1.2.3 From a5c657563746d2576b662f1711723312fcb1c186 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 6 Feb 2014 22:01:45 +0100 Subject: bump Standards-Version to 3.9.5 (no changes needed) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f3303e891..0c1341bb9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Michael Vogt , Christian Perrier , Julian Andres Klode -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, -- cgit v1.2.3 From bfa1ebf5d062dfcdb2019725df9069148ceaef0b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 6 Feb 2014 23:32:53 +0100 Subject: disable doxygen undocumented method warning Very few methods we have are documented, so this is A LOT of noise hidden the "interesting" warnings about methods which are documented, but incorrectly and such stuff. Git-Dch: Ignore --- doc/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 9ebbd9673..306bab1dc 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -613,7 +613,7 @@ WARNINGS = YES # for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. -WARN_IF_UNDOCUMENTED = YES +WARN_IF_UNDOCUMENTED = NO # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for # potential errors in the documentation, such as not documenting some -- cgit v1.2.3 From 436bcfbb16ce558c228a3a6e29ad77c0c62664bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 10 Feb 2014 14:42:56 +0100 Subject: do not use an empty APT_CONFIG environment variable --- apt-pkg/init.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 81b601a7f..6ab5ec42d 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -92,7 +92,7 @@ bool pkgInitConfig(Configuration &Cnf) // Read an alternate config file const char *Cfg = getenv("APT_CONFIG"); - if (Cfg != 0) + if (Cfg != 0 && strlen(Cfg) != 0) { if (RealFileExists(Cfg) == true) Res &= ReadConfigFile(Cnf,Cfg); -- cgit v1.2.3 From 34d6ece7566ea4fcda2286478b31641378aefc93 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 10 Feb 2014 17:55:13 +0100 Subject: always cleanup patchfiles at the end of rred call With APT::Get::List-Cleanup disabled the ed-style patch files are lingering in the lists/ directory otherwise. That was kinda okay in the old none-client-merge as the filename was always the same so it was constantly overridden, but now with different names for client-merge quiet a few could pill up on the system and are used by the next call as it picks them up based on the filename. --- apt-pkg/acquire-item.cc | 9 +++++++++ test/integration/test-pdiff-usage | 28 +++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1185908f3..60003c023 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -757,6 +757,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has { // remove the just applied patch available_patches.erase(available_patches.begin()); + unlink((FinalFile + ".ed").c_str()); // move into place if(Debug) @@ -887,6 +888,14 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string M // otherwise lists cleanup will eat the file DestFile = FinalFile; + // ensure the ed's are gone regardless of list-cleanup + for (std::vector::const_iterator I = allPatches->begin(); + I != allPatches->end(); ++I) + { + std::string patch = FinalFile + ".ed." + (*I)->patch.file + ".gz"; + unlink(patch.c_str()); + } + // all set and done Complete = true; if(Debug) diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index ad31511b9..afe1ad443 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -31,6 +31,16 @@ wasmergeused() { msgfail fi + msgtest 'No intermediate patch files' 'still exist' + local EDS="$(find rootdir/var/lib/apt/lists -name '*.ed' -o -name '*.ed.*')" + if [ -z "$EDS" ]; then + msgpass + else + echo + echo "$EDS" + msgfail + fi + msgtest 'Check if the right pdiff merger was used' if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' $OUTPUT; then if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then @@ -46,7 +56,7 @@ wasmergeused() { } testrun() { - # setup the base + msgmsg "Testcase: setup the base with: $*" find aptarchive -name 'Packages*' -type f -delete cp ${PKGFILE} aptarchive/Packages compressfile 'aptarchive/Packages' @@ -59,7 +69,7 @@ testrun() { testequal "$(cat ${PKGFILE}) " aptcache show apt oldstuff - msgmsg 'Testcase: apply with one patch' + msgmsg "Testcase: apply with one patch: $*" cp ${PKGFILE}-new aptarchive/Packages compressfile 'aptarchive/Packages' mkdir -p aptarchive/Packages.diff @@ -82,13 +92,13 @@ SHA1-Patches: testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - msgmsg 'Testcase: index is already up-to-date' + msgmsg "Testcase: index is already up-to-date: $*" find rootdir/var/lib/apt/lists -name '*.IndexDiff' -type f -delete testsuccess aptget update "$@" testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff - msgmsg 'Testcase: apply with two patches' + msgmsg "Testcase: apply with two patches: $*" cp ${PKGFILE}-new aptarchive/Packages echo ' Package: futurestuff @@ -129,7 +139,7 @@ SHA1-Patches: testequal "$(cat Packages-future) " aptcache show apt newstuff futurestuff - msgmsg 'Testcase: patch applying fails, but successful fallback' + msgmsg "Testcase: patch applying fails, but successful fallback: $*" rm -rf rootdir/var/lib/apt/lists cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists cp ${PKGFILE}-new aptarchive/Packages @@ -154,6 +164,10 @@ SHA1-Patches: testequal "$(cat ${PKGFILE}-new) " aptcache show apt newstuff } +echo 'Debug::pkgAcquire::Diffs "true"; +Debug::pkgAcquire::rred "true";' > rootdir/etc/apt/apt.conf.d/rreddebug.conf -testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=0 -testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=1 +testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1 +testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1 +testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0 +testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=0 -- cgit v1.2.3 From e209542632e61b9bf07b809c333f1e4b9de7fde9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 10 Feb 2014 18:06:28 +0100 Subject: use VersionSet in download to handle repeats Closes: 738103 --- cmdline/apt-get.cc | 6 +++--- test/integration/test-apt-get-download | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6bff6e7de..2a9964722 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -630,8 +630,8 @@ bool DoDownload(CommandLine &CmdL) return false; APT::CacheSetHelper helper(c0out); - APT::VersionList verset = APT::VersionList::FromCommandLine(Cache, - CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper); + APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache, + CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); if (verset.empty() == true) return false; @@ -650,7 +650,7 @@ bool DoDownload(CommandLine &CmdL) std::string const cwd = SafeGetCWD(); _config->Set("Dir::Cache::Archives", cwd); int i = 0; - for (APT::VersionList::const_iterator Ver = verset.begin(); + for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver, ++i) { pkgAcquire::Item *I = new pkgAcqArchive(&Fetcher, SrcList, &Recs, *Ver, storefile[i]); diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index c2a5c3d8e..ec809e0ce 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -34,8 +34,13 @@ testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) SHA512:$(sh # deb:677887 testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms -# deb:736962 - apt-get download foo && -aptget download apt -aptget download apt +# deb:736962 +testsuccess aptget download apt +testsuccess aptget download apt +testsuccess test -s apt_2.0_all.deb + +rm -f apt_1.0_all.deb apt_2.0_all.deb + +# deb:738103 +testsuccess aptget download apt apt apt/unstable apt=2.0 testsuccess test -s apt_2.0_all.deb -rm -f apt_1.0_all.deb -- cgit v1.2.3 From 246bbb611d4cd5e2a13ecffb6cbe0e76390eae6f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 10 Feb 2014 21:52:38 +0100 Subject: use utimes instead of utimensat/futimens cppcheck complains about the obsolete utime as it was removed in POSIX1.2008 and recommends usage of utimensat/futimens instead as those are in POSIX and so commit 9ce3cfc9 switched to them. It is just that they aren't as portable as the standard suggests: At least our kFreeBSD and Hurd ports stumble over it at runtime. So to make both, the ports and cppcheck happy, we use utimes instead. Closes: 738567 --- apt-inst/dirstream.cc | 9 +++++---- ftparchive/multicompress.cc | 3 ++- methods/copy.cc | 14 ++++++-------- methods/ftp.cc | 18 +++++++++--------- methods/gzip.cc | 22 ++++++++-------------- methods/https.cc | 6 +++--- methods/rred.cc | 9 +++++---- methods/rsh.cc | 18 +++++++++--------- methods/server.cc | 12 ++++++------ 9 files changed, 53 insertions(+), 58 deletions(-) diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index b62bdcae1..e06c30a57 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -95,11 +96,11 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd) /* Set the modification times. The only way it can fail is if someone has futzed with our file, which is intolerable :> */ - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = times[1].tv_sec = Itm.MTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(Fd, times) != 0) - _error->Errno("futimens", "Failed to set modification time for %s",Itm.Name); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm.Name, times) != 0) + _error->Errno("utimes", "Failed to set modification time for %s",Itm.Name); if (close(Fd) != 0) return _error->Errno("close",_("Failed to close file %s"),Itm.Name); diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index c1bd6037a..1555d2f2d 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -237,7 +238,7 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) if (UpdateMTime > 0 && (Now - St.st_mtime > (signed)UpdateMTime || St.st_mtime > Now)) { - utimensat(AT_FDCWD, I->Output.c_str(), NULL, AT_SYMLINK_NOFOLLOW); + utimes(I->Output.c_str(), NULL); Changed = true; } } diff --git a/methods/copy.cc b/methods/copy.cc index 744cc2b51..f2a8f9ed8 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -18,6 +18,7 @@ #include #include +#include #include #include /*}}}*/ @@ -70,18 +71,15 @@ bool CopyMethod::Fetch(FetchItem *Itm) } From.Close(); + To.Close(); // Transfer the modification times - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Buf.st_atime; times[1].tv_sec = Buf.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(To.Fd(), times) != 0) - { - To.OpFail(); - return _error->Errno("futimens",_("Failed to set modification time")); - } - To.Close(); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Res.Filename.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); diff --git a/methods/ftp.cc b/methods/ftp.cc index 2d05364d5..70bf4f607 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -954,11 +954,11 @@ void FtpMethod::SigTerm(int) _exit(100); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); @@ -1062,11 +1062,11 @@ bool FtpMethod::Fetch(FetchItem *Itm) Fd.Close(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); // If the file is missing we hard fail and delete the destfile // otherwise transient fail @@ -1081,11 +1081,11 @@ bool FtpMethod::Fetch(FetchItem *Itm) Res.Size = Fd.Size(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(Fd.Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Fd.Name().c_str(), times); FailFd = -1; } diff --git a/methods/gzip.cc b/methods/gzip.cc index f1edb353b..a2844e969 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -93,6 +94,8 @@ bool GzipMethod::Fetch(FetchItem *Itm) } From.Close(); + Res.Size = To.FileSize(); + To.Close(); if (Failed == true) return false; @@ -102,23 +105,14 @@ bool GzipMethod::Fetch(FetchItem *Itm) if (stat(Path.c_str(),&Buf) != 0) return _error->Errno("stat",_("Failed to stat")); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Buf.st_atime; - times[1].tv_sec = Buf.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (futimens(To.Fd(), times) != 0) - { - To.OpFail(); - return _error->Errno("futimens",_("Failed to set modification time")); - } - Res.Size = To.FileSize(); - To.Close(); - - if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat",_("Failed to stat")); + Res.LastModified = times[1].tv_sec = Buf.st_mtime; + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm->DestFile.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); // Return a Done response - Res.LastModified = Buf.st_mtime; Res.TakeHashes(Hash); URIDone(Res); diff --git a/methods/https.cc b/methods/https.cc index e16e36339..146b2bfb8 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -404,11 +404,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_getinfo(curl, CURLINFO_FILETIME, &Res.LastModified); if (Res.LastModified != -1) { - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = Res.LastModified; times[1].tv_sec = Res.LastModified; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(File->Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(File->Name().c_str(), times); } else Res.LastModified = resultStat.st_mtime; diff --git a/methods/rred.cc b/methods/rred.cc index f7dac3c19..fe7ef7322 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include @@ -597,12 +598,12 @@ class RredMethod : public pkgAcqMethod { stat(patch_name.c_str(), &bufpatch) != 0) return _error->Errno("stat", _("Failed to stat")); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = bufbase.st_atime; times[1].tv_sec = bufpatch.st_mtime; - times[0].tv_nsec = times[1].tv_nsec = 0; - if (utimensat(AT_FDCWD, Itm->DestFile.c_str(), times, 0) != 0) - return _error->Errno("utimensat",_("Failed to set modification time")); + times[0].tv_usec = times[1].tv_usec = 0; + if (utimes(Itm->DestFile.c_str(), times) != 0) + return _error->Errno("utimes",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(), &bufbase) != 0) return _error->Errno("stat", _("Failed to stat")); diff --git a/methods/rsh.cc b/methods/rsh.cc index a441220bf..4e1aaea26 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -396,11 +396,11 @@ void RSHMethod::SigTerm(int sig) _exit(100); // Transfer the modification times - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); _exit(100); @@ -488,11 +488,11 @@ bool RSHMethod::Fetch(FetchItem *Itm) Fd.Close(); // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); // If the file is missing we hard fail otherwise transient fail if (Missing == true) @@ -502,11 +502,11 @@ bool RSHMethod::Fetch(FetchItem *Itm) } Res.Size = Fd.Size(); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(Fd.Fd(), times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Fd.Name().c_str(), times); FailFd = -1; } diff --git a/methods/server.cc b/methods/server.cc index e12c23c07..76faa7e7f 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -369,11 +369,11 @@ void ServerMethod::SigTerm(int) if (FailFd == -1) _exit(100); - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = FailTime; times[1].tv_sec = FailTime; - times[0].tv_nsec = times[1].tv_nsec = 0; - futimens(FailFd, times); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(FailFile.c_str(), times); close(FailFd); _exit(100); @@ -539,10 +539,10 @@ int ServerMethod::Loop() File = 0; // Timestamp - struct timespec times[2]; + struct timeval times[2]; times[0].tv_sec = times[1].tv_sec = Server->Date; - times[0].tv_nsec = times[1].tv_nsec = 0; - utimensat(AT_FDCWD, Queue->DestFile.c_str(), times, AT_SYMLINK_NOFOLLOW); + times[0].tv_usec = times[1].tv_usec = 0; + utimes(Queue->DestFile.c_str(), times); // Send status to APT if (Result == true) -- cgit v1.2.3 From 62dcbf84c4aee8cb01e40c594d4c7f3a23b64836 Mon Sep 17 00:00:00 2001 From: John Ogness Date: Fri, 13 Dec 2013 20:59:31 +0100 Subject: apt-cdrom should succeed if any drive succeeds If there are multiple CD-ROM drives, `apt-cdrom add` will abort with an error if any of the drives do not contain a Debian CD which is against the documentation we have saying "a CD-ROM" and also scripts do not expect it this way. This patch modifies apt-cdrom to return success if any of the drives succeeded. If failures occur, apt-cdrom will still continue trying all the drives and report the last failure (if none of them succeeded). The 'ident' command was also changed to match the new 'add' behavior. Closes: 728153 --- apt-pkg/cdrom.cc | 26 ++++++++++++++++-- cmdline/apt-cdrom.cc | 76 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 83 insertions(+), 19 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index a5668a50a..f577e3572 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -577,8 +577,30 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ CDROM.c_str()); log->Update(msg.str()); } - if (MountCdrom(CDROM) == false) - return _error->Error("Failed to mount the cdrom."); + + // Unmount the CD and get the user to put in the one they want + if (_config->FindB("APT::CDROM::NoMount",false) == false) + { + if(log != NULL) + log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); + UnmountCdrom(CDROM); + + if(log != NULL) + { + log->Update(_("Waiting for disc...\n"), STEP_WAIT); + if(!log->ChangeCdrom()) { + // user aborted + return false; + } + } + + // Mount the new CDROM + if(log != NULL) + log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT); + + if (MountCdrom(CDROM) == false) + return _error->Error("Failed to mount the cdrom."); + } // Hash the CD to get an ID if (log != NULL) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 17a60ddcb..20c6e8892 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -111,10 +111,12 @@ OpProgress* pkgCdromTextStatus::GetOpProgress() }; /*}}}*/ // SetupAutoDetect /*{{{*/ -bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i) +bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted) { bool Debug = _config->FindB("Debug::Acquire::cdrom", false); + automounted = false; + vector v = UdevCdroms.Scan(); if (i >= v.size()) return false; @@ -137,6 +139,8 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i) mkdir(AptMountPoint.c_str(), 0750); if(MountCdrom(AptMountPoint, v[i].DeviceName) == false) _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str()); + else + automounted = true; _config->Set("Acquire::cdrom::mount", AptMountPoint); _config->Set("APT::CDROM::NoMount", true); } @@ -160,17 +164,35 @@ bool DoAdd(CommandLine &) bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); unsigned int count = 0; + string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); + bool automounted = false; if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count)) - res &= cdrom.Add(&log); - if (count == 0) { - res = cdrom.Add(&log); - if (res == false) { - _error->Error("%s", _(W_NO_CDROM_FOUND)); + while (AutoDetectCdrom(UdevCdroms, count, automounted)) { + if (count == 1) { + // begin loop with res false to detect any success using OR + res = false; + } + + // dump any warnings/errors from autodetect + if (_error->empty() == false) + _error->DumpErrors(); + + res |= cdrom.Add(&log); + + if (automounted) + UnmountCdrom(AptMountPoint); + + // dump any warnings/errors from add/unmount + if (_error->empty() == false) + _error->DumpErrors(); } - } - if(res) + if (count == 0) + res = cdrom.Add(&log); + + if (res == false) + _error->Error("%s", _(W_NO_CDROM_FOUND)); + else cout << _("Repeat this process for the rest of the CDs in your set.") << endl; return res; @@ -187,18 +209,38 @@ bool DoIdent(CommandLine &) pkgCdrom cdrom; bool res = true; - bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect"); + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); unsigned int count = 0; + string AptMountPoint = _config->FindDir("Dir::Media::MountPath"); + bool automounted = false; if (AutoDetect && UdevCdroms.Dlopen()) - while (AutoDetectCdrom(UdevCdroms, count)) - res &= cdrom.Ident(ident, &log); - if (count == 0) { - res = cdrom.Ident(ident, &log); - if (res == false) { - _error->Error("%s", _(W_NO_CDROM_FOUND)); + while (AutoDetectCdrom(UdevCdroms, count, automounted)) { + if (count == 1) { + // begin loop with res false to detect any success using OR + res = false; + } + + // dump any warnings/errors from autodetect + if (_error->empty() == false) + _error->DumpErrors(); + + res |= cdrom.Ident(ident, &log); + + if (automounted) + UnmountCdrom(AptMountPoint); + + // dump any warnings/errors from add/unmount + if (_error->empty() == false) + _error->DumpErrors(); } - } + + if (count == 0) + res = cdrom.Ident(ident, &log); + + if (res == false) + _error->Error("%s", _(W_NO_CDROM_FOUND)); + return res; } /*}}}*/ -- cgit v1.2.3 From ce55512d4924b52c985276c62a0c69ac13e203cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Feb 2014 02:12:40 +0100 Subject: remove duplication in pkgCdrom::Add and ::Ident Git-Dch: Ignore --- apt-pkg/cdrom.cc | 131 +++++++++++++----------------------------- apt-pkg/cdrom.h | 4 ++ debian/libapt-pkg4.12.symbols | 1 + 3 files changed, 46 insertions(+), 90 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index f577e3572..3ae1e8b1d 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -561,25 +561,23 @@ bool pkgCdrom::WriteSourceList(string Name,vector &List,bool Source) return true; } /*}}}*/ -bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ +bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log)/*{{{*/ { - stringstream msg; - // Startup - string CDROM = _config->FindDir("Acquire::cdrom::mount"); + CDROM = _config->FindDir("Acquire::cdrom::mount"); if (CDROM[0] == '.') CDROM= SafeGetCWD() + '/' + CDROM; if (log != NULL) { - msg.str(""); - ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"), - CDROM.c_str()); - log->Update(msg.str()); + string msg; + log->SetTotal(STEP_LAST); + strprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str()); + log->Update(msg, STEP_PREPARE); } // Unmount the CD and get the user to put in the one they want - if (_config->FindB("APT::CDROM::NoMount",false) == false) + if (_config->FindB("APT::CDROM::NoMount", false) == false) { if(log != NULL) log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); @@ -604,24 +602,24 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ // Hash the CD to get an ID if (log != NULL) - log->Update(_("Identifying.. ")); - + log->Update(_("Identifying.. "), STEP_IDENT); if (IdentCdrom(CDROM,ident) == false) { ident = ""; + if (log != NULL) + log->Update("\n"); return false; } if (log != NULL) { - msg.str(""); - ioprintf(msg, "[%s]\n",ident.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, "[%s]\n", ident.c_str()); + log->Update(msg); } // Read the database - Configuration Database; string DFile = _config->FindFile("Dir::State::cdroms"); if (FileExists(DFile) == true) { @@ -629,12 +627,22 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ return _error->Error("Unable to read the cdrom database %s", DFile.c_str()); } + return true; +} + /*}}}*/ +bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ +{ + Configuration Database; + std::string CDROM; + if (MountAndIdentCDROM(Database, CDROM, ident, log) == false) + return false; + if (log != NULL) { - msg.str(""); - ioprintf(msg, _("Stored label: %s\n"), - Database.Find("CD::"+ident).c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("Stored label: %s\n"), + Database.Find("CD::"+ident).c_str()); + log->Update(msg); } // Unmount and finish @@ -650,70 +658,13 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ /*}}}*/ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ { - stringstream msg; - - // Startup - string CDROM = _config->FindDir("Acquire::cdrom::mount"); - if (CDROM[0] == '.') - CDROM= SafeGetCWD() + '/' + CDROM; - - if(log != NULL) - { - log->SetTotal(STEP_LAST); - msg.str(""); - ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str()); - log->Update(msg.str(), STEP_PREPARE); - } - - // Read the database Configuration Database; - string DFile = _config->FindFile("Dir::State::cdroms"); - if (FileExists(DFile) == true) - { - if (ReadConfigFile(Database,DFile) == false) - return _error->Error("Unable to read the cdrom database %s", - DFile.c_str()); - } - - // Unmount the CD and get the user to put in the one they want - if (_config->FindB("APT::CDROM::NoMount",false) == false) - { - if(log != NULL) - log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT); - UnmountCdrom(CDROM); - - if(log != NULL) - { - log->Update(_("Waiting for disc...\n"), STEP_WAIT); - if(!log->ChangeCdrom()) { - // user aborted - return false; - } - } - - // Mount the new CDROM - if(log != NULL) - log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT); - - if (MountCdrom(CDROM) == false) - return _error->Error("Failed to mount the cdrom."); - } - - // Hash the CD to get an ID - if(log != NULL) - log->Update(_("Identifying.. "), STEP_IDENT); - string ID; - if (IdentCdrom(CDROM,ID) == false) - { - if (log != NULL) - log->Update("\n"); + std::string ID, CDROM; + if (MountAndIdentCDROM(Database, CDROM, ID, log) == false) return false; - } + if(log != NULL) - { - log->Update("["+ID+"]\n"); log->Update(_("Scanning disc for index files..\n"),STEP_SCAN); - } // Get the CD structure vector List; @@ -762,12 +713,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if (_config->FindB("APT::CDROM::DropTranslation", true) == true) DropTranslation(TransList); if(log != NULL) { - msg.str(""); - ioprintf(msg, _("Found %zu package indexes, %zu source indexes, " + string msg; + strprintf(msg, _("Found %zu package indexes, %zu source indexes, " "%zu translation indexes and %zu signatures\n"), List.size(), SourceList.size(), TransList.size(), SigList.size()); - log->Update(msg.str(), STEP_SCAN); + log->Update(msg, STEP_SCAN); } if (List.empty() == true && SourceList.empty() == true) @@ -800,9 +751,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if(log != NULL) { - msg.str(""); - ioprintf(msg, _("Found label '%s'\n"), Name.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("Found label '%s'\n"), Name.c_str()); + log->Update(msg); } Database.Set("CD::" + ID + "::Label",Name); } @@ -846,9 +797,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ Database.Set("CD::" + ID,Name); if(log != NULL) { - msg.str(""); - ioprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str()); - log->Update(msg.str()); + string msg; + strprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str()); + log->Update(msg); log->Update(_("Copying package lists..."), STEP_COPY); } @@ -906,7 +857,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ if(log != NULL) { - msg.str(""); + stringstream msg; msg << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) << " " << string(*I,Space+1) << endl; log->Update(msg.str()); @@ -924,7 +875,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ } if(log != NULL) { - msg.str(""); + stringstream msg; msg << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) << " " << string(*I,Space+1) << endl; log->Update(msg.str()); diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 7d19eb813..db637b96d 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -69,6 +69,10 @@ class pkgCdrom /*{{{*/ public: bool Ident(std::string &ident, pkgCdromStatus *log); bool Add(pkgCdromStatus *log); + + private: + bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM, + std::string &ident, pkgCdromStatus * const log); }; /*}}}*/ diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 40a68e5b3..3236d227a 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1586,6 +1586,7 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashString::GetHashForFile(std::basic_string, std::allocator >) const@Base" 0.9.13.1 (c++)"indexRecords::GetSuite() const@Base" 0.9.13.2 (c++)"GetTempDir()@Base" 0.9.14.2 + (c++|optional=private)"pkgCdrom::MountAndIdentCDROM(Configuration&, std::basic_string, std::allocator >&, std::basic_string, std::allocator >&, pkgCdromStatus*)@Base" 0.9.15.2 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 ### gcc artefacts -- cgit v1.2.3 From 8f3594c3487800edc2a97af1f3290049776dc556 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 12 Feb 2014 07:59:07 +0100 Subject: Use a APT::VersionSet instead of a VersionList Use a APT::VersionSet instead of a APT::VersionList in DoDownload() to ensure that there is only one version in the set even if the user passes multiple identical name/versions on the commandline (Bug#738103) --- cmdline/apt-get.cc | 6 +++--- test/integration/test-apt-get-download | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 1019ff325..4d609104c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -630,8 +630,8 @@ bool DoDownload(CommandLine &CmdL) return false; APT::CacheSetHelper helper(c0out); - APT::VersionList verset = APT::VersionList::FromCommandLine(Cache, - CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper); + APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache, + CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); if (verset.empty() == true) return false; @@ -650,7 +650,7 @@ bool DoDownload(CommandLine &CmdL) std::string const cwd = SafeGetCWD(); _config->Set("Dir::Cache::Archives", cwd); int i = 0; - for (APT::VersionList::const_iterator Ver = verset.begin(); + for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver, ++i) { pkgAcquire::Item *I = new pkgAcqArchive(&Fetcher, SrcList, &Recs, *Ver, storefile[i]); diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index c2a5c3d8e..0d92283f1 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -39,3 +39,8 @@ aptget download apt aptget download apt testsuccess test -s apt_2.0_all.deb rm -f apt_1.0_all.deb + +# deb:738103 - apt-get download foo foo fails +rm -f apt_*.deb +aptget download apt apt +testsuccess test -s apt_2.0_all.deb -- cgit v1.2.3 From add49c7a4568491c6e9486a6744840f7bc446ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Ng=E1=BB=8Dc=20Qu=C3=A2n?= Date: Mon, 10 Feb 2014 07:57:04 +0700 Subject: l10n: vi.po (621t): Update and review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Trần Ngọc Quân --- po/vi.po | 2768 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 1388 insertions(+), 1380 deletions(-) diff --git a/po/vi.po b/po/vi.po index 8d2b4fac3..78bc3cda5 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt 0.9.14.2\n" +"Project-Id-Version: apt 0.9.15.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" -"PO-Revision-Date: 2014-01-01 13:45+0700\n" +"POT-Creation-Date: 2014-02-10 07:15+0700\n" +"PO-Revision-Date: 2014-02-10 07:50+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -167,7 +167,7 @@ msgstr " Bảng phiên bản:" #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s dành cho %s được biên dịch vào %s %s\n" +msgstr "%s-%s được biên dịch cho %s vào lúc “%s %s”\n" #: cmdline/apt-cache.cc:1740 msgid "" @@ -233,14 +233,14 @@ msgstr "" " policy - Hiển thị các cài đặt chính sách\n" "\n" "Tùy chọn:\n" -" -h Trợ giúp này.\n" +" -h Hiển thị trợ giúp này.\n" " -p=? Bộ nhớ tạm gói.\n" " -s=? Bộ nhớ tạm nguồn.\n" -" -q Không hiển thị diễn tiến.\n" +" -q Không hiển thị diễn tiến công việc.\n" " -i Chỉ hiển thị những phụ thuộc quan trọng cho lệnh unmet.\n" " -c=? Đọc tập tin cấu hình này\n" " -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. -o dir::cache=/tmp\n" -"Để tìm thông tin thêm, xem hai trang man (hướng dẫn)\n" +"Để tìm thông tin thêm, xem hai trang hướng dẫn\n" " apt-cache(8) và apt.conf(5).\n" #. }}} @@ -257,11 +257,11 @@ msgstr "" #: cmdline/apt-cdrom.cc:89 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "Hãy cung cấp tên cho Đĩa này, ví dụ như là: “Debian 5.0.3 Đĩa 1”" +msgstr "Hãy cung cấp tên cho Đĩa này, kiểu như là: “Debian 5.0.3 Đĩa 1”" #: cmdline/apt-cdrom.cc:104 msgid "Please insert a Disc in the drive and press enter" -msgstr "Hãy đưa đĩa vào ổ và bấm nút Enter" +msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter" #: cmdline/apt-cdrom.cc:139 #, c-format @@ -687,11 +687,10 @@ msgstr "Hủy bỏ nắm giữ %s.\n" #: cmdline/apt-mark.cc:334 msgid "Executing dpkg failed. Are you root?" msgstr "" -"Thực thi lệnh dpkg gặp lỗi. Bạn có cần quyền siêu người dùng (root) để làm " -"việc này" +"Thực thi lệnh “dpkg” gặp lỗi. Bạn có cần quyền siêu người dùng để thực thi " +"lệnh này" #: cmdline/apt-mark.cc:381 -#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -726,6 +725,11 @@ msgstr "" "Lệnh:\n" " auto - Đánh dấu các gói đưa ra là được cài đặt tự động\n" " manual - Đánh dấu các gói đưa ra là được cài đặt bằng tay\n" +" hold - Đánh dấu một gói là giữ lại\n" +" unhold - Bỏ đánh dấu một gói là giữ lại\n" +" showauto - In ra danh sách các gói được tự động cài đặt\n" +" showmanual - In ra danh sách các gói được cài đặt bằng tay\n" +" showhold - In ra danh sách các gói được giữ lại\n" "\n" "Tùy chọn:\n" " -h Trợ giúp này.\n" @@ -739,7 +743,6 @@ msgstr "" " apt-mark(8) và apt.conf(5)" #: cmdline/apt.cc:71 -#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" @@ -768,8 +771,13 @@ msgstr "" " show - hiển thị thông tin chi tiết về gói\n" "\n" " update - cập nhật danh sánh các gói sẵn có\n" +"\n" " install - cài đặt các gói\n" +" remove - gỡ bỏ các gói\n" +"\n" " upgrade - nâng cấp các gói trong hệ thống\n" +" full-upgrade - nâng cấp hệ thống bằng cách gỡ bỏ, cài đặt, nâng cấp các " +"gói\n" "\n" " edit-sources - sửa tập tin thông tin gói nguồn\n" @@ -1392,12 +1400,12 @@ msgstr "Gặp lỗi khi lấy về %s %s\n" #: apt-private/private-output.cc:72 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" -msgstr "" +msgstr "không hiểu" #: apt-private/private-output.cc:198 -#, fuzzy, c-format +#, c-format msgid "[installed,upgradable to: %s]" -msgstr "đã cài, có thể nâng cấp thành: " +msgstr "[đã cài, có thể nâng cấp thành: %s]" #: apt-private/private-output.cc:202 msgid "[installed,local]" @@ -1405,7 +1413,7 @@ msgstr "[đã cài đặt,nội bộ]" #: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" -msgstr "[đã cài, có thể tự động gỡ bỏ]" +msgstr "[đã cài,có thể tự động gỡ bỏ]" #: apt-private/private-output.cc:207 msgid "[installed,automatic]" @@ -1416,9 +1424,9 @@ msgid "[installed]" msgstr "[đã cài đặt]" #: apt-private/private-output.cc:213 -#, fuzzy, c-format +#, c-format msgid "[upgradable from: %s]" -msgstr "[có thể nâng cấp từ: " +msgstr "[có thể nâng cấp từ: %s]" #: apt-private/private-output.cc:217 msgid "[residual-config]" @@ -1460,7 +1468,7 @@ msgstr " hay" #: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" -msgstr "Những gói MỚI sau sẽ được cài đặt:" +msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:" #: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" @@ -1480,7 +1488,7 @@ msgstr "Những gói sau đây sẽ bị HẠ CẤP:" #: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" -msgstr "Những gói sau đây sẽ được thay đổi:" +msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:" #: apt-private/private-output.cc:620 #, c-format @@ -1608,7 +1616,7 @@ msgstr "Tìm kiếm toàn văn" msgid "There is %lu additional record. Please use the '-a' switch to see it" msgid_plural "" "There are %lu additional records. Please use the '-a' switch to see them." -msgstr[0] "" +msgstr[0] "Ở đây có %lu bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem" #: apt-private/private-show.cc:159 msgid "not a real package (virtual)" @@ -1621,10 +1629,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" -"GHI CHÚ: đây chỉ là mô phỏng!\n" -" apt-get yêu cầu quyền root để thực hiện thật.\n" -" Cần nhớ rằng chức năng khóa đã bị tắt,\n" -" nên có thể nó không chính xác như những gì làm thật!" +"CHÚ Ý: đây chỉ là mô phỏng!\n" +" apt-get yêu cầu quyền root để thực hiện thật.\n" +" Cần nhớ rằng chức năng khóa đã bị tắt,\n" +" nên có thể nó không chính xác như những gì làm thật!" #: apt-private/private-sources.cc:45 #, c-format @@ -1697,19 +1705,19 @@ msgstr "Không thể chuyển đổi sang %s" #: methods/mirror.cc:280 #, c-format msgid "No mirror file '%s' found " -msgstr "Không tìm thấy tập tin nhân bản “%s” " +msgstr "Không tìm thấy tập tin bản sao “%s” " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:287 #, c-format msgid "Can not read mirror file '%s'" -msgstr "Không thể đọc tập tin mirror “%s”" +msgstr "Không thể đọc tập tin bản sao “%s”" #: methods/mirror.cc:315 #, c-format msgid "No entry found in mirror file '%s'" -msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”" +msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”" #: methods/mirror.cc:445 #, c-format @@ -1760,1845 +1768,1845 @@ msgstr "" msgid "Merging available information" msgstr "Đang hòa trộn các thông tin sẵn có..." -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s không phải là một gói DEB hợp lệ." +#: apt-inst/contrib/extracttar.cc:116 +msgid "Failed to create pipes" +msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" -#: cmdline/apt-extracttemplates.cc:234 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" -"\n" -"[extract: rút trích;\n" -"templates: mẫu]\n" -"\n" -"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" -"\tvà biểu mẫu đều từ gói Debian\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này\n" -" -t Đặt thư mục tạm thời\n" -" [t: viết tắt cho từ “temporary”: tạm thời]\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "Việc thực hiện gzip bị lỗi " + +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +msgid "Corrupted archive" +msgstr "Kho bị hỏng." + +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" -#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 +#: apt-inst/contrib/extracttar.cc:300 #, c-format -msgid "Unable to write to %s" -msgstr "Không thể ghi vào %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" -#: cmdline/apt-extracttemplates.cc:308 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "Chữ ký kho không hợp lệ" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 -msgid "Package extension list is too long" -msgstr "Danh sách mở rộng gói quá dài" +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: apt-inst/contrib/arfile.cc:94 #, c-format -msgid "Error processing directory %s" -msgstr "Gặp lỗi khi xử lý thư mục %s" +msgid "Invalid archive member header %s" +msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" -#: ftparchive/apt-ftparchive.cc:262 -msgid "Source extension list is too long" -msgstr "Danh sách mở rộng nguồn quá dài" +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "Phần đầu thành viên kho không hợp lê" -#: ftparchive/apt-ftparchive.cc:379 -msgid "Error writing header to contents file" -msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" +#: apt-inst/contrib/arfile.cc:135 +msgid "Archive is too short" +msgstr "Kho quá ngắn" -#: ftparchive/apt-ftparchive.cc:409 -#, c-format -msgid "Error processing contents %s" -msgstr "Gặp lỗi khi xử lý nội dung %s" +#: apt-inst/contrib/arfile.cc:139 +msgid "Failed to read the archive headers" +msgstr "Việc đọc phần đầu kho bị lỗi" -#: ftparchive/apt-ftparchive.cc:597 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" -"\n" -"[ftparchive: FTP archive: kho FTP]\n" -"\n" -"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" -" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" -" contents path\n" -" release path\n" -" generate config [các_nhóm]\n" -" clean config\n" -"\n" -"(packages: những gói;\n" -"binarypath: đường dẫn nhị phân;\n" -"sources: những nguồn;\n" -"srcpath: đường dẫn nguồn;\n" -"contents path: đường dẫn nội dung;\n" -"release path: đường dẫn bản đã phát hành;\n" -"generate config [groups]: tạo ra cấu hình [các nhóm];\n" -"clean config: cấu hình toàn mới)\n" -"\n" -"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" -"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" -"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" -"và dpkg-scansources (dpkg-quét_nguồn).\n" -"\n" -"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" -"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" -"cùng với băm MD5 và kích cỡ tập tin.\n" -"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" -"\n" -"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" -"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" -"để ghi rõ tập tin đè nguồn\n" -"\n" -"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" -"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " -"quy,\n" -"và tập tin đè nên chứa những cờ đè.\n" -"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" -"những trường tên tập tin nếu có.\n" -"Cách sử dụng thí dụ từ kho Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Tùy chọn:\n" -" -h _Trợ giúp_ này\n" -" --md5 Điều khiển cách tạo ra MD5\n" -" -s=? Tập tin đè nguồn\n" -" -q _Im lặng_ (không xuất chi tiết)\n" -" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" -" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" -" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" -#: ftparchive/apt-ftparchive.cc:803 -msgid "No selections matched" -msgstr "Không có cái được chọn khớp được" +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "Gặp lỗi xác định vị trí phần tử băm!" -#: ftparchive/apt-ftparchive.cc:881 +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "Gặp lỗi khi xác định vị trí trệch đi" + +#: apt-inst/filelist.cc:466 +msgid "Internal error in AddDiversion" +msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" + +#: apt-inst/filelist.cc:479 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" -#: ftparchive/cachedb.cc:47 +#: apt-inst/filelist.cc:508 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." +msgid "Double add of diversion %s -> %s" +msgstr "Sự trệch đi được thêm hai lần %s → %s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/filelist.cc:551 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s" +msgid "Duplicate conf file %s/%s" +msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " -"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "Việc ghi tập tin %s gặp lỗi" -#: ftparchive/cachedb.cc:81 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." +msgid "Failed to close file %s" +msgstr "Việc đóng tập tin %s gặp lỗi" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format -msgid "Failed to stat %s" -msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" +msgid "The path %s is too long" +msgstr "Đường dẫn %s quá dài" -#: ftparchive/cachedb.cc:249 -msgid "Archive has no control record" -msgstr "Kho không có mục ghi điều khiển" +#: apt-inst/extract.cc:125 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Đang giải nén %s nhiều lần" -#: ftparchive/cachedb.cc:490 -msgid "Unable to get a cursor" -msgstr "Không thể lấy con trỏ" - -#: ftparchive/writer.cc:82 +#: apt-inst/extract.cc:135 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "CB: Không thể đọc thư mục %s\n" +msgid "The directory %s is diverted" +msgstr "Thư mục %s bị trệch hướng" -#: ftparchive/writer.cc:87 +#: apt-inst/extract.cc:145 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "CB: Không thể lấy thông tin thống kê %s\n" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: ftparchive/writer.cc:143 -msgid "E: " -msgstr "L: " +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +msgid "The diversion path is too long" +msgstr "Đường dẫn trệch đi quá dài" -#: ftparchive/writer.cc:145 -msgid "W: " -msgstr "CB: " +#: apt-inst/extract.cc:179 apt-inst/extract.cc:192 apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:127 +#, c-format +msgid "Failed to stat %s" +msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" -#: ftparchive/writer.cc:152 -msgid "E: Errors apply to file " -msgstr "LỖI: có lỗi áp dụng vào tập tin " +#: apt-inst/extract.cc:187 ftparchive/multicompress.cc:371 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Việc đổi tên %s thành %s bị lỗi" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: apt-inst/extract.cc:242 #, c-format -msgid "Failed to resolve %s" -msgstr "Gặp lỗi khi phân giải %s" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" -#: ftparchive/writer.cc:183 -msgid "Tree walking failed" -msgstr "Việc di chuyển qua cây bị lỗi" +#: apt-inst/extract.cc:282 +msgid "Failed to locate node in its hash bucket" +msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" -#: ftparchive/writer.cc:210 -#, c-format -msgid "Failed to open %s" -msgstr "Việc mở %s bị lỗi" +#: apt-inst/extract.cc:286 +msgid "The path is too long" +msgstr "Đường dẫn quá dài" -#: ftparchive/writer.cc:269 +#: apt-inst/extract.cc:414 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Bỏ liên kết %s [%s]\n" +msgid "Overwrite package match with no version for %s" +msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: ftparchive/writer.cc:277 +#: apt-inst/extract.cc:431 #, c-format -msgid "Failed to readlink %s" -msgstr "Gặp lỗi khi đọc liên kết %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" -#: ftparchive/writer.cc:281 +#: apt-inst/extract.cc:491 #, c-format -msgid "Failed to unlink %s" -msgstr "Việc bỏ liên kết %s bị lỗi" +msgid "Unable to stat %s" +msgstr "Không thể lấy thông tin thống kê %s" -#: ftparchive/writer.cc:289 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#: apt-inst/deb/debfile.cc:54 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Gặp lỗi khi liên kết %s đến %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" -#: ftparchive/writer.cc:299 +#: apt-inst/deb/debfile.cc:119 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Hết hạn bỏ liên kết của %sB.\n" +msgid "Internal error, could not locate member %s" +msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" -#: ftparchive/writer.cc:404 -msgid "Archive had no package field" -msgstr "Kho không có trường gói" +#: apt-inst/deb/debfile.cc:213 +msgid "Unparsable control file" +msgstr "Tập tin điều khiển không có khả năng phân tách" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s không có mục ghi đè (override)\n" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " người bảo trì %s là %s không phải %s\n" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Không thể nhân đôi bộ mô tả tập tin %i" -#: ftparchive/writer.cc:712 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s không có mục ghi đè (override) nguồn\n" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" -#: ftparchive/writer.cc:716 +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" + +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" + +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 -msgid "realloc - Failed to allocate memory" -msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Gặp lỗi khi cắt ngắn tập tin" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Unable to open %s" -msgstr "Không thể mở %s" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" +"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" +"Giá trị hiện thời là: %lu. (man 5 apt.conf)" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:65 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Sai override %s dòng %llu #1" +#: apt-pkg/contrib/mmap.cc:446 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " +"dùng tắt đi." + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:401 #, c-format -msgid "Failed to read the override file %s" -msgstr "Việc đọc tập tin đè %s bị lỗi" +msgid "%lid %lih %limin %lis" +msgstr "%li ngày %li giờ %li phút %li giây" -#: ftparchive/override.cc:163 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:408 #, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Sai override %s dòng %llu #1" +msgid "%lih %limin %lis" +msgstr "%li giờ %li phút %li giây" -#: ftparchive/override.cc:175 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:415 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Sai override %s dòng %llu #2" +msgid "%limin %lis" +msgstr "%li phút %li giây" -#: ftparchive/override.cc:188 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:420 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Sai override %s dòng %llu #3" +msgid "%lis" +msgstr "%li giây" -#: ftparchive/multicompress.cc:70 +#: apt-pkg/contrib/strutl.cc:1229 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Không biết thuật toán nén “%s”" +msgid "Selection %s not found" +msgstr "Không tìm thấy vùng chọn %s" -#: ftparchive/multicompress.cc:100 +#: apt-pkg/contrib/configuration.cc:503 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Không chấp nhận kiểu viết tắt: “%c”" -#: ftparchive/multicompress.cc:189 -msgid "Failed to create FILE*" -msgstr "Việc tạo TẬP_TIN* bị lỗi" +#: apt-pkg/contrib/configuration.cc:617 +#, c-format +msgid "Opening configuration file %s" +msgstr "Đang mở tập tin cấu hình %s..." -#: ftparchive/multicompress.cc:192 -msgid "Failed to fork" -msgstr "Gặp lỗi khi rẽ nhánh tiến trình" +#: apt-pkg/contrib/configuration.cc:785 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." -#: ftparchive/multicompress.cc:206 -msgid "Compress child" -msgstr "Nén con" +#: apt-pkg/contrib/configuration.cc:804 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" -#: ftparchive/multicompress.cc:229 +#: apt-pkg/contrib/configuration.cc:821 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" -#: ftparchive/multicompress.cc:302 -msgid "IO to subprocess/file failed" -msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" +#: apt-pkg/contrib/configuration.cc:861 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" -#: ftparchive/multicompress.cc:340 -msgid "Failed to read while computing MD5" -msgstr "Gặp lỗi khi đọc trong khi tính MD5" +#: apt-pkg/contrib/configuration.cc:868 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" -#: ftparchive/multicompress.cc:356 +#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Problem unlinking %s" -msgstr "Gặp lỗi khi bỏ liên kết %s" +msgid "Syntax error %s:%u: Included from here" +msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: apt-pkg/contrib/configuration.cc:881 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Việc đổi tên %s thành %s bị lỗi" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" -#: cmdline/apt-internal-solver.cc:38 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/contrib/configuration.cc:884 +#, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Cách dùng: apt-internal-solver\n" -"\n" -"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" -"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" -"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này.\n" -" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Không hiểu bản ghi gói!" +"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " +"số" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" -"\n" -"[sortpkgs: sort packages: sắp xếp các gói]\n" -"\n" -"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" -"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp_ này\n" -" -s Sắp xếp những tập tin _nguồn_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +#: apt-pkg/contrib/configuration.cc:934 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" -#: apt-inst/contrib/extracttar.cc:116 -msgid "Failed to create pipes" -msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" +#: apt-pkg/contrib/progress.cc:146 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Lỗi!" -#: apt-inst/contrib/extracttar.cc:143 -msgid "Failed to exec gzip " -msgstr "Việc thực hiện gzip bị lỗi " +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Xong" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 -msgid "Corrupted archive" -msgstr "Kho bị hỏng." +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "..." -#: apt-inst/contrib/extracttar.cc:195 -msgid "Tar checksum failed, archive corrupted" -msgstr "Lỗi kiểm tổng tar, kho bị hỏng" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-pkg/contrib/cmndline.cc:116 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." -#: apt-inst/contrib/arfile.cc:74 -msgid "Invalid archive signature" -msgstr "Chữ ký kho không hợp lệ" +#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 +#: apt-pkg/contrib/cmndline.cc:158 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Không hiểu tùy chọn dòng lệnh %s" -#: apt-inst/contrib/arfile.cc:82 -msgid "Error reading archive member header" -msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" +#: apt-pkg/contrib/cmndline.cc:163 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" -#: apt-inst/contrib/arfile.cc:94 +#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 #, c-format -msgid "Invalid archive member header %s" -msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" +msgid "Option %s requires an argument." +msgstr "Tùy chọn %s yêu cầu một đối số." -#: apt-inst/contrib/arfile.cc:106 -msgid "Invalid archive member header" -msgstr "Phần đầu thành viên kho không hợp lê" +#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=”." -#: apt-inst/contrib/arfile.cc:135 -msgid "Archive is too short" -msgstr "Kho quá ngắn" +#: apt-pkg/contrib/cmndline.cc:273 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" -#: apt-inst/contrib/arfile.cc:139 -msgid "Failed to read the archive headers" -msgstr "Việc đọc phần đầu kho bị lỗi" +#: apt-pkg/contrib/cmndline.cc:304 +#, c-format +msgid "Option '%s' is too long" +msgstr "Tùy chọn “%s” quá dài" -#: apt-inst/filelist.cc:382 -msgid "DropNode called on still linked node" -msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" +#: apt-pkg/contrib/cmndline.cc:336 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." -#: apt-inst/filelist.cc:414 -msgid "Failed to locate the hash element!" -msgstr "Gặp lỗi xác định vị trí phần tử băm!" +#: apt-pkg/contrib/cmndline.cc:386 +#, c-format +msgid "Invalid operation %s" +msgstr "Thao tác “%s” không hợp lệ" -#: apt-inst/filelist.cc:461 -msgid "Failed to allocate diversion" -msgstr "Gặp lỗi khi xác định vị trí trệch đi" +#: apt-pkg/contrib/cdromutl.cc:56 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-inst/filelist.cc:466 -msgid "Internal error in AddDiversion" -msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" +#: apt-pkg/contrib/cdromutl.cc:225 +msgid "Failed to stat the cdrom" +msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" -#: apt-inst/filelist.cc:479 +#: apt-pkg/contrib/fileutl.cc:95 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" +msgid "Problem closing the gzip file %s" +msgstr "Gặp vấn đề khi đóng tập tin gzip %s" -#: apt-inst/filelist.cc:508 +#: apt-pkg/contrib/fileutl.cc:228 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Sự trệch đi được thêm hai lần %s → %s" +msgid "Not using locking for read only lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-inst/filelist.cc:551 +#: apt-pkg/contrib/fileutl.cc:233 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" +msgid "Could not open lock file %s" +msgstr "Không thể mở tập tin khóa %s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/contrib/fileutl.cc:256 #, c-format -msgid "Failed to write file %s" -msgstr "Việc ghi tập tin %s gặp lỗi" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/contrib/fileutl.cc:261 #, c-format -msgid "Failed to close file %s" -msgstr "Việc đóng tập tin %s gặp lỗi" +msgid "Could not get lock %s" +msgstr "Không thể lấy khóa %s" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 #, c-format -msgid "The path %s is too long" -msgstr "Đường dẫn %s quá dài" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" -#: apt-inst/extract.cc:125 +#: apt-pkg/contrib/fileutl.cc:432 #, c-format -msgid "Unpacking %s more than once" -msgstr "Đang giải nén %s nhiều lần" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" -#: apt-inst/extract.cc:135 +#: apt-pkg/contrib/fileutl.cc:450 #, c-format -msgid "The directory %s is diverted" -msgstr "Thư mục %s bị trệch hướng" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" -#: apt-inst/extract.cc:145 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" - -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 -msgid "The diversion path is too long" -msgstr "Đường dẫn trệch đi quá dài" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " +"lệ" -#: apt-inst/extract.cc:242 +#: apt-pkg/contrib/fileutl.cc:862 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" - -#: apt-inst/extract.cc:282 -msgid "Failed to locate node in its hash bucket" -msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" - -#: apt-inst/extract.cc:286 -msgid "The path is too long" -msgstr "Đường dẫn quá dài" +msgid "Sub-process %s received a segmentation fault." +msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." -#: apt-inst/extract.cc:414 +#: apt-pkg/contrib/fileutl.cc:864 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" +msgid "Sub-process %s received signal %u." +msgstr "Tiến trình con %s đã nhận tín hiệu %u." -#: apt-inst/extract.cc:431 +#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" -#: apt-inst/extract.cc:491 +#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 #, c-format -msgid "Unable to stat %s" -msgstr "Không thể lấy thông tin thống kê %s" +msgid "Sub-process %s exited unexpectedly" +msgstr "Tiến trình con %s đã thoát bất thường" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-pkg/contrib/fileutl.cc:1016 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" +msgid "Could not open file %s" +msgstr "Không thể mở tập tin %s" -#: apt-inst/deb/debfile.cc:119 +#: apt-pkg/contrib/fileutl.cc:1093 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" +msgid "Could not open file descriptor %d" +msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-inst/deb/debfile.cc:213 -msgid "Unparsable control file" -msgstr "Tập tin điều khiển không có khả năng phân tách" +#: apt-pkg/contrib/fileutl.cc:1178 +msgid "Failed to create subprocess IPC" +msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" +#: apt-pkg/contrib/fileutl.cc:1233 +msgid "Failed to exec compressor " +msgstr "Gặp lỗi khi thực hiện nén " -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/contrib/fileutl.cc:1326 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Không thể nhân đôi bộ mô tả tập tin %i" +msgid "read, still have %llu to read but none left" +msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" +msgid "write, still have %llu to write but couldn't" +msgstr "ghi, còn cần ghi %llu nhưng mà không thể" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" +#: apt-pkg/contrib/fileutl.cc:1726 +#, c-format +msgid "Problem closing the file %s" +msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" +#: apt-pkg/contrib/fileutl.cc:1738 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" -#: apt-pkg/contrib/mmap.cc:290 +#: apt-pkg/contrib/fileutl.cc:1749 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" +msgid "Problem unlinking the file %s" +msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Gặp lỗi khi cắt ngắn tập tin" +#: apt-pkg/contrib/fileutl.cc:1762 +msgid "Problem syncing the file" +msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" -#: apt-pkg/contrib/mmap.cc:341 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:70 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" -"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" -"Giá trị hiện thời là: %lu. (man 5 apt.conf)" +msgid "No keyring installed in %s." +msgstr "Không có vòng khoá nào được cài đặt vào %s." -#: apt-pkg/contrib/mmap.cc:446 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." +#: apt-pkg/pkgcache.cc:148 +msgid "Empty package cache" +msgstr "Bộ nhớ tạm gói trống" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " -"dùng tắt đi." +#: apt-pkg/pkgcache.cc:154 +msgid "The package cache file is corrupted" +msgstr "Tập tin nhớ tạm gói bị hỏng" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li ngày %li giờ %li phút %li giây" +#: apt-pkg/pkgcache.cc:159 +msgid "The package cache file is an incompatible version" +msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 -#, c-format -msgid "%lih %limin %lis" -msgstr "%li giờ %li phút %li giây" +#: apt-pkg/pkgcache.cc:162 +msgid "The package cache file is corrupted, it is too small" +msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/pkgcache.cc:167 #, c-format -msgid "%limin %lis" -msgstr "%li phút %li giây" +msgid "This APT does not support the versioning system '%s'" +msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:420 -#, c-format -msgid "%lis" -msgstr "%li giây" +#: apt-pkg/pkgcache.cc:172 +msgid "The package cache was built for a different architecture" +msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" -#: apt-pkg/contrib/strutl.cc:1229 -#, c-format -msgid "Selection %s not found" -msgstr "Không tìm thấy vùng chọn %s" +#: apt-pkg/pkgcache.cc:314 +msgid "Depends" +msgstr "Phụ thuộc" -#: apt-pkg/contrib/configuration.cc:503 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Không chấp nhận kiểu viết tắt: “%c”" +#: apt-pkg/pkgcache.cc:314 +msgid "PreDepends" +msgstr "Phụ thuộc sẵn" -#: apt-pkg/contrib/configuration.cc:617 -#, c-format -msgid "Opening configuration file %s" -msgstr "Đang mở tập tin cấu hình %s..." +#: apt-pkg/pkgcache.cc:314 +msgid "Suggests" +msgstr "Đề nghị" -#: apt-pkg/contrib/configuration.cc:785 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." +#: apt-pkg/pkgcache.cc:315 +msgid "Recommends" +msgstr "Khuyến khích" -#: apt-pkg/contrib/configuration.cc:804 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" +#: apt-pkg/pkgcache.cc:315 +msgid "Conflicts" +msgstr "Xung đột" -#: apt-pkg/contrib/configuration.cc:821 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" +#: apt-pkg/pkgcache.cc:315 +msgid "Replaces" +msgstr "Thay thế" -#: apt-pkg/contrib/configuration.cc:861 -#, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" +#: apt-pkg/pkgcache.cc:316 +msgid "Obsoletes" +msgstr "Cũ" -#: apt-pkg/contrib/configuration.cc:868 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" +#: apt-pkg/pkgcache.cc:316 +msgid "Breaks" +msgstr "Làm hỏng" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" +#: apt-pkg/pkgcache.cc:316 +msgid "Enhances" +msgstr "Tăng cường" -#: apt-pkg/contrib/configuration.cc:881 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" +#: apt-pkg/pkgcache.cc:327 +msgid "important" +msgstr "quan trọng" -#: apt-pkg/contrib/configuration.cc:884 -#, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" -"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " -"số" +#: apt-pkg/pkgcache.cc:327 +msgid "required" +msgstr "yêu cầu" -#: apt-pkg/contrib/configuration.cc:934 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" +#: apt-pkg/pkgcache.cc:327 +msgid "standard" +msgstr "chuẩn" -#: apt-pkg/contrib/progress.cc:146 -#, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Lỗi!" +#: apt-pkg/pkgcache.cc:328 +msgid "optional" +msgstr "tùy chọn" -#: apt-pkg/contrib/progress.cc:148 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Xong" +#: apt-pkg/pkgcache.cc:328 +msgid "extra" +msgstr "bổ sung" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "..." +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +msgid "Building dependency tree" +msgstr "Đang xây dựng cây quan hệ phụ thuộc" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +#: apt-pkg/depcache.cc:133 +msgid "Candidate versions" +msgstr "Phiên bản ứng cử" -#: apt-pkg/contrib/cmndline.cc:116 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." +#: apt-pkg/depcache.cc:162 +msgid "Dependency generation" +msgstr "Tạo ra quan hệ phụ thuộc" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Không hiểu tùy chọn dòng lệnh %s" +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +msgid "Reading state information" +msgstr "Đang đọc thông tin về tình trạng" -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/depcache.cc:244 #, c-format -msgid "Command line option %s is not boolean" -msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" +msgid "Failed to open StateFile %s" +msgstr "Lỗi mở tập tin tình trạng StateFile %s" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/depcache.cc:250 #, c-format -msgid "Option %s requires an argument." -msgstr "Tùy chọn %s yêu cầu một đối số." +msgid "Failed to write temporary StateFile %s" +msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/tagfile.cc:138 #, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=”." +msgid "Unable to parse package file %s (1)" +msgstr "Không thể phân tích tập tin gói %s (1)" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/tagfile.cc:235 #, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" +msgid "Unable to parse package file %s (2)" +msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/sourcelist.cc:118 #, c-format -msgid "Option '%s' is too long" -msgstr "Tùy chọn “%s” quá dài" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/contrib/cmndline.cc:336 +#: apt-pkg/sourcelist.cc:161 #, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " +"tích được)" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/sourcelist.cc:164 #, c-format -msgid "Invalid operation %s" -msgstr "Thao tác “%s” không hợp lệ" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/sourcelist.cc:175 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " +"gán)" -#: apt-pkg/contrib/cdromutl.cc:225 -msgid "Failed to stat the cdrom" -msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" +#: apt-pkg/sourcelist.cc:181 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/contrib/fileutl.cc:95 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gặp vấn đề khi đóng tập tin gzip %s" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " +"trị)" -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/sourcelist.cc:197 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/contrib/fileutl.cc:233 +#: apt-pkg/sourcelist.cc:199 #, c-format -msgid "Could not open lock file %s" -msgstr "Không thể mở tập tin khóa %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/sourcelist.cc:202 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Could not get lock %s" -msgstr "Không thể lấy khóa %s" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/sourcelist.cc:215 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/sourcelist.cc:326 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" +msgid "Opening %s" +msgstr "Đang mở %s" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" +msgid "Line %u too long in source list %s." +msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/sourcelist.cc:362 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " -"lệ" +msgid "Malformed line %u in source list %s (type)" +msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-pkg/sourcelist.cc:366 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/sourcelist.cc:407 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Tiến trình con %s đã nhận tín hiệu %u." +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." +"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Tiến trình con %s đã thoát bất thường" +msgid "Could not configure '%s'. " +msgstr "Không thể cấu hình “%s”. " -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/packagemanager.cc:570 #, c-format -msgid "Could not open file %s" -msgstr "Không thể mở tập tin %s" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " +"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " +"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" +"LoopBreak” (buộc ngắt vòng lặp)." -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/pkgrecords.cc:34 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Không thể mở bộ mô tả tập tin %d" +msgid "Index file type '%s' is not supported" +msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" -#: apt-pkg/contrib/fileutl.cc:1178 -msgid "Failed to create subprocess IPC" -msgstr "Việc tạo tiến trình con IPC bị lỗi" +#: apt-pkg/algorithms.cc:266 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/contrib/fileutl.cc:1233 -msgid "Failed to exec compressor " -msgstr "Gặp lỗi khi thực hiện nén " +#: apt-pkg/algorithms.cc:1068 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " +"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/contrib/fileutl.cc:1326 -#, c-format -msgid "read, still have %llu to read but none left" -msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" +#: apt-pkg/algorithms.cc:1070 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "ghi, còn cần ghi %llu nhưng mà không thể" +msgid "List directory %spartial is missing." +msgstr "Thiếu thư mục danh sách %spartial." -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/acquire.cc:85 #, c-format -msgid "Problem closing the file %s" -msgstr "Gặp vấn đề khi đóng tập tin %s" +msgid "Archives directory %spartial is missing." +msgstr "Thiếu thư mục kho lưu %spartial." -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/acquire.cc:93 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" +msgid "Unable to lock directory %s" +msgstr "Không thể khoá thư mục %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:893 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" -#: apt-pkg/contrib/fileutl.cc:1762 -msgid "Problem syncing the file" -msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" +#: apt-pkg/acquire.cc:895 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Đang tải tập tin %li trong tổng số %li" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-pkg/acquire-worker.cc:112 #, c-format -msgid "No keyring installed in %s." -msgstr "Không có vòng khoá nào được cài đặt vào %s." +msgid "The method driver %s could not be found." +msgstr "Không tìm thấy trình điều khiển phương thức %s." -#: apt-pkg/pkgcache.cc:148 -msgid "Empty package cache" -msgstr "Bộ nhớ tạm gói trống" +#: apt-pkg/acquire-worker.cc:161 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Phương thức %s đã không khởi chạy đúng đắn." -#: apt-pkg/pkgcache.cc:154 -msgid "The package cache file is corrupted" -msgstr "Tập tin nhớ tạm gói bị hỏng" +#: apt-pkg/acquire-worker.cc:447 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter." -#: apt-pkg/pkgcache.cc:159 -msgid "The package cache file is an incompatible version" -msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" +#: apt-pkg/init.cc:143 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Không hỗ trợ hệ thống đóng gói “%s”" -#: apt-pkg/pkgcache.cc:162 -msgid "The package cache file is corrupted, it is too small" -msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" +#: apt-pkg/init.cc:159 +msgid "Unable to determine a suitable packaging system type" +msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/clean.cc:57 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" +msgid "Unable to stat %s." +msgstr "Không thể lấy trạng thái về %s." -#: apt-pkg/pkgcache.cc:172 -msgid "The package cache was built for a different architecture" -msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" - -#: apt-pkg/pkgcache.cc:314 -msgid "Depends" -msgstr "Phụ thuộc" +#: apt-pkg/srcrecords.cc:47 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" +"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" -#: apt-pkg/pkgcache.cc:314 -msgid "PreDepends" -msgstr "Phụ thuộc sẵn" +#: apt-pkg/cachefile.cc:87 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." -#: apt-pkg/pkgcache.cc:314 -msgid "Suggests" -msgstr "Đề nghị" +#: apt-pkg/cachefile.cc:91 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " +"này" -#: apt-pkg/pkgcache.cc:315 -msgid "Recommends" -msgstr "Khuyến khích" +#: apt-pkg/cachefile.cc:109 +msgid "The list of sources could not be read." +msgstr "Không thể đọc danh sách nguồn." -#: apt-pkg/pkgcache.cc:315 -msgid "Conflicts" -msgstr "Xung đột" +#: apt-pkg/policy.cc:75 +#, c-format +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " +"không sẵn có trong mã nguồn" -#: apt-pkg/pkgcache.cc:315 -msgid "Replaces" -msgstr "Thay thế" +#: apt-pkg/policy.cc:414 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." -#: apt-pkg/pkgcache.cc:316 -msgid "Obsoletes" -msgstr "Cũ" +#: apt-pkg/policy.cc:436 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/pkgcache.cc:316 -msgid "Breaks" -msgstr "Làm hỏng" +#: apt-pkg/policy.cc:444 +msgid "No priority (or zero) specified for pin" +msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/pkgcache.cc:316 -msgid "Enhances" -msgstr "Tăng cường" +#: apt-pkg/pkgcachegen.cc:87 +msgid "Cache has an incompatible versioning system" +msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" -#: apt-pkg/pkgcache.cc:327 -msgid "important" -msgstr "quan trọng" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" -#: apt-pkg/pkgcache.cc:327 -msgid "required" -msgstr "yêu cầu" +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/pkgcache.cc:327 -msgid "standard" -msgstr "chuẩn" +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/pkgcache.cc:328 -msgid "optional" -msgstr "tùy chọn" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." -#: apt-pkg/pkgcache.cc:328 -msgid "extra" -msgstr "bổ sung" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 -msgid "Building dependency tree" -msgstr "Đang xây dựng cây quan hệ phụ thuộc" +#: apt-pkg/pkgcachegen.cc:570 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/depcache.cc:133 -msgid "Candidate versions" -msgstr "Phiên bản ứng cử" +#: apt-pkg/pkgcachegen.cc:1199 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/depcache.cc:162 -msgid "Dependency generation" -msgstr "Tạo ra quan hệ phụ thuộc" +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +msgid "Reading package lists" +msgstr "Đang đọc các danh sách gói" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 -msgid "Reading state information" -msgstr "Đang đọc thông tin về tình trạng" +#: apt-pkg/pkgcachegen.cc:1304 +msgid "Collecting File Provides" +msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/pkgcachegen.cc:1388 cmdline/apt-extracttemplates.cc:266 #, c-format -msgid "Failed to open StateFile %s" -msgstr "Lỗi mở tập tin tình trạng StateFile %s" +msgid "Unable to write to %s" +msgstr "Không thể ghi vào %s" -#: apt-pkg/depcache.cc:250 -#, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +msgid "IO Error saving source cache" +msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/acquire-item.cc:139 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Không thể phân tích tập tin gói %s (1)" +msgid "rename failed, %s (%s -> %s)." +msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." -#: apt-pkg/tagfile.cc:235 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Không thể phân tích tập tin gói %s (2)" +#: apt-pkg/acquire-item.cc:154 +msgid "Hash Sum mismatch" +msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" -#: apt-pkg/sourcelist.cc:118 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" +#: apt-pkg/acquire-item.cc:159 +msgid "Size mismatch" +msgstr "Kích cỡ không khớp nhau" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/acquire-item.cc:164 +msgid "Invalid file format" +msgstr "Định dạng tập tập tin không hợp lệ" + +#: apt-pkg/acquire-item.cc:1561 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" msgstr "" -"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " -"tích được)" +"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " +"sources.list hoặc tập tin bị hỏng)" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/acquire-item.cc:1577 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/acquire-item.cc:1619 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" + +#: apt-pkg/acquire-item.cc:1657 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " -"gán)" +"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " +"này sẽ không được áp dụng." -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/acquire-item.cc:1679 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/acquire-item.cc:1709 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "" +"An error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " -"trị)" +"Gặp lỗi trong khi thẩm tra chữ ký.\n" +"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" +"Lỗi GPG: %s: %s\n" -#: apt-pkg/sourcelist.cc:197 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" +msgid "GPG error: %s: %s" +msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/acquire-item.cc:1847 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " +"này, do thiếu kiến trúc." -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/acquire-item.cc:1913 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/acquire-item.cc:1971 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" +"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " +"tin:) cho gói %s." -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/indexrecords.cc:73 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" +msgid "Unable to parse Release file %s" +msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/indexrecords.cc:81 #, c-format -msgid "Opening %s" -msgstr "Đang mở %s" +msgid "No sections in Release file %s" +msgstr "Không có phần nào trong tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/indexrecords.cc:112 #, c-format -msgid "Line %u too long in source list %s." -msgstr "Dòng %u quá dài trong danh sách nguồn %s." +msgid "No Hash entry in Release file %s" +msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/indexrecords.cc:125 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "" +"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " +"hành %s" -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/indexrecords.cc:144 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." +msgid "Invalid 'Date' entry in Release file %s" +msgstr "" +"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" -#: apt-pkg/sourcelist.cc:407 -#, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." +#: apt-pkg/vendorlist.cc:78 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Khối nhà bán %s không chứa vân tay" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/cdrom.cc:576 #, c-format msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" msgstr "" -"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." -"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" +"Đang dùng thư mục gắn đĩa CD-ROM %s\n" +"Đang gắn đĩa CD-ROM...\n" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 -#, c-format -msgid "Could not configure '%s'. " -msgstr "Không thể cấu hình “%s”. " +#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 +msgid "Identifying.. " +msgstr "Đang nhận diện... " -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/cdrom.cc:613 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " -"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " -"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" -"LoopBreak” (buộc ngắt vòng lặp)." +msgid "Stored label: %s\n" +msgstr "Nhãn đã lưu: %s\n" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 +msgid "Unmounting CD-ROM...\n" +msgstr "Đang bỏ gắn CD-ROM...\n" + +#: apt-pkg/cdrom.cc:642 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" +msgid "Using CD-ROM mount point %s\n" +msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/cdrom.cc:660 +msgid "Unmounting CD-ROM\n" +msgstr "Đang bỏ gắn CD-ROM...\n" + +#: apt-pkg/cdrom.cc:665 +msgid "Waiting for disc...\n" +msgstr "Đang đợi đĩa...\n" + +#: apt-pkg/cdrom.cc:674 +msgid "Mounting CD-ROM...\n" +msgstr "Đang gắn đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:693 +msgid "Scanning disc for index files..\n" +msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" + +#: apt-pkg/cdrom.cc:744 #, c-format msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/cdrom.cc:755 msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" msgstr "" -"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " -"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." - -#: apt-pkg/algorithms.cc:1070 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." +"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " +"hoặc có kiến trúc không đúng?" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/cdrom.cc:782 #, c-format -msgid "List directory %spartial is missing." -msgstr "Thiếu thư mục danh sách %spartial." +msgid "Found label '%s'\n" +msgstr "Tìm thấy nhãn “%s”\n" -#: apt-pkg/acquire.cc:85 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Thiếu thư mục kho lưu %spartial." +#: apt-pkg/cdrom.cc:811 +msgid "That is not a valid name, try again.\n" +msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/cdrom.cc:828 #, c-format -msgid "Unable to lock directory %s" -msgstr "Không thể khoá thư mục %s" +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Tên đĩa này:\n" +"“%s”\n" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:893 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" +#: apt-pkg/cdrom.cc:830 +msgid "Copying package lists..." +msgstr "Đang sao chép các danh sách gói..." -#: apt-pkg/acquire.cc:895 +#: apt-pkg/cdrom.cc:865 +msgid "Writing new source list\n" +msgstr "Đang ghi danh sách nguồn mới\n" + +#: apt-pkg/cdrom.cc:873 +msgid "Source list entries for this disc are:\n" +msgstr "Các mục tin danh sách nguồn cho đĩa này:\n" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Đang tải tập tin %li trong tổng số %li" +msgid "Wrote %i records.\n" +msgstr "Đã ghi %i bản ghi.\n" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format -msgid "The method driver %s could not be found." -msgstr "Không tìm thấy trình điều khiển phương thức %s." +msgid "Wrote %i records with %i missing files.\n" +msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format -msgid "Method %s did not start correctly" -msgstr "Phương thức %s đã không khởi chạy đúng đắn." +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter." +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " +"nhau\n" -#: apt-pkg/init.cc:143 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Không hỗ trợ hệ thống đóng gói “%s”" +msgid "Can't find authentication record for: %s" +msgstr "Không tìm thấy bản ghi xác thực cho: %s" -#: apt-pkg/init.cc:159 -msgid "Unable to determine a suitable packaging system type" -msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" +#: apt-pkg/indexcopy.cc:521 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "Sai khớp chuỗi duy nhất cho: %s" -#: apt-pkg/clean.cc:57 +#: apt-pkg/cacheset.cc:469 #, c-format -msgid "Unable to stat %s." -msgstr "Không thể lấy trạng thái về %s." +msgid "Release '%s' for '%s' was not found" +msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" -#: apt-pkg/srcrecords.cc:47 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" +#: apt-pkg/cacheset.cc:472 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Không tìm thấy phiên bản “%s” cho “%s”" -#: apt-pkg/cachefile.cc:87 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." +#: apt-pkg/cacheset.cc:583 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Không tìm thấy tác vụ “%s”" -#: apt-pkg/cachefile.cc:91 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " -"này" +#: apt-pkg/cacheset.cc:589 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”" -#: apt-pkg/cachefile.cc:109 -msgid "The list of sources could not be read." -msgstr "Không thể đọc danh sách nguồn." +#: apt-pkg/cacheset.cc:600 +#, c-format +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo" -#: apt-pkg/policy.cc:75 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " -"không sẵn có trong mã nguồn" +"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” " +"mà không có trong nó" -#: apt-pkg/policy.cc:414 +#: apt-pkg/cacheset.cc:621 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" -"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo" -#: apt-pkg/policy.cc:436 +#: apt-pkg/cacheset.cc:629 #, c-format -msgid "Did not understand pin type %s" -msgstr "Không hiểu kiểu ghim %s" - -#: apt-pkg/policy.cc:444 -msgid "No priority (or zero) specified for pin" -msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử" -#: apt-pkg/pkgcachegen.cc:87 -msgid "Cache has an incompatible versioning system" -msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" - -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/cacheset.cc:637 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" - -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." - -#: apt-pkg/pkgcachegen.cc:254 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " +"đặt" -#: apt-pkg/pkgcachegen.cc:570 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "Gửi kịch bản đến bộ phân giải" -#: apt-pkg/pkgcachegen.cc:1199 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" +#: apt-pkg/edsp.cc:209 +msgid "Send request to solver" +msgstr "Gửi yêu cầu đến bộ phân giải" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 -msgid "Reading package lists" -msgstr "Đang đọc các danh sách gói" +#: apt-pkg/edsp.cc:279 +msgid "Prepare for receiving solution" +msgstr "Chuẩn bị để lấy cách giải quyết" -#: apt-pkg/pkgcachegen.cc:1304 -msgid "Collecting File Provides" -msgstr "Đang tập hợp các Nhà cung cấp Tập tin" +#: apt-pkg/edsp.cc:286 +msgid "External solver failed without a proper error message" +msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 -msgid "IO Error saving source cache" -msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +msgid "Execute external solver" +msgstr "Thi hành bộ phân giải từ bên ngoài" -#: apt-pkg/acquire-item.cc:139 +#: apt-pkg/install-progress.cc:51 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." - -#: apt-pkg/acquire-item.cc:154 -msgid "Hash Sum mismatch" -msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" - -#: apt-pkg/acquire-item.cc:159 -msgid "Size mismatch" -msgstr "Kích cỡ không khớp nhau" +msgid "Progress: [%3i%%]" +msgstr "Diễn biến: [%3i%%]" -#: apt-pkg/acquire-item.cc:164 -msgid "Invalid file format" -msgstr "Định dạng tập tập tin không hợp lệ" +#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +msgid "Running dpkg" +msgstr "Đang chạy dpkg" -#: apt-pkg/acquire-item.cc:1561 -#, c-format +#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." msgstr "" -"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " -"sources.list hoặc tập tin bị hỏng)" +"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " +"được dùng thay thế." -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/deb/dpkgpm.cc:91 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" - -#: apt-pkg/acquire-item.cc:1619 -msgid "There is no public key available for the following key IDs:\n" -msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" +msgid "Installing %s" +msgstr "Đang cài đặt %s" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " -"này sẽ không được áp dụng." +msgid "Configuring %s" +msgstr "Đang cấu hình %s" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/deb/dpkgpm.cc:94 #, c-format -msgid "" -"An error occurred during the signature verification. The repository is not " -"updated and the previous index files will be used. GPG error: %s: %s\n" -msgstr "" -"Gặp lỗi trong khi thẩm tra chữ ký.\n" -"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" -"Lỗi GPG: %s: %s\n" +msgid "Completely removing %s" +msgstr "Đang gỡ bỏ hoàn toàn %s" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format -msgid "GPG error: %s: %s" -msgstr "Lỗi GPG: %s: %s" +msgid "Noting disappearance of %s" +msgstr "Đang ghi chép sự biến mất của %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/deb/dpkgpm.cc:96 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" -msgstr "" -"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " -"này, do thiếu kiến trúc." +msgid "Running post-installation trigger %s" +msgstr "Đang chạy bẫy sau-cài-đặt %s" -#: apt-pkg/acquire-item.cc:1913 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" +msgid "Directory '%s' missing" +msgstr "Thiếu thư mục “%s”" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "" -"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " -"tin:) cho gói %s." +msgid "Could not open file '%s'" +msgstr "Không thể mở tập tin “%s”" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format -msgid "Unable to parse Release file %s" -msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" +msgid "Preparing %s" +msgstr "Đang chuẩn bị %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format -msgid "No sections in Release file %s" -msgstr "Không có phần nào trong tập tin Phát hành %s" +msgid "Unpacking %s" +msgstr "Đang mở gói %s" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" +msgid "Preparing to configure %s" +msgstr "Đang chuẩn bị cấu hình %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "" -"Gặp mục nhập “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " -"hành %s" +msgid "Installed %s" +msgstr "Đã cài đặt %s" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "" -"Gặp mục nhập “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" +msgid "Preparing for removal of %s" +msgstr "Đang chuẩn bị gỡ bỏ %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Khối nhà bán %s không chứa vân tay" +msgid "Removed %s" +msgstr "Đã gỡ bỏ %s" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Đang dùng thư mục gắn đĩa CD-ROM %s\n" -"Đang gắn đĩa CD-ROM...\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Đang nhận diện... " +msgid "Preparing to completely remove %s" +msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: apt-pkg/cdrom.cc:613 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format -msgid "Stored label: %s\n" -msgstr "Nhãn đã lưu: %s\n" +msgid "Completely removed %s" +msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Đang bỏ gắn CD-ROM...\n" +#: apt-pkg/deb/dpkgpm.cc:1046 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "ioctl(TIOCGWINSZ) gặp lỗi" -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" +msgid "Can not write log (%s)" +msgstr "Không thể ghi nhật ký (%s)" -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" -msgstr "Đang bỏ gắn CD-ROM...\n" +#: apt-pkg/deb/dpkgpm.cc:1049 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts đã gắn chưa?" -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" -msgstr "Đang đợi đĩa...\n" +#: apt-pkg/deb/dpkgpm.cc:1070 +msgid "Is stdout a terminal?" +msgstr "Đầu ra là thiết bị cuối?" -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "Đang gắn đĩa CD-ROM...\n" +#: apt-pkg/deb/dpkgpm.cc:1558 +msgid "Operation was interrupted before it could finish" +msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: apt-pkg/cdrom.cc:693 -msgid "Scanning disc for index files..\n" -msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" +#: apt-pkg/deb/dpkgpm.cc:1620 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" -#: apt-pkg/cdrom.cc:744 -#, c-format +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1625 +msgid "dependency problems - leaving unconfigured" +msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" + +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " +"do một sự thất bại trước đó." -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " -"hoặc có kiến trúc không đúng?" - -#: apt-pkg/cdrom.cc:782 -#, c-format -msgid "Found label '%s'\n" -msgstr "Tìm thấy nhãn “%s”\n" - -#: apt-pkg/cdrom.cc:811 -msgid "That is not a valid name, try again.\n" -msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: apt-pkg/cdrom.cc:828 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" -"This disc is called: \n" -"'%s'\n" +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -"Tên đĩa này:\n" -"“%s”\n" - -#: apt-pkg/cdrom.cc:830 -msgid "Copying package lists..." -msgstr "Đang sao chép các danh sách gói..." - -#: apt-pkg/cdrom.cc:865 -msgid "Writing new source list\n" -msgstr "Đang ghi danh sách nguồn mới\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " +"bộ nhớ”" -#: apt-pkg/cdrom.cc:873 -msgid "Source list entries for this disc are:\n" -msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " +"thống nội bộ" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Đã ghi %i bản ghi.\n" +#: apt-pkg/deb/dpkgpm.cc:1674 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/deb/debsystem.cc:84 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " +"phải không?" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/deb/debsystem.cc:87 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:103 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " -"nhau\n" +"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " +"vấn đề này. " -#: apt-pkg/indexcopy.cc:515 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "Không tìm thấy bản ghi xác thực cho: %s" +#: apt-pkg/deb/debsystem.cc:121 +msgid "Not locked" +msgstr "Chưa được khoá" -#: apt-pkg/indexcopy.cc:521 +#: cmdline/apt-extracttemplates.cc:100 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Sai khớp chuỗi duy nhất cho: %s" +msgid "%s not a valid DEB package." +msgstr "%s không phải là một gói DEB hợp lệ." -#: apt-pkg/cacheset.cc:469 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" +#: cmdline/apt-extracttemplates.cc:234 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" +"\n" +"[extract: rút trích;\n" +"templates: mẫu]\n" +"\n" +"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" +"\tvà biểu mẫu đều từ gói Debian\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này\n" +" -t Đặt thư mục tạm thời\n" +" [t: viết tắt cho từ “temporary”: tạm thời]\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-pkg/cacheset.cc:472 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Không tìm thấy phiên bản “%s” cho “%s”" +#: cmdline/apt-extracttemplates.cc:308 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: apt-pkg/cacheset.cc:583 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Không tìm thấy tác vụ “%s”" +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +msgid "Package extension list is too long" +msgstr "Danh sách mở rộng gói quá dài" -#: apt-pkg/cacheset.cc:589 +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”" +msgid "Error processing directory %s" +msgstr "Gặp lỗi khi xử lý thư mục %s" -#: apt-pkg/cacheset.cc:600 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo" +#: ftparchive/apt-ftparchive.cc:262 +msgid "Source extension list is too long" +msgstr "Danh sách mở rộng nguồn quá dài" -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: ftparchive/apt-ftparchive.cc:379 +msgid "Error writing header to contents file" +msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" + +#: ftparchive/apt-ftparchive.cc:409 #, c-format +msgid "Error processing contents %s" +msgstr "Gặp lỗi khi xử lý nội dung %s" + +#: ftparchive/apt-ftparchive.cc:597 msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” " -"mà không có trong nó" +"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" +"\n" +"[ftparchive: FTP archive: kho FTP]\n" +"\n" +"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" +" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" +" contents path\n" +" release path\n" +" generate config [các_nhóm]\n" +" clean config\n" +"\n" +"(packages: những gói;\n" +"binarypath: đường dẫn nhị phân;\n" +"sources: những nguồn;\n" +"srcpath: đường dẫn nguồn;\n" +"contents path: đường dẫn nội dung;\n" +"release path: đường dẫn bản đã phát hành;\n" +"generate config [groups]: tạo ra cấu hình [các nhóm];\n" +"clean config: cấu hình toàn mới)\n" +"\n" +"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" +"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" +"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" +"và dpkg-scansources (dpkg-quét_nguồn).\n" +"\n" +"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" +"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" +"cùng với băm MD5 và kích cỡ tập tin.\n" +"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" +"\n" +"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" +"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" +"để ghi rõ tập tin đè nguồn\n" +"\n" +"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" +"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " +"quy,\n" +"và tập tin đè nên chứa những cờ đè.\n" +"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" +"những trường tên tập tin nếu có.\n" +"Cách sử dụng thí dụ từ kho Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Tùy chọn:\n" +" -h _Trợ giúp_ này\n" +" --md5 Điều khiển cách tạo ra MD5\n" +" -s=? Tập tin đè nguồn\n" +" -q _Im lặng_ (không xuất chi tiết)\n" +" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" +" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" +" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" -#: apt-pkg/cacheset.cc:621 +#: ftparchive/apt-ftparchive.cc:803 +msgid "No selections matched" +msgstr "Không có cái được chọn khớp được" + +#: ftparchive/apt-ftparchive.cc:881 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo" +msgid "Some files are missing in the package file group `%s'" +msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." -#: apt-pkg/cacheset.cc:629 +#: ftparchive/cachedb.cc:47 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." -#: apt-pkg/cacheset.cc:637 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" -"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " -"đặt" +msgid "DB is old, attempting to upgrade %s" +msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 -msgid "Send scenario to solver" -msgstr "Gửi kịch bản đến bộ phân giải" +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " +"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." -#: apt-pkg/edsp.cc:209 -msgid "Send request to solver" -msgstr "Gửi yêu cầu đến bộ phân giải" +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: apt-pkg/edsp.cc:279 -msgid "Prepare for receiving solution" -msgstr "Chuẩn bị để lấy cách giải quyết" +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "Kho không có mục ghi điều khiển" -#: apt-pkg/edsp.cc:286 -msgid "External solver failed without a proper error message" -msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "Không thể lấy con trỏ" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 -msgid "Execute external solver" -msgstr "Thi hành bộ phân giải từ bên ngoài" +#: ftparchive/writer.cc:82 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "CB: Không thể đọc thư mục %s\n" -#: apt-pkg/install-progress.cc:51 +#: ftparchive/writer.cc:87 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Diễn biến: [%3i%%]" +msgid "W: Unable to stat %s\n" +msgstr "CB: Không thể lấy thông tin thống kê %s\n" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 -msgid "Running dpkg" -msgstr "Đang chạy dpkg" +#: ftparchive/writer.cc:143 +msgid "E: " +msgstr "L: " -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." -msgstr "" -"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " -"được dùng thay thế." +#: ftparchive/writer.cc:145 +msgid "W: " +msgstr "CB: " -#: apt-pkg/deb/dpkgpm.cc:91 -#, c-format -msgid "Installing %s" -msgstr "Đang cài đặt %s" +#: ftparchive/writer.cc:152 +msgid "E: Errors apply to file " +msgstr "LỖI: có lỗi áp dụng vào tập tin " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 #, c-format -msgid "Configuring %s" -msgstr "Đang cấu hình %s" +msgid "Failed to resolve %s" +msgstr "Gặp lỗi khi phân giải %s" + +#: ftparchive/writer.cc:183 +msgid "Tree walking failed" +msgstr "Việc di chuyển qua cây bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: ftparchive/writer.cc:210 #, c-format -msgid "Removing %s" -msgstr "Đang gỡ bỏ %s" +msgid "Failed to open %s" +msgstr "Gặp lỗi khi mở %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: ftparchive/writer.cc:269 #, c-format -msgid "Completely removing %s" -msgstr "Đang gỡ bỏ hoàn toàn %s" +msgid " DeLink %s [%s]\n" +msgstr " Bỏ liên kết %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:277 #, c-format -msgid "Noting disappearance of %s" -msgstr "Đang ghi chép sự biến mất của %s" +msgid "Failed to readlink %s" +msgstr "Gặp lỗi khi đọc liên kết %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: ftparchive/writer.cc:281 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Đang chạy bẫy sau-cài-đặt %s" +msgid "Failed to unlink %s" +msgstr "Việc bỏ liên kết %s bị lỗi" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 +#: ftparchive/writer.cc:289 #, c-format -msgid "Directory '%s' missing" -msgstr "Thiếu thư mục “%s”" +msgid "*** Failed to link %s to %s" +msgstr "*** Gặp lỗi khi liên kết %s đến %s" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#: ftparchive/writer.cc:299 #, c-format -msgid "Could not open file '%s'" -msgstr "Không thể mở tập tin “%s”" +msgid " DeLink limit of %sB hit.\n" +msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: apt-pkg/deb/dpkgpm.cc:970 -#, c-format -msgid "Preparing %s" -msgstr "Đang chuẩn bị %s" +#: ftparchive/writer.cc:404 +msgid "Archive had no package field" +msgstr "Kho không có trường gói" -#: apt-pkg/deb/dpkgpm.cc:971 +#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 #, c-format -msgid "Unpacking %s" -msgstr "Đang mở gói %s" +msgid " %s has no override entry\n" +msgstr " %s không có mục ghi đè (override)\n" -#: apt-pkg/deb/dpkgpm.cc:976 +#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 #, c-format -msgid "Preparing to configure %s" -msgstr "Đang chuẩn bị cấu hình %s" +msgid " %s maintainer is %s not %s\n" +msgstr " người bảo trì %s là %s không phải %s\n" -#: apt-pkg/deb/dpkgpm.cc:978 +#: ftparchive/writer.cc:712 #, c-format -msgid "Installed %s" -msgstr "Đã cài đặt %s" +msgid " %s has no source override entry\n" +msgstr " %s không có mục ghi đè (override) nguồn\n" -#: apt-pkg/deb/dpkgpm.cc:983 +#: ftparchive/writer.cc:716 #, c-format -msgid "Preparing for removal of %s" -msgstr "Đang chuẩn bị gỡ bỏ %s" +msgid " %s has no binary override entry either\n" +msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" -#: apt-pkg/deb/dpkgpm.cc:985 -#, c-format -msgid "Removed %s" -msgstr "Đã gỡ bỏ %s" +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:990 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" +msgid "Unable to open %s" +msgstr "Không thể mở %s" -#: apt-pkg/deb/dpkgpm.cc:991 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Completely removed %s" -msgstr "Gỡ bỏ hoàn toàn %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Sai “override” %s dòng %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:1046 -msgid "ioctl(TIOCGWINSZ) failed" -msgstr "" +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: ftparchive/override.cc:163 #, c-format -msgid "Can not write log (%s)" -msgstr "Không thể ghi nhật ký (%s)" +msgid "Malformed override %s line %llu #1" +msgstr "Sai override %s dòng %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1049 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts đã gắn chưa?" +#: ftparchive/override.cc:175 +#, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Sai override %s dòng %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1070 -msgid "Is stdout a terminal?" -msgstr "Đầu ra là thiết bị cuối?" +#: ftparchive/override.cc:188 +#, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Sai override %s dòng %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1558 -msgid "Operation was interrupted before it could finish" -msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" +#: ftparchive/multicompress.cc:70 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Không biết thuật toán nén “%s”" -#: apt-pkg/deb/dpkgpm.cc:1620 -msgid "No apport report written because MaxReports is reached already" -msgstr "" -"Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)" +#: ftparchive/multicompress.cc:100 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "dependency problems - leaving unconfigured" -msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" +#: ftparchive/multicompress.cc:189 +msgid "Failed to create FILE*" +msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:1627 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " -"do một sự thất bại trước đó." +#: ftparchive/multicompress.cc:192 +msgid "Failed to fork" +msgstr "Gặp lỗi khi rẽ nhánh tiến trình" -#: apt-pkg/deb/dpkgpm.cc:1633 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" +#: ftparchive/multicompress.cc:206 +msgid "Compress child" +msgstr "Nén con" -#: apt-pkg/deb/dpkgpm.cc:1640 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " -"bộ nhớ”" +#: ftparchive/multicompress.cc:229 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " -"thống nội bộ" +#: ftparchive/multicompress.cc:302 +msgid "IO to subprocess/file failed" +msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#: apt-pkg/deb/dpkgpm.cc:1674 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" +#: ftparchive/multicompress.cc:340 +msgid "Failed to read while computing MD5" +msgstr "Gặp lỗi khi đọc trong khi tính MD5" -#: apt-pkg/deb/debsystem.cc:84 +#: ftparchive/multicompress.cc:356 #, c-format +msgid "Problem unlinking %s" +msgstr "Gặp lỗi khi bỏ liên kết %s" + +#: cmdline/apt-internal-solver.cc:38 msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " -"phải không?" +"Cách dùng: apt-internal-solver\n" +"\n" +"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" +"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" +"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này.\n" +" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-pkg/deb/debsystem.cc:87 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Không hiểu bản ghi gói!" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 -#, c-format +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " -"vấn đề này. " - -#: apt-pkg/deb/debsystem.cc:121 -msgid "Not locked" -msgstr "Chưa được khoá" +"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" +"\n" +"[sortpkgs: sort packages: sắp xếp các gói]\n" +"\n" +"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" +"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp_ này\n" +" -s Sắp xếp những tập tin _nguồn_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " -- cgit v1.2.3 From 362b152c38195a3d51406285011fc34238158bda Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Feb 2014 09:51:57 +0100 Subject: remove duplicated apt-get download apt apt test --- test/integration/test-apt-get-download | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index 7cce6ef29..be3144e1f 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -45,7 +45,3 @@ rm -f apt_1.0_all.deb apt_2.0_all.deb testsuccess aptget download apt apt apt/unstable apt=2.0 testsuccess test -s apt_2.0_all.deb -# deb:738103 - apt-get download foo foo fails -rm -f apt_*.deb -aptget download apt apt -testsuccess test -s apt_2.0_all.deb -- cgit v1.2.3 From 72bae92a6c0deb638b0daf844ccb06273b1723c6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Feb 2014 09:52:03 +0100 Subject: releasing package apt version 0.9.15.2 --- configure.ac | 2 +- debian/changelog | 24 + doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 6 +- doc/po/de.po | 4 +- doc/po/es.po | 4 +- doc/po/fr.po | 4 +- doc/po/it.po | 4 +- doc/po/ja.po | 4 +- doc/po/pl.po | 4 +- doc/po/pt.po | 4 +- doc/po/pt_BR.po | 4 +- po/ar.po | 199 ++-- po/ast.po | 208 ++-- po/bg.po | 208 ++-- po/bs.po | 201 ++-- po/ca.po | 208 ++-- po/cs.po | 208 ++-- po/cy.po | 201 ++-- po/da.po | 208 ++-- po/de.po | 208 ++-- po/dz.po | 210 ++-- po/el.po | 208 ++-- po/es.po | 208 ++-- po/eu.po | 208 ++-- po/fi.po | 208 ++-- po/fr.po | 208 ++-- po/gl.po | 208 ++-- po/hu.po | 208 ++-- po/it.po | 208 ++-- po/ja.po | 208 ++-- po/km.po | 210 ++-- po/ko.po | 208 ++-- po/ku.po | 195 ++-- po/lt.po | 199 ++-- po/mr.po | 208 ++-- po/nb.po | 208 ++-- po/ne.po | 210 ++-- po/nl.po | 208 ++-- po/nn.po | 210 ++-- po/pl.po | 208 ++-- po/pt.po | 208 ++-- po/pt_BR.po | 208 ++-- po/ro.po | 208 ++-- po/ru.po | 208 ++-- po/sk.po | 208 ++-- po/sl.po | 208 ++-- po/sv.po | 208 ++-- po/th.po | 208 ++-- po/tl.po | 210 ++-- po/tr.po | 208 ++-- po/uk.po | 208 ++-- po/vi.po | 2806 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 208 ++-- po/zh_TW.po | 208 ++-- 55 files changed, 5743 insertions(+), 5830 deletions(-) diff --git a/configure.ac b/configure.ac index a49c9a479..de784a76b 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.15.1" +PACKAGE_VERSION="0.9.15.2" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index 40085985f..22624bcaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +apt (0.9.15.2) unstable; urgency=medium + + [ Michael Vogt ] + * move isatty() check into InitOutput() + * Use a APT::VersionSet instead of a VersionList + (closes: #738103) + + [ David Kalnischkies ] + * simplify code to make compilers happy + * update libapt-pkg.symbols file + * bump Standards-Version to 3.9.5 (no changes needed) + * do not use an empty APT_CONFIG environment variable + * always cleanup patchfiles at the end of rred call + * use VersionSet in download to handle repeats (Closes: 738103) + * use utimes instead of utimensat/futimens (Closes: 738567) + + [ John Ogness ] + * apt-cdrom should succeed if any drive succeeds (Closes: 728153) + + [ Trần Ngọc Quân ] + * l10n: vi.po (621t): Update and review + + -- Michael Vogt Thu, 13 Feb 2014 09:50:04 +0100 + apt (0.9.15.1) unstable; urgency=medium [ David Kalnischkies ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index a96c84d3a..cadcc27ae 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,7 +219,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 36aa51ff9..d0973638a 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.15.1\n" +"Project-Id-Version: apt-doc 0.9.15.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6186,7 +6186,7 @@ msgstr "" #: guide.sgml:163 msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/de.po b/doc/po/de.po index 6914f6fdc..69f018966 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.14.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2014-01-26 15:26+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -8750,7 +8750,7 @@ msgstr "" #| "command that caused them to be downloaded again without -d." msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/es.po b/doc/po/es.po index 6e277b452..213c704b1 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -8762,7 +8762,7 @@ msgstr "" #| "command that caused them to be downloaded again without -d." msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/fr.po b/doc/po/fr.po index 11d4bfeb7..0a240192a 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -8723,7 +8723,7 @@ msgstr "" #| "command that caused them to be downloaded again without -d." msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/it.po b/doc/po/it.po index 97fa23697..23d39d156 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2012-12-23 18:04+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" @@ -8736,7 +8736,7 @@ msgstr "" #| "command that caused them to be downloaded again without -d." msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/ja.po b/doc/po/ja.po index 57dad234e..3b78ee69b 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2012-08-08 07:58+0900\n" "Last-Translator: KURASAWA Nozomu \n" "Language-Team: Debian Japanese List \n" @@ -8306,7 +8306,7 @@ msgstr "" #: guide.sgml:163 msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/pl.po b/doc/po/pl.po index b0311d96f..99c07d3ff 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2012-07-28 21:59+0200\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" @@ -7966,7 +7966,7 @@ msgstr "" #| "command that caused them to be downloaded again without -d." msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/pt.po b/doc/po/pt.po index 24d74f0e5..3092cd08d 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2012-09-03 01:53+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -8670,7 +8670,7 @@ msgstr "" #| "command that caused them to be downloaded again without -d." msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 4c6f1bb5b..8bc4e768d 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 18:22+0100\n" +"POT-Creation-Date: 2014-02-13 09:53+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes \n" "Language-Team: \n" @@ -6601,7 +6601,7 @@ msgstr "" #: guide.sgml:163 msgid "" "apt-get has several command line options that are detailed in " -"its man page, . The most useful " +"its man page, . The most useful " "option is -d which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When -d is used " diff --git a/po/ar.po b/po/ar.po index a524dc0e2..12f2a2a4e 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -160,7 +160,7 @@ msgstr "" msgid " Version table:" msgstr " جدول النسخ:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -222,12 +222,12 @@ msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2. msgid "Please insert a Disc in the drive and press enter" msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "فشل تغيير اسم %s إلى %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." @@ -643,12 +643,12 @@ msgstr "لم يُعثر على القرص." msgid "File not found" msgstr "لم يُعثر على الملف" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -907,7 +907,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1212,108 +1212,108 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟" msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [مُثبّتة]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " أو" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1321,27 +1321,27 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" @@ -1350,7 +1350,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1358,21 +1358,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1540,7 +1540,7 @@ msgstr "فشل إغلاق الملف %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -1843,47 +1843,47 @@ msgstr "" msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "خطأ داخلي، تعذر إنشاء %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" @@ -1997,12 +1997,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "فشلت كتابة الملف %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" @@ -2380,22 +2380,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2644,7 +2644,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "" @@ -2814,35 +2814,35 @@ msgstr "الحجم غير متطابق" msgid "Invalid file format" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2850,24 +2850,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2903,71 +2903,64 @@ msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/cdrom.cc:575 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" +msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 +#: apt-pkg/cdrom.cc:583 +msgid "Unmounting CD-ROM\n" +msgstr "فك تركيب القرص المدمج\n" + +#: apt-pkg/cdrom.cc:588 +msgid "Waiting for disc...\n" +msgstr "بانتظار القرص...\n" + +#: apt-pkg/cdrom.cc:597 +msgid "Mounting CD-ROM...\n" +msgstr "تركيب القرص...\n" + +#: apt-pkg/cdrom.cc:605 msgid "Identifying.. " msgstr "جاري التعرف..." -#: apt-pkg/cdrom.cc:613 +#: apt-pkg/cdrom.cc:643 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "فك تركيب القرص المدمج..." -#: apt-pkg/cdrom.cc:642 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" -msgstr "فك تركيب القرص المدمج\n" - -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" -msgstr "بانتظار القرص...\n" - -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "تركيب القرص...\n" - -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -2976,15 +2969,15 @@ msgstr "" "هذا القرص مسمى: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "نسخ قوائم الحزم..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "كتابة لائحة المصادر الجديدة\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/ast.po b/po/ast.po index 15a485a67..617e576c9 100644 --- a/po/ast.po +++ b/po/ast.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -153,7 +153,7 @@ msgstr " Chincheta de paquetes: " msgid " Version table:" msgstr " Tabla de versiones:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -253,12 +253,12 @@ msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Inxerta un discu nel preséu y calca intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falló al montar '%s' a '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repite'l procesu colos demás CDs del conxuntu." @@ -749,12 +749,12 @@ msgstr "Nun s'atopa'l discu." msgid "File not found" msgstr "Nun s'atopa'l ficheru." -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -1016,7 +1016,7 @@ msgstr "" "Les robles siguientes nun pudieron verificase porque la to llave pública nun " "ta a mano:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1334,108 +1334,108 @@ msgstr "¿Instalar esos paquetes ensin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Falló algamar %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instaláu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "pero %s ta instaláu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "pero nun ta instaláu" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes reteníos:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1443,27 +1443,27 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" @@ -1472,7 +1472,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1480,21 +1480,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación d'espresión regular - %s" @@ -1667,7 +1667,7 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'" msgid "[Mirror: %s]" msgstr "[Espeyu: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" @@ -2025,47 +2025,47 @@ msgstr "Saltu mal formáu %s llinia %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Saltu mal formáu %s llinia %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmu de compresión desconocíu '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La salida comprimida %s necesita un xuegu de compresión" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nun pudo criase FICHERU*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Nun pudo biforcase" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimir fíu" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Error internu, nun pudo criase %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Fallu na ES al soprocesu/ficheru" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Nun pudo lleese al computar MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema al desenllazar %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" @@ -2202,12 +2202,12 @@ msgstr "Doble suma de desvíu %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ficheru de configuración duplicáu %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura nel ficheru %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Falló al pesllar el ficheru %s" @@ -2590,22 +2590,22 @@ msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" msgid "write, still have %llu to write but couldn't" msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hai problemes al renomar el ficheru %s a %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -2865,7 +2865,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta'l direutoriu de llistes %spartial." @@ -3037,35 +3037,35 @@ msgstr "El tamañu nun concasa" msgid "Invalid file format" msgstr "Operación incorreuta: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nun se pudo parchear el ficheru release %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3075,12 +3075,12 @@ msgstr "" "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3089,12 +3089,12 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3132,50 +3132,41 @@ msgstr "Entrada inválida pa 'Date' nel ficheru release %s" msgid "Vendor block %s contains no fingerprint" msgstr "El bloque de fornidor %s nun contién una buelga dixital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Usando el puntu de montaxe de CD-ROM %s\n" -"Montando el CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etiqueta guardada: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando l CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el puntu de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando'l CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Esperando'l discu...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando'l CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etiqueta guardada: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando l CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Buscando nel discu ficheros d'índices...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3184,7 +3175,7 @@ msgstr "" "Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y " "%zu firmes\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3192,16 +3183,16 @@ msgstr "" "Nun s'alcuentra dengún paquete de ficheros, seique nun ye un Discu Debian o " "hai una arquiteutura inválida?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Atopóse la etiqueta: '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Esi nun ye un nome válidu; inténtalo otra vuelta.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3210,15 +3201,15 @@ msgstr "" "Esti discu llámase: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando les llistes de paquetes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Escribiendo llista nueva d'oríxenes\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n" @@ -3526,6 +3517,13 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiáu" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Usando el puntu de montaxe de CD-ROM %s\n" +#~ "Montando el CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/bg.po b/po/bg.po index 860ab7e10..a7745b195 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -159,7 +159,7 @@ msgstr " Отбиване на пакета: " msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Укажете име за този диск, например „Debian msgid "Please insert a Disc in the drive and press enter" msgstr "Сложете диск в устройството и натиснете „Enter“" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Неуспех при монтиране на %s на %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторете този процес за останалите дискове от комплекта." @@ -776,12 +776,12 @@ msgstr "Дискът не е намерен." msgid "File not found" msgstr "Файлът не е намерен" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1048,7 +1048,7 @@ msgstr "" "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " "наличен:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Празни файлове не могат да бъдат валидни архиви" @@ -1368,108 +1368,108 @@ msgstr "Инсталиране на тези пакети без проверк msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Инсталиран]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " или" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1477,27 +1477,27 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" @@ -1506,7 +1506,7 @@ msgstr "%lu не са напълно инсталирани или премах #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1514,21 +1514,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -1702,7 +1702,7 @@ msgstr "Грешка при четене файла „%s“ от огледал msgid "[Mirror: %s]" msgstr "[Огледален сървър: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" @@ -2062,47 +2062,47 @@ msgstr "Неправилно форматиран override %s, ред %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Неправилно форматиран override %s, ред %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Непознат алгоритъм за компресия „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Компресираният изход %s изисква настройка за компресирането" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Неуспех при създаването на FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Неуспех при пускането на подпроцес" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Процес-потомък за компресиране" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Вътрешна грешка, неуспех при създаването на %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "В/И към подпроцеса/файла пропадна" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Неуспех при четене докато се изчислява MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" @@ -2237,12 +2237,12 @@ msgstr "Двойно добавяне на отклонение %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Дублиран конфигурационен файл %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Неуспех при запис на файл %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" @@ -2630,22 +2630,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2911,7 +2911,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Директорията със списъци %spartial липсва." @@ -3090,7 +3090,7 @@ msgstr "Несъответствие на размера" msgid "Invalid file format" msgstr "Невалидна операция %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3099,16 +3099,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3117,12 +3117,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3132,12 +3132,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3146,12 +3146,12 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3188,50 +3188,41 @@ msgstr "Неправилна стойност за „Date“ във фай msgid "Vendor block %s contains no fingerprint" msgstr "Блокът на производителя %s не съдържа отпечатък" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Използване на точка за монтиране на CD-ROM %s\n" -"Монтиране на CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Идентифициране..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Запазен етикет: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Демонтиране на CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Използване на точка за монтиране на CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Демонтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Чакане за диск...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Монтиране на CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Идентифициране..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Запазен етикет: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтиране на CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Сканиране на диска за индексни файлове...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3240,7 +3231,7 @@ msgstr "" "Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu " "индекса с преводи и %zu подписа.\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3248,16 +3239,16 @@ msgstr "" "Не са намерени файлове с пакети. Мое би дискът не е с Дебиан или е за " "погрешна компютърна архитектура." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Намерен е етикет „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Това не е валидно име, опитайте отново.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3266,15 +3257,15 @@ msgstr "" "Наименование на този диск: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" @@ -3584,6 +3575,13 @@ msgstr "" msgid "Not locked" msgstr "Без заключване" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Използване на точка за монтиране на CD-ROM %s\n" +#~ "Монтиране на CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/bs.po b/po/bs.po index 85e507b3a..32164cd30 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -155,7 +155,7 @@ msgstr "" msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -216,12 +216,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Ne mogu otvoriti %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -649,12 +649,12 @@ msgstr "Datoteka nije pronađena" msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "" @@ -913,7 +913,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1212,135 +1212,135 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr "[Instalirano]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ali nije instaliran" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ili" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1349,7 +1349,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1357,21 +1357,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1535,7 +1535,7 @@ msgstr "Ne mogu otvoriti %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -1837,47 +1837,47 @@ msgstr "" msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -1991,12 +1991,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2374,22 +2374,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "" @@ -2639,7 +2639,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "" @@ -2807,35 +2807,35 @@ msgstr "" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2843,24 +2843,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2896,88 +2896,81 @@ msgstr "Ne mogu otvoriti DB datoteku %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "" - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Pogrešan CD" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "" + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Pogrešan CD" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index f5d32b07a..5b77752af 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -157,7 +157,7 @@ msgstr " Etiqueta del paquet: " msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -255,12 +255,12 @@ msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»" msgid "Please insert a Disc in the drive and press enter" msgstr "Inseriu un disc en la unitat i premeu Intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No s'ha pogut muntar «%s» a «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetiu aquest procés per a la resta de CD del vostre joc." @@ -760,12 +760,12 @@ msgstr "No s'ha trobat el disc" msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1031,7 +1031,7 @@ msgstr "" "Les signatures següents no s'han pogut verificar perquè la clau pública no " "està disponible:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Els fitxers buits no poden ser arxius vàlids" @@ -1357,108 +1357,108 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instaŀlat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "però està instaŀlat %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "però s'instaŀlarà %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "però no és instaŀlable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "però no està instaŀlat" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "però no serà instaŀlat" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "S'instaŀlaran els paquets NOUS següents:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "S'han mantingut els paquets següents:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Es canviaran els paquets retinguts següents:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1466,27 +1466,27 @@ msgstr "" "AVÍS: Es suprimiran els paquets essencials següents.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instaŀlar, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstaŀlats, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a suprimir i %lu no actualitzats.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instaŀlats o suprimits completament.\n" @@ -1495,7 +1495,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1503,21 +1503,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -1689,7 +1689,7 @@ msgstr "No es pot llegir el fitxer rèplica «%s»" msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" @@ -2046,47 +2046,47 @@ msgstr "Línia predominant %s malformada %llu núm 2" msgid "Malformed override %s line %llu #3" msgstr "Línia predominant %s malformada %llu núm 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorisme de compressió desconegut '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La sortida comprimida %s necessita un joc de compressió" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "No s'ha pogut crear FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "No s'ha pogut bifurcar" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimeix el fil" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" @@ -2221,12 +2221,12 @@ msgstr "Afegit doble d'una desviació %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fitxer de conf. duplicat %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" @@ -2614,22 +2614,22 @@ msgstr "llegits, falten %llu per llegir, però no queda res" msgid "write, still have %llu to write but couldn't" msgstr "escrits, falten %llu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2891,7 +2891,7 @@ msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directori de llistes %spartial." @@ -3071,7 +3071,7 @@ msgstr "La mida no concorda" msgid "Invalid file format" msgstr "Operació no vàlida %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3080,16 +3080,16 @@ msgstr "" "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " "al sources.list o fitxer malformat)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3098,12 +3098,12 @@ msgstr "" "El fitxer Release per a %s ha caducat (invàlid des de %s). Les " "actualitzacions per a aquest dipòsit no s'aplicaran." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3114,12 +3114,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3129,12 +3129,12 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "No es troba una font per baixar la versió «%s» de «%s»" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3172,50 +3172,41 @@ msgstr "El camp «Date» al fitxer Release %s és invàlid" msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"S'està utilitzant el punt de muntatge de CD-ROM %s\n" -"S'està muntant el CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "S'està identificant…" - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "S'ha emmagatzemat l'etiqueta: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "S'esta desmuntant el CD-ROM…\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "S'està desmuntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc…\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM…\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "S'està identificant…" + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "S'ha emmagatzemat l'etiqueta: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "S'esta desmuntant el CD-ROM…\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "S'està analitzant el disc per a fitxers d'índex…\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3224,7 +3215,7 @@ msgstr "" "S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de " "traduccions i %zu signatures\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3232,16 +3223,16 @@ msgstr "" "No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la " "arquitectura és incorrecta?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "S'ha trobat l'etiqueta «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3250,15 +3241,15 @@ msgstr "" "El disc es diu:\n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets…" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" @@ -3567,6 +3558,13 @@ msgstr "" msgid "Not locked" msgstr "No blocat" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "S'està utilitzant el punt de muntatge de CD-ROM %s\n" +#~ "S'està muntant el CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/cs.po b/po/cs.po index 2ff4c08fa..3f74994f9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-07-08 13:46+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -154,7 +154,7 @@ msgstr " Vypíchnutý balík: " msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -247,12 +247,12 @@ msgstr "Zadejte prosím název tohoto média, např. „Debian 5.0.3 Disk 1“" msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte prosím médium do mechaniky a stiskněte enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Selhalo připojení „%s“ na „%s“" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Tento proces opakujte pro všechna zbývající média." @@ -758,12 +758,12 @@ msgstr "Disk nebyl nalezen." msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1024,7 +1024,7 @@ msgstr "" "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný " "klíč:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Prázdné soubory nejsou platnými archivy" @@ -1346,108 +1346,108 @@ msgstr "Instalovat tyto balíky bez ověření?" msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr "[Instalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " nebo" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1455,27 +1455,27 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu přeinstalováno, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" @@ -1484,7 +1484,7 @@ msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1492,21 +1492,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -1679,7 +1679,7 @@ msgstr "Nelze číst soubor se zrcadly „%s“" msgid "[Mirror: %s]" msgstr "[Zrcadlo: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" @@ -2029,47 +2029,47 @@ msgstr "Zkomolený override soubor %s, řádek %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Zkomolený override soubor %s, řádek %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámý kompresní algoritmus „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potřebuje kompresní sadu" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Selhalo vytvoření FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Volání fork() se nezdařilo" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimovat potomka" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "V/V operace s podprocesem/souborem selhala" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Chyba čtení při výpočtu MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" @@ -2203,12 +2203,12 @@ msgstr "Dvojí přidání diverze %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" @@ -2590,22 +2590,22 @@ msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá" msgid "write, still have %llu to write but couldn't" msgstr "zápis, stále mám %llu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problém při zavírání souboru %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém při přejmenování souboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2860,7 +2860,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Adresář seznamů %spartial chybí." @@ -3032,7 +3032,7 @@ msgstr "Velikosti nesouhlasí" msgid "Invalid file format" msgstr "Neplatná operace %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3041,16 +3041,16 @@ msgstr "" "V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list " "nebo porušený soubor)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "V souboru Release nelze najít kontrolní součet „%s“" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3059,12 +3059,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3074,12 +3074,12 @@ msgstr "" "se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3088,12 +3088,12 @@ msgstr "" "Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento " "balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3130,50 +3130,41 @@ msgstr "Neplatná položka „Date“ v Release souboru %s" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Používám přípojný bod %s\n" -"Připojuji CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Rozpoznávám… " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Uložený název: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Odpojuji CD-ROM…\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Odpojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čekám na disk…\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM…\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Rozpoznávám… " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Uložený název: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Odpojuji CD-ROM…\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Hledám na disku indexové soubory…\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3182,7 +3173,7 @@ msgstr "" "Nalezeny indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a " "podpisy (%zu)\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3190,16 +3181,16 @@ msgstr "" "Nenalezeny žádné balíky. Možná to není disk s Debianem, nebo je pro jinou " "architekturu?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Nalezený název: „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3208,15 +3199,15 @@ msgstr "" "Tento disk se nazývá: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků…" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" @@ -3512,6 +3503,13 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „% msgid "Not locked" msgstr "Není uzamčen" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Používám přípojný bod %s\n" +#~ "Připojuji CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/cy.po b/po/cy.po index 14c656a47..b971b013b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -173,7 +173,7 @@ msgstr " Pin Pecyn: " msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -274,12 +274,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -767,12 +767,12 @@ msgstr "Ffeil heb ei ganfod" msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1036,7 +1036,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1359,111 +1359,111 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1473,27 +1473,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1502,7 +1502,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1510,21 +1510,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1693,7 +1693,7 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" @@ -2053,48 +2053,48 @@ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 #, fuzzy msgid "Compress child" msgstr "Plentyn Cywasgu" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, fuzzy, c-format msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -2234,12 +2234,12 @@ msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -2628,22 +2628,22 @@ msgstr "o hyd %lu i ddarllen ond dim ar ôl" msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2912,7 +2912,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." @@ -3093,7 +3093,7 @@ msgstr "Camgyfatebiaeth maint" msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3101,28 +3101,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3130,13 +3130,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3145,12 +3145,12 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3189,89 +3189,82 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "" - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "CD Anghywir" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "" + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/da.po b/po/da.po index ce9926c70..aea3dc547 100644 --- a/po/da.po +++ b/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2013-12-14 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -160,7 +160,7 @@ msgstr " Pakke-pin: " msgid " Version table:" msgstr " Versionstabel:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Indsæt en disk i drevet og tryk retur" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Kunne ikke montere %s til %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gentag processen for resten af cd'erne i dit sæt." @@ -786,12 +786,12 @@ msgstr "Disk blev ikke fundet." msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -1056,7 +1056,7 @@ msgstr "" "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er " "tilgængelig:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Tomme filer kan ikke være gyldige arkiver" @@ -1376,105 +1376,105 @@ msgstr "Installér disse pakker uden verifikation?" msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "installeret,kan opgraderes til: " -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 msgid "[installed,local]" msgstr "[Installeret,lokalt]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 msgid "[installed,automatic]" msgstr "[Installeret,automatisk]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 msgid "[installed]" msgstr "[Installeret]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, fuzzy, c-format msgid "[upgradable from: %s]" msgstr "[kan opgraderes fra: " -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "[residual-konfig]" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uopfyldte afhængigheder:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil blive installeret:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Følgende pakker er blevet holdt tilbage:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Følgende tilbageholdte pakker vil blive ændret:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1482,27 +1482,27 @@ msgstr "" "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n" "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" @@ -1511,7 +1511,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1519,21 +1519,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -1704,7 +1704,7 @@ msgstr "Ingen post fundet i spejlfil »%s«" msgid "[Mirror: %s]" msgstr "[Spejl: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" @@ -2061,47 +2061,47 @@ msgstr "Ugyldig gennemtvangs %s-linje %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Ugyldig gennemtvangs %s-linje %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukendt komprimeringsalgoritme »%s«" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerede uddata %s kræver et komprimeringssæt" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Kunne ikke oprette FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Kunne ikke spalte" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern fejl. Kunne ikke oprette %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO til underproces/fil mislykkedes" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Kunne ikke læse under beregning af MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem under aflænkning af %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdøbe %s til %s" @@ -2236,12 +2236,12 @@ msgstr "Dobbelt tilføjelse af omrokering %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opsætningsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" @@ -2622,22 +2622,22 @@ msgstr "læs, mangler stadig at læse %llu men der er ikke flere" msgid "write, still have %llu to write but couldn't" msgstr "skriv, mangler stadig at skrive %llu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem under lukning af filen %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem under omdøbning af filen %s til %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2895,7 +2895,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappen %spartial mangler." @@ -3067,7 +3067,7 @@ msgstr "Størrelsen stemmer ikke" msgid "Invalid file format" msgstr "Ugyldigt filformat" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3076,17 +3076,17 @@ msgstr "" "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" "punkt eller forkert udformet fil)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3095,12 +3095,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3110,12 +3110,12 @@ msgstr "" "og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3124,12 +3124,12 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3165,50 +3165,41 @@ msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s" msgid "Vendor block %s contains no fingerprint" msgstr "Leverandørblok %s inderholder intet fingeraftryk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Bruger cdrom-monteringspunktet %s\n" -"Monterer cdrom\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificerer .. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Gemt mærkat: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Afmonterer cdrom ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger cdrom-monteringspunktet %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Afmonterer cdrom\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Venter på disken ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterer cdrom ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificerer .. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Gemt mærkat: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Afmonterer cdrom ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Skanner disken for indeksfiler ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3217,7 +3208,7 @@ msgstr "" "Fandt %zu pakkeindekser, %zu kildeindekser, %zu oversættelsesindekser og %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3225,16 +3216,16 @@ msgstr "" "Kunne ikke finde nogen pakkefiler, det er muligvis ikke en Debiandisk eller " "den forkerte arkitektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Fandt mærkatet »%s«\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prøv igen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3243,15 +3234,15 @@ msgstr "" "Denne disk hedder: \n" "»%s«\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" @@ -3546,6 +3537,13 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet." msgid "Not locked" msgstr "Ikke låst" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Bruger cdrom-monteringspunktet %s\n" +#~ "Monterer cdrom\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/de.po b/po/de.po index 718a8c300..b09db2f4b 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.2\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-06-27 10:55+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -161,7 +161,7 @@ msgstr " Paket-Pinning: " msgid " Version table:" msgstr " Versionstabelle:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -260,12 +260,12 @@ msgstr "" "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die " "Eingabetaste (Enter)." -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "»%s« konnte nicht in »%s« eingebunden werden." -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes." @@ -796,12 +796,12 @@ msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -1071,7 +1071,7 @@ msgstr "" "öffentlicher\n" "Schlüssel nicht verfügbar ist:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Leere Dateien können kein gültiges Archiv sein." @@ -1401,109 +1401,109 @@ msgstr "Diese Pakete ohne Überprüfung installieren?" msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installiert]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installiert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installiert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installiert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " oder" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "" "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1511,27 +1511,27 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu durch eine ältere Version ersetzt, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" @@ -1540,7 +1540,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1548,21 +1548,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -1735,7 +1735,7 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." @@ -2100,47 +2100,47 @@ msgstr "Missgestaltetes Override %s Zeile %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Missgestaltetes Override %s Zeile %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Unbekannter Komprimierungsalgorithmus »%s«" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz." -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Fork fehlgeschlagen" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimierungs-Kindprozess" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Interner Fehler, %s konnte nicht erzeugt werden." -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem beim Entfernen (unlink) von %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s konnte nicht in %s umbenannt werden." @@ -2276,12 +2276,12 @@ msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Datei %s konnte nicht geschrieben werden." -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Datei %s konnte nicht geschlossen werden." @@ -2674,22 +2674,22 @@ msgstr "" "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " "nicht möglich." -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem beim Synchronisieren der Datei" @@ -2951,7 +2951,7 @@ msgstr "" "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte " "Pakete." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listenverzeichnis %spartial fehlt." @@ -3138,7 +3138,7 @@ msgstr "Größe stimmt nicht überein" msgid "Invalid file format" msgstr "Ungültige Operation %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3147,17 +3147,17 @@ msgstr "" "Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden " "(falscher Eintrag in sources.list oder missgebildete Datei)." -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden." -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3166,12 +3166,12 @@ msgstr "" "Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für " "dieses Depot werden nicht angewendet." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3182,12 +3182,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3197,14 +3197,14 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« " "herunterzuladen." -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3241,50 +3241,41 @@ msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s" msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck." -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Verwendeter CD-ROM-Einbindungspunkt: %s\n" -"CD-ROM wird eingebunden.\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifizieren ... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Gespeicherte Kennzeichnung: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Einbindung der CD-ROM wird gelöst ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Lösen der CD-ROM-Einbindung\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Warten auf Medium ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM wird eingebunden ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifizieren ... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Gespeicherte Kennzeichnung: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Einbindung der CD-ROM wird gelöst ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3293,7 +3284,7 @@ msgstr "" "%zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu " "Signaturen gefunden\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3301,16 +3292,16 @@ msgstr "" "Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine " "Debian-Disk oder eine für die falsche Architektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Kennzeichnung »%s« gefunden\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3319,15 +3310,15 @@ msgstr "" "Dieses Medium heißt: \n" "»%s«\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopieren der Paketlisten ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Schreiben der neuen Quellliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" @@ -3640,6 +3631,13 @@ msgstr "" msgid "Not locked" msgstr "Nicht gesperrt" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Verwendeter CD-ROM-Einbindungspunkt: %s\n" +#~ "CD-ROM wird eingebunden.\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/dz.po b/po/dz.po index ec6a7aaea..58d1e9abf 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -161,7 +161,7 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:" msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -261,12 +261,12 @@ msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ msgid "Please insert a Disc in the drive and press enter" msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།" @@ -742,12 +742,12 @@ msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1011,7 +1011,7 @@ msgid "" msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1326,108 +1326,108 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr "ཡང་ན།" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s( %s་གིས་སྦེ)" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1435,27 +1435,27 @@ msgstr "" "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" @@ -1464,7 +1464,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1472,21 +1472,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "ཝའི།" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -1654,7 +1654,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" @@ -2016,47 +2016,47 @@ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག msgid "Malformed override %s line %llu #3" msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2193,12 +2193,12 @@ msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ msgid "Duplicate conf file %s/%s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -2577,22 +2577,22 @@ msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་% msgid "write, still have %llu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2850,7 +2850,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" @@ -3022,35 +3022,35 @@ msgstr "ཚད་མ་མཐུན།" msgid "Invalid file format" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3058,12 +3058,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3072,12 +3072,12 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3114,73 +3114,64 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Vendor block %s contains no fingerprint" msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -" %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" -"སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ།\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "ངོས་འཛིན་འབད་དོ.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོ།\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "ངོས་འཛིན་འབད་དོ.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་ %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསྐྱེད།\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3189,15 +3180,15 @@ msgstr "" "ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིན།\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" @@ -3482,6 +3473,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n" +#~ "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ།\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" diff --git a/po/el.po b/po/el.po index 9f99d4de3..0d91aceef 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -166,7 +166,7 @@ msgstr " Καθήλωση Πακέτου: " msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -266,12 +266,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Αποτυχία σύνδεσης του %s σε %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας." @@ -753,12 +753,12 @@ msgstr "Ο δίσκος δεν βρέθηκε." msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1024,7 +1024,7 @@ msgstr "" "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " "διαθέσιμο το δημόσιο κλειδί:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1344,108 +1344,108 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Εγκατεστημένα]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " η" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1453,27 +1453,27 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" @@ -1482,7 +1482,7 @@ msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκα #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Ν/ο]" @@ -1490,21 +1490,21 @@ msgstr "[Ν/ο]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[ν/Ο]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -1674,7 +1674,7 @@ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" @@ -2036,47 +2036,47 @@ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu msgid "Malformed override %s line %llu #3" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Αποτυχία αγκίστρωσης" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Συμπίεση απογόνου" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" @@ -2212,12 +2212,12 @@ msgstr "Διπλή προσθήκη εκτροπής %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" @@ -2601,22 +2601,22 @@ msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για αν msgid "write, still have %llu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2873,7 +2873,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Ο φάκελος λιστών %spartial αγνοείται." @@ -3051,35 +3051,35 @@ msgstr "Ανόμοιο μέγεθος" msgid "Invalid file format" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3087,12 +3087,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3101,12 +3101,12 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3144,50 +3144,41 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Vendor block %s contains no fingerprint" msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Χρησιμοποιείται το σημείο προσάρτησης %s\n" -"Προσαρτάται το CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Αναγνώριση..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Αποθήκευση Ετικέτας: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Αποπροσάρτηση του CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Αποπροσάρτηση του CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Αναγνώριση..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Αποθήκευση Ετικέτας: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Αποπροσάρτηση του CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3196,22 +3187,22 @@ msgstr "" "Βρέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι " "μεταφράσεων και %zu υπογραφές\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Εύρεση ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3220,15 +3211,15 @@ msgstr "" "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" @@ -3511,6 +3502,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Χρησιμοποιείται το σημείο προσάρτησης %s\n" +#~ "Προσαρτάται το CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" diff --git a/po/es.po b/po/es.po index 9e33aaf2c..c87710e2d 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2011-01-24 11:47+0100\n" "Last-Translator: Javier Fernández-Sanguino Peña \n" "Language-Team: Debian Spanish \n" @@ -211,7 +211,7 @@ msgstr " Pin del paquete: " msgid " Version table:" msgstr " Tabla de versión:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -314,12 +314,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor, introduzca un disco en la unidad y pulse Intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "No se pudo montar «%s» como «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para el resto de los CDs del conjunto." @@ -813,12 +813,12 @@ msgstr "Disco no encontrado." msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificación" @@ -1082,7 +1082,7 @@ msgstr "" "Las firmas siguientes no se pudieron verificar porque su llave pública no " "está disponible:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1408,108 +1408,108 @@ msgstr "¿Instalar estos paquetes sin verificación?" msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "pero no es instalable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "pero no está instalado" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Se instalarán los siguientes paquetes NUEVOS:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARÁN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Se actualizarán los siguientes paquetes:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARÁN los siguientes paquetes:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Se cambiarán los siguientes paquetes retenidos:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1517,27 +1517,27 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarán, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" @@ -1546,7 +1546,7 @@ msgstr "%lu no instalados del todo o eliminados.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1554,21 +1554,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -1740,7 +1740,7 @@ msgstr "No se encontró un archivo de réplica «%s»" msgid "[Mirror: %s]" msgstr "[Réplica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Falló la creación de una tubería IPC para el subproceso" @@ -2103,47 +2103,47 @@ msgstr "Predominio mal formado %s línea %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Predominio mal formado %s línea %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo desconocido de compresión «%s»" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Salida comprimida %s necesita una herramienta de compresión" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "No se pudo crear FICHERO*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "No se pudo bifurcar" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Hijo compresión" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Error interno, no se pudo crear %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Falló la ES a subproceso/archivo" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "No se pudo leer mientras se computaba MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Se produjo un problema al desligar %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falló el renombre de %s a %s" @@ -2281,12 +2281,12 @@ msgstr "Doble suma de desviación %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuración duplicado %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falló la escritura del archivo %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" @@ -2673,22 +2673,22 @@ msgstr "leídos, todavía debía leer %lu pero no queda nada" msgid "write, still have %llu to write but couldn't" msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Se produjo un problema al cerrar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Se produjo un problema al renombrar el fichero %s a %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Se produjo un problema al desligar el fichero %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Se produjo un problema al sincronizar el fichero" @@ -2955,7 +2955,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes rotos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta el directorio de listas %spartial." @@ -3132,37 +3132,37 @@ msgstr "El tamaño difiere" msgid "Invalid file format" msgstr "Operación inválida: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pública disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3173,12 +3173,12 @@ msgstr "" "GPG es: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Error de GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3188,12 +3188,12 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3231,50 +3231,41 @@ msgstr "Entrada «Date» inválida en el archivo «Release» %s" msgid "Vendor block %s contains no fingerprint" msgstr "Bloque de fabricante %s sin huella digital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Usando el punto de montaje del CD-ROM %s\n" -"Montando el CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etiqueta guardada: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando el CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando el CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etiqueta guardada: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando el CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Buscando en el disco archivos de índices...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3283,7 +3274,7 @@ msgstr "" "Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices " "de traducción y %zu firmas\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3291,16 +3282,16 @@ msgstr "" "No pude localizar ningún archivo de paquete, ¿quizás este no sea un disco de " "Debian o sea de otra arquitectura?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Se encontró la etiqueta: «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3309,15 +3300,15 @@ msgstr "" "Este disco se llama: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" @@ -3628,6 +3619,13 @@ msgstr "" msgid "Not locked" msgstr "No bloqueado" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Usando el punto de montaje del CD-ROM %s\n" +#~ "Montando el CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/eu.po b/po/eu.po index 8619b0b96..fbde6d3f8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -159,7 +159,7 @@ msgstr " Paketearen pin-a:" msgid " Version table:" msgstr " Bertsio taula:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Mesedez sar diska bat gailuan eta enter sakatu" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu." @@ -741,12 +741,12 @@ msgstr "Ez da diska aurkitu" msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -1012,7 +1012,7 @@ msgstr "" "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " "eskuragarri:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1334,108 +1334,108 @@ msgstr "Paketeak egiaztapen gabe instalatu?" msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalatuta]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " edo" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak bertsio-berrituko dira:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1443,27 +1443,27 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" @@ -1472,7 +1472,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[B/e]" @@ -1480,21 +1480,21 @@ msgstr "[B/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[b/E]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -1662,7 +1662,7 @@ msgstr "%s fitxategia ezin izan da ireki" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" @@ -2017,47 +2017,47 @@ msgstr "Gaizki osatutako override %s, lerroa: %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' Konpresio Algoritmo Ezezaguna" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s irteera konprimituak konpresio-tresna bat behar du" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Huts egin du FILE* sortzean" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Huts egin du sardetzean" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Konprimatu Umeak" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Barne Errorea, Huts %s sortzerakoan" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Huts egin du MD5 konputatzean" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" @@ -2192,12 +2192,12 @@ msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" @@ -2580,22 +2580,22 @@ msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" msgid "write, still have %llu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2851,7 +2851,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "%spartial zerrenda-direktorioa falta da." @@ -3020,35 +3020,35 @@ msgstr "Tamaina ez dator bat" msgid "Invalid file format" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3056,12 +3056,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3070,12 +3070,12 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3113,50 +3113,41 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Vendor block %s contains no fingerprint" msgstr "%s saltzaile blokeak ez du egiaztapen markarik" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"%s CD-ROM muntatze puntua erabiltzen\n" -"CD-ROM-a muntatzen\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Egiaztatzen... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Gordetako Etiketa: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM Desmuntatzen...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM-a desmuntatzen\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Egiaztatzen... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Gordetako Etiketa: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM Desmuntatzen...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Indize fitxategien bila diska arakatzen...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3165,22 +3156,22 @@ msgstr "" "%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura " "aurkitu dira\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Aurkitutako Etiketa: '%s' \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Hau ez baliozko izen bat, froga berriro.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3189,15 +3180,15 @@ msgstr "" "Diskaren izen:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" @@ -3481,6 +3472,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "%s CD-ROM muntatze puntua erabiltzen\n" +#~ "CD-ROM-a muntatzen\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" diff --git a/po/fi.po b/po/fi.po index c0efe6487..8d8400609 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -157,7 +157,7 @@ msgstr " Paketin tunnistenumero: " msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Aseta levy asemaan ja paina Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Toista tämä lopuille rompuille kasassasi." @@ -735,12 +735,12 @@ msgstr "Levyä ei löydy" msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1004,7 +1004,7 @@ msgstr "" "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole " "saatavilla:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1326,108 +1326,108 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?" msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Asennettu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " tai" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1435,27 +1435,27 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" @@ -1464,7 +1464,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[K/e]" @@ -1472,21 +1472,21 @@ msgstr "[K/e]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "K" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -1654,7 +1654,7 @@ msgstr "Tiedostoa %s ei voitu avata" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" @@ -2014,47 +2014,47 @@ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" msgid "Malformed override %s line %llu #3" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Tuntematon pakkausalgoritmi \"%s\"" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* luominen ei onnistunut" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork ei onnistunut" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Compress-lapsiprosessi" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" @@ -2189,12 +2189,12 @@ msgstr "Korvautuksen kaksoislisäys %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" @@ -2571,22 +2571,22 @@ msgstr "read, vielä %lu lukematta mutta tiedosto loppui" msgid "write, still have %llu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2840,7 +2840,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Luettelokansio %spartial puuttuu." @@ -3011,35 +3011,35 @@ msgstr "Koko ei täsmää" msgid "Invalid file format" msgstr "Virheellinen toiminto %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3047,12 +3047,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3061,12 +3061,12 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3104,50 +3104,41 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Vendor block %s contains no fingerprint" msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Käytetään rompun liitoskohtaa %s\n" -"Liitetään romppu\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Tunnistetaan... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Tallennettu nimio: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Irrotetaan romppu...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Irrotetaan romppu\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Tunnistetaan... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Tallennettu nimio: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Irrotetaan romppu...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3156,22 +3147,22 @@ msgstr "" "Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, " "käännösten %zu ja allekirjoituksia löytyi %zu\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Löytyi nimiö: \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3180,15 +3171,15 @@ msgstr "" "Tämä levy on: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" @@ -3473,6 +3464,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Käytetään rompun liitoskohtaa %s\n" +#~ "Liitetään romppu\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" diff --git a/po/fr.po b/po/fr.po index 6740d57e9..68ef07aa9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2013-08-17 07:57+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -156,7 +156,7 @@ msgstr " Épinglage de paquet : " msgid " Version table:" msgstr " Table de version :" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -260,12 +260,12 @@ msgid "Please insert a Disc in the drive and press enter" msgstr "" "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Impossible de monter « %s » sur « %s »" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "Veuillez répéter cette opération pour tous les disques de votre jeu de " @@ -799,12 +799,12 @@ msgstr "Disque non trouvé." msgid "File not found" msgstr "Fichier non trouvé" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1075,7 +1075,7 @@ msgstr "" "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " "n'est pas disponible :\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" @@ -1409,108 +1409,108 @@ msgstr "Faut-il installer ces paquets sans vérification ?" msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installé]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installé]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installé]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installé]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra être installé" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mais ne sera pas installé" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installés :" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVÉS :" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont été conservés :" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis à jour :" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changés :" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1519,27 +1519,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis à jour, %lu nouvellement installés, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu à enlever et %lu non mis à jour.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installés ou enlevés.\n" @@ -1548,7 +1548,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[O/n]" @@ -1556,21 +1556,21 @@ msgstr "[O/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[o/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -1744,7 +1744,7 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." msgid "[Mirror: %s]" msgstr "[Miroir : %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de créer le tube IPC sur le sous-processus" @@ -2105,47 +2105,47 @@ msgstr "Entrée « override » %s mal formée %llu n° 2" msgid "Malformed override %s line %llu #3" msgstr "Entrée « override » %s mal formée %llu n° 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorithme de compression « %s » inconnu" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La sortie compressée %s a besoin d'un ensemble de compression" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Impossible de créer FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Échec du fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Fils compressé" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Erreur interne, impossible de créer %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Impossible de lire lors du calcul de la somme MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problème en déliant %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" @@ -2283,12 +2283,12 @@ msgstr "Addition double d'une déviation %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fichier de configuration en double %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Erreur d'écriture du fichier %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Échec de clôture du fichier %s" @@ -2682,22 +2682,22 @@ msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" msgid "write, still have %llu to write but couldn't" msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problème de renommage du fichier %s en %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problème de suppression du lien %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2970,7 +2970,7 @@ msgstr "" "Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Le répertoire %spartial pour les listes n'existe pas." @@ -3159,7 +3159,7 @@ msgstr "Taille incohérente" msgid "Invalid file format" msgstr "L'opération %s n'est pas valable" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3168,18 +3168,18 @@ msgstr "" "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : " " ligne non valable dans sources.list ou fichier corrompu" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Impossible de trouver la comme de contrôle de « %s » dans le fichier Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3188,12 +3188,12 @@ msgstr "" "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises " "à jour depuis ce dépôt ne s'effectueront pas." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3204,12 +3204,12 @@ msgstr "" "GPG : %s : %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3218,14 +3218,14 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossible de trouver une source de téléchargement de la version « %s » de " "« %s »" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3263,50 +3263,41 @@ msgstr "Entrée « Date » non valable dans le fichier Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Utilisation du point de montage %s pour le cédérom\n" -"Montage du cédérom\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identification..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Étiquette stockée : %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Démontage du cédérom...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cédérom\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Démontage du cédérom\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montage du cédérom...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identification..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Étiquette stockée : %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Démontage du cédérom...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Examen du disque à la recherche de fichiers d'index...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3315,7 +3306,7 @@ msgstr "" "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions " "et %zu signatures\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3323,16 +3314,16 @@ msgstr "" "Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian " "ou bien l'architecture est-elle incorrecte." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Étiquette « %s » trouvée\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3341,15 +3332,15 @@ msgstr "" "Ce disque s'appelle :\n" "« %s »\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Écriture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Les entrées de listes de sources pour ce disque sont :\n" @@ -3659,6 +3650,13 @@ msgstr "" msgid "Not locked" msgstr "Non verrouillé" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Utilisation du point de montage %s pour le cédérom\n" +#~ "Montage du cédérom\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/gl.po b/po/gl.po index fc10b5552..70aa59a65 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -161,7 +161,7 @@ msgstr " Inmobilizado: " msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»" msgid "Please insert a Disc in the drive and press enter" msgstr "Insira un disco na unidade e prema Intro" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Produciuse un fallo ao montar «%s» en «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este proceso para o resto de CD do seu conxunto." @@ -758,12 +758,12 @@ msgstr "Non se atopou o disco" msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -1029,7 +1029,7 @@ msgstr "" "Non se puideron verificar as seguintes sinaturas porque a chave pública non " "está dispoñíbel:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Os ficheiros baleiros non poden ser arquivadores válidos" @@ -1358,108 +1358,108 @@ msgstr "Instalar estes paquetes sen verificación?" msgid "Failed to fetch %s %s\n" msgstr "Non foi posíbel obter %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mais %s está instalado" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mais vaise instalar %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mais non é instalábel" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mais é un paquete virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mais non está instalado" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mais non se vai a instalar" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (por mor de %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1467,27 +1467,27 @@ msgstr "" "AVISO: Retiraranse os seguintes paquetes esenciais.\n" "Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu revertidos, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou retirados de todo.\n" @@ -1496,7 +1496,7 @@ msgstr "%lu non instalados ou retirados de todo.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1504,21 +1504,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Produciuse un erro na compilación da expresión regular - %s" @@ -1691,7 +1691,7 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»" msgid "[Mirror: %s]" msgstr "[Replica: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" @@ -2049,47 +2049,47 @@ msgstr "«Override» %s liña %lu incorrecta (2)" msgid "Malformed override %s line %llu #3" msgstr "«Override» %s liña %lu incorrecta (3)" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compresión «%s» descoñecido" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "A saída comprimida %s precisa dun conxunto de compresión" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Non foi posíbel crear o FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Non foi posíbel facer a bifurcación" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Fillo de compresión" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Produciuse un erro interno, non foi posíbel crear %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Produciuse un fallo na E/S do subproceso/ficheiro" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Non foi posíbel ler ao calcular o MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Xurdiu un problema ao desligar %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Non foi posíbel cambiar o nome de %s a %s" @@ -2226,12 +2226,12 @@ msgstr "Desvío %s -> %s engadido dúas veces" msgid "Duplicate conf file %s/%s" msgstr "Ficheiro de configuración %s/%s duplicado" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Non foi posíbel escribir no ficheiro «%s»" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Non foi posíbel pechar o ficheiro %s" @@ -2620,22 +2620,22 @@ msgstr "lectura, aínda hai %lu para ler pero non queda ningún" msgid "write, still have %llu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Produciuse un problema ao renomear o ficheiro %s a %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Produciuse un problema ao desligar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Produciuse un problema ao sincronizar o ficheiro" @@ -2897,7 +2897,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Non se atopa a lista de directorios %sparcial." @@ -3073,7 +3073,7 @@ msgstr "Os tamaños non coinciden" msgid "Invalid file format" msgstr "Operación incorrecta: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3082,29 +3082,29 @@ msgstr "" "Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " "(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" "Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3115,12 +3115,12 @@ msgstr "" "%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Produciuse un erro de GPG: %s %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3129,12 +3129,12 @@ msgstr "" "Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falta a arquitectura)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3172,50 +3172,41 @@ msgstr "A entrada «Date» no ficheiro de publicación %s non é válida" msgid "Vendor block %s contains no fingerprint" msgstr "O bloque de provedor %s non contén unha pegada dixital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Empregando o punto de montaxe de CD-ROMs %s\n" -"Montando o CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etiqueta almacenada: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando o CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Empregando o punto de montaxe de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando o CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Agardando polo disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando o CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etiqueta almacenada: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Buscando os ficheiros de índices no disco..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3224,7 +3215,7 @@ msgstr "" "Atopáronse %zu índices de paquetes, %zu índices de orixes, %zu índices de " "traducións e %zu sinaturas\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3232,16 +3223,16 @@ msgstr "" "Non é posíbel localizar ningún ficheiro de paquetes. É posíbel que non sexa " "un disco de Debian ou que a arquitectura sexa incorrecta." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Atopouse a etiqueta «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Ese non é un nome correcto, volva tentalo.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3250,15 +3241,15 @@ msgstr "" "Este disco chámase: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando as listas de paquetes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Escribindo a nova lista de orixes\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de orixes deste disco son:\n" @@ -3571,6 +3562,13 @@ msgstr "" msgid "Not locked" msgstr "Non está bloqueado" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Empregando o punto de montaxe de CD-ROMs %s\n" +#~ "Montando o CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/hu.po b/po/hu.po index da083b8c7..9a8c47b71 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt trunk\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -159,7 +159,7 @@ msgstr " Csomagrögzítés: " msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemez”" msgid "Please insert a Disc in the drive and press enter" msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "„%s” csatolása a(z) „%s” könyvtárba meghiúsult" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ismételje meg a folyamatot készlete többi CD-jével is." @@ -775,12 +775,12 @@ msgstr "A lemez nem található." msgid "File not found" msgstr "A fájl nem található" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -1045,7 +1045,7 @@ msgstr "" "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető " "el:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Az üres fájlok biztosan nem érvényes csomagok" @@ -1364,108 +1364,108 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Telepítve]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " vagy" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1473,27 +1473,27 @@ msgstr "" "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n" "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu visszafejlesztendő, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" @@ -1502,7 +1502,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[I/n]" @@ -1510,21 +1510,21 @@ msgstr "[I/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[i/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -1696,7 +1696,7 @@ msgstr "A(z) „%s” tükörfájl nem olvasható" msgid "[Mirror: %s]" msgstr "[Tükör: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" @@ -2052,47 +2052,47 @@ msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" msgid "Malformed override %s line %llu #3" msgstr "%s felülbírálás deformált a(z) %llu. sorában #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "„%s” tömörítési algoritmus ismeretlen" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nem sikerült FILE*-ot létrehozni" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Nem sikerült forkolni" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Gyermekfolyamat tömörítése" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Belső hiba, %s létrehozása sikertelen" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Olvasási hiba az MD5 kiszámításakor" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Hiba %s törlésekor" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "„%s” átnevezése sikertelen erre: %s" @@ -2228,12 +2228,12 @@ msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "A(z) %s fájl írása sikertelen" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "A(z) %s fájl bezárása sikertelen" @@ -2622,22 +2622,22 @@ msgstr "olvasás, még kellene %llu, de már az összes elfogyott" msgid "write, still have %llu to write but couldn't" msgstr "írás, még kiírandó %llu, de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Hiba a(z) %s fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Hiba a(z) %s fájl törlésekor" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2903,7 +2903,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "A(z) %spartial listakönyvtár hiányzik." @@ -3081,7 +3081,7 @@ msgstr "A méret nem megfelelő" msgid "Invalid file format" msgstr "%s érvénytelen művelet" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3090,16 +3090,16 @@ msgstr "" "A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list " "bejegyzés vagy helytelenül formázott fájl)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3108,12 +3108,12 @@ msgstr "" "A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " "frissítései nem kerülnek alkalmazásra." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3123,12 +3123,12 @@ msgstr "" "előző indexfájl lesz használva. GPG hiba: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hiba: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3137,12 +3137,12 @@ msgstr "" "Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3179,50 +3179,41 @@ msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban" msgid "Vendor block %s contains no fingerprint" msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"%s CD-ROM csatolási pont használata\n" -"CD-ROM csatolása\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Azonosítás... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Tárolt címke: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM leválasztása...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM leválasztása\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM csatolása...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Azonosítás... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Tárolt címke: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM leválasztása...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3231,7 +3222,7 @@ msgstr "" "%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás " "megtalálva\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3239,16 +3230,16 @@ msgstr "" "Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem " "megfelelő az architektúra?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Talált címke: „%s”\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "A név érvénytelen, próbálja újra.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3257,15 +3248,15 @@ msgstr "" "A lemez neve: \n" "„%s”\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" @@ -3566,6 +3557,13 @@ msgstr "" msgid "Not locked" msgstr "Nincs zárolva" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "%s CD-ROM csatolási pont használata\n" +#~ "CD-ROM csatolása\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/it.po b/po/it.po index 94d28a51e..2b3ece7f4 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2013-08-27 22:06+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -159,7 +159,7 @@ msgstr " Gancio del pacchetto: " msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -262,12 +262,12 @@ msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Inserire un disco nell'unità e premere Invio" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Mount di \"%s\" su \"%s\" non riuscito" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ripetere questo processo per il resto dei CD." @@ -788,12 +788,12 @@ msgstr "Disco non trovato" msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -1063,7 +1063,7 @@ msgstr "" "Le seguenti firme non sono state verificate perché la chiave pubblica non è " "disponibile:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" @@ -1392,108 +1392,108 @@ msgstr "Installare questi pacchetti senza verificarli?" msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installato]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installato]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installato]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installato]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ma la versione %s è installata" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ma non è installabile" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ma è un pacchetto virtuale" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ma non è installato" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " oppure" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1502,27 +1502,27 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo." -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" @@ -1531,7 +1531,7 @@ msgstr "%lu non completamente installati o rimossi.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1539,21 +1539,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@ -1726,7 +1726,7 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\"" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" @@ -2088,47 +2088,47 @@ msgstr "Override %s riga %llu malformato #2" msgid "Malformed override %s line %llu #3" msgstr "Override %s riga %llu malformato #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo di compressione \"%s\" sconosciuto" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "L'output compresso %s necessita di un insieme di compressione" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Creazione di FILE* non riuscita" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Fork non riuscita" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Sottoprocesso compresso" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Errore interno, creazione di %s non riuscita" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "I/O al sottoprocesso/file non riuscito" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lettura durante l'elaborazione MD5 non riuscita" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Rinomina di %s in %s non riuscita" @@ -2262,12 +2262,12 @@ msgstr "Doppia aggiunta di deviazione %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplicato %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Scrittura del file %s non riuscita" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s non riuscita" @@ -2663,22 +2663,22 @@ msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" msgid "write, still have %llu to write but couldn't" msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Si è verificato un problema nel rinominare il file %s in %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Si è verificato un problema nel sincronizzare il file" @@ -2950,7 +2950,7 @@ msgstr "" "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." # (ndt) sarebbe da controllare meglio assieme a quella dopo -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Manca la directory di liste %spartial." @@ -3131,7 +3131,7 @@ msgstr "Le dimensioni non corrispondono" msgid "Invalid file format" msgstr "Operazione %s non valida" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3140,17 +3140,17 @@ msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3159,12 +3159,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3174,12 +3174,12 @@ msgstr "" "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3188,14 +3188,14 @@ msgstr "" "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" "Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\"" # (ndt) sarebbe da controllare se veramente possono esistere più file indice -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3233,50 +3233,41 @@ msgstr "Voce \"Date\" nel file Release %s non valida" msgid "Vendor block %s contains no fingerprint" msgstr "Il blocco vendor %s non contiene impronte" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Viene usato il punto di mount del CD-ROM %s\n" -"Montaggio CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificazione... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etichette archiviate: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Smontaggio CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Viene usato il punto di mount del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Smontaggio CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificazione... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etichette archiviate: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Smontaggio CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Analisi del disco per file indice...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3285,7 +3276,7 @@ msgstr "" "Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di " "traduzione e %zu firme\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3293,16 +3284,16 @@ msgstr "" "Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un " "disco Debian o potrebbe essere l'architettura errata." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Trovata l'etichetta \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Questo non è un nome valido, riprovare.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3311,15 +3302,15 @@ msgstr "" "Questo disco è chiamato: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copia elenco pacchetti..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Scrittura nuovo elenco sorgenti\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" @@ -3633,6 +3624,13 @@ msgstr "" msgid "Not locked" msgstr "Non bloccato" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Viene usato il punto di mount del CD-ROM %s\n" +#~ "Montaggio CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/ja.po b/po/ja.po index 2440aa449..e30393043 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.9.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2013-08-11 19:39+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -156,7 +156,7 @@ msgstr " パッケージ Pin: " msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "このディスクに、'Debian 5.0.3 Disk 1' のような名前を付 msgid "Please insert a Disc in the drive and press enter" msgstr "ディスクをドライブに入れて Enter キーを押してください" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s' を '%s' にマウントできませんでした" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。" @@ -778,12 +778,12 @@ msgstr "ディスクが見つかりません。" msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1046,7 +1046,7 @@ msgid "" "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "空のファイルは有効なアーカイブと認められません" @@ -1361,108 +1361,108 @@ msgstr "検証なしにこれらのパッケージをインストールします msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [インストール済み]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " または" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1470,27 +1470,27 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" @@ -1499,7 +1499,7 @@ msgstr "%lu 個のパッケージが完全にインストールまたは削除 #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1507,21 +1507,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -1694,7 +1694,7 @@ msgstr "ミラーファイル '%s' のエントリが見つかりません" msgid "[Mirror: %s]" msgstr "[ミラー: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" @@ -2047,47 +2047,47 @@ msgstr "不正な override %s %llu 行目 #2" msgid "Malformed override %s line %llu #3" msgstr "不正な override %s %llu 行目 #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' は未知の圧縮アルゴリズムです" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "圧縮出力 %s には圧縮セットが必要です" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* の作成に失敗しました" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork に失敗しました" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "圧縮子プロセス" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "内部エラー、%s の作成に失敗しました" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 の計算中に読み込みに失敗しました" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" @@ -2221,12 +2221,12 @@ msgstr "%s -> %s の diversion が二重に追加されています" msgid "Duplicate conf file %s/%s" msgstr "設定ファイル %s/%s が重複しています" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" @@ -2610,22 +2610,22 @@ msgstr "読み込みが %llu 残っているはずですが、何も残ってい msgid "write, still have %llu to write but couldn't" msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2886,7 +2886,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "リストディレクトリ %spartial が見つかりません。" @@ -3065,7 +3065,7 @@ msgstr "サイズが適合しません" msgid "Invalid file format" msgstr "不正な操作 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3074,16 +3074,16 @@ msgstr "" "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " "sources.list エントリか、壊れたファイル)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3092,14 +3092,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3109,12 +3109,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3123,12 +3123,12 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3166,50 +3166,41 @@ msgstr "Release ファイル %s に無効な 'Date' エントリがあります" msgid "Vendor block %s contains no fingerprint" msgstr "ベンダブロック %s は鍵指紋を含んでいません" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"CD-ROM マウントポイント %s を使用します\n" -"CD-ROM をマウントしています\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "確認しています.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "格納されたラベル: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM をアンマウントしています ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM マウントポイント %s を使用します\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM をアンマウントしています\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "ディスクを待っています ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM をマウントしています ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "確認しています.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "格納されたラベル: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM をアンマウントしています ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "ディスクのインデックスファイルを走査しています ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3218,7 +3209,7 @@ msgstr "" "%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック" "ス、%zu の署名を見つけました\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3226,16 +3217,16 @@ msgstr "" "パッケージファイルを配置できません。Debian のディスクではないか、誤ったアーキ" "テクチャではないでしょうか?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "ラベル '%s' を見つけました\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "これは有効な名前ではありません。再試行してください。\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3244,15 +3235,15 @@ msgstr "" "このディスクは以下のように呼ばれます: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" @@ -3557,6 +3548,13 @@ msgstr "" msgid "Not locked" msgstr "ロックされていません" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "CD-ROM マウントポイント %s を使用します\n" +#~ "CD-ROM をマウントしています\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/km.po b/po/km.po index f1d9bee64..60090a304 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -161,7 +161,7 @@ msgstr " ខ្ទាស់​កញ្ចប់ ៖ " msgid " Version table:" msgstr " តារាង​កំណែ ៖" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​ msgid "Please insert a Disc in the drive and press enter" msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។" @@ -733,12 +733,12 @@ msgstr "រក​ថាសមិ​ន​ឃើញ​ ។" msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -997,7 +997,7 @@ msgid "" "available:\n" msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1308,108 +1308,108 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [បានដំឡើង​]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ឬ" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (ដោយ​សារតែ​ %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1417,27 +1417,27 @@ msgstr "" "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu ​ត្រូវបានបន្ទាប់ " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" @@ -1446,7 +1446,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញប #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1454,21 +1454,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" @@ -1636,7 +1636,7 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡ msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" @@ -1991,47 +1991,47 @@ msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "បង្ហាប់កូន" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" @@ -2166,12 +2166,12 @@ msgstr "ការបន្ថែម​ស្ទួន នៃការបង្ msgid "Duplicate conf file %s/%s" msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" @@ -2549,22 +2549,22 @@ msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អា msgid "write, still have %llu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2819,7 +2819,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" @@ -2990,35 +2990,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" msgid "Invalid file format" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3026,12 +3026,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3040,12 +3040,12 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3081,73 +3081,64 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1 msgid "Vendor block %s contains no fingerprint" msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" -"កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "បានទុក​ស្លាក ៖ %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "កំពុង​រង់ចាំឌីស​...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "បានទុក​ស្លាក ៖ %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i លិបិក្រម​ប្រភព%i និង ហត្ថលេខា %i \n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "បានទុក​ស្លាក ៖ %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "នោះមិនមែនជាឈ្មោះត្រឹមត្រូវទេ សូមព្យាយាម​ម្ដងទៀត ។\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3156,15 +3147,15 @@ msgstr "" "ឌីស​នេះ​ត្រូវ​បាន​ហៅ​ ៖ \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" @@ -3446,6 +3437,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n" +#~ "កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" diff --git a/po/ko.po b/po/ko.po index bdfc73b70..2ee50c339 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -152,7 +152,7 @@ msgstr " 패키지 핀: " msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -250,12 +250,12 @@ msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')" msgid "Please insert a Disc in the drive and press enter" msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오." @@ -740,12 +740,12 @@ msgstr "디스크가 없습니다." msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -1005,7 +1005,7 @@ msgid "" "available:\n" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1319,108 +1319,108 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까?" msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는데 실패했습니다 %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [설치함]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [설치함]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [설치함]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [설치함]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "하지만 %s 패키지를 설치했습니다" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 패키지를 설치할 것입니다" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "하지만 가상 패키지입니다" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " 혹은" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1428,27 +1428,27 @@ msgstr "" "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" @@ -1457,7 +1457,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Y/n]" @@ -1465,21 +1465,21 @@ msgstr "[Y/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[y/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -1651,7 +1651,7 @@ msgstr "'%s' 미러 파일이 없습니다 " msgid "[Mirror: %s]" msgstr "[미러 사이트: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" @@ -2006,47 +2006,47 @@ msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" msgid "Malformed override %s line %llu #3" msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' 압축 알고리즘을 알 수 없습니다" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE*를 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork하는데 실패했습니다" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "압축 하위 프로세스" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "내부 오류, %s 만드는데 실패했습니다" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" @@ -2182,12 +2182,12 @@ msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s 파일을 쓰는데 실패했습니다" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는데 실패했습니다" @@ -2565,22 +2565,22 @@ msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습 msgid "write, still have %llu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "%s 파일을 닫는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "%s 파일을 삭제하는데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" @@ -2838,7 +2838,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "목록 디렉터리 %spartial이 빠졌습니다." @@ -3008,35 +3008,35 @@ msgstr "크기가 맞지 않습니다" msgid "Invalid file format" msgstr "잘못된 작업 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3046,12 +3046,12 @@ msgstr "" "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 오류: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3060,12 +3060,12 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3102,57 +3102,48 @@ msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다" msgid "Vendor block %s contains no fingerprint" msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"CD-ROM 마운트 위치로 %s 사용\n" -"CD-ROM을 마운트하는 중입니다\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "알아보는 중입니다.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "저장된 레이블: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM 마운트 해제하는 중입니다\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "알아보는 중입니다.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "저장된 레이블: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3160,16 +3151,16 @@ msgstr "" "패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘" "못된 것 같습니다?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "레이블 발견: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3178,15 +3169,15 @@ msgstr "" "이 디스크는 다음과 같습니다: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "패키지 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" @@ -3480,6 +3471,13 @@ msgstr "" msgid "Not locked" msgstr "잠기지 않음" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "CD-ROM 마운트 위치로 %s 사용\n" +#~ "CD-ROM을 마운트하는 중입니다\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/ku.po b/po/ku.po index 27b91ba0e..31f7720f0 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -160,7 +160,7 @@ msgstr " Destika pakêtê:" msgid " Version table:" msgstr " Tabloya guhertoyan:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -222,12 +222,12 @@ msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk msgid "Please insert a Disc in the drive and press enter" msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -653,13 +653,13 @@ msgstr "Dîsk nehate dîtin." msgid "File not found" msgstr "Pel nehate dîtin" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "" @@ -918,7 +918,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1217,134 +1217,134 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Sazkirî]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "lê %s sazkirî ye" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "lê %s dê were sazkirin" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "lê sazkirina wê ne gengaz e" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "lê paketeke farazî ye" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "lê ne sazkirî ye" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "lê dê neyê sazkirin" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " û" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Ev pakêt dê werine RAKIRIN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Ev paket dê werine bilindkirin:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (ji ber %s)" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin." -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu ji nû ve sazkirî," -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu hatine nizmkirin." -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" @@ -1353,7 +1353,7 @@ msgstr "" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 #, fuzzy msgid "[Y/n]" msgstr "[E/n]" @@ -1362,21 +1362,21 @@ msgstr "[E/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1540,7 +1540,7 @@ msgstr "Nikarî pelê %s veke" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "" @@ -1841,47 +1841,47 @@ msgstr "" msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -2010,12 +2010,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Nivîsîna pelê %s biserneket" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Girtina pelê %s biserneket" @@ -2394,22 +2394,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "" @@ -2657,7 +2657,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Peldanka '%s' kêm e" @@ -2825,35 +2825,35 @@ msgstr "Mezinahî li hev nayên" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2861,24 +2861,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2914,70 +2914,63 @@ msgstr "Pakêt nehate dîtin %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/cdrom.cc:575 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " +msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" +#: apt-pkg/cdrom.cc:583 +msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" +#: apt-pkg/cdrom.cc:588 +msgid "Waiting for disc...\n" msgstr "" -#: apt-pkg/cdrom.cc:642 -#, c-format -msgid "Using CD-ROM mount point %s\n" +#: apt-pkg/cdrom.cc:597 +msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Etîketa '%s' hatiye dîtin\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -2986,15 +2979,15 @@ msgstr "" "Navê dîskê: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Lîsteyên pakêtan tên jibergirtin..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/lt.po b/po/lt.po index b6d55782a..02bd75fbb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -158,7 +158,7 @@ msgstr " Paketo susiejimai: " msgid " Version table:" msgstr " Versijų lentelė:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -219,12 +219,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Prašome įdėti diską į įrenginį ir paspausti Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nepavyko pervadinti %s į %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje." @@ -657,12 +657,12 @@ msgstr "Diskas nerastas." msgid "File not found" msgstr "Failas nerastas" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "" @@ -919,7 +919,7 @@ msgid "" "available:\n" msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1229,108 +1229,108 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?" msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Įdiegtas]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Šie paketai turi neįdiegtų priklausomybių:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "bet %s yra įdiegtas" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "bet %s bus įdiegtas" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "tačiau jis negali būti įdiegtas" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "bet tai yra virtualus paketas" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "bet jis nėra įdiegtas" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "bet jis nebus įdiegtas" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " arba" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Bus įdiegti šie NAUJI paketai:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Bus PAŠALINTI šie paketai:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Šių paketų atnaujinimas sulaikomas:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Bus atnaujinti šie paketai:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Bus pakeisti šie sulaikyti paketai:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (dėl %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1338,27 +1338,27 @@ msgstr "" "Įspėjimas: Šie būtini paketai bus pašalinti.\n" "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu atnaujinti, %lu naujai įdiegti, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu įdiegti iš naujo, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu pasendinti, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nepilnai įdiegti ar pašalinti.\n" @@ -1367,7 +1367,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[T/n]" @@ -1375,21 +1375,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -1558,7 +1558,7 @@ msgstr "Nepavyko atverti failo %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Nepavyko subprocesui sukurti IPC gijos" @@ -1923,47 +1923,47 @@ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Nežinomas suspaudimo algoritmas „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nepavyko sukurti FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Vidinė klaida, nepavyko sukurti %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Nepavyko Nusk/Įraš į subprocesą/failą" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Skaitymo klaida skaičiuojant MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nepavyko pervadinti %s į %s" @@ -2100,12 +2100,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "" @@ -2483,22 +2483,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -2746,7 +2746,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Trūksta aplanko „%s“" @@ -2917,35 +2917,35 @@ msgstr "Neatitinka dydžiai" msgid "Invalid file format" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2953,24 +2953,24 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3006,70 +3006,63 @@ msgstr "Nepavyko atverti DB failo %s: %s" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifikuojama.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Atjungiamas CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Naudojama CD-ROM prijungimo vieta %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Atjungiamas CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Laukiama disko...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Prijungiamas CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifikuojama.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Atjungiamas CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Rasta žymė „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3078,15 +3071,15 @@ msgstr "" "Šio disko pavadinimas: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopijuojami paketų sąrašai..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Rašomas naujas šaltinių sąrašas\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" diff --git a/po/mr.po b/po/mr.po index d10cf403c..0714bc52d 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -155,7 +155,7 @@ msgstr "पॅकेज (पिन):" msgid " Version table:" msgstr "आवृत्ती कोष्टक:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -253,12 +253,12 @@ msgstr "या तबकडीला कृपया नाव द्या ज msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)" @@ -729,12 +729,12 @@ msgstr "डिस्क सापडत नाही" msgid "File not found" msgstr "फाईल सापडली नाही" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -995,7 +995,7 @@ msgid "" "available:\n" msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1312,108 +1312,108 @@ msgstr "पडताळून पाहिल्याशिवाय ही प msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr "[संस्थापित केले]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "पण %s संस्थापित झाले" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "पण %s संस्थापित करायचे आहे" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "पण ते संस्थापित करण्याजोगे नाही" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "पण ते आभासी पॅकेज आहे" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "पण ते संस्थापित केले नाही" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "पण ते संस्थापित होणार नाही" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr "किंवा" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "खालील पॅकेजेस परत ठेवली गेली:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (च्या मुळे %s)" -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1421,27 +1421,27 @@ msgstr "" "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुनर्संस्थापित केले," -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu मागील आवृत्तीकृत केले," -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n" @@ -1450,7 +1450,7 @@ msgstr "%lu संपूर्ण संस्थापित किंवा #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1458,21 +1458,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "होय" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -1640,7 +1640,7 @@ msgstr "%s फाईल उघडता येत नाही" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" @@ -1996,47 +1996,47 @@ msgstr "व्यंगीत/हिडीस दुर्लक्षित क msgid "Malformed override %s line %llu #3" msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "संचिका * तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO ची उपक्रिया/संचिका असमर्थ " -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " @@ -2172,12 +2172,12 @@ msgstr "%s -> %s डायव्हर्जन दुप्पट मिळव msgid "Duplicate conf file %s/%s" msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s फाईल बंद करण्यास असमर्थ" @@ -2554,22 +2554,22 @@ msgstr "वाचा, %lu अजूनही वाचण्यासाठी msgid "write, still have %llu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "संचिकेची syncing समस्या" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2824,7 +2824,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "संचयिका यादीत %s पार्शल हरवले आहे." @@ -2998,35 +2998,35 @@ msgstr "आकार जुळतनाही" msgid "Invalid file format" msgstr "%s अवैध क्रिया" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3034,12 +3034,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3048,12 +3048,12 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3091,50 +3091,41 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Vendor block %s contains no fingerprint" msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"सिडी-रॉमचे माउंट स्थान %s वापरुन\n" -"सिडी-रॉम माउंट होत आहे\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "ओळखत आहे.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "ग्रहण केलेले नामदर्शक: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "सिडी-रॉम अनमाउंट करत आहे\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "सिडी-रॉम माउंट होत आहे...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "ओळखत आहे.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "ग्रहण केलेले नामदर्शक: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी-रॉम अनमाउंट होत आहे...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3143,22 +3134,22 @@ msgstr "" "%zu पॅकेजेसची यादी/सूची, %zu स्त्रोताची यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu " "स्वाक्षऱ्या/सिगनेचर्स सापडल्या\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "'%s' लेबल सापडले\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "ते स्विकारण्याजोगे/वैध नांव नाही, पुन्हा प्रयत्न करा.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3167,15 +3158,15 @@ msgstr "" "ह्या डिस्कला/चकतीला: म्हणतात\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "नविन स्त्रोत सूची लिहित आहे\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" @@ -3458,6 +3449,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" +#~ "सिडी-रॉम माउंट होत आहे\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" diff --git a/po/nb.po b/po/nb.po index a452f57b5..5249ddabc 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -160,7 +160,7 @@ msgstr " Pakke låst til: " msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -259,12 +259,12 @@ msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»" msgid "Please insert a Disc in the drive and press enter" msgstr "Sett inn en disk i lagringsenheten og trykk Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikke montere «%s» på «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett." @@ -746,12 +746,12 @@ msgstr "Disk ikke funnet." msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -1013,7 +1013,7 @@ msgstr "" "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen " "ikke er tilgjengelig:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1333,108 +1333,108 @@ msgstr "Installer disse pakkene uten verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Følgende pakker har uinnfridde avhengighetsforhold:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men er ikke installert" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Følgende NYE pakker vil bli installert:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1442,27 +1442,27 @@ msgstr "" "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n" "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert på nytt, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu å fjerne og %lu ikke oppgradert.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" @@ -1471,7 +1471,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1479,21 +1479,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -1665,7 +1665,7 @@ msgstr "Ingen speilfil «%s» funnet" msgid "[Mirror: %s]" msgstr "[Speil: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" @@ -2022,47 +2022,47 @@ msgstr "Ugyldig overstyring %s linje %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Ugyldig overstyring %s linje %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjent komprimeringsalgoritme «%s»" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s trenger et komprimeringssett" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Klarte ikke å opprette FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Klarte ikke å forgreine prosess" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimer barneprosess" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikke å opprette %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Klarte ikke å kommunisere med underprosess/fil" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Klarte ikke å lese under utregning av MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke å endre navnet på %s til %s" @@ -2198,12 +2198,12 @@ msgstr "Dobbel tillegging av avledning %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Klarte ikke å skrive fila %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" @@ -2584,22 +2584,22 @@ msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen" msgid "write, still have %llu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem ved låsing av fila %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved endring av navn på fila %s til %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenke til fila %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2856,7 +2856,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listemappa %spartial mangler." @@ -3027,36 +3027,36 @@ msgstr "Feil størrelse" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3066,12 +3066,12 @@ msgstr "" "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-feil: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3080,12 +3080,12 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3121,50 +3121,41 @@ msgstr "Ugyldig «Date»-oppføring i Release-fila %s" msgid "Vendor block %s contains no fingerprint" msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Bruker CD-ROM monteringspunkt %s\n" -"Monterer CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Indentifiserer.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Lagret merkelapp: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Venter på CD-en...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Indentifiserer.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Lagret merkelapp: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Leter gjennom CD for indeksfiler..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3173,7 +3164,7 @@ msgstr "" "Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3181,16 +3172,16 @@ msgstr "" "Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc " "eller du har valgt feil arkitektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Fant merkelapp «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldig navn, prøv igjen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3199,15 +3190,15 @@ msgstr "" "CD-en er kalt: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppføringer for denne CD-en er:\n" @@ -3508,6 +3499,13 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet," msgid "Not locked" msgstr "Ikke låst" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Bruker CD-ROM monteringspunkt %s\n" +#~ "Monterer CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/ne.po b/po/ne.po index e627077a0..a8fa67496 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -158,7 +158,7 @@ msgstr "प्याकेज पिन:" msgid " Version table:" msgstr " संस्करण तालिका:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "कृपया यो डिस्कको लागि नाम उ msgid "Please insert a Disc in the drive and press enter" msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । " @@ -731,12 +731,12 @@ msgstr "डिस्क फेला परेन ।" msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -996,7 +996,7 @@ msgid "" "available:\n" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1309,108 +1309,108 @@ msgstr "यी प्याकेजहरू रूजू बिना स् msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [स्थापना भयो]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "तर %s स्थापना भयो" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "तर %s स्थापना हुनुपर्यो" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "तर यो स्थापनायोग्य छैन" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "तर यो अवास्तविक प्याकेज होइन" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "तर यो स्थापना भएन" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "तर यो स्थापना हुन गइरहेको छैन" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr "वा" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "निम्न प्याकेजहरू हटाइनेछन्:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s कारणले) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1418,27 +1418,27 @@ msgstr "" "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu पुन: स्थापना गरियो, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu स्तर कम गरियो, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" @@ -1447,7 +1447,7 @@ msgstr "%lu पूर्णरुपले स्थापना भएन र #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1455,21 +1455,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -1637,7 +1637,7 @@ msgstr "फाइल %s खोल्न सकिएन" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" @@ -1993,47 +1993,47 @@ msgstr "वैरुप्य गरिएको अधिलेखन %s र msgid "Malformed override %s line %llu #3" msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "FILE* सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "काँटा गर्न असफल" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "सङ्कुचन शाखा" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 गणना गर्दा पढ्न असफल भयो" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr " %s मा %s पुन:नामकरण असफल भयो" @@ -2168,12 +2168,12 @@ msgstr "मोडको डबल थप %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s फाइल बन्द गर्न असफल भयो" @@ -2551,22 +2551,22 @@ msgstr "पड्नुहोस्, अहिले सम्म %lu पढ् msgid "write, still have %llu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2821,7 +2821,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" @@ -2992,35 +2992,35 @@ msgstr "साइज मेल खाएन" msgid "Invalid file format" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3028,12 +3028,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3042,12 +3042,12 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3083,73 +3083,64 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Vendor block %s contains no fingerprint" msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" -"सिडी रोम माउन्ट गरिदैछ\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "परिचय गराइदैछ.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "सिडी रोम अनमाउन्ट गरिदैछ\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "डिस्को लागि पर्खिदै...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "सिडी रोम माउन्ट गरिदै...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "परिचय गराइदैछ.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "सिडी रोम अनमाउन्ट गरिदैछ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i हस्ताक्षरहरू फेला परे\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "त्यो वैध नाम होइन, फेरी प्रयास गर्नुहोस् ।\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3158,15 +3149,15 @@ msgstr "" "यो डिस्कको नाम:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" @@ -3449,6 +3440,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n" +#~ "सिडी रोम माउन्ट गरिदैछ\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" diff --git a/po/nl.po b/po/nl.po index f9768da25..157f67583 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2011-12-05 17:10+0100\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -158,7 +158,7 @@ msgstr " Pakketpin: " msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -258,12 +258,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Aankoppelen van '%s' op '%s' is mislukt" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set." @@ -757,12 +757,12 @@ msgstr "Schijf niet gevonden" msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "stat is mislukt" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1027,7 +1027,7 @@ msgstr "" "De volgende ondertekeningen konden niet geverifieerd worden omdat de " "publieke sleutel niet beschikbaar is:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1353,108 +1353,108 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?" msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Geïnstalleerd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "maar %s is geïnstalleerd" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "maar het zal niet geïnstalleerd worden" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " of" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1462,27 +1462,27 @@ msgstr "" "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw geïnstalleerd, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" @@ -1491,7 +1491,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1499,21 +1499,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -1685,7 +1685,7 @@ msgstr "Geen spiegelbestand '%s' gevonden " msgid "[Mirror: %s]" msgstr "[Spiegelserver: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" @@ -2048,47 +2048,47 @@ msgstr "Misvormde voorrangsingang %s op regel %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Misvormde voorrangsingang %s op regel %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Onbekend compressie-algoritme '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Gecomprimeerde uitvoer %s vereist een compressieset" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Aanmaken van FILE* is mislukt" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Vorken van proces is mislukt" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimeer kind" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Interne fout, aanmaken van %s is mislukt" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO naar subproces/bestand is mislukt" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" @@ -2224,12 +2224,12 @@ msgstr "Dubbele toevoeging van de omleiding %s->%s" msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" @@ -2618,22 +2618,22 @@ msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" msgid "write, still have %llu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2893,7 +2893,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." @@ -3074,36 +3074,36 @@ msgstr "Grootte komt niet overeen" msgid "Invalid file format" msgstr "Ongeldige operatie %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3114,12 +3114,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3128,12 +3128,12 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3171,50 +3171,41 @@ msgstr "Geen 'Date'-vermelding in Release-bestand %s" msgid "Vendor block %s contains no fingerprint" msgstr "Verkopersblok %s bevat geen vingerafdruk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -"CD wordt aangekoppeld\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificatie..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Opgeslagen label: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD wordt afgekoppeld...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD wordt losgekoppeld\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificatie..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Opgeslagen label: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD wordt afgekoppeld...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Er wordt gescand voor indexbestanden...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3223,7 +3214,7 @@ msgstr "" "Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu " "handtekeningen gevonden\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3231,16 +3222,16 @@ msgstr "" "Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de " "verkeerde architectuur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Label '%s' gevonden\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3249,15 +3240,15 @@ msgstr "" "De schijf heet:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" @@ -3567,6 +3558,13 @@ msgstr "" msgid "Not locked" msgstr "Niet vergrendeld" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" +#~ "CD wordt aangekoppeld\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/nn.po b/po/nn.po index 0ef1b50ec..37c373e18 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -160,7 +160,7 @@ msgstr " Pakke spikra til: " msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -261,12 +261,12 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Klarte ikkje endra namnet p %s til %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -740,12 +740,12 @@ msgstr "Fann ikkje fila" msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1005,7 +1005,7 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1318,108 +1318,108 @@ msgstr "Installer desse pakkane utan verifikasjon?" msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installert]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installert]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installert]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installert]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men er ikkje installert" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1428,27 +1428,27 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" @@ -1457,7 +1457,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1465,21 +1465,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -1648,7 +1648,7 @@ msgstr "Klarte ikkje opna fila %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" @@ -1999,47 +1999,47 @@ msgstr "Misforma overstyring %s linje %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Misforma overstyring %s linje %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjend komprimeringsalgoritme %s" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s treng eit komprimeringssett" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Klarte ikkje oppretta FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Klarte ikkje gafla" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikkje oppretta %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Klarte ikkje lesa under utrekning av MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" @@ -2174,12 +2174,12 @@ msgstr "Dobbel tilleggjing av avleiing %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" @@ -2557,22 +2557,22 @@ msgstr "lese, har framleis %lu att msgid "write, still have %llu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2829,7 +2829,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Listekatalogen %spartial manglar." @@ -3004,35 +3004,35 @@ msgstr "Feil storleik" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3040,12 +3040,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3054,12 +3054,12 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3096,73 +3096,64 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Brukar monteringspunktet %s for CD-ROM\n" -"Monterer CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifiserer ... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Lagra etikett: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Ventar p disk ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifiserer ... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Lagra etikett: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Leitar etter indeksfiler p disken ...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Det er ikkje eit gyldig namn, prv igjen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3171,15 +3162,15 @@ msgstr "" "Disken vert kalla: \n" "%s\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" @@ -3462,6 +3453,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Brukar monteringspunktet %s for CD-ROM\n" +#~ "Monterer CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Merk, vel %s i staden for regex %s\n" diff --git a/po/pl.po b/po/pl.po index a1e4c2aec..79e0a0470 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -162,7 +162,7 @@ msgstr " Sposób przypięcia: " msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Proszę włożyć dysk do napędu i nacisnąć enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Nie udało się zamontować \"%s\" w \"%s\"" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Należy powtórzyć ten proces dla reszty płyt." @@ -784,12 +784,12 @@ msgstr "Nie odnaleziono dysku." msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -1055,7 +1055,7 @@ msgstr "" "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza " "publicznego:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Puste pliki nie mogą być prawidłowymi archiwami" @@ -1391,108 +1391,108 @@ msgstr "Zainstalować te pakiety bez weryfikacji?" msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Zainstalowany]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Następujące pakiety mają niespełnione zależności:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zostać zainstalowany" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ale nie da się go zainstalować" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " lub" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Zostaną zainstalowane następujące NOWE pakiety:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Następujące pakiety zostały zatrzymane:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Zostaną zmienione następujące zatrzymane pakiety:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1500,27 +1500,27 @@ msgstr "" "UWAGA: Zostaną usunięte następujące istotne pakiety.\n" "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu ponownie instalowanych, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu cofniętych wersji, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" @@ -1529,7 +1529,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[T/n]" @@ -1537,21 +1537,21 @@ msgstr "[T/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[t/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "T" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -1727,7 +1727,7 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\"" msgid "[Mirror: %s]" msgstr "[Serwer lustrzany: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" @@ -2086,47 +2086,47 @@ msgstr "Nieprawidłowa linia %llu #2 pliku override %s" msgid "Malformed override %s line %llu #3" msgstr "Nieprawidłowa linia %llu #3 pliku override %s" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Nieznany algorytm kompresji \"%s\"" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Nie udało się utworzyć obiektu FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Nie udało się utworzyć procesu potomnego" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Potomny proces kompresujący" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Zawiodła operacja IO na pliku/podprocesie" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Nie udało się zmienić nazwy %s na %s" @@ -2261,12 +2261,12 @@ msgstr "Podwójne dodanie ominięcia %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Nie udało się zapisać pliku %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Nie udało się zamknąć pliku %s" @@ -2654,22 +2654,22 @@ msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" msgid "write, still have %llu to write but couldn't" msgstr "należało zapisać jeszcze %llu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2930,7 +2930,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." @@ -3102,7 +3102,7 @@ msgstr "Błędny rozmiar" msgid "Invalid file format" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3111,16 +3111,16 @@ msgstr "" "Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " "(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3129,12 +3129,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3144,12 +3144,12 @@ msgstr "" "w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3158,12 +3158,12 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\"" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3200,50 +3200,41 @@ msgstr "Nieprawidłowy wpis Date w pliku Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "Blok producenta %s nie zawiera odcisku" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Użycie %s jako punktu montowania CD-ROM-u\n" -"Montowanie CD-ROM-u\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identyfikacja.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etykieta: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Odmontowanie CD-ROM-u...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Użycie %s jako punktu montowania CD-ROM-u\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Odmontowanie CD-ROM-u\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Oczekiwanie na płytę...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROM-u...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identyfikacja.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etykieta: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Odmontowanie CD-ROM-u...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3252,7 +3243,7 @@ msgstr "" "Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów " "tłumaczeń i %zu podpisów\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3260,16 +3251,16 @@ msgstr "" "Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk " "Debiana lub jest to inna architektura?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Znaleziono etykietę \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "To nie jest prawidłowa nazwa, proszę spróbować ponownie.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3278,15 +3269,15 @@ msgstr "" "Płyta nosi nazwę: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopiowanie list pakietów..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy źródeł\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" @@ -3598,6 +3589,13 @@ msgstr "" msgid "Not locked" msgstr "Niezablokowany" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Użycie %s jako punktu montowania CD-ROM-u\n" +#~ "Montowanie CD-ROM-u\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/pt.po b/po/pt.po index 8c6f82bad..ce7d19cf7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -158,7 +158,7 @@ msgstr " Marcação do Pacote: " msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "Por favor insira um Disco no leitor e pressione enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Falhou ao montar '%s' para '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repita este processo para o resto dos CDs no seu conjunto." @@ -777,12 +777,12 @@ msgstr "Disco não encontrado." msgid "File not found" msgstr "Ficheiro não encontrado" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -1047,7 +1047,7 @@ msgstr "" "As seguintes assinaturas não puderam ser verificadas porque a chave pública " "não está disponível:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Ficheiros vazios não podem ser arquivos válidos" @@ -1367,108 +1367,108 @@ msgstr "Instalar estes pacotes sem verificação?" msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalado]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalado]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalado]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalado]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "mas não é instalável" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "mas não está instalado" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Serão instalados os seguintes NOVOS pacotes:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Será feito o DOWNGRADE aos seguintes pacotes:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1476,27 +1476,27 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" @@ -1505,7 +1505,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[S/n]" @@ -1513,21 +1513,21 @@ msgstr "[S/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "s/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "S" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "N" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -1699,7 +1699,7 @@ msgstr "Não pode ler ficheiro de mirror '%s'" msgid "[Mirror: %s]" msgstr "[Mirror: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" @@ -2058,47 +2058,47 @@ msgstr "Override %s malformado linha %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Override %s malformado linha %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compressão desconhecido '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compressão" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Falhou criar FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Falhou o fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Compactar filho" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro Interno, falhou criar %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Falhou o IO para subprocesso/arquivo" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Falhou ler durante o cálculo de MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Falhou renomear %s para %s" @@ -2233,12 +2233,12 @@ msgstr "Adição dupla de desvio %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falhou escrever o ficheiro %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Falhou fechar o ficheiro %s" @@ -2630,22 +2630,22 @@ msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" msgid "write, still have %llu to write but couldn't" msgstr "escritos, ainda restam %llu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2908,7 +2908,7 @@ msgstr "" "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) " "estragados." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Falta directório de listas %spartial." @@ -3089,7 +3089,7 @@ msgstr "Tamanho incorrecto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3098,18 +3098,18 @@ msgstr "" "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " "errada em sources.list ou ficheiro malformado)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3118,12 +3118,12 @@ msgstr "" "O ficheiro Release para %s está expirado (inválido desde %s). Não serão " "aplicadas as actualizações para este repositório." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3134,12 +3134,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3149,12 +3149,12 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3192,50 +3192,41 @@ msgstr "Entrada, 'Date', inválida no ficheiro Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "O bloco de fabricante %s não contém a impressão digital" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Utilizando o ponto de montagem do CD-ROM %s\n" -"A montar o CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "A identificar.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Label Guardada: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "A desmontar o CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A utilizar o ponto de montagem do CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "A identificar.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Label Guardada: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "A desmontar o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "A pesquisar os ficheiros de índice do disco..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3244,7 +3235,7 @@ msgstr "" "Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu " "índices de tradução e %zu assinaturas\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3252,16 +3243,16 @@ msgstr "" "Não foi possível localizar quaisquer ficheiros de pacote, talvez este não " "seja um disco Debian ou seja a arquitectura errada?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Encontrada a etiqueta '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Isso não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3270,15 +3261,15 @@ msgstr "" "Este disco tem o nome: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" @@ -3588,6 +3579,13 @@ msgstr "" msgid "Not locked" msgstr "Sem acesso exclusivo" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Utilizando o ponto de montagem do CD-ROM %s\n" +#~ "A montar o CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/pt_BR.po b/po/pt_BR.po index c2211ccd0..6d0e09792 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese %s" msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Falhou ao escrever arquivo %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Falhou ao fechar arquivo %s" @@ -2596,22 +2596,22 @@ msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" msgid "write, still have %llu to write but couldn't" msgstr "escrita, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -2873,7 +2873,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Diretório de listas %spartial está faltando." @@ -3051,35 +3051,35 @@ msgstr "Tamanho incorreto" msgid "Invalid file format" msgstr "Operação %s inválida" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3087,12 +3087,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3102,12 +3102,12 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3145,50 +3145,41 @@ msgstr "Impossível analisar arquivo de pacote %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Usando ponto de montagem de CD-ROM %s\n" -"Montando CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificando.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Rótulo armazenado: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Desmontando CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Aguardando por disco...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montando CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificando.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Rótulo armazenado: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Procurando por arquivos de índice no disco..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3197,22 +3188,22 @@ msgstr "" "Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu " "índice(s) de traduções e %zu assinatura(s)\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Rótulo encontrado: '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3221,15 +3212,15 @@ msgstr "" "Esse disco é chamado: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" @@ -3514,6 +3505,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Usando ponto de montagem de CD-ROM %s\n" +#~ "Montando CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Nota, selecionando %s para expressão regular '%s'\n" diff --git a/po/ro.po b/po/ro.po index 5ff851765..a89a9131f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -159,7 +159,7 @@ msgstr " Pachet ales special: " msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1 msgid "Please insert a Disc in the drive and press enter" msgstr "Introduceți un disc în unitate și apăsați Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Eșec la redenumirea lui %s în %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Repetați această procedură pentru restul CD-urilor din set." @@ -747,12 +747,12 @@ msgstr "Disc negăsit." msgid "File not found" msgstr "Fișier negăsit" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -1020,7 +1020,7 @@ msgstr "" "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu " "este disponibilă:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1348,108 +1348,108 @@ msgstr "Instalați aceste pachete fără verificare?" msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Instalat]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Instalat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Instalat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Instalat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependențe neîndeplinite:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "dar nu este instalat" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " sau" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reținute:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ținute vor fi schimbate:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1457,27 +1457,27 @@ msgstr "" "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n" "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de șters și %lu neînnoite.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau șterse incomplet.\n" @@ -1486,7 +1486,7 @@ msgstr "%lu instalate sau șterse incomplet.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1494,21 +1494,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "Y" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -1677,7 +1677,7 @@ msgstr "Nu s-a putut deschide fișierul %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" @@ -2042,47 +2042,47 @@ msgstr "Înlocuire greșită %s linia %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Înlocuire greșită %s linia %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritm de compresie necunoscut '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Eșec la crearea FIȘIERULUI*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Eșec la „fork”" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Comprimare copil" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Eroare internă, eșec la crearea lui %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IE către subproces/fișier eșuat" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Eșec la citire în timpul calculului sumei MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Eșec la redenumirea lui %s în %s" @@ -2220,12 +2220,12 @@ msgstr "Adăugare dublă de redirectare %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Fișier „conf” duplicat %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Eșec la scrierea fișierului %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Eșec la închiderea fișierului %s" @@ -2606,22 +2606,22 @@ msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" msgid "write, still have %llu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2877,7 +2877,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Directorul de liste %spartial lipsește." @@ -3056,37 +3056,37 @@ msgstr "Nepotrivire dimensiune" msgid "Invalid file format" msgstr "Operațiune invalidă %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3094,12 +3094,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3108,12 +3108,12 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3151,51 +3151,42 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Blocul vânzător %s nu conține amprentă" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Utilizare puct de montare CD-ROM %s\n" -"Montare CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificare.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Etichetă memorată: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Se demontează CD-ul...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilizare punct de montare CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Demontare CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Aștept discul...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Montez CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificare.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etichetă memorată: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Se demontează CD-ul...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Scanez discul de fișierele index..\n" # DEVELOPERS: please consider using somehow plural forms -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3204,22 +3195,22 @@ msgstr "" "Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri " "de traduceri și %zu semnături\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "A fost găsită eticheta „%s”\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Acesta nu este un nume valid, mai încercați.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3228,15 +3219,15 @@ msgstr "" "Acest disc este numit: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" @@ -3520,6 +3511,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Utilizare puct de montare CD-ROM %s\n" +#~ "Montare CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" diff --git a/po/ru.po b/po/ru.po index 786621f57..c4faf8f62 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt rev2227.1.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -163,7 +163,7 @@ msgstr " Фиксатор пакета: " msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -257,12 +257,12 @@ msgstr "Задайте имя для этого диска, например «D msgid "Please insert a Disc in the drive and press enter" msgstr "Вставьте диск в устройство и нажмите ввод" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не удалось примонтировать «%s» к «%s»" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторите этот процесс для всех имеющихся CD." @@ -782,12 +782,12 @@ msgstr "Диск не найден." msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1054,7 +1054,7 @@ msgstr "" "Следующие подписи не могут быть проверены, так как недоступен открытый " "ключ:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Пустые файлы не могут быть допустимыми архивами" @@ -1385,109 +1385,109 @@ msgstr "Установить эти пакеты без проверки?" msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Установлен]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Установлен]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Установлен]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Установлен]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "но он не установлен" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " или" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1495,27 +1495,27 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" @@ -1524,7 +1524,7 @@ msgstr "не установлено до конца или удалено %lu п #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[Д/н]" @@ -1532,21 +1532,21 @@ msgstr "[Д/н]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "д" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "н" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения — %s" @@ -1721,7 +1721,7 @@ msgstr "Невозможно прочитать файл на зеркале «% msgid "[Mirror: %s]" msgstr "[Зеркало: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" @@ -2082,48 +2082,48 @@ msgstr "Неправильная запись о переназначении (o msgid "Malformed override %s line %llu #3" msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Неизвестный алгоритм сжатия «%s»" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" "Для получения сжатого вывода %s необходимо включить использования сжатия" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Не удалось создать FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Не удалось запустить порождённый процесс" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Процесс-потомок, производящий сжатие" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутренняя ошибка, не удалось создать %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Ошибка чтения во время вычисления MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" @@ -2258,12 +2258,12 @@ msgstr "Двойное добавление diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Повторно указан файл настройки %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" @@ -2655,22 +2655,22 @@ msgstr "" msgid "write, still have %llu to write but couldn't" msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Проблема закрытия файла %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема при удалении файла %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файла" @@ -2932,7 +2932,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Каталог списка %spartial отсутствует." @@ -3109,7 +3109,7 @@ msgstr "Не совпадает размер" msgid "Invalid file format" msgstr "Неверная операция %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3118,16 +3118,16 @@ msgstr "" "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " "в sources.list или файл)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Невозможно найти хеш-сумму «%s» в файле Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3136,12 +3136,12 @@ msgstr "" "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " "репозитория производиться не будет." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3151,12 +3151,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3165,12 +3165,12 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3206,50 +3206,41 @@ msgstr "Неправильный элемент «Date» в файле Release % msgid "Vendor block %s contains no fingerprint" msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"В качестве точки монтирования CD-ROM используется %s\n" -"Монтируется CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Идентификация.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Найдена метка: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Размонтирование CD-ROM…\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Размонтирование CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском…\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM…\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Идентификация.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Найдена метка: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Размонтирование CD-ROM…\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Поиск на диске индексных файлов..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3258,7 +3249,7 @@ msgstr "" "Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и " "%zu для сигнатур\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3266,16 +3257,16 @@ msgstr "" "Не удалось найти ни одного файла пакетов; возможно это не диск Debian или с " "не той архитектурой?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Найден ярлык «%s»\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3284,15 +3275,15 @@ msgstr "" "Название диска: \n" "«%s»\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Копирование списков пакетов…" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" @@ -3602,6 +3593,13 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "В качестве точки монтирования CD-ROM используется %s\n" +#~ "Монтируется CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/sk.po b/po/sk.po index 6d55616b7..495b096d4 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -159,7 +159,7 @@ msgstr " Pripevnený balík:" msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1 msgid "Please insert a Disc in the drive and press enter" msgstr "Vložte disk do mechaniky a stlačte Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Pripojenie „%s“ na „%s“ zlyhalo" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Zopakujte tento postup pre všetky CD v sade diskov." @@ -768,12 +768,12 @@ msgstr "Disk sa nenašiel." msgid "File not found" msgstr "Súbor sa nenašiel" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1034,7 +1034,7 @@ msgstr "" "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " "kľúč:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Prázdne súbory nemôžu byť platné archívy" @@ -1362,108 +1362,108 @@ msgstr "Nainštalovať tieto nekontrolované balíky?" msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Nainštalovaný]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " alebo" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1471,27 +1471,27 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových nainštalovaných, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" @@ -1500,7 +1500,7 @@ msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1508,21 +1508,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -1695,7 +1695,7 @@ msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle" msgid "[Mirror: %s]" msgstr "[Zrkadlo: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" @@ -2048,47 +2048,47 @@ msgstr "Skomolený „override“ %s riadok %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Skomolený „override“ %s riadok %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámy kompresný algoritmus „%s“" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Zlyhalo vytvorenie FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Volanie fork() zlyhalo" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Komprimovať potomka" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Chyba čítania pri výpočte MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" @@ -2222,12 +2222,12 @@ msgstr "Dvojité pridanie diverzie %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" @@ -2610,22 +2610,22 @@ msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva" msgid "write, still have %llu to write but couldn't" msgstr "zápis, treba zapísať ešte %llu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problém pri zatváraní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problém pri synchronizovaní súboru %s na %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problém pri odstraňovaní súboru %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -2881,7 +2881,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Adresár zoznamov %spartial chýba." @@ -3054,7 +3054,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Invalid file format" msgstr "Neplatná operácia %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3063,16 +3063,16 @@ msgstr "" "Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna " "položka sources.list alebo chybný formát súboru)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3081,12 +3081,12 @@ msgstr "" "Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " "softvéru sa nepoužijú." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3096,12 +3096,12 @@ msgstr "" "použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3110,12 +3110,12 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3151,50 +3151,41 @@ msgstr "Chýba položka „Date“ v súbore Release %s" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Použije sa CD-ROM prípojný bod %s\n" -"Pripája sa CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifikuje sa.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Uložená menovka: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM sa odpája...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Použije sa prípojný bod CD-ROM %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM sa odpája\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifikuje sa.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Uložená menovka: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM sa odpája...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Na disku sa hľadajú indexové súbory..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3203,7 +3194,7 @@ msgstr "" "Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov " "prekladov a %zu signatúr\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3211,16 +3202,16 @@ msgstr "" "Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom " "alebo je pre nesprávnu architektúru?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Nájdená menovka: „%s“\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Neplatný názov, skúste znova.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3229,15 +3220,15 @@ msgstr "" "Názov tohto disku je: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" @@ -3536,6 +3527,13 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s msgid "Not locked" msgstr "Nie je zamknuté" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Použije sa CD-ROM prípojný bod %s\n" +#~ "Pripája sa CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/sl.po b/po/sl.po index 5ece639cc..a0ee37460 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -157,7 +157,7 @@ msgstr " Bucika paketa: " msgid " Version table:" msgstr " Preglednica različic:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -252,12 +252,12 @@ msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Vstavite disk v pogon in pritisnite vnosno tipko" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Priklapljanje '%s' na '%s' je spodletelo" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki." @@ -763,12 +763,12 @@ msgstr "Diska ni mogoče najti." msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -1029,7 +1029,7 @@ msgid "" msgstr "" "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Prazne datoteke ne morejo biti veljavni arhivi" @@ -1361,108 +1361,108 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?" msgid "Failed to fetch %s %s\n" msgstr "Ni mogoče dobiti %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Nameščeno]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nerešene odvisnosti:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameščen" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameščen" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "vendar ni nameščen" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "vendar ne bo nameščen" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ali" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1470,27 +1470,27 @@ msgstr "" "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" "Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameščenih, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" @@ -1499,7 +1499,7 @@ msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1507,21 +1507,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka med prevajanjem logičnega izraza - %s" @@ -1695,7 +1695,7 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoče prebrati" msgid "[Mirror: %s]" msgstr "[Zrcalni strežnik: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" @@ -2049,47 +2049,47 @@ msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" msgid "Malformed override %s line %llu #3" msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznan algoritem stiskanja '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Stisnjen izhod %s potrebuje niz stiskanja" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Ustvarjanje DATOTEKE* ni uspelo" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Vejitev ni uspela" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Podrejeni predmet stiskanja" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Notranja napaka. Ni mogoče ustvariti %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "VI podopravila/datoteke je spodletel" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Med računanjem MD5 ni mogoče brati" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Napaka med odvezovanjem %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoče preimenovati %s v %s" @@ -2225,12 +2225,12 @@ msgstr "Dvojni seštevek odklona %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Zapisovanje datoteke %s je spodletelo" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Napaka med zapiranjem datoteke %s" @@ -2612,22 +2612,22 @@ msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo msgid "write, still have %llu to write but couldn't" msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Težava med usklajevanjem datoteke" @@ -2888,7 +2888,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Mapa seznama %spartial manjka." @@ -3059,7 +3059,7 @@ msgstr "Neujemanje velikosti" msgid "Invalid file format" msgstr "Neveljavno opravilo %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3068,16 +3068,16 @@ msgstr "" "Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " "sources.list ali slabo oblikovana datoteka)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3086,12 +3086,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3101,12 +3101,12 @@ msgstr "" "zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3115,12 +3115,12 @@ msgstr "" "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno " "popraviti ta paket (zaradi manjkajočega arhiva)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3158,50 +3158,41 @@ msgstr "Neveljavne vnos 'Datum' v Release datoteki %s" msgid "Vendor block %s contains no fingerprint" msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Uporabljanje CD-ROM-ove priklopne točke %s\n" -"Priklapljanje CD-ROM-a\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identificiranje ... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Shranjena oznaka: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Odklapljanje CD-ROM-a ...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljanje CD-ROM-ove priklopne točke %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Odklapljanje CD-ROM-a\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Čakanje na disk ...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Priklapljanje CD-ROM-a ...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identificiranje ... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Shranjena oznaka: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Odklapljanje CD-ROM-a ...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Preiskovanje diska za datoteke kazala ..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3210,7 +3201,7 @@ msgstr "" "Najdenih je bilo %zu kazal paketov, %zu kazal virov, %zu kazalov prevodov in " "%zu podpisov\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3218,16 +3209,16 @@ msgstr "" "Nobenih datotek paketov ni mogoče najti, morda to ni disk Debian ali pa je " "arhitektura napačna?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Najdena je bila oznaka '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "To ni veljavno ime, poskusite znova.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3236,15 +3227,15 @@ msgstr "" "Ta disk se imenuje: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Pisanje novega seznama virov\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" @@ -3544,6 +3535,13 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. " msgid "Not locked" msgstr "Ni zaklenjeno" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Uporabljanje CD-ROM-ove priklopne točke %s\n" +#~ "Priklapljanje CD-ROM-a\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/sv.po b/po/sv.po index 298573eea..fda0cac14 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -157,7 +157,7 @@ msgstr " Paketnålning: " msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -255,12 +255,12 @@ msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\"" msgid "Please insert a Disc in the drive and press enter" msgstr "Mata in en skiva i enheten och tryck på Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Misslyckades med att montera \"%s\" till \"%s\"" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning." @@ -747,12 +747,12 @@ msgstr "Skivan hittades inte." msgid "File not found" msgstr "Filen hittades inte" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -1021,7 +1021,7 @@ msgstr "" "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är " "tillgänglig:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1345,108 +1345,108 @@ msgstr "Installera dessa paket utan verifiering?" msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Installerat]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Installerat]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Installerat]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Installerat]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Följande paket har beroenden som inte kan tillfredsställas:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "men %s är installerat" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "men det är ett virtuellt paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "men det är inte installerat" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " eller" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Följande NYA paket kommer att installeras:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Följande paket har hållits tillbaka:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Följande tillbakahållna paket kommer att ändras:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (på grund av %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1454,27 +1454,27 @@ msgstr "" "VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu att uppgradera, %lu att nyinstallera, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu att installera om, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu att nedgradera, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu att inte uppgradera.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu är inte helt installerade eller borttagna.\n" @@ -1483,7 +1483,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[J/n]" @@ -1491,21 +1491,21 @@ msgstr "[J/n]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[j/N]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "J" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -1683,7 +1683,7 @@ msgstr "Ingen spegelfil \"%s\" hittades " msgid "[Mirror: %s]" msgstr "[Spegel: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" @@ -2044,48 +2044,48 @@ msgstr "Felaktig override %s rad %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Okänd komprimeringsalgoritm \"%s\"" # ??? -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Misslyckades med att skapa FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Misslyckades med att grena process" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Barnprocess för komprimering" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Internt fel, misslyckades med att skapa %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "In/ut för underprocess/fil misslyckades" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Misslyckades med att läsa vid beräkning av MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn på %s till %s" @@ -2220,12 +2220,12 @@ msgstr "Omdirigeringen %s -> %s inlagd två gånger" msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades med att skriva filen %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades med att stänga filen %s" @@ -2607,22 +2607,22 @@ msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" msgid "write, still have %llu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Problem med att stänga filen %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Problem med att byta namn på filen %s till %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Problem med att avlänka filen %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2883,7 +2883,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." @@ -3057,35 +3057,35 @@ msgstr "Storleken stämmer inte" msgid "Invalid file format" msgstr "Felaktig åtgärd %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kunde inte tolka \"Release\"-filen %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3096,12 +3096,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3110,12 +3110,12 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3151,50 +3151,41 @@ msgstr "Ogiltig \"Date\"-post i Release-filen %s" msgid "Vendor block %s contains no fingerprint" msgstr "Leverantörsblocket %s saknar fingeravtryck" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Använder cd-rom-monteringspunkten %s\n" -"Monterar cd-rom\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identifierar.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Lagrad etikett: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterar cd-rom...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Använder cd-rom-monteringspunkten %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Avmonterar cd-rom\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Väntar på skiva...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Identifierar.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Lagrad etikett: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterar cd-rom...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Söker efter indexfiler på skivan...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3203,7 +3194,7 @@ msgstr "" "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu " "signaturer\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3211,16 +3202,16 @@ msgstr "" "Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva " "eller felaktig arkitektur?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Hittade etiketten \"%s\"\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Namnet är ogiltigt, försök igen.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3229,15 +3220,15 @@ msgstr "" "Denna skiva heter: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Skriver ny källista\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" @@ -3542,6 +3533,13 @@ msgstr "" msgid "Not locked" msgstr "Inte låst" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Använder cd-rom-monteringspunkten %s\n" +#~ "Monterar cd-rom\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/th.po b/po/th.po index 263830ef1..83ee7e98f 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-10-27 22:44+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -155,7 +155,7 @@ msgstr " การตรึงแพกเกจ: " msgid " Version table:" msgstr " ตารางรุ่น:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -249,12 +249,12 @@ msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian msgid "Please insert a Disc in the drive and press enter" msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด" @@ -749,12 +749,12 @@ msgstr "ไม่พบแผ่น" msgid "File not found" msgstr "ไม่พบแฟ้ม" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -1011,7 +1011,7 @@ msgid "" "available:\n" msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้" @@ -1318,108 +1318,108 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [ติดตั้งอยู่]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "แต่รุ่นที่จะติดตั้งคือ %s" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "แต่ไม่สามารถติดตั้งได้" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "แต่ได้ติดตั้งไว้" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " หรือ" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (เนื่องจาก %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1427,27 +1427,27 @@ msgstr "" "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "ติดตั้งซ้ำ %lu, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "ปรับรุ่นลง %lu, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n" @@ -1456,7 +1456,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1464,21 +1464,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -1649,7 +1649,7 @@ msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำ msgid "[Mirror: %s]" msgstr "[แหล่งสำเนา: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" @@ -1995,47 +1995,47 @@ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรร msgid "Malformed override %s line %llu #3" msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "สร้าง FILE* ไม่สำเร็จ" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork ไม่สำเร็จ" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "โพรเซสลูกสำหรับบีบอัด" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" @@ -2170,12 +2170,12 @@ msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง" msgid "Duplicate conf file %s/%s" msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "ไม่สามารถเขียนแฟ้ม %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "ไม่สามารถปิดแฟ้ม %s" @@ -2552,22 +2552,22 @@ msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้ msgid "write, still have %llu to write but couldn't" msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2823,7 +2823,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial" @@ -2992,7 +2992,7 @@ msgstr "ขนาดไม่ตรงกัน" msgid "Invalid file format" msgstr "ไม่รู้จักคำสั่ง %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3001,16 +3001,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3019,12 +3019,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3034,24 +3034,24 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3087,50 +3087,41 @@ msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ msgid "Vendor block %s contains no fingerprint" msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"กำลังใช้จุดเมานท์ซีดีรอม %s\n" -"กำลังเมานท์ซีดีรอม\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "กำลังตรวจสอบชื่อแผ่น.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "ชื่อที่เก็บไว้: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "กำลังเลิกเมานท์ซีดีรอม\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "กำลังรอแผ่น...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "กำลังเมานท์ซีดีรอม...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "กำลังตรวจสอบชื่อแผ่น.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "ชื่อที่เก็บไว้: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "กำลังเลิกเมานท์ซีดีรอม...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3139,22 +3130,22 @@ msgstr "" "พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น " "%zu รายการ\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "ไม่พบแฟ้มแพกเกจใดๆ บางทีแผ่นนี้อาจจะไม่ใช่แผ่นเดเบียน หรือสถาปัตยกรรมอาจไม่ถูกต้อง" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "พบชื่อแผ่น '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "ไม่ใช่ชื่อที่ใช้ได้ กรุณาลองใหม่\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3163,15 +3154,15 @@ msgstr "" "แผ่นนี้เรียกชื่อว่า:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "กำลังคัดลอกรายชื่อแพกเกจ..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" @@ -3455,6 +3446,13 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี msgid "Not locked" msgstr "ไม่ได้ล็อคอยู่" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "กำลังใช้จุดเมานท์ซีดีรอม %s\n" +#~ "กำลังเมานท์ซีดีรอม\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/tl.po b/po/tl.po index 180f2732e..a320e92fa 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -161,7 +161,7 @@ msgstr " Naka-Pin na Pakete: " msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -262,12 +262,12 @@ msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set." @@ -744,12 +744,12 @@ msgstr "Hindi nahanap ang Disk." msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1014,7 +1014,7 @@ msgstr "" "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " "available:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1332,108 +1332,108 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Nakaluklok]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " o" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1441,27 +1441,27 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" @@ -1470,7 +1470,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[O/h]" @@ -1478,21 +1478,21 @@ msgstr "[O/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[o/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "O" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "H" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -1660,7 +1660,7 @@ msgstr "Hindi mabuksan ang talaksang %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" @@ -2022,47 +2022,47 @@ msgstr "Maling anyo ng override %s linya %lu #2" msgid "Malformed override %s line %llu #3" msgstr "Maling anyo ng override %s linya %lu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Hindi kilalang algorithmong compression '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Kailangan ng compression set ang compressed output %s" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Bigo ang paglikha ng FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Bigo ang pag-fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Anak para sa pag-Compress" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Error na internal, bigo ang paglikha ng %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Bigo ang IO sa subprocess/talaksan" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" @@ -2198,12 +2198,12 @@ msgstr "Dobleng pagdagdag ng diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Nadobleng talaksang conf %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" @@ -2588,22 +2588,22 @@ msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" msgid "write, still have %llu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2862,7 +2862,7 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Nawawala ang directory ng talaan %spartial." @@ -3039,35 +3039,35 @@ msgstr "Di tugmang laki" msgid "Invalid file format" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3075,12 +3075,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3089,12 +3089,12 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3132,51 +3132,42 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Block ng nagbebenta %s ay walang fingerprint" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Ginagamit ang %s bilang mount point ng CD-ROM\n" -"Sinasalang ang CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Kinikilala..." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Naka-imbak na Label: %s \n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Ina-unmount ang CD-ROM..." - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Ina-unmount ang CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Kinikilala..." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Naka-imbak na Label: %s \n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Ina-unmount ang CD-ROM..." + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, fuzzy, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3185,22 +3176,22 @@ msgstr "" "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " "signature\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Hindi yan tanggap na pangalan, subukan muli.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3209,15 +3200,15 @@ msgstr "" "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" @@ -3502,6 +3493,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Ginagamit ang %s bilang mount point ng CD-ROM\n" +#~ "Sinasalang ang CD-ROM\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" diff --git a/po/tr.po b/po/tr.po index b1bb0f17d..0ea96fe86 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2013-02-18 03:41+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish\n" @@ -159,7 +159,7 @@ msgstr " Paket sabitleme: " msgid " Version table:" msgstr " Sürüm çizelgesi:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -255,12 +255,12 @@ msgstr "Lütfen bu CD/DVD'ye bir isim verin, örneğin 'Debian 5.0.3 Disk 1'" msgid "Please insert a Disc in the drive and press enter" msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "'%s', '%s' konumuna bağlanamadı" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Kalan CD'leriniz için bu işlemi yineleyin." @@ -770,12 +770,12 @@ msgstr "Disk bulunamadı." msgid "File not found" msgstr "Dosya bulunamadı" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -1034,7 +1034,7 @@ msgid "" "available:\n" msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar" @@ -1358,108 +1358,108 @@ msgstr "Paketler doğrulanmadan kurulsun mu?" msgid "Failed to fetch %s %s\n" msgstr "%s ağdan alınamadı. %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Kuruldu]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "ama %s kurulu" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "ama %s kurulacak" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "ama kurulabilir değil" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "ama o bir sanal paket" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "ama kurulu değil" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "ama kurulmayacak" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " ya da" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (%s nedeniyle) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1467,27 +1467,27 @@ msgstr "" "UYARI: Aşağıdaki temel paketler kaldırılacak.\n" "Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu paket yeniden kurulacak, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu paketin sürümü düşürülecek, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" @@ -1496,7 +1496,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[E/h]" @@ -1504,21 +1504,21 @@ msgstr "[E/h]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[e/H]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "E" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "H" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Regex derleme hatası - %s" @@ -1692,7 +1692,7 @@ msgstr "Yansı dosyası %s okunamıyor" msgid "[Mirror: %s]" msgstr "[Yansı: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Altsürece IPC borusu oluşturulamadı" @@ -2051,47 +2051,47 @@ msgstr "Hatalı geçersiz kılma %s satır %llu #2" msgid "Malformed override %s line %llu #3" msgstr "Hatalı geçersiz kılma %s satır %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Bilinmeyen sıkıştırma algoritması '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır." -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "DOSYA* oluşturulamadı" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "fork yapılamadı" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Çocuğu sıkıştır" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "İç hata, %s oluşturulamadı" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "MD5 hesaplanırken okunamadı" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "%s bağı koparılırken sorun çıktı" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "%s, %s olarak yeniden adlandırılamadı" @@ -2227,12 +2227,12 @@ msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "%s/%s yapılandırma dosyası zaten mevcut" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "%s dosyasına yazılamadı" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "%s dosyası kapatılamadı" @@ -2620,22 +2620,22 @@ msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış" msgid "write, still have %llu to write but couldn't" msgstr "write, yazılması gereken %llu bayt yazılamıyor" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "%s dosyası kapatılamadı" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "%s dosyası %s olarak yeniden adlandırılamadı" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "%s dosyasından bağ kaldırma sorunu" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Dosya eşitlenirken sorun çıktı" @@ -2905,7 +2905,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Liste dizini %spartial bulunamadı." @@ -3079,7 +3079,7 @@ msgstr "Boyutlar eşleşmiyor" msgid "Invalid file format" msgstr "Geçersiz işlem: %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3088,17 +3088,17 @@ msgstr "" "'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list " "dosyasındaki girdi ya da satır hatalı)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3107,12 +3107,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3122,12 +3122,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3136,12 +3136,12 @@ msgstr "" "%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle " "düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3177,50 +3177,41 @@ msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi" msgid "Vendor block %s contains no fingerprint" msgstr "Sağlayıcı bloğu %s parmak izi içermiyor" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"CD-ROM bağlama noktası %s kullanılıyor\n" -"CD-ROM bağlanıyor\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Tanımlanıyor... " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Kayıtlı etiket: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM ayrılıyor...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM bağlama noktası %s kullanılıyor\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM ayrılıyor\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Disk bekleniliyor...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM bağlanıyor...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Tanımlanıyor... " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Kayıtlı etiket: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM ayrılıyor...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Disk, indeks dosyaları için taranıyor..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3229,7 +3220,7 @@ msgstr "" "%zu paket indeksi, %zu kaynak indeksi, %zu çeviri indeksi ve %zu imza " "bulundu\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3237,16 +3228,16 @@ msgstr "" "Hiç paket dosyası bulunamadı. Belirttiğiniz disk bir Debian diski değil ya " "da yanlış mimariye sahip." -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "'%s' etiketi bulundu\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Bu, geçerli bir ad değil, yeniden deneyin.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3255,15 +3246,15 @@ msgstr "" "Disk adı: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Paket listeleri kopyalanıyor.." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Yeni kaynak listesi yazılıyor\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Bu disk için olan kaynak listesi girdileri:\n" @@ -3560,6 +3551,13 @@ msgstr "" msgid "Not locked" msgstr "Kilitlenmemiş" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "CD-ROM bağlama noktası %s kullanılıyor\n" +#~ "CD-ROM bağlanıyor\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/uk.po b/po/uk.po index 7f7f094c3..c089d5fac 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -164,7 +164,7 @@ msgstr " Фіксатор(pin) пакунка: " msgid " Version table:" msgstr " Таблиця версій:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -258,12 +258,12 @@ msgstr "Задайте назву для цього Диска, наприкла msgid "Please insert a Disc in the drive and press enter" msgstr "Будь-ласка, вставте Диск у пристрій і натисніть Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Не вдалося під'єднати '%s' до '%s'" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Повторіть цей процес для решти CD з вашого набору." @@ -781,13 +781,13 @@ msgstr "Диск не знайдено." msgid "File not found" msgstr "Файл не знайдено" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -1050,7 +1050,7 @@ msgstr "" "Наступні підписи не можуть бути перевірені, тому що публічний ключ " "відсутній:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Пусті файли не можуть бути правильними архівами" @@ -1379,108 +1379,108 @@ msgstr "Встановити ці пакунки без перевірки?" msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [Встановлено]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "але %s вже встановлений" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "але %s буде встановлений" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "але він не може бути встановлений" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "але це віртуальний пакунок" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "але він не встановлений" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "але він не буде встановлений" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " чи" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (внаслідок %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1488,27 +1488,27 @@ msgstr "" "УВАГА: Наступні важливі пакунки будуть вилучені.\n" "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "оновлено %lu, встановлено %lu нових, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu перевстановлено, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu замінено на старіші версії, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu відмічено для видалення і %lu не оновлено.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" @@ -1517,7 +1517,7 @@ msgstr "не встановлено(видалено) до кінця %lu пак #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1525,21 +1525,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -1713,7 +1713,7 @@ msgstr "Неможливо прочитати файл дзеркала '%s'" msgid "[Mirror: %s]" msgstr "[Дзеркало: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Не вдалося створити IPC канал для підпроцесу" @@ -2079,47 +2079,47 @@ msgstr "Спотворений запис про перепризначення msgid "Malformed override %s line %llu #3" msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Невідомий алгоритм стиснення '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "Не вдалося створити FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Не вдалося породити процес (fork)" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "Процес-нащадок, що виконує пакування" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутрішня помилка, не вдалося створити %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Помилка уведення/виводу в підпроцес/файл" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Помилка зчитування під час обчислення MD5" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Не вдалося видалити %s" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Не вдалося перейменувати %s на %s" @@ -2258,12 +2258,12 @@ msgstr "Подвійне додавання diversion %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Копія конфігураційного файлу %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "Не вдалося записати файл %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Не вдалося закрити файл %s" @@ -2655,22 +2655,22 @@ msgstr "зчитування, повинен зчитати ще %llu байт, msgid "write, still have %llu to write but couldn't" msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "Проблема з закриттям файла %s" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "Проблема з роз'єднанням файла %s" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2929,7 +2929,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "Відсутня директорія зі списками: %spartial" @@ -3102,7 +3102,7 @@ msgstr "Невідповідність розміру" msgid "Invalid file format" msgstr "Невірна дія %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3111,16 +3111,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -3129,12 +3129,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3144,12 +3144,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3158,12 +3158,12 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3200,50 +3200,41 @@ msgstr "Невірний запис 'Date' у 'Release' файлі %s" msgid "Vendor block %s contains no fingerprint" msgstr "Блок постачальника %s не містить відбитку (fingerprint)" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Використовується точка монтування CD-ROM: %s\n" -"Монтується CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Ідентифікація.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Записано мітку: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Демонтується CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Використовується точка монтування CD-ROM: %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "Демонтується CD-ROM\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "Чекаю на диск...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "Монтується CD-ROM...\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Ідентифікація.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "Записано мітку: %s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтується CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "Сканується диск на вміст індексних файлів..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3252,7 +3243,7 @@ msgstr "" "Знайдено %zu індексів пакунків, %zu індексів вихідних текстів, %zu індексів " "перекладів і %zu підписів\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3260,16 +3251,16 @@ msgstr "" "Неможливо знайти ніякі файли пакунків, можливо, що це не диск з Debian, або " "невірна архітектура?" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "Знайдено мітку: '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "Не є вірною назвою, спробуйте ще.\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3278,15 +3269,15 @@ msgstr "" "Цей диск зветься: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "Копіюються переліки пакунків..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "Записується новий перелік вихідних текстів\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "Перелік вихідних текстів для цього диска:\n" @@ -3597,6 +3588,13 @@ msgstr "" msgid "Not locked" msgstr "Не заблоковано" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Використовується точка монтування CD-ROM: %s\n" +#~ "Монтується CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/vi.po b/po/vi.po index 78bc3cda5..a4941fe3f 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.15.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-10 07:15+0700\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2014-02-10 07:50+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -161,7 +161,7 @@ msgstr " Ghim gói: " msgid " Version table:" msgstr " Bảng phiên bản:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -263,12 +263,12 @@ msgstr "Hãy cung cấp tên cho Đĩa này, kiểu như là: “Debian 5.0.3 Đ msgid "Please insert a Disc in the drive and press enter" msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Gặp lỗi khi gắn “%s” vào “%s”" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn." @@ -811,12 +811,12 @@ msgstr "Không tìm thấy đĩa." msgid "File not found" msgstr "Không tìm thấy tập tin" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -1079,7 +1079,7 @@ msgid "" msgstr "" "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ" @@ -1397,105 +1397,105 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?" msgid "Failed to fetch %s %s\n" msgstr "Gặp lỗi khi lấy về %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "không hiểu" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, c-format msgid "[installed,upgradable to: %s]" msgstr "[đã cài, có thể nâng cấp thành: %s]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 msgid "[installed,local]" msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "[đã cài,có thể tự động gỡ bỏ]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 msgid "[installed,automatic]" msgstr "[đã cài đặt,tự động]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 msgid "[installed]" msgstr "[đã cài đặt]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "[có thể nâng cấp từ: %s]" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "[residual-config]" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "nhưng mà nó không được cài đặt" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " hay" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "Những gói sau sẽ bị GỠ BỎ:" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "Những gói sau đây được giữ lại:" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "Những gói sau đây sẽ được NÂNG CẤP:" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "Những gói sau đây sẽ bị HẠ CẤP:" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (bởi vì %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1503,27 +1503,27 @@ msgstr "" "CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nâng cấp, %lu được cài đặt mới, " -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "%lu bị hạ cấp, " -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" @@ -1532,7 +1532,7 @@ msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "[C/k]" @@ -1540,21 +1540,21 @@ msgstr "[C/k]" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "[c/K]" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "C" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "K" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dịch biểu thức chính quy - %s" @@ -1724,7 +1724,7 @@ msgstr "Không tìm thấy điểm vào trong tập tin bản sao “%s”" msgid "[Mirror: %s]" msgstr "[Bản sao: %s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" @@ -1768,1845 +1768,1843 @@ msgstr "" msgid "Merging available information" msgstr "Đang hòa trộn các thông tin sẵn có..." -#: apt-inst/contrib/extracttar.cc:116 -msgid "Failed to create pipes" -msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" - -#: apt-inst/contrib/extracttar.cc:143 -msgid "Failed to exec gzip " -msgstr "Việc thực hiện gzip bị lỗi " - -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 -msgid "Corrupted archive" -msgstr "Kho bị hỏng." - -#: apt-inst/contrib/extracttar.cc:195 -msgid "Tar checksum failed, archive corrupted" -msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" - -#: apt-inst/contrib/extracttar.cc:300 +#: cmdline/apt-extracttemplates.cc:100 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" - -#: apt-inst/contrib/arfile.cc:74 -msgid "Invalid archive signature" -msgstr "Chữ ký kho không hợp lệ" +msgid "%s not a valid DEB package." +msgstr "%s không phải là một gói DEB hợp lệ." -#: apt-inst/contrib/arfile.cc:82 -msgid "Error reading archive member header" -msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" +#: cmdline/apt-extracttemplates.cc:234 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" +"\n" +"[extract: rút trích;\n" +"templates: mẫu]\n" +"\n" +"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" +"\tvà biểu mẫu đều từ gói Debian\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này\n" +" -t Đặt thư mục tạm thời\n" +" [t: viết tắt cho từ “temporary”: tạm thời]\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-inst/contrib/arfile.cc:94 +#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388 #, c-format -msgid "Invalid archive member header %s" -msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" +msgid "Unable to write to %s" +msgstr "Không thể ghi vào %s" -#: apt-inst/contrib/arfile.cc:106 -msgid "Invalid archive member header" -msgstr "Phần đầu thành viên kho không hợp lê" +#: cmdline/apt-extracttemplates.cc:308 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: apt-inst/contrib/arfile.cc:135 -msgid "Archive is too short" -msgstr "Kho quá ngắn" +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +msgid "Package extension list is too long" +msgstr "Danh sách mở rộng gói quá dài" -#: apt-inst/contrib/arfile.cc:139 -msgid "Failed to read the archive headers" -msgstr "Việc đọc phần đầu kho bị lỗi" +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 +#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#, c-format +msgid "Error processing directory %s" +msgstr "Gặp lỗi khi xử lý thư mục %s" -#: apt-inst/filelist.cc:382 -msgid "DropNode called on still linked node" -msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" +#: ftparchive/apt-ftparchive.cc:262 +msgid "Source extension list is too long" +msgstr "Danh sách mở rộng nguồn quá dài" -#: apt-inst/filelist.cc:414 -msgid "Failed to locate the hash element!" -msgstr "Gặp lỗi xác định vị trí phần tử băm!" +#: ftparchive/apt-ftparchive.cc:379 +msgid "Error writing header to contents file" +msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: apt-inst/filelist.cc:461 -msgid "Failed to allocate diversion" -msgstr "Gặp lỗi khi xác định vị trí trệch đi" +#: ftparchive/apt-ftparchive.cc:409 +#, c-format +msgid "Error processing contents %s" +msgstr "Gặp lỗi khi xử lý nội dung %s" -#: apt-inst/filelist.cc:466 -msgid "Internal error in AddDiversion" -msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" +#: ftparchive/apt-ftparchive.cc:597 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" +"\n" +"[ftparchive: FTP archive: kho FTP]\n" +"\n" +"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" +" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" +" contents path\n" +" release path\n" +" generate config [các_nhóm]\n" +" clean config\n" +"\n" +"(packages: những gói;\n" +"binarypath: đường dẫn nhị phân;\n" +"sources: những nguồn;\n" +"srcpath: đường dẫn nguồn;\n" +"contents path: đường dẫn nội dung;\n" +"release path: đường dẫn bản đã phát hành;\n" +"generate config [groups]: tạo ra cấu hình [các nhóm];\n" +"clean config: cấu hình toàn mới)\n" +"\n" +"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" +"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" +"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" +"và dpkg-scansources (dpkg-quét_nguồn).\n" +"\n" +"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" +"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" +"cùng với băm MD5 và kích cỡ tập tin.\n" +"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" +"\n" +"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" +"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" +"để ghi rõ tập tin đè nguồn\n" +"\n" +"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" +"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " +"quy,\n" +"và tập tin đè nên chứa những cờ đè.\n" +"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" +"những trường tên tập tin nếu có.\n" +"Cách sử dụng thí dụ từ kho Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Tùy chọn:\n" +" -h _Trợ giúp_ này\n" +" --md5 Điều khiển cách tạo ra MD5\n" +" -s=? Tập tin đè nguồn\n" +" -q _Im lặng_ (không xuất chi tiết)\n" +" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" +" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" +" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" -#: apt-inst/filelist.cc:479 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" +#: ftparchive/apt-ftparchive.cc:803 +msgid "No selections matched" +msgstr "Không có cái được chọn khớp được" -#: apt-inst/filelist.cc:508 +#: ftparchive/apt-ftparchive.cc:881 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Sự trệch đi được thêm hai lần %s → %s" +msgid "Some files are missing in the package file group `%s'" +msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." -#: apt-inst/filelist.cc:551 +#: ftparchive/cachedb.cc:47 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Failed to write file %s" -msgstr "Việc ghi tập tin %s gặp lỗi" +msgid "DB is old, attempting to upgrade %s" +msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Việc đóng tập tin %s gặp lỗi" +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " +"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: ftparchive/cachedb.cc:81 #, c-format -msgid "The path %s is too long" -msgstr "Đường dẫn %s quá dài" +msgid "Unable to open DB file %s: %s" +msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: apt-inst/extract.cc:125 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format -msgid "Unpacking %s more than once" -msgstr "Đang giải nén %s nhiều lần" +msgid "Failed to stat %s" +msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" -#: apt-inst/extract.cc:135 -#, c-format -msgid "The directory %s is diverted" -msgstr "Thư mục %s bị trệch hướng" +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "Kho không có mục ghi điều khiển" -#: apt-inst/extract.cc:145 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" - -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 -msgid "The diversion path is too long" -msgstr "Đường dẫn trệch đi quá dài" +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "Không thể lấy con trỏ" -#: apt-inst/extract.cc:179 apt-inst/extract.cc:192 apt-inst/extract.cc:209 -#: ftparchive/cachedb.cc:127 +#: ftparchive/writer.cc:82 #, c-format -msgid "Failed to stat %s" -msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" +msgid "W: Unable to read directory %s\n" +msgstr "CB: Không thể đọc thư mục %s\n" -#: apt-inst/extract.cc:187 ftparchive/multicompress.cc:371 +#: ftparchive/writer.cc:87 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Việc đổi tên %s thành %s bị lỗi" +msgid "W: Unable to stat %s\n" +msgstr "CB: Không thể lấy thông tin thống kê %s\n" -#: apt-inst/extract.cc:242 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" +#: ftparchive/writer.cc:143 +msgid "E: " +msgstr "L: " -#: apt-inst/extract.cc:282 -msgid "Failed to locate node in its hash bucket" -msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" +#: ftparchive/writer.cc:145 +msgid "W: " +msgstr "CB: " -#: apt-inst/extract.cc:286 -msgid "The path is too long" -msgstr "Đường dẫn quá dài" +#: ftparchive/writer.cc:152 +msgid "E: Errors apply to file " +msgstr "LỖI: có lỗi áp dụng vào tập tin " -#: apt-inst/extract.cc:414 +#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" +msgid "Failed to resolve %s" +msgstr "Gặp lỗi khi phân giải %s" -#: apt-inst/extract.cc:431 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" +#: ftparchive/writer.cc:183 +msgid "Tree walking failed" +msgstr "Việc di chuyển qua cây bị lỗi" -#: apt-inst/extract.cc:491 +#: ftparchive/writer.cc:210 #, c-format -msgid "Unable to stat %s" -msgstr "Không thể lấy thông tin thống kê %s" +msgid "Failed to open %s" +msgstr "Gặp lỗi khi mở %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: ftparchive/writer.cc:269 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" +msgid " DeLink %s [%s]\n" +msgstr " Bỏ liên kết %s [%s]\n" -#: apt-inst/deb/debfile.cc:119 +#: ftparchive/writer.cc:277 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" - -#: apt-inst/deb/debfile.cc:213 -msgid "Unparsable control file" -msgstr "Tập tin điều khiển không có khả năng phân tách" - -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" +msgid "Failed to readlink %s" +msgstr "Gặp lỗi khi đọc liên kết %s" -#: apt-pkg/contrib/mmap.cc:111 +#: ftparchive/writer.cc:281 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Không thể nhân đôi bộ mô tả tập tin %i" +msgid "Failed to unlink %s" +msgstr "Việc bỏ liên kết %s bị lỗi" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/writer.cc:289 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" - -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" - -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" +msgid "*** Failed to link %s to %s" +msgstr "*** Gặp lỗi khi liên kết %s đến %s" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/writer.cc:299 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" +msgid " DeLink limit of %sB hit.\n" +msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Gặp lỗi khi cắt ngắn tập tin" +#: ftparchive/writer.cc:404 +msgid "Archive had no package field" +msgstr "Kho không có trường gói" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" -"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" -"Giá trị hiện thời là: %lu. (man 5 apt.conf)" +msgid " %s has no override entry\n" +msgstr " %s không có mục ghi đè (override)\n" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." - -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " -"dùng tắt đi." +msgid " %s maintainer is %s not %s\n" +msgstr " người bảo trì %s là %s không phải %s\n" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: ftparchive/writer.cc:712 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li ngày %li giờ %li phút %li giây" +msgid " %s has no source override entry\n" +msgstr " %s không có mục ghi đè (override) nguồn\n" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: ftparchive/writer.cc:716 #, c-format -msgid "%lih %limin %lis" -msgstr "%li giờ %li phút %li giây" +msgid " %s has no binary override entry either\n" +msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 -#, c-format -msgid "%limin %lis" -msgstr "%li phút %li giây" +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format -msgid "%lis" -msgstr "%li giây" +msgid "Unable to open %s" +msgstr "Không thể mở %s" -#: apt-pkg/contrib/strutl.cc:1229 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 #, c-format -msgid "Selection %s not found" -msgstr "Không tìm thấy vùng chọn %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Sai “override” %s dòng %llu (%s)" -#: apt-pkg/contrib/configuration.cc:503 +#: ftparchive/override.cc:124 ftparchive/override.cc:198 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Không chấp nhận kiểu viết tắt: “%c”" +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" -#: apt-pkg/contrib/configuration.cc:617 +#: ftparchive/override.cc:163 #, c-format -msgid "Opening configuration file %s" -msgstr "Đang mở tập tin cấu hình %s..." +msgid "Malformed override %s line %llu #1" +msgstr "Sai override %s dòng %llu #1" -#: apt-pkg/contrib/configuration.cc:785 +#: ftparchive/override.cc:175 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." +msgid "Malformed override %s line %llu #2" +msgstr "Sai override %s dòng %llu #2" -#: apt-pkg/contrib/configuration.cc:804 +#: ftparchive/override.cc:188 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" +msgid "Malformed override %s line %llu #3" +msgstr "Sai override %s dòng %llu #3" -#: apt-pkg/contrib/configuration.cc:821 +#: ftparchive/multicompress.cc:71 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" +msgid "Unknown compression algorithm '%s'" +msgstr "Không biết thuật toán nén “%s”" -#: apt-pkg/contrib/configuration.cc:861 +#: ftparchive/multicompress.cc:101 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" +msgid "Compressed output %s needs a compression set" +msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#: apt-pkg/contrib/configuration.cc:868 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" +#: ftparchive/multicompress.cc:190 +msgid "Failed to create FILE*" +msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" +#: ftparchive/multicompress.cc:193 +msgid "Failed to fork" +msgstr "Gặp lỗi khi rẽ nhánh tiến trình" -#: apt-pkg/contrib/configuration.cc:881 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" +#: ftparchive/multicompress.cc:207 +msgid "Compress child" +msgstr "Nén con" -#: apt-pkg/contrib/configuration.cc:884 +#: ftparchive/multicompress.cc:230 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" -"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " -"số" +msgid "Internal error, failed to create %s" +msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: apt-pkg/contrib/configuration.cc:934 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" +#: ftparchive/multicompress.cc:303 +msgid "IO to subprocess/file failed" +msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#: apt-pkg/contrib/progress.cc:146 +#: ftparchive/multicompress.cc:341 +msgid "Failed to read while computing MD5" +msgstr "Gặp lỗi khi đọc trong khi tính MD5" + +#: ftparchive/multicompress.cc:357 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Lỗi!" +msgid "Problem unlinking %s" +msgstr "Gặp lỗi khi bỏ liên kết %s" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Xong" +msgid "Failed to rename %s to %s" +msgstr "Việc đổi tên %s thành %s bị lỗi" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "..." +#: cmdline/apt-internal-solver.cc:38 +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-internal-solver\n" +"\n" +"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" +"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" +"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này.\n" +" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Không hiểu bản ghi gói!" -#: apt-pkg/contrib/cmndline.cc:116 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." +#: cmdline/apt-sortpkgs.cc:153 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" +"\n" +"[sortpkgs: sort packages: sắp xếp các gói]\n" +"\n" +"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" +"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp_ này\n" +" -s Sắp xếp những tập tin _nguồn_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Không hiểu tùy chọn dòng lệnh %s" +#: apt-inst/contrib/extracttar.cc:116 +msgid "Failed to create pipes" +msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "Việc thực hiện gzip bị lỗi " -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 -#, c-format -msgid "Option %s requires an argument." -msgstr "Tùy chọn %s yêu cầu một đối số." +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +msgid "Corrupted archive" +msgstr "Kho bị hỏng." -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=”." +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-inst/contrib/extracttar.cc:300 #, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" +msgid "Unknown TAR header type %u, member %s" +msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" -#: apt-pkg/contrib/cmndline.cc:304 -#, c-format -msgid "Option '%s' is too long" -msgstr "Tùy chọn “%s” quá dài" +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "Chữ ký kho không hợp lệ" -#: apt-pkg/contrib/cmndline.cc:336 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-inst/contrib/arfile.cc:94 #, c-format -msgid "Invalid operation %s" -msgstr "Thao tác “%s” không hợp lệ" +msgid "Invalid archive member header %s" +msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" -#: apt-pkg/contrib/cdromutl.cc:56 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "Phần đầu thành viên kho không hợp lê" -#: apt-pkg/contrib/cdromutl.cc:225 -msgid "Failed to stat the cdrom" -msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" +#: apt-inst/contrib/arfile.cc:135 +msgid "Archive is too short" +msgstr "Kho quá ngắn" -#: apt-pkg/contrib/fileutl.cc:95 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gặp vấn đề khi đóng tập tin gzip %s" +#: apt-inst/contrib/arfile.cc:139 +msgid "Failed to read the archive headers" +msgstr "Việc đọc phần đầu kho bị lỗi" -#: apt-pkg/contrib/fileutl.cc:228 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" -#: apt-pkg/contrib/fileutl.cc:233 -#, c-format -msgid "Could not open lock file %s" -msgstr "Không thể mở tập tin khóa %s" +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "Gặp lỗi xác định vị trí phần tử băm!" -#: apt-pkg/contrib/fileutl.cc:256 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "Gặp lỗi khi xác định vị trí trệch đi" -#: apt-pkg/contrib/fileutl.cc:261 -#, c-format -msgid "Could not get lock %s" -msgstr "Không thể lấy khóa %s" +#: apt-inst/filelist.cc:466 +msgid "Internal error in AddDiversion" +msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-inst/filelist.cc:479 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" -"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-inst/filelist.cc:508 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" +msgid "Double add of diversion %s -> %s" +msgstr "Sự trệch đi được thêm hai lần %s → %s" -#: apt-pkg/contrib/fileutl.cc:450 +#: apt-inst/filelist.cc:551 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" +msgid "Duplicate conf file %s/%s" +msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " -"lệ" +msgid "Failed to write file %s" +msgstr "Việc ghi tập tin %s gặp lỗi" -#: apt-pkg/contrib/fileutl.cc:862 +#: apt-inst/dirstream.cc:106 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." +msgid "Failed to close file %s" +msgstr "Việc đóng tập tin %s gặp lỗi" -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Tiến trình con %s đã nhận tín hiệu %u." +msgid "The path %s is too long" +msgstr "Đường dẫn %s quá dài" -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 +#: apt-inst/extract.cc:125 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" +msgid "Unpacking %s more than once" +msgstr "Đang giải nén %s nhiều lần" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#: apt-inst/extract.cc:135 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Tiến trình con %s đã thoát bất thường" +msgid "The directory %s is diverted" +msgstr "Thư mục %s bị trệch hướng" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-inst/extract.cc:145 #, c-format -msgid "Could not open file %s" -msgstr "Không thể mở tập tin %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 +msgid "The diversion path is too long" +msgstr "Đường dẫn trệch đi quá dài" + +#: apt-inst/extract.cc:242 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Không thể mở bộ mô tả tập tin %d" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" -#: apt-pkg/contrib/fileutl.cc:1178 -msgid "Failed to create subprocess IPC" -msgstr "Việc tạo tiến trình con IPC bị lỗi" +#: apt-inst/extract.cc:282 +msgid "Failed to locate node in its hash bucket" +msgstr "Gặp lỗi khi xác định vị trí điểm nút trong hộp băm nó bị lỗi" -#: apt-pkg/contrib/fileutl.cc:1233 -msgid "Failed to exec compressor " -msgstr "Gặp lỗi khi thực hiện nén " +#: apt-inst/extract.cc:286 +msgid "The path is too long" +msgstr "Đường dẫn quá dài" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-inst/extract.cc:414 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" +msgid "Overwrite package match with no version for %s" +msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 +#: apt-inst/extract.cc:431 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "ghi, còn cần ghi %llu nhưng mà không thể" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-inst/extract.cc:491 #, c-format -msgid "Problem closing the file %s" -msgstr "Gặp vấn đề khi đóng tập tin %s" - -#: apt-pkg/contrib/fileutl.cc:1738 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" +msgid "Unable to stat %s" +msgstr "Không thể lấy thông tin thống kê %s" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#: apt-inst/deb/debfile.cc:54 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" - -#: apt-pkg/contrib/fileutl.cc:1762 -msgid "Problem syncing the file" -msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 +#: apt-inst/deb/debfile.cc:119 #, c-format -msgid "No keyring installed in %s." -msgstr "Không có vòng khoá nào được cài đặt vào %s." - -#: apt-pkg/pkgcache.cc:148 -msgid "Empty package cache" -msgstr "Bộ nhớ tạm gói trống" - -#: apt-pkg/pkgcache.cc:154 -msgid "The package cache file is corrupted" -msgstr "Tập tin nhớ tạm gói bị hỏng" +msgid "Internal error, could not locate member %s" +msgstr "Gặp lỗi nội bộ, không thể xác định vị trí thành viên %s" -#: apt-pkg/pkgcache.cc:159 -msgid "The package cache file is an incompatible version" -msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" +#: apt-inst/deb/debfile.cc:213 +msgid "Unparsable control file" +msgstr "Tập tin điều khiển không có khả năng phân tách" -#: apt-pkg/pkgcache.cc:162 -msgid "The package cache file is corrupted, it is too small" -msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng" -#: apt-pkg/pkgcache.cc:167 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" - -#: apt-pkg/pkgcache.cc:172 -msgid "The package cache was built for a different architecture" -msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" - -#: apt-pkg/pkgcache.cc:314 -msgid "Depends" -msgstr "Phụ thuộc" - -#: apt-pkg/pkgcache.cc:314 -msgid "PreDepends" -msgstr "Phụ thuộc sẵn" - -#: apt-pkg/pkgcache.cc:314 -msgid "Suggests" -msgstr "Đề nghị" - -#: apt-pkg/pkgcache.cc:315 -msgid "Recommends" -msgstr "Khuyến khích" - -#: apt-pkg/pkgcache.cc:315 -msgid "Conflicts" -msgstr "Xung đột" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Không thể nhân đôi bộ mô tả tập tin %i" -#: apt-pkg/pkgcache.cc:315 -msgid "Replaces" -msgstr "Thay thế" +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" -#: apt-pkg/pkgcache.cc:316 -msgid "Obsoletes" -msgstr "Cũ" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" -#: apt-pkg/pkgcache.cc:316 -msgid "Breaks" -msgstr "Làm hỏng" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" -#: apt-pkg/pkgcache.cc:316 -msgid "Enhances" -msgstr "Tăng cường" +#: apt-pkg/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/pkgcache.cc:327 -msgid "important" -msgstr "quan trọng" +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Gặp lỗi khi cắt ngắn tập tin" -#: apt-pkg/pkgcache.cc:327 -msgid "required" -msgstr "yêu cầu" +#: apt-pkg/contrib/mmap.cc:341 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" +"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" +"Giá trị hiện thời là: %lu. (man 5 apt.conf)" -#: apt-pkg/pkgcache.cc:327 -msgid "standard" -msgstr "chuẩn" +#: apt-pkg/contrib/mmap.cc:446 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." -#: apt-pkg/pkgcache.cc:328 -msgid "optional" -msgstr "tùy chọn" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " +"dùng tắt đi." -#: apt-pkg/pkgcache.cc:328 -msgid "extra" -msgstr "bổ sung" +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:401 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%li ngày %li giờ %li phút %li giây" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 -msgid "Building dependency tree" -msgstr "Đang xây dựng cây quan hệ phụ thuộc" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:408 +#, c-format +msgid "%lih %limin %lis" +msgstr "%li giờ %li phút %li giây" -#: apt-pkg/depcache.cc:133 -msgid "Candidate versions" -msgstr "Phiên bản ứng cử" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:415 +#, c-format +msgid "%limin %lis" +msgstr "%li phút %li giây" -#: apt-pkg/depcache.cc:162 -msgid "Dependency generation" -msgstr "Tạo ra quan hệ phụ thuộc" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:420 +#, c-format +msgid "%lis" +msgstr "%li giây" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 -msgid "Reading state information" -msgstr "Đang đọc thông tin về tình trạng" +#: apt-pkg/contrib/strutl.cc:1229 +#, c-format +msgid "Selection %s not found" +msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/contrib/configuration.cc:503 #, c-format -msgid "Failed to open StateFile %s" -msgstr "Lỗi mở tập tin tình trạng StateFile %s" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Không chấp nhận kiểu viết tắt: “%c”" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/contrib/configuration.cc:617 #, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" +msgid "Opening configuration file %s" +msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/tagfile.cc:138 +#: apt-pkg/contrib/configuration.cc:785 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Không thể phân tích tập tin gói %s (1)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên." -#: apt-pkg/tagfile.cc:235 +#: apt-pkg/contrib/configuration.cc:804 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Không thể phân tích tập tin gói %s (2)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" -#: apt-pkg/sourcelist.cc:118 +#: apt-pkg/contrib/configuration.cc:821 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị" -#: apt-pkg/sourcelist.cc:161 +#: apt-pkg/contrib/configuration.cc:861 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " -"tích được)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "Gặp lỗi cú pháp %s:%u: Chỉ có thể thực hiện chỉ thị mức đầu" -#: apt-pkg/sourcelist.cc:164 +#: apt-pkg/contrib/configuration.cc:868 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau" -#: apt-pkg/sourcelist.cc:175 +#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " -"gán)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây" -#: apt-pkg/sourcelist.cc:181 +#: apt-pkg/contrib/configuration.cc:881 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " -"trị)" +"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối " +"số" -#: apt-pkg/sourcelist.cc:197 +#: apt-pkg/contrib/configuration.cc:934 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/contrib/progress.cc:146 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" +msgid "%c%s... Error!" +msgstr "%c%s... Lỗi!" -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" +msgid "%c%s... Done" +msgstr "%c%s... Xong" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:179 +msgid "..." +msgstr "..." + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:195 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/sourcelist.cc:215 +#: apt-pkg/contrib/cmndline.cc:116 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Không rõ tùy chọn dòng lệnh “%c” [từ %s]." -#: apt-pkg/sourcelist.cc:326 +#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 +#: apt-pkg/contrib/cmndline.cc:158 #, c-format -msgid "Opening %s" -msgstr "Đang mở %s" +msgid "Command line option %s is not understood" +msgstr "Không hiểu tùy chọn dòng lệnh %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 +#: apt-pkg/contrib/cmndline.cc:163 #, c-format -msgid "Line %u too long in source list %s." -msgstr "Dòng %u quá dài trong danh sách nguồn %s." +msgid "Command line option %s is not boolean" +msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)" -#: apt-pkg/sourcelist.cc:362 +#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." +msgid "Option %s requires an argument." +msgstr "Tùy chọn %s yêu cầu một đối số." -#: apt-pkg/sourcelist.cc:366 +#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." +msgid "Option %s: Configuration item specification must have an =." +msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=”." -#: apt-pkg/sourcelist.cc:407 +#: apt-pkg/contrib/cmndline.cc:273 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/contrib/cmndline.cc:304 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." -"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" +msgid "Option '%s' is too long" +msgstr "Tùy chọn “%s” quá dài" -#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/contrib/cmndline.cc:336 #, c-format -msgid "Could not configure '%s'. " -msgstr "Không thể cấu hình “%s”. " +msgid "Sense %s is not understood, try true or false." +msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)." -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/contrib/cmndline.cc:386 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " -"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " -"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" -"LoopBreak” (buộc ngắt vòng lặp)." +msgid "Invalid operation %s" +msgstr "Thao tác “%s” không hợp lệ" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/contrib/cdromutl.cc:56 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" +msgid "Unable to stat the mount point %s" +msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/contrib/cdromutl.cc:225 +msgid "Failed to stat the cdrom" +msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi" + +#: apt-pkg/contrib/fileutl.cc:95 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." +msgid "Problem closing the gzip file %s" +msgstr "Gặp vấn đề khi đóng tập tin gzip %s" -#: apt-pkg/algorithms.cc:1068 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " -"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." +#: apt-pkg/contrib/fileutl.cc:228 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/algorithms.cc:1070 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." +#: apt-pkg/contrib/fileutl.cc:233 +#, c-format +msgid "Could not open lock file %s" +msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/contrib/fileutl.cc:256 #, c-format -msgid "List directory %spartial is missing." -msgstr "Thiếu thư mục danh sách %spartial." +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/contrib/fileutl.cc:261 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Thiếu thư mục kho lưu %spartial." +msgid "Could not get lock %s" +msgstr "Không thể lấy khóa %s" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 #, c-format -msgid "Unable to lock directory %s" -msgstr "Không thể khoá thư mục %s" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:893 +#: apt-pkg/contrib/fileutl.cc:432 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/contrib/fileutl.cc:450 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Đang tải tập tin %li trong tổng số %li" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format -msgid "The method driver %s could not be found." -msgstr "Không tìm thấy trình điều khiển phương thức %s." +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " +"lệ" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/contrib/fileutl.cc:862 #, c-format -msgid "Method %s did not start correctly" -msgstr "Phương thức %s đã không khởi chạy đúng đắn." +msgid "Sub-process %s received a segmentation fault." +msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/contrib/fileutl.cc:864 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter." +msgid "Sub-process %s received signal %u." +msgstr "Tiến trình con %s đã nhận tín hiệu %u." -#: apt-pkg/init.cc:143 +#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Không hỗ trợ hệ thống đóng gói “%s”" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" -#: apt-pkg/init.cc:159 -msgid "Unable to determine a suitable packaging system type" -msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" +#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Tiến trình con %s đã thoát bất thường" -#: apt-pkg/clean.cc:57 +#: apt-pkg/contrib/fileutl.cc:1016 #, c-format -msgid "Unable to stat %s." -msgstr "Không thể lấy trạng thái về %s." +msgid "Could not open file %s" +msgstr "Không thể mở tập tin %s" -#: apt-pkg/srcrecords.cc:47 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" +#: apt-pkg/contrib/fileutl.cc:1093 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-pkg/cachefile.cc:87 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." +#: apt-pkg/contrib/fileutl.cc:1178 +msgid "Failed to create subprocess IPC" +msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/cachefile.cc:91 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " -"này" +#: apt-pkg/contrib/fileutl.cc:1233 +msgid "Failed to exec compressor " +msgstr "Gặp lỗi khi thực hiện nén " -#: apt-pkg/cachefile.cc:109 -msgid "The list of sources could not be read." -msgstr "Không thể đọc danh sách nguồn." +#: apt-pkg/contrib/fileutl.cc:1326 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/policy.cc:75 +#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" -"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " -"không sẵn có trong mã nguồn" +msgid "write, still have %llu to write but couldn't" +msgstr "ghi, còn cần ghi %llu nhưng mà không thể" -#: apt-pkg/policy.cc:414 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" -"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." +msgid "Problem closing the file %s" +msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/policy.cc:436 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format -msgid "Did not understand pin type %s" -msgstr "Không hiểu kiểu ghim %s" +msgid "Problem renaming the file %s to %s" +msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" -#: apt-pkg/policy.cc:444 -msgid "No priority (or zero) specified for pin" -msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" +#: apt-pkg/contrib/fileutl.cc:1755 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/pkgcachegen.cc:87 -msgid "Cache has an incompatible versioning system" -msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" +#: apt-pkg/contrib/fileutl.cc:1768 +msgid "Problem syncing the file" +msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:70 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" +msgid "No keyring installed in %s." +msgstr "Không có vòng khoá nào được cài đặt vào %s." -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:148 +msgid "Empty package cache" +msgstr "Bộ nhớ tạm gói trống" -#: apt-pkg/pkgcachegen.cc:254 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:154 +msgid "The package cache file is corrupted" +msgstr "Tập tin nhớ tạm gói bị hỏng" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:159 +msgid "The package cache file is an incompatible version" +msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." +#: apt-pkg/pkgcache.cc:162 +msgid "The package cache file is corrupted, it is too small" +msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ" -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcache.cc:167 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" +msgid "This APT does not support the versioning system '%s'" +msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản “%s”" -#: apt-pkg/pkgcachegen.cc:1199 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" +#: apt-pkg/pkgcache.cc:172 +msgid "The package cache was built for a different architecture" +msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 -msgid "Reading package lists" -msgstr "Đang đọc các danh sách gói" +#: apt-pkg/pkgcache.cc:314 +msgid "Depends" +msgstr "Phụ thuộc" -#: apt-pkg/pkgcachegen.cc:1304 -msgid "Collecting File Provides" -msgstr "Đang tập hợp các Nhà cung cấp Tập tin" +#: apt-pkg/pkgcache.cc:314 +msgid "PreDepends" +msgstr "Phụ thuộc sẵn" -#: apt-pkg/pkgcachegen.cc:1388 cmdline/apt-extracttemplates.cc:266 -#, c-format -msgid "Unable to write to %s" -msgstr "Không thể ghi vào %s" +#: apt-pkg/pkgcache.cc:314 +msgid "Suggests" +msgstr "Đề nghị" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 -msgid "IO Error saving source cache" -msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" +#: apt-pkg/pkgcache.cc:315 +msgid "Recommends" +msgstr "Khuyến khích" -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." +#: apt-pkg/pkgcache.cc:315 +msgid "Conflicts" +msgstr "Xung đột" -#: apt-pkg/acquire-item.cc:154 -msgid "Hash Sum mismatch" -msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" +#: apt-pkg/pkgcache.cc:315 +msgid "Replaces" +msgstr "Thay thế" -#: apt-pkg/acquire-item.cc:159 -msgid "Size mismatch" -msgstr "Kích cỡ không khớp nhau" +#: apt-pkg/pkgcache.cc:316 +msgid "Obsoletes" +msgstr "Cũ" -#: apt-pkg/acquire-item.cc:164 -msgid "Invalid file format" -msgstr "Định dạng tập tập tin không hợp lệ" +#: apt-pkg/pkgcache.cc:316 +msgid "Breaks" +msgstr "Làm hỏng" + +#: apt-pkg/pkgcache.cc:316 +msgid "Enhances" +msgstr "Tăng cường" + +#: apt-pkg/pkgcache.cc:327 +msgid "important" +msgstr "quan trọng" + +#: apt-pkg/pkgcache.cc:327 +msgid "required" +msgstr "yêu cầu" + +#: apt-pkg/pkgcache.cc:327 +msgid "standard" +msgstr "chuẩn" + +#: apt-pkg/pkgcache.cc:328 +msgid "optional" +msgstr "tùy chọn" + +#: apt-pkg/pkgcache.cc:328 +msgid "extra" +msgstr "bổ sung" + +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +msgid "Building dependency tree" +msgstr "Đang xây dựng cây quan hệ phụ thuộc" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/depcache.cc:133 +msgid "Candidate versions" +msgstr "Phiên bản ứng cử" + +#: apt-pkg/depcache.cc:162 +msgid "Dependency generation" +msgstr "Tạo ra quan hệ phụ thuộc" + +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +msgid "Reading state information" +msgstr "Đang đọc thông tin về tình trạng" + +#: apt-pkg/depcache.cc:244 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " -"sources.list hoặc tập tin bị hỏng)" +msgid "Failed to open StateFile %s" +msgstr "Lỗi mở tập tin tình trạng StateFile %s" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/depcache.cc:250 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" +msgid "Failed to write temporary StateFile %s" +msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s" -#: apt-pkg/acquire-item.cc:1619 -msgid "There is no public key available for the following key IDs:\n" -msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" +#: apt-pkg/tagfile.cc:138 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Không thể phân tích tập tin gói %s (1)" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/tagfile.cc:235 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " -"này sẽ không được áp dụng." +msgid "Unable to parse package file %s (2)" +msgstr "Không thể phân tích tập tin gói %s (2)" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/sourcelist.cc:118 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/sourcelist.cc:161 #, c-format -msgid "" -"An error occurred during the signature verification. The repository is not " -"updated and the previous index files will be used. GPG error: %s: %s\n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -"Gặp lỗi trong khi thẩm tra chữ ký.\n" -"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" -"Lỗi GPG: %s: %s\n" +"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân " +"tích được)" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/sourcelist.cc:164 #, c-format -msgid "GPG error: %s: %s" -msgstr "Lỗi GPG: %s: %s" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/sourcelist.cc:175 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " -"này, do thiếu kiến trúc." +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép " +"gán)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/sourcelist.cc:181 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " -"tin:) cho gói %s." +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá " +"trị)" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/sourcelist.cc:197 #, c-format -msgid "Unable to parse Release file %s" -msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/sourcelist.cc:199 #, c-format -msgid "No sections in Release file %s" -msgstr "Không có phần nào trong tập tin Phát hành %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/sourcelist.cc:202 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " -"hành %s" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/sourcelist.cc:215 #, c-format -msgid "Invalid 'Date' entry in Release file %s" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" +"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/sourcelist.cc:326 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Khối nhà bán %s không chứa vân tay" +msgid "Opening %s" +msgstr "Đang mở %s" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Đang dùng thư mục gắn đĩa CD-ROM %s\n" -"Đang gắn đĩa CD-ROM...\n" +msgid "Line %u too long in source list %s." +msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Đang nhận diện... " - -#: apt-pkg/cdrom.cc:613 +#: apt-pkg/sourcelist.cc:362 #, c-format -msgid "Stored label: %s\n" -msgstr "Nhãn đã lưu: %s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Đang bỏ gắn CD-ROM...\n" +msgid "Malformed line %u in source list %s (type)" +msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/sourcelist.cc:366 #, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" - -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" -msgstr "Đang bỏ gắn CD-ROM...\n" - -#: apt-pkg/cdrom.cc:665 -msgid "Waiting for disc...\n" -msgstr "Đang đợi đĩa...\n" - -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "Đang gắn đĩa CD-ROM...\n" - -#: apt-pkg/cdrom.cc:693 -msgid "Scanning disc for index files..\n" -msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/sourcelist.cc:407 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" -msgstr "" -"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#, c-format msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " -"hoặc có kiến trúc không đúng?" +"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt." +"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 #, c-format -msgid "Found label '%s'\n" -msgstr "Tìm thấy nhãn “%s”\n" - -#: apt-pkg/cdrom.cc:811 -msgid "That is not a valid name, try again.\n" -msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" +msgid "Could not configure '%s'. " +msgstr "Không thể cấu hình “%s”. " -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/packagemanager.cc:570 #, c-format msgid "" -"This disc is called: \n" -"'%s'\n" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Tên đĩa này:\n" -"“%s”\n" - -#: apt-pkg/cdrom.cc:830 -msgid "Copying package lists..." -msgstr "Đang sao chép các danh sách gói..." - -#: apt-pkg/cdrom.cc:865 -msgid "Writing new source list\n" -msgstr "Đang ghi danh sách nguồn mới\n" - -#: apt-pkg/cdrom.cc:873 -msgid "Source list entries for this disc are:\n" -msgstr "Các mục tin danh sách nguồn cho đĩa này:\n" - -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Đã ghi %i bản ghi.\n" +"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " +"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " +"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-" +"LoopBreak” (buộc ngắt vòng lặp)." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/pkgrecords.cc:34 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" +msgid "Index file type '%s' is not supported" +msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/algorithms.cc:266 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +#: apt-pkg/algorithms.cc:1068 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." msgstr "" -"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " -"nhau\n" +"Lỗi: “pkgProblemResolver::Resolve” (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " +"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/indexcopy.cc:515 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "Không tìm thấy bản ghi xác thực cho: %s" +#: apt-pkg/algorithms.cc:1070 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng." -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Sai khớp chuỗi duy nhất cho: %s" +msgid "List directory %spartial is missing." +msgstr "Thiếu thư mục danh sách %spartial." -#: apt-pkg/cacheset.cc:469 +#: apt-pkg/acquire.cc:85 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" +msgid "Archives directory %spartial is missing." +msgstr "Thiếu thư mục kho lưu %spartial." -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/acquire.cc:93 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Không tìm thấy phiên bản “%s” cho “%s”" +msgid "Unable to lock directory %s" +msgstr "Không thể khoá thư mục %s" -#: apt-pkg/cacheset.cc:583 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:893 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Không tìm thấy tác vụ “%s”" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)" -#: apt-pkg/cacheset.cc:589 +#: apt-pkg/acquire.cc:895 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”" +msgid "Retrieving file %li of %li" +msgstr "Đang tải tập tin %li trong tổng số %li" -#: apt-pkg/cacheset.cc:600 +#: apt-pkg/acquire-worker.cc:112 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo" +msgid "The method driver %s could not be found." +msgstr "Không tìm thấy trình điều khiển phương thức %s." -#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#: apt-pkg/acquire-worker.cc:161 #, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” " -"mà không có trong nó" +msgid "Method %s did not start correctly" +msgstr "Phương thức %s đã không khởi chạy đúng đắn." -#: apt-pkg/cacheset.cc:621 +#: apt-pkg/acquire-worker.cc:447 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter." -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/init.cc:143 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử" +msgid "Packaging system '%s' is not supported" +msgstr "Không hỗ trợ hệ thống đóng gói “%s”" -#: apt-pkg/cacheset.cc:637 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" -"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " -"đặt" +#: apt-pkg/init.cc:159 +msgid "Unable to determine a suitable packaging system type" +msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 -msgid "Send scenario to solver" -msgstr "Gửi kịch bản đến bộ phân giải" +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "Không thể lấy trạng thái về %s." -#: apt-pkg/edsp.cc:209 -msgid "Send request to solver" -msgstr "Gửi yêu cầu đến bộ phân giải" +#: apt-pkg/srcrecords.cc:47 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" +"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)" -#: apt-pkg/edsp.cc:279 -msgid "Prepare for receiving solution" -msgstr "Chuẩn bị để lấy cách giải quyết" +#: apt-pkg/cachefile.cc:87 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Không thể phân tích hay mở danh sách gói hay tập tin trạng thái." -#: apt-pkg/edsp.cc:286 -msgid "External solver failed without a proper error message" -msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" +#: apt-pkg/cachefile.cc:91 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " +"này" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 -msgid "Execute external solver" -msgstr "Thi hành bộ phân giải từ bên ngoài" +#: apt-pkg/cachefile.cc:109 +msgid "The list of sources could not be read." +msgstr "Không thể đọc danh sách nguồn." -#: apt-pkg/install-progress.cc:51 +#: apt-pkg/policy.cc:75 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Diễn biến: [%3i%%]" - -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 -msgid "Running dpkg" -msgstr "Đang chạy dpkg" - -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " -"được dùng thay thế." - -#: apt-pkg/deb/dpkgpm.cc:91 -#, c-format -msgid "Installing %s" -msgstr "Đang cài đặt %s" +"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " +"không sẵn có trong mã nguồn" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/policy.cc:414 #, c-format -msgid "Configuring %s" -msgstr "Đang cấu hình %s" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/policy.cc:436 #, c-format -msgid "Removing %s" -msgstr "Đang gỡ bỏ %s" +msgid "Did not understand pin type %s" +msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/deb/dpkgpm.cc:94 -#, c-format -msgid "Completely removing %s" -msgstr "Đang gỡ bỏ hoàn toàn %s" +#: apt-pkg/policy.cc:444 +msgid "No priority (or zero) specified for pin" +msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Noting disappearance of %s" -msgstr "Đang ghi chép sự biến mất của %s" - -#: apt-pkg/deb/dpkgpm.cc:96 -#, c-format -msgid "Running post-installation trigger %s" -msgstr "Đang chạy bẫy sau-cài-đặt %s" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:808 -#, c-format -msgid "Directory '%s' missing" -msgstr "Thiếu thư mục “%s”" +#: apt-pkg/pkgcachegen.cc:87 +msgid "Cache has an incompatible versioning system" +msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" -#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, c-format -msgid "Could not open file '%s'" -msgstr "Không thể mở tập tin “%s”" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" -#: apt-pkg/deb/dpkgpm.cc:970 -#, c-format -msgid "Preparing %s" -msgstr "Đang chuẩn bị %s" +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:971 -#, c-format -msgid "Unpacking %s" -msgstr "Đang mở gói %s" +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:976 -#, c-format -msgid "Preparing to configure %s" -msgstr "Đang chuẩn bị cấu hình %s" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:978 -#, c-format -msgid "Installed %s" -msgstr "Đã cài đặt %s" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/pkgcachegen.cc:570 #, c-format -msgid "Preparing for removal of %s" -msgstr "Đang chuẩn bị gỡ bỏ %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin" -#: apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format -msgid "Removed %s" -msgstr "Đã gỡ bỏ %s" +msgid "Couldn't stat source package list %s" +msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/deb/dpkgpm.cc:990 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 +msgid "Reading package lists" +msgstr "Đang đọc các danh sách gói" -#: apt-pkg/deb/dpkgpm.cc:991 -#, c-format -msgid "Completely removed %s" -msgstr "Gỡ bỏ hoàn toàn %s" +#: apt-pkg/pkgcachegen.cc:1304 +msgid "Collecting File Provides" +msgstr "Đang tập hợp các Nhà cung cấp Tập tin" -#: apt-pkg/deb/dpkgpm.cc:1046 -msgid "ioctl(TIOCGWINSZ) failed" -msgstr "ioctl(TIOCGWINSZ) gặp lỗi" +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 +msgid "IO Error saving source cache" +msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/acquire-item.cc:139 #, c-format -msgid "Can not write log (%s)" -msgstr "Không thể ghi nhật ký (%s)" +msgid "rename failed, %s (%s -> %s)." +msgstr "gặp lỗi khi đổi tên, %s (%s → %s)." -#: apt-pkg/deb/dpkgpm.cc:1049 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts đã gắn chưa?" +#: apt-pkg/acquire-item.cc:154 +msgid "Hash Sum mismatch" +msgstr "Mã băm tổng kiểm tra (hash sum) không khớp" -#: apt-pkg/deb/dpkgpm.cc:1070 -msgid "Is stdout a terminal?" -msgstr "Đầu ra là thiết bị cuối?" +#: apt-pkg/acquire-item.cc:159 +msgid "Size mismatch" +msgstr "Kích cỡ không khớp nhau" -#: apt-pkg/deb/dpkgpm.cc:1558 -msgid "Operation was interrupted before it could finish" -msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" +#: apt-pkg/acquire-item.cc:164 +msgid "Invalid file format" +msgstr "Định dạng tập tập tin không hợp lệ" -#: apt-pkg/deb/dpkgpm.cc:1620 -msgid "No apport report written because MaxReports is reached already" +#: apt-pkg/acquire-item.cc:1570 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" msgstr "" -"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" +"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong " +"sources.list hoặc tập tin bị hỏng)" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "dependency problems - leaving unconfigured" -msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" +#: apt-pkg/acquire-item.cc:1586 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s" -#: apt-pkg/deb/dpkgpm.cc:1627 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " -"do một sự thất bại trước đó." +#: apt-pkg/acquire-item.cc:1628 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n" -#: apt-pkg/deb/dpkgpm.cc:1633 +#: apt-pkg/acquire-item.cc:1666 +#, c-format msgid "" -"No apport report written because the error message indicates a disk full " -"error" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" +"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho " +"này sẽ không được áp dụng." -#: apt-pkg/deb/dpkgpm.cc:1640 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " -"bộ nhớ”" +#: apt-pkg/acquire-item.cc:1688 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)" -#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +#: apt-pkg/acquire-item.cc:1718 +#, c-format msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"An error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " -"thống nội bộ" +"Gặp lỗi trong khi thẩm tra chữ ký.\n" +"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n" +"Lỗi GPG: %s: %s\n" -#: apt-pkg/deb/dpkgpm.cc:1674 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" -"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 +#, c-format +msgid "GPG error: %s: %s" +msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/deb/debsystem.cc:84 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" msgstr "" -"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " -"phải không?" +"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " +"này, do thiếu kiến trúc." -#: apt-pkg/deb/debsystem.cc:87 +#: apt-pkg/acquire-item.cc:1922 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +"The package index files are corrupted. No Filename: field for package %s." msgstr "" -"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " -"vấn đề này. " +"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " +"tin:) cho gói %s." -#: apt-pkg/deb/debsystem.cc:121 -msgid "Not locked" -msgstr "Chưa được khoá" +#: apt-pkg/indexrecords.cc:73 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s" -#: cmdline/apt-extracttemplates.cc:100 +#: apt-pkg/indexrecords.cc:81 #, c-format -msgid "%s not a valid DEB package." -msgstr "%s không phải là một gói DEB hợp lệ." +msgid "No sections in Release file %s" +msgstr "Không có phần nào trong tập tin Phát hành %s" -#: cmdline/apt-extracttemplates.cc:234 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexrecords.cc:112 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s" + +#: apt-pkg/indexrecords.cc:125 +#, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" -"\n" -"[extract: rút trích;\n" -"templates: mẫu]\n" -"\n" -"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" -"\tvà biểu mẫu đều từ gói Debian\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này\n" -" -t Đặt thư mục tạm thời\n" -" [t: viết tắt cho từ “temporary”: tạm thời]\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát " +"hành %s" -#: cmdline/apt-extracttemplates.cc:308 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" +#: apt-pkg/indexrecords.cc:144 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "" +"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 -msgid "Package extension list is too long" -msgstr "Danh sách mở rộng gói quá dài" +#: apt-pkg/vendorlist.cc:78 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Khối nhà bán %s không chứa vân tay" -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: apt-pkg/cdrom.cc:575 #, c-format -msgid "Error processing directory %s" -msgstr "Gặp lỗi khi xử lý thư mục %s" +msgid "Using CD-ROM mount point %s\n" +msgstr "Đang dùng điểm gắn đĩa CD-ROM %s\n" -#: ftparchive/apt-ftparchive.cc:262 -msgid "Source extension list is too long" -msgstr "Danh sách mở rộng nguồn quá dài" +#: apt-pkg/cdrom.cc:583 +msgid "Unmounting CD-ROM\n" +msgstr "Đang bỏ gắn CD-ROM...\n" -#: ftparchive/apt-ftparchive.cc:379 -msgid "Error writing header to contents file" -msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" +#: apt-pkg/cdrom.cc:588 +msgid "Waiting for disc...\n" +msgstr "Đang đợi đĩa...\n" -#: ftparchive/apt-ftparchive.cc:409 +#: apt-pkg/cdrom.cc:597 +msgid "Mounting CD-ROM...\n" +msgstr "Đang gắn đĩa CD-ROM...\n" + +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "Đang nhận diện... " + +#: apt-pkg/cdrom.cc:643 #, c-format -msgid "Error processing contents %s" -msgstr "Gặp lỗi khi xử lý nội dung %s" +msgid "Stored label: %s\n" +msgstr "Nhãn đã lưu: %s\n" -#: ftparchive/apt-ftparchive.cc:597 +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "Đang bỏ gắn CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 +msgid "Scanning disc for index files..\n" +msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" + +#: apt-pkg/cdrom.cc:717 +#, c-format msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" msgstr "" -"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" -"\n" -"[ftparchive: FTP archive: kho FTP]\n" -"\n" -"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" -" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" -" contents path\n" -" release path\n" -" generate config [các_nhóm]\n" -" clean config\n" -"\n" -"(packages: những gói;\n" -"binarypath: đường dẫn nhị phân;\n" -"sources: những nguồn;\n" -"srcpath: đường dẫn nguồn;\n" -"contents path: đường dẫn nội dung;\n" -"release path: đường dẫn bản đã phát hành;\n" -"generate config [groups]: tạo ra cấu hình [các nhóm];\n" -"clean config: cấu hình toàn mới)\n" -"\n" -"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" -"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" -"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" -"và dpkg-scansources (dpkg-quét_nguồn).\n" -"\n" -"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" -"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" -"cùng với băm MD5 và kích cỡ tập tin.\n" -"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" -"\n" -"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" -"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" -"để ghi rõ tập tin đè nguồn\n" -"\n" -"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" -"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " -"quy,\n" -"và tập tin đè nên chứa những cờ đè.\n" -"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" -"những trường tên tập tin nếu có.\n" -"Cách sử dụng thí dụ từ kho Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Tùy chọn:\n" -" -h _Trợ giúp_ này\n" -" --md5 Điều khiển cách tạo ra MD5\n" -" -s=? Tập tin đè nguồn\n" -" -q _Im lặng_ (không xuất chi tiết)\n" -" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" -" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" -" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”" +"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n" -#: ftparchive/apt-ftparchive.cc:803 -msgid "No selections matched" -msgstr "Không có cái được chọn khớp được" +#: apt-pkg/cdrom.cc:728 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, " +"hoặc có kiến trúc không đúng?" -#: ftparchive/apt-ftparchive.cc:881 +#: apt-pkg/cdrom.cc:755 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”." +msgid "Found label '%s'\n" +msgstr "Tìm thấy nhãn “%s”\n" -#: ftparchive/cachedb.cc:47 +#: apt-pkg/cdrom.cc:784 +msgid "That is not a valid name, try again.\n" +msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" + +#: apt-pkg/cdrom.cc:801 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Tên đĩa này:\n" +"“%s”\n" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/cdrom.cc:803 +msgid "Copying package lists..." +msgstr "Đang sao chép các danh sách gói..." + +#: apt-pkg/cdrom.cc:838 +msgid "Writing new source list\n" +msgstr "Đang ghi danh sách nguồn mới\n" + +#: apt-pkg/cdrom.cc:846 +msgid "Source list entries for this disc are:\n" +msgstr "Các mục tin danh sách nguồn cho đĩa này:\n" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" +msgid "Wrote %i records.\n" +msgstr "Đã ghi %i bản ghi.\n" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" + +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" + +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " -"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." +"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " +"nhau\n" -#: ftparchive/cachedb.cc:81 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." +msgid "Can't find authentication record for: %s" +msgstr "Không tìm thấy bản ghi xác thực cho: %s" -#: ftparchive/cachedb.cc:249 -msgid "Archive has no control record" -msgstr "Kho không có mục ghi điều khiển" +#: apt-pkg/indexcopy.cc:521 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "Sai khớp chuỗi duy nhất cho: %s" -#: ftparchive/cachedb.cc:490 -msgid "Unable to get a cursor" -msgstr "Không thể lấy con trỏ" +#: apt-pkg/cacheset.cc:469 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" -#: ftparchive/writer.cc:82 +#: apt-pkg/cacheset.cc:472 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "CB: Không thể đọc thư mục %s\n" +msgid "Version '%s' for '%s' was not found" +msgstr "Không tìm thấy phiên bản “%s” cho “%s”" -#: ftparchive/writer.cc:87 +#: apt-pkg/cacheset.cc:583 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "CB: Không thể lấy thông tin thống kê %s\n" +msgid "Couldn't find task '%s'" +msgstr "Không tìm thấy tác vụ “%s”" -#: ftparchive/writer.cc:143 -msgid "E: " -msgstr "L: " +#: apt-pkg/cacheset.cc:589 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”" -#: ftparchive/writer.cc:145 -msgid "W: " -msgstr "CB: " +#: apt-pkg/cacheset.cc:600 +#, c-format +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo" -#: ftparchive/writer.cc:152 -msgid "E: Errors apply to file " -msgstr "LỖI: có lỗi áp dụng vào tập tin " +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” " +"mà không có trong nó" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: apt-pkg/cacheset.cc:621 #, c-format -msgid "Failed to resolve %s" -msgstr "Gặp lỗi khi phân giải %s" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo" -#: ftparchive/writer.cc:183 -msgid "Tree walking failed" -msgstr "Việc di chuyển qua cây bị lỗi" +#: apt-pkg/cacheset.cc:629 +#, c-format +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử" -#: ftparchive/writer.cc:210 +#: apt-pkg/cacheset.cc:637 #, c-format -msgid "Failed to open %s" -msgstr "Gặp lỗi khi mở %s" +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài " +"đặt" + +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "Gửi kịch bản đến bộ phân giải" + +#: apt-pkg/edsp.cc:209 +msgid "Send request to solver" +msgstr "Gửi yêu cầu đến bộ phân giải" + +#: apt-pkg/edsp.cc:279 +msgid "Prepare for receiving solution" +msgstr "Chuẩn bị để lấy cách giải quyết" + +#: apt-pkg/edsp.cc:286 +msgid "External solver failed without a proper error message" +msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp" + +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +msgid "Execute external solver" +msgstr "Thi hành bộ phân giải từ bên ngoài" + +#: apt-pkg/install-progress.cc:51 +#, c-format +msgid "Progress: [%3i%%]" +msgstr "Diễn biến: [%3i%%]" + +#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +msgid "Running dpkg" +msgstr "Đang chạy dpkg" + +#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"Một số tập tin chỉ mục không tải về được. Chúng đã bị bỏ qua, hoặc cái cũ đã " +"được dùng thay thế." -#: ftparchive/writer.cc:269 +#: apt-pkg/deb/dpkgpm.cc:91 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Bỏ liên kết %s [%s]\n" +msgid "Installing %s" +msgstr "Đang cài đặt %s" -#: ftparchive/writer.cc:277 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, c-format -msgid "Failed to readlink %s" -msgstr "Gặp lỗi khi đọc liên kết %s" +msgid "Configuring %s" +msgstr "Đang cấu hình %s" -#: ftparchive/writer.cc:281 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, c-format -msgid "Failed to unlink %s" -msgstr "Việc bỏ liên kết %s bị lỗi" +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s" -#: ftparchive/writer.cc:289 +#: apt-pkg/deb/dpkgpm.cc:94 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Gặp lỗi khi liên kết %s đến %s" +msgid "Completely removing %s" +msgstr "Đang gỡ bỏ hoàn toàn %s" -#: ftparchive/writer.cc:299 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Hết hạn bỏ liên kết của %sB.\n" - -#: ftparchive/writer.cc:404 -msgid "Archive had no package field" -msgstr "Kho không có trường gói" +msgid "Noting disappearance of %s" +msgstr "Đang ghi chép sự biến mất của %s" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: apt-pkg/deb/dpkgpm.cc:96 #, c-format -msgid " %s has no override entry\n" -msgstr " %s không có mục ghi đè (override)\n" +msgid "Running post-installation trigger %s" +msgstr "Đang chạy bẫy sau-cài-đặt %s" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:808 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " người bảo trì %s là %s không phải %s\n" +msgid "Directory '%s' missing" +msgstr "Thiếu thư mục “%s”" -#: ftparchive/writer.cc:712 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s không có mục ghi đè (override) nguồn\n" +msgid "Could not open file '%s'" +msgstr "Không thể mở tập tin “%s”" -#: ftparchive/writer.cc:716 +#: apt-pkg/deb/dpkgpm.cc:970 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" - -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 -msgid "realloc - Failed to allocate memory" -msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" +msgid "Preparing %s" +msgstr "Đang chuẩn bị %s" -#: ftparchive/override.cc:35 ftparchive/override.cc:139 +#: apt-pkg/deb/dpkgpm.cc:971 #, c-format -msgid "Unable to open %s" -msgstr "Không thể mở %s" +msgid "Unpacking %s" +msgstr "Đang mở gói %s" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:65 +#: apt-pkg/deb/dpkgpm.cc:976 #, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Sai “override” %s dòng %llu (%s)" +msgid "Preparing to configure %s" +msgstr "Đang chuẩn bị cấu hình %s" -#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#: apt-pkg/deb/dpkgpm.cc:978 #, c-format -msgid "Failed to read the override file %s" -msgstr "Việc đọc tập tin đè %s bị lỗi" +msgid "Installed %s" +msgstr "Đã cài đặt %s" -#: ftparchive/override.cc:163 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Sai override %s dòng %llu #1" +msgid "Preparing for removal of %s" +msgstr "Đang chuẩn bị gỡ bỏ %s" -#: ftparchive/override.cc:175 +#: apt-pkg/deb/dpkgpm.cc:985 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Sai override %s dòng %llu #2" +msgid "Removed %s" +msgstr "Đã gỡ bỏ %s" -#: ftparchive/override.cc:188 +#: apt-pkg/deb/dpkgpm.cc:990 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Sai override %s dòng %llu #3" +msgid "Preparing to completely remove %s" +msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: ftparchive/multicompress.cc:70 +#: apt-pkg/deb/dpkgpm.cc:991 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Không biết thuật toán nén “%s”" +msgid "Completely removed %s" +msgstr "Gỡ bỏ hoàn toàn %s" + +#: apt-pkg/deb/dpkgpm.cc:1046 +msgid "ioctl(TIOCGWINSZ) failed" +msgstr "ioctl(TIOCGWINSZ) gặp lỗi" -#: ftparchive/multicompress.cc:100 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" +msgid "Can not write log (%s)" +msgstr "Không thể ghi nhật ký (%s)" -#: ftparchive/multicompress.cc:189 -msgid "Failed to create FILE*" -msgstr "Việc tạo TẬP_TIN* bị lỗi" +#: apt-pkg/deb/dpkgpm.cc:1049 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts đã gắn chưa?" -#: ftparchive/multicompress.cc:192 -msgid "Failed to fork" -msgstr "Gặp lỗi khi rẽ nhánh tiến trình" +#: apt-pkg/deb/dpkgpm.cc:1070 +msgid "Is stdout a terminal?" +msgstr "Đầu ra là thiết bị cuối?" -#: ftparchive/multicompress.cc:206 -msgid "Compress child" -msgstr "Nén con" +#: apt-pkg/deb/dpkgpm.cc:1558 +msgid "Operation was interrupted before it could finish" +msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành" -#: ftparchive/multicompress.cc:229 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" +#: apt-pkg/deb/dpkgpm.cc:1620 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" -#: ftparchive/multicompress.cc:302 -msgid "IO to subprocess/file failed" -msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1625 +msgid "dependency problems - leaving unconfigured" +msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình" -#: ftparchive/multicompress.cc:340 -msgid "Failed to read while computing MD5" -msgstr "Gặp lỗi khi đọc trong khi tính MD5" +#: apt-pkg/deb/dpkgpm.cc:1627 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp " +"do một sự thất bại trước đó." -#: ftparchive/multicompress.cc:356 -#, c-format -msgid "Problem unlinking %s" -msgstr "Gặp lỗi khi bỏ liên kết %s" +#: apt-pkg/deb/dpkgpm.cc:1633 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”" -#: cmdline/apt-internal-solver.cc:38 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -"Cách dùng: apt-internal-solver\n" -"\n" -"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" -"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" -"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này.\n" -" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ " +"bộ nhớ”" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Không hiểu bản ghi gói!" +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ " +"thống nội bộ" -#: cmdline/apt-sortpkgs.cc:153 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"No apport report written because the error message indicates a dpkg I/O error" msgstr "" -"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" -"\n" -"[sortpkgs: sort packages: sắp xếp các gói]\n" -"\n" -"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" -"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp_ này\n" -" -s Sắp xếp những tập tin _nguồn_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”" + +#: apt-pkg/deb/debsystem.cc:84 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó " +"phải không?" + +#: apt-pkg/deb/debsystem.cc:87 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:103 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" +"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải " +"vấn đề này. " + +#: apt-pkg/deb/debsystem.cc:121 +msgid "Not locked" +msgstr "Chưa được khoá" + +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "Đang dùng thư mục gắn đĩa CD-ROM %s\n" +#~ "Đang gắn đĩa CD-ROM...\n" #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " diff --git a/po/zh_CN.po b/po/zh_CN.po index 3b3e10554..7a97e6305 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -156,7 +156,7 @@ msgstr " 软件包锁：" msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 #: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 @@ -254,12 +254,12 @@ msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”" msgid "Please insert a Disc in the drive and press enter" msgstr "请把盘片插入驱动器再按回车键" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:141 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "无法将 %s 挂载到 %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" @@ -736,12 +736,12 @@ msgstr "找不到盘片。" msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 -#: methods/rred.cc:598 methods/rred.cc:608 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -999,7 +999,7 @@ msgid "" "available:\n" msgstr "由于没有公钥，无法验证下列签名：\n" -#: methods/gzip.cc:64 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" @@ -1303,108 +1303,108 @@ msgstr "不经验证就安装这些软件包吗？" msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 #: apt-private/private-show.cc:86 msgid "unknown" msgstr "" -#: apt-private/private-output.cc:198 +#: apt-private/private-output.cc:201 #, fuzzy, c-format msgid "[installed,upgradable to: %s]" msgstr " [已安装]" -#: apt-private/private-output.cc:202 +#: apt-private/private-output.cc:205 #, fuzzy msgid "[installed,local]" msgstr " [已安装]" -#: apt-private/private-output.cc:205 +#: apt-private/private-output.cc:208 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:210 #, fuzzy msgid "[installed,automatic]" msgstr " [已安装]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:212 #, fuzzy msgid "[installed]" msgstr " [已安装]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:216 #, c-format msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:217 +#: apt-private/private-output.cc:220 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:317 +#: apt-private/private-output.cc:320 msgid "The following packages have unmet dependencies:" msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-output.cc:407 +#: apt-private/private-output.cc:410 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装" -#: apt-private/private-output.cc:409 +#: apt-private/private-output.cc:412 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: apt-private/private-output.cc:416 +#: apt-private/private-output.cc:419 msgid "but it is not installable" msgstr "但无法安装它" -#: apt-private/private-output.cc:418 +#: apt-private/private-output.cc:421 msgid "but it is a virtual package" msgstr "但是它是虚拟软件包" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: apt-private/private-output.cc:421 +#: apt-private/private-output.cc:424 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: apt-private/private-output.cc:426 +#: apt-private/private-output.cc:429 msgid " or" msgstr " 或" -#: apt-private/private-output.cc:455 +#: apt-private/private-output.cc:458 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: apt-private/private-output.cc:481 +#: apt-private/private-output.cc:484 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: apt-private/private-output.cc:503 +#: apt-private/private-output.cc:506 msgid "The following packages have been kept back:" msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-output.cc:524 +#: apt-private/private-output.cc:527 msgid "The following packages will be upgraded:" msgstr "下列软件包将被升级：" -#: apt-private/private-output.cc:545 +#: apt-private/private-output.cc:548 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: apt-private/private-output.cc:565 +#: apt-private/private-output.cc:568 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-output.cc:620 +#: apt-private/private-output.cc:623 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: apt-private/private-output.cc:628 +#: apt-private/private-output.cc:631 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -1412,27 +1412,27 @@ msgstr "" "【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" -#: apt-private/private-output.cc:659 +#: apt-private/private-output.cc:662 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:663 +#: apt-private/private-output.cc:666 #, c-format msgid "%lu reinstalled, " msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-output.cc:665 +#: apt-private/private-output.cc:668 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: apt-private/private-output.cc:667 +#: apt-private/private-output.cc:670 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" -#: apt-private/private-output.cc:671 +#: apt-private/private-output.cc:674 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" @@ -1441,7 +1441,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:693 +#: apt-private/private-output.cc:696 msgid "[Y/n]" msgstr "" @@ -1449,21 +1449,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:699 +#: apt-private/private-output.cc:702 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:710 +#: apt-private/private-output.cc:713 msgid "Y" msgstr "" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:716 +#: apt-private/private-output.cc:719 msgid "N" msgstr "" -#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -1633,7 +1633,7 @@ msgstr "没有找到镜像文件 %s" msgid "[Mirror: %s]" msgstr "[镜像：%s]" -#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" @@ -1983,47 +1983,47 @@ msgstr "override 文件 %s 第 %lu 行的格式有误 #2" msgid "Malformed override %s line %llu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:190 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误，无法创建 %s" -#: ftparchive/multicompress.cc:302 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:340 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:356 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" @@ -2158,12 +2158,12 @@ msgstr "添加了两个转移项 %s-> %s" msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" @@ -2540,22 +2540,22 @@ msgstr "读取文件出错，还剩 %lu 字节没有读出" msgid "write, still have %llu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, c-format msgid "Problem closing the file %s" msgstr "关闭文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, c-format msgid "Problem renaming the file %s to %s" msgstr "重命名文件 %s 为 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, c-format msgid "Problem unlinking the file %s" msgstr "用 unlink 删除文件 %s 出错" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2813,7 +2813,7 @@ msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, c-format msgid "List directory %spartial is missing." msgstr "软件包列表的目录 %spartial 缺失。" @@ -2982,35 +2982,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "无效的操作 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3019,12 +3019,12 @@ msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3033,12 +3033,12 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3074,50 +3074,41 @@ msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"现把 %s 作为了 CD-ROM 的挂载点\n" -"正在挂载 CD-ROM\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "正在鉴别.. " - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "已归档文件的标签：%s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸载 CD-ROM...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "正在鉴别.. " + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "已归档文件的标签：%s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸载 CD-ROM...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "正在盘片中查找索引文件..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " @@ -3126,7 +3117,7 @@ msgstr "" "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签" "名\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" @@ -3134,16 +3125,16 @@ msgstr "" "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" "架。" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "找到标签 '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请重试。\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3152,15 +3143,15 @@ msgstr "" "这张盘片现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "正在写入新的源列表\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "对应于该盘片的软件源设置项是：\n" @@ -3443,6 +3434,13 @@ msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。" msgid "Not locked" msgstr "未锁定" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "现把 %s 作为了 CD-ROM 的挂载点\n" +#~ "正在挂载 CD-ROM\n" + #~ msgid "" #~ "Could not patch %s with mmap and with file operation usage - the patch " #~ "seems to be corrupt." diff --git a/po/zh_TW.po b/po/zh_TW.po index 123cef942..09bdf0760 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-02-06 20:46+0100\n" +"POT-Creation-Date: 2014-02-13 10:19+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] %s" msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:105 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" @@ -2540,22 +2540,22 @@ msgstr "讀取，仍有 %lu 未讀但已無空間" msgid "write, still have %llu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/contrib/fileutl.cc:1732 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/contrib/fileutl.cc:1744 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "在同步檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/contrib/fileutl.cc:1755 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:1762 +#: apt-pkg/contrib/fileutl.cc:1768 msgid "Problem syncing the file" msgstr "在同步檔案時發生問題" @@ -2808,7 +2808,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "找不到清單目錄 %spartial。" @@ -2977,35 +2977,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "無效的操作 %s" -#: apt-pkg/acquire-item.cc:1561 +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1577 +#: apt-pkg/acquire-item.cc:1586 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1619 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1657 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3013,12 +3013,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3027,12 +3027,12 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/acquire-item.cc:1922 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3068,72 +3068,63 @@ msgstr "在 Release 檔 %s 裡沒有 Hash 項目" msgid "Vendor block %s contains no fingerprint" msgstr "提供者區塊 %s 沒有包含指紋碼" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"使用光碟機掛載點 %s\n" -"正在掛載光碟機\n" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "正在識別.." - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "保存標籤：%s\n" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸載光碟機...\n" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "正在卸載光碟機\n" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 msgid "Waiting for disc...\n" msgstr "正在等待碟片...\n" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "正在掛載光碟機... \n" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "正在識別.." + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "保存標籤：%s\n" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸載光碟機...\n" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "正在掃描碟片中的索引檔..\n" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "找到標籤 '%s'\n" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "這並不是正確的名稱，請重試。\n" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" @@ -3142,15 +3133,15 @@ msgstr "" "這個碟片名為：\n" "'%s'\n" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 msgid "Copying package lists..." msgstr "正在複製套件清單..." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 msgid "Writing new source list\n" msgstr "正在寫入新的來源列表\n" -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" @@ -3431,6 +3422,13 @@ msgstr "" msgid "Not locked" msgstr "" +#~ msgid "" +#~ "Using CD-ROM mount point %s\n" +#~ "Mounting CD-ROM\n" +#~ msgstr "" +#~ "使用光碟機掛載點 %s\n" +#~ "正在掛載光碟機\n" + #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" #~ msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n" -- cgit v1.2.3 From 28b4b983d95fa742a5431547285a748e8b856399 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Feb 2014 14:22:24 +0100 Subject: use "Restrictions: allow-stderr and avoid apt-stderr.log in debian/tests/run-tests --- debian/tests/control | 3 ++- debian/tests/run-tests | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index e38921c7e..ae794f762 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,2 +1,3 @@ Tests: run-tests -Depends: @, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4 \ No newline at end of file +Restrictions: allow-stderr +Depends: @, apt, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4 diff --git a/debian/tests/run-tests b/debian/tests/run-tests index 233c5a386..d9a9db7bf 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -2,12 +2,9 @@ set -e -# auto-package-test is very unhappy if stuff it writen to stderr -exec 2> apt-stderr.log - # we need the buildin webserver for the tests if [ ! -e environment.mak ]; then - ./configure + make startup fi make -C test/interactive-helper/ -- cgit v1.2.3